Use 0.4 file_format

Author: jack-berg

sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/DeclarativeConfigurationTest.java

@@ -23,7 +23,7 @@ class DeclarativeConfigurationTest {
   @Test
   void configFile(@TempDir Path tempDir) throws IOException {
     String yaml =
-        "file_format: \"0.3\"\n"
+        "file_format: \"0.4\"\n"
             + "resource:\n"
             + "  attributes:\n"
             + "    - name: service.name\n"

sdk-extensions/autoconfigure/src/testIncubating/java/io/opentelemetry/sdk/autoconfigure/DeclarativeConfigurationTest.java

@@ -62,7 +62,7 @@ class DeclarativeConfigurationTest {
   @BeforeEach
   void setup() throws IOException {
     String yaml =
-        "file_format: \"0.3\"\n"
+        "file_format: \"0.4\"\n"
             + "resource:\n"
             + "  attributes:\n"
             + "    - name: service.name\n"
@@ -199,7 +199,7 @@ void configFile_setResultAsGlobalTrue() {
   @Test
   void configFile_Error(@TempDir Path tempDir) throws IOException {
     String yaml =
-        "file_format: \"0.3\"\n"
+        "file_format: \"0.4\"\n"
             + "resource:\n"
             + "  attributes:\n"
             + "    - name: service.name\n"

sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/OpenTelemetryConfigurationFactory.java

@@ -31,9 +31,9 @@ static OpenTelemetryConfigurationFactory getInstance() {
   public OpenTelemetrySdk create(
       OpenTelemetryConfigurationModel model, SpiHelper spiHelper, List<Closeable> closeables) {
     OpenTelemetrySdkBuilder builder = OpenTelemetrySdk.builder();
-    if (!"0.3".equals(model.getFileFormat())) {
+    if (!"0.4".equals(model.getFileFormat())) {
       throw new DeclarativeConfigException(
-          "Unsupported file format. Supported formats include: 0.3");
+          "Unsupported file format. Supported formats include: 0.4");
     }
 
     if (Objects.equals(Boolean.TRUE, model.getDisabled())) {

sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationCreateTest.java

@@ -106,7 +106,7 @@ void parseAndCreate_Exception_CleansUpPartials() {
     // exporter with OTLP exporter, following by invalid batch exporter which references invalid
     // exporter "foo".
     String yaml =
-        "file_format: \"0.3\"\n"
+        "file_format: \"0.4\"\n"
             + "logger_provider:\n"
             + "  processors:\n"
             + "    - batch:\n"
@@ -133,7 +133,7 @@ void parseAndCreate_Exception_CleansUpPartials() {
   @Test
   void parseAndCreate_EmptyComponentProviderConfig() {
     String yaml =
-        "file_format: \"0.3\"\n"
+        "file_format: \"0.4\"\n"
             + "logger_provider:\n"
             + "  processors:\n"
             + "    - test:\n"
@@ -151,7 +151,7 @@ void parseAndCreate_EmptyComponentProviderConfig() {
   @Test
   void create_ModelCustomizer() {
     OpenTelemetryConfigurationModel model = new OpenTelemetryConfigurationModel();
-    model.withFileFormat("0.3");
+    model.withFileFormat("0.4");
     model.withTracerProvider(
         new TracerProviderModel()
             .withProcessors(

sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationParseTest.java

@@ -113,7 +113,7 @@ void parse_BadInputStream() {
   void parse_KitchenSinkExampleFile() throws IOException {
     OpenTelemetryConfigurationModel expected = new OpenTelemetryConfigurationModel();
 
-    expected.withFileFormat("0.3");
+    expected.withFileFormat("0.4");
     expected.withDisabled(false);
     expected.withLogLevel("info");
 
@@ -705,7 +705,7 @@ void parse_KitchenSinkExampleFile() throws IOException {
       OpenTelemetryConfigurationModel config = DeclarativeConfiguration.parse(configExampleFile);
 
       // General config
-      assertThat(config.getFileFormat()).isEqualTo("0.3");
+      assertThat(config.getFileFormat()).isEqualTo("0.4");
       assertThat(config.getResource()).isEqualTo(resource);
       assertThat(config.getAttributeLimits()).isEqualTo(attributeLimits);
       assertThat(config.getPropagator()).isEqualTo(propagator);
@@ -770,7 +770,7 @@ void parse_KitchenSinkExampleFile() throws IOException {
   @Test
   void parse_nullValuesParsedToEmptyObjects() {
     String objectPlaceholderString =
-        "file_format: \"0.3\"\n"
+        "file_format: \"0.4\"\n"
             + "tracer_provider:\n"
             + "  processors:\n"
             + "    - batch:\n"
@@ -788,7 +788,7 @@ void parse_nullValuesParsedToEmptyObjects() {
             new ByteArrayInputStream(objectPlaceholderString.getBytes(StandardCharsets.UTF_8)));
 
     String noOjbectPlaceholderString =
-        "file_format: \"0.3\"\n"
+        "file_format: \"0.4\"\n"
             + "tracer_provider:\n"
             + "  processors:\n"
             + "    - batch:\n"
@@ -961,7 +961,7 @@ private static Map<String, Object> mapOf(Map.Entry<String, ?>... entries) {
   @Test
   void read_WithEnvironmentVariables() {
     String yaml =
-        "file_format: \"0.3\"\n"
+        "file_format: \"0.4\"\n"
             + "tracer_provider:\n"
             + "  processors:\n"
             + "    - batch:\n"
@@ -980,7 +980,7 @@ void read_WithEnvironmentVariables() {
     assertThat(model)
         .isEqualTo(
             new OpenTelemetryConfigurationModel()
-                .withFileFormat("0.3")
+                .withFileFormat("0.4")
                 .withTracerProvider(
                     new TracerProviderModel()
                         .withProcessors(

sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/OpenTelemetryConfigurationFactoryTest.java

@@ -87,7 +87,7 @@ void create_InvalidFileFormat() {
                   OpenTelemetryConfigurationFactory.getInstance()
                       .create(testCase, spiHelper, closeables))
           .isInstanceOf(DeclarativeConfigException.class)
-          .hasMessage("Unsupported file format. Supported formats include: 0.3");
+          .hasMessage("Unsupported file format. Supported formats include: 0.4");
       cleanup.addCloseables(closeables);
     }
   }
@@ -101,7 +101,7 @@ void create_Defaults() {
     OpenTelemetrySdk sdk =
         OpenTelemetryConfigurationFactory.getInstance()
             .create(
-                new OpenTelemetryConfigurationModel().withFileFormat("0.3"), spiHelper, closeables);
+                new OpenTelemetryConfigurationModel().withFileFormat("0.4"), spiHelper, closeables);
     cleanup.addCloseable(sdk);
     cleanup.addCloseables(closeables);
 
@@ -118,7 +118,7 @@ void create_Disabled() {
         OpenTelemetryConfigurationFactory.getInstance()
             .create(
                 new OpenTelemetryConfigurationModel()
-                    .withFileFormat("0.3")
+                    .withFileFormat("0.4")
                     .withDisabled(true)
                     // Logger provider configuration should be ignored since SDK is disabled
                     .withLoggerProvider(
@@ -213,7 +213,7 @@ void create_Configured() {
         OpenTelemetryConfigurationFactory.getInstance()
             .create(
                 new OpenTelemetryConfigurationModel()
-                    .withFileFormat("0.3")
+                    .withFileFormat("0.4")
                     .withPropagator(
                         new PropagatorModel()
                             .withCompositeList("tracecontext,baggage,ottrace,b3multi,b3,jaeger"))

sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/YamlDeclarativeConfigPropertiesTest.java

@@ -22,7 +22,7 @@
 class YamlDeclarativeConfigPropertiesTest {
 
   private static final String extendedSchema =
-      "file_format: \"0.3\"\n"
+      "file_format: \"0.4\"\n"
           + "disabled: false\n"
           + "\n"
           + "resource:\n"
@@ -69,7 +69,7 @@ void setup() {
   @Test
   void configurationSchema() {
     // Validate can read declarative configuration schema properties
-    assertThat(structuredConfigProps.getString("file_format")).isEqualTo("0.3");
+    assertThat(structuredConfigProps.getString("file_format")).isEqualTo("0.4");
     DeclarativeConfigProperties resourceProps = structuredConfigProps.getStructured("resource");
     assertThat(resourceProps).isNotNull();
     List<DeclarativeConfigProperties> resourceAttributesList =