file format cleanup, only major and minor.

marcalff · marcalff · commit 1621ae575dde · 2025-09-18T22:18:19.000+02:00
diff --git a/examples/configuration/extensions.yaml b/examples/configuration/extensions.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # The file format version
-file_format: "0.1"
+file_format: "1.0"
 
 # 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
diff --git a/functional/configuration/shelltests/kitchen-sink.yaml b/functional/configuration/shelltests/kitchen-sink.yaml
@@ -11,7 +11,7 @@
 # The file format version.
 # The yaml format is documented at
 # https://github.com/open-telemetry/opentelemetry-configuration/tree/main/schema
-file_format: "1.0.0-rc.1"
+file_format: "1.0-rc.1"
 # Configure if the SDK is disabled or not.
 # If omitted or null, false is used.
 disabled: false
diff --git a/functional/configuration/shelltests/propagator_both.yaml b/functional/configuration/shelltests/propagator_both.yaml
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-file_format: 1.0.0
+file_format: "1.0"
 
 propagator:
   composite:
diff --git a/functional/configuration/shelltests/propagator_broken.yaml b/functional/configuration/shelltests/propagator_broken.yaml
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-file_format: 1.0.0
+file_format: "1.0"
 
 propagator:
   composite:
diff --git a/functional/configuration/shelltests/propagator_composite_list.yaml b/functional/configuration/shelltests/propagator_composite_list.yaml
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-file_format: 1.0.0
+file_format: "1.0"
 
 propagator:
   composite_list: "tracecontext,baggage,b3,b3multi"
diff --git a/functional/configuration/shelltests/propagator_duplicates.yaml b/functional/configuration/shelltests/propagator_duplicates.yaml
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-file_format: 1.0.0
+file_format: "1.0"
 
 propagator:
   composite:
diff --git a/functional/configuration/shelltests/propagator_multi.yaml b/functional/configuration/shelltests/propagator_multi.yaml
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-file_format: 1.0.0
+file_format: "1.0"
 
 propagator:
   composite:
diff --git a/functional/configuration/shelltests/propagator_ottrace.yaml b/functional/configuration/shelltests/propagator_ottrace.yaml
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-file_format: 1.0.0
+file_format: "1.0"
 
 propagator:
   composite:
diff --git a/functional/configuration/shelltests/propagator_single.yaml b/functional/configuration/shelltests/propagator_single.yaml
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-file_format: 1.0.0
+file_format: "1.0"
 
 propagator:
   composite:
diff --git a/functional/configuration/shelltests/propagator_unknown.yaml b/functional/configuration/shelltests/propagator_unknown.yaml
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-file_format: 1.0.0
+file_format: "1.0"
 
 propagator:
   composite:
diff --git a/functional/configuration/shelltests/propagator_xray.yaml b/functional/configuration/shelltests/propagator_xray.yaml
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-file_format: 1.0.0
+file_format: "1.0"
 
 propagator:
   composite:
diff --git a/functional/configuration/shelltests/sampler_jaeger.yaml b/functional/configuration/shelltests/sampler_jaeger.yaml
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-file_format: 1.0.0
+file_format: "1.0"
 
 tracer_provider:
   processors:
diff --git a/sdk/include/opentelemetry/sdk/configuration/configuration_parser.h b/sdk/include/opentelemetry/sdk/configuration/configuration_parser.h
@@ -348,7 +348,6 @@ class ConfigurationParser
   std::string version_;
   int version_major_;
   int version_minor_;
-  int version_patch_;
 };
 
 }  // namespace configuration
