Skip to content

Commit 2608c18

Browse files
malkiamalkia
committed
merged from upstream
2 parents 998c0ee + 5540dae commit 2608c18

22 files changed

+792
-324
lines changed

‎examples/configuration/extensions.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
# The file format version
5-
file_format: "0.1"
5+
file_format: "1.0"
66

77
# Configure if the SDK is disabled or not. This is not required to be provided
88
# to ensure the SDK isn't disabled, the default value when this is not provided

‎functional/configuration/shelltests/propagator_both.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright The OpenTelemetry Authors
22
# SPDX-License-Identifier: Apache-2.0
33

4-
file_format: 1.0.0
4+
file_format: "1.0"
55

66
propagator:
77
composite:

‎functional/configuration/shelltests/propagator_broken.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright The OpenTelemetry Authors
22
# SPDX-License-Identifier: Apache-2.0
33

4-
file_format: 1.0.0
4+
file_format: "1.0"
55

66
propagator:
77
composite:

‎functional/configuration/shelltests/propagator_composite_list.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright The OpenTelemetry Authors
22
# SPDX-License-Identifier: Apache-2.0
33

4-
file_format: 1.0.0
4+
file_format: "1.0"
55

66
propagator:
77
composite_list: "tracecontext,baggage,b3,b3multi"

‎functional/configuration/shelltests/propagator_duplicates.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright The OpenTelemetry Authors
22
# SPDX-License-Identifier: Apache-2.0
33

4-
file_format: 1.0.0
4+
file_format: "1.0"
55

66
propagator:
77
composite:

‎functional/configuration/shelltests/propagator_multi.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright The OpenTelemetry Authors
22
# SPDX-License-Identifier: Apache-2.0
33

4-
file_format: 1.0.0
4+
file_format: "1.0"
55

66
propagator:
77
composite:

‎functional/configuration/shelltests/propagator_ottrace.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright The OpenTelemetry Authors
22
# SPDX-License-Identifier: Apache-2.0
33

4-
file_format: 1.0.0
4+
file_format: "1.0"
55

66
propagator:
77
composite:

‎functional/configuration/shelltests/propagator_single.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright The OpenTelemetry Authors
22
# SPDX-License-Identifier: Apache-2.0
33

4-
file_format: 1.0.0
4+
file_format: "1.0"
55

66
propagator:
77
composite:

‎functional/configuration/shelltests/propagator_unknown.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright The OpenTelemetry Authors
22
# SPDX-License-Identifier: Apache-2.0
33

4-
file_format: 1.0.0
4+
file_format: "1.0"
55

66
propagator:
77
composite:

‎functional/configuration/shelltests/propagator_xray.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright The OpenTelemetry Authors
22
# SPDX-License-Identifier: Apache-2.0
33

4-
file_format: 1.0.0
4+
file_format: "1.0"
55

66
propagator:
77
composite:

0 commit comments

Comments
 (0)