Update to rc.3

Author: jack-berg

sdk-extensions/incubator/build.gradle.kts

@@ -58,8 +58,8 @@ dependencies {
 // 6. deleteJs2pTmp - delete tmp directory
 // ... proceed with normal sourcesJar, compileJava, etc
 
-val configurationTag = "1.0.0-rc.1"
-val configurationRef = "447ff81a6dc566243813e6e45e378adf9a5b0bd7" // Replace with commit SHA to point to experiment with a specific commit
+val configurationTag = "1.0.0-rc.3"
+val configurationRef = "refs/tags/v$configurationTag" // Replace with commit SHA to point to experiment with a specific commit
 val configurationRepoZip = "https://github.com/open-telemetry/opentelemetry-configuration/archive/$configurationRef.zip"
 val buildDirectory = layout.buildDirectory.asFile.get()
 

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

@@ -92,7 +92,6 @@
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SimpleLogRecordProcessorModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SimpleSpanProcessorModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanExporterModel;
-import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanExporterPropertyModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanKind;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanLimitsModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel;
@@ -135,7 +134,7 @@ void parse_BadInputStream() {
   void parse_KitchenSinkExampleFile() throws IOException {
     OpenTelemetryConfigurationModel expected = new OpenTelemetryConfigurationModel();
 
-    expected.withFileFormat("1.0-rc.2");
+    expected.withFileFormat("1.0-rc.3");
     expected.withDisabled(false);
     expected.withLogLevel(OpenTelemetryConfigurationModel.SeverityNumber.INFO);
 
@@ -379,30 +378,13 @@ void parse_KitchenSinkExampleFile() throws IOException {
                                 new ExperimentalOtlpFileExporterModel()
                                     .withOutputStream("stdout"))));
     SpanProcessorModel spanProcessor5 =
-        new SpanProcessorModel()
-            .withBatch(
-                new BatchSpanProcessorModel()
-                    .withExporter(
-                        new SpanExporterModel()
-                            .withAdditionalProperty(
-                                "zipkin",
-                                new SpanExporterPropertyModel()
-                                    .withAdditionalProperty(
-                                        "endpoint", "http://localhost:9411/api/v2/spans")
-                                    .withAdditionalProperty("timeout", 10_000))));
-    SpanProcessorModel spanProcessor6 =
         new SpanProcessorModel()
             .withSimple(
                 new SimpleSpanProcessorModel()
                     .withExporter(new SpanExporterModel().withConsole(new ConsoleExporterModel())));
     tracerProvider.withProcessors(
         Arrays.asList(
-            spanProcessor1,
-            spanProcessor2,
-            spanProcessor3,
-            spanProcessor4,
-            spanProcessor5,
-            spanProcessor6));
+            spanProcessor1, spanProcessor2, spanProcessor3, spanProcessor4, spanProcessor5));
 
     expected.withTracerProvider(tracerProvider);
     // end TracerProvider config
@@ -840,7 +822,7 @@ void parse_KitchenSinkExampleFile() throws IOException {
       OpenTelemetryConfigurationModel config = DeclarativeConfiguration.parse(configExampleFile);
 
       // General config
-      assertThat(config.getFileFormat()).isEqualTo("1.0-rc.2");
+      assertThat(config.getFileFormat()).isEqualTo("1.0-rc.3");
       assertThat(config.getResource()).isEqualTo(resource);
       assertThat(config.getAttributeLimits()).isEqualTo(attributeLimits);
       assertThat(config.getPropagator()).isEqualTo(propagator);
@@ -854,12 +836,7 @@ void parse_KitchenSinkExampleFile() throws IOException {
       assertThat(configTracerProvider.getProcessors())
           .isEqualTo(
               Arrays.asList(
-                  spanProcessor1,
-                  spanProcessor2,
-                  spanProcessor3,
-                  spanProcessor4,
-                  spanProcessor5,
-                  spanProcessor6));
+                  spanProcessor1, spanProcessor2, spanProcessor3, spanProcessor4, spanProcessor5));
       assertThat(configTracerProvider).isEqualTo(tracerProvider);
 
       // LoggerProvider config

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

@@ -114,6 +114,7 @@ private static Stream<Arguments> fileFormatArgs() {
         Arguments.of("0.4", true),
         Arguments.of("1.0-rc.1", true),
         Arguments.of("1.0-rc.2", true),
+        Arguments.of("1.0-rc.3", true),
         Arguments.of("1.0", true));
   }