Merge branch 'main' into codeboten/add-log-level

open-telemetry · Oct 10, 2024 · cf89496 · cf89496
2 parents 11e30e4 + 844869c
commit cf89496
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 69 deletions.
diff --git a/examples/anchors.yaml b/examples/anchors.yaml
diff --git a/examples/kitchen-sink.yaml b/examples/kitchen-sink.yaml
@@ -6,7 +6,7 @@
 # Configuration values are set to their defaults when default values are defined.
 
 # The file format version.
-file_format: "0.1"
+file_format: "0.3"
 
 # Configure if the SDK is disabled or not. This is not required to be provided to ensure the SDK isn't disabled, the default value when this is not provided is for the SDK to be enabled.
 disabled: false

diff --git a/examples/sdk-config.yaml b/examples/sdk-config.yaml
@@ -6,7 +6,7 @@
 # vars defined in https://opentelemetry.io/docs/specs/otel/configuration/sdk-environment-variables/.
 
 # The file format version.
-file_format: "0.1"
+file_format: "0.3"
 
 # Configure if the SDK is disabled or not. This is not required to be provided to ensure the SDK isn't disabled, the default value when this is not provided is for the SDK to be enabled.
 disabled: false

diff --git a/examples/sdk-migration-config.yaml b/examples/sdk-migration-config.yaml
@@ -35,7 +35,7 @@
 # - OTEL_EXPORTER_OTLP_TIMEOUT
 
 # The file format version The file format version.
-file_format: "0.1"
+file_format: "0.3"
 
 # Configure if the SDK is disabled or not. This is not required to be provided to ensure the SDK isn't disabled, the default value when this is not provided is for the SDK to be enabled.
 disabled: ${OTEL_SDK_DISABLED:-false}

diff --git a/validator/shelltests/examples.test b/validator/shelltests/examples.test
@@ -1,6 +1,5 @@
 make validator-validate-examples
 >>>
-Validating anchors.yaml
 Validating kitchen-sink.yaml
 Validating sdk-config.yaml
 Validating sdk-migration-config.yaml