diff --git a/sdk/src/configuration/configuration_parser.cc b/sdk/src/configuration/configuration_parser.cc
@@ -1870,10 +1870,9 @@ std::unique_ptr<Configuration> ConfigurationParser::Parse(std::unique_ptr<Docume
     int count;
     int major;
     int minor;
-    int patch;
 
-    count = sscanf(model->file_format.c_str(), "%d.%d.%d", &major, &minor, &patch);
-    if (count != 3)
+    count = sscanf(model->file_format.c_str(), "%d.%d", &major, &minor);
+    if (count != 2)
     {
       std::string message("Invalid file_format");
       throw InvalidSchemaException(message);
@@ -1886,9 +1885,17 @@ std::unique_ptr<Configuration> ConfigurationParser::Parse(std::unique_ptr<Docume
       throw InvalidSchemaException(message);
     }
 
+    if (minor != 0)
+    {
+      std::string message("Unsupported file_format, major = ");
+      message.append(std::to_string(major));
+      message.append(", minor = ");
+      message.append(std::to_string(minor));
+      throw InvalidSchemaException(message);
+    }
+
     version_major_ = major;
     version_minor_ = minor;
-    version_patch_ = patch;
   }
 
   model->disabled = node->GetBoolean("disabled", false);
diff --git a/sdk/test/configuration/yaml_logs_test.cc b/sdk/test/configuration/yaml_logs_test.cc
@@ -30,7 +30,7 @@ static std::unique_ptr<opentelemetry::sdk::configuration::Configuration> DoParse
 TEST(YamlLogs, no_processors)
 {
   std::string yaml = R"(
-file_format: 1.0.0-logs
+file_format: "1.0-logs"
 logger_provider:
 )";
 
@@ -41,7 +41,7 @@ file_format: 1.0.0-logs
 TEST(YamlLogs, empty_processors)
 {
   std::string yaml = R"(
-file_format: 1.0.0-logs
+file_format: "1.0-logs"
 logger_provider:
   processors:
 )";
@@ -53,7 +53,7 @@ file_format: 1.0.0-logs
 TEST(YamlLogs, many_processors)
 {
   std::string yaml = R"(
-file_format: 1.0.0-logs
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - simple:
@@ -73,7 +73,7 @@ file_format: 1.0.0-logs
 TEST(YamlLogs, simple_processor)
 {
   std::string yaml = R"(
-file_format: 1.0.0-logs
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - simple:
@@ -98,7 +98,7 @@ file_format: 1.0.0-logs
 TEST(YamlLogs, default_batch_processor)
 {
   std::string yaml = R"(
-file_format: 1.0.0-logs
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - batch:
@@ -127,7 +127,7 @@ file_format: 1.0.0-logs
 TEST(YamlLogs, batch_processor)
 {
   std::string yaml = R"(
-file_format: 1.0.0-logs
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - batch:
@@ -160,7 +160,7 @@ file_format: 1.0.0-logs
 TEST(YamlLogs, default_otlp_http)
 {
   std::string yaml = R"(
-file_format: 1.0.0-logs
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - simple:
@@ -198,7 +198,7 @@ file_format: 1.0.0-logs
 TEST(YamlLogs, otlp_http)
 {
   std::string yaml = R"(
-file_format: 1.0.0-logs
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - simple:
@@ -251,7 +251,7 @@ file_format: 1.0.0-logs
 TEST(YamlLogs, default_otlp_grpc)
 {
   std::string yaml = R"(
-file_format: 1.0.0-logs
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - simple:
@@ -289,7 +289,7 @@ file_format: 1.0.0-logs
 TEST(YamlLogs, otlp_grpc)
 {
   std::string yaml = R"(
-file_format: 1.0.0-logs
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - simple:
@@ -342,7 +342,7 @@ file_format: 1.0.0-logs
 TEST(YamlLogs, default_otlp_file)
 {
   std::string yaml = R"(
-file_format: 1.0.0-logs
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - simple:
@@ -371,7 +371,7 @@ file_format: 1.0.0-logs
 TEST(YamlLogs, otlp_file)
 {
   std::string yaml = R"(
-file_format: 1.0.0-logs
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - simple:
@@ -401,7 +401,7 @@ file_format: 1.0.0-logs
 TEST(YamlLogs, otlp_console)
 {
   std::string yaml = R"(
-file_format: 1.0.0-logs
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - simple:
@@ -426,7 +426,7 @@ file_format: 1.0.0-logs
 TEST(YamlLogs, no_limits)
 {
   std::string yaml = R"(
-file_format: 1.0.0-logs
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - simple:
@@ -443,7 +443,7 @@ file_format: 1.0.0-logs
 TEST(YamlLogs, default_limits)
 {
   std::string yaml = R"(
-file_format: 1.0.0-logs
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - simple:
@@ -463,7 +463,7 @@ file_format: 1.0.0-logs
 TEST(YamlLogs, limits)
 {
   std::string yaml = R"(
-file_format: 1.0.0-logs
+file_format: "1.0-logs"
 logger_provider:
   processors:
     - simple:
diff --git a/sdk/test/configuration/yaml_metrics_test.cc b/sdk/test/configuration/yaml_metrics_test.cc
diff --git a/sdk/test/configuration/yaml_propagator_test.cc b/sdk/test/configuration/yaml_propagator_test.cc
diff --git a/sdk/test/configuration/yaml_resource_test.cc b/sdk/test/configuration/yaml_resource_test.cc
diff --git a/sdk/test/configuration/yaml_test.cc b/sdk/test/configuration/yaml_test.cc
diff --git a/sdk/test/configuration/yaml_trace_test.cc b/sdk/test/configuration/yaml_trace_test.cc
