Changes as of 12/4/24

Author: jack-berg

sdk-extensions/incubator/build.gradle.kts

@@ -60,8 +60,8 @@ dependencies {
 //  it was needed after 0.3.0 release because file_format in the examples weren't updated prior to the release tag
 // val configurationTag = "0.3.0"
 // val configurationRef = "refs/tags/v$configurationTag" // Replace with commit SHA to point to experiment with a specific commit
-val configurationRef = "cea3905ce0a542d573968c3c47d413143d473cf4"
-val configurationRepoZip = "https://github.com/open-telemetry/opentelemetry-configuration/archive/$configurationRef.zip"
+val configurationRef = "60a2d91aa03b94b1bd34b85cc349a83ed9f35527"
+val configurationRepoZip = "https://github.com/jack-berg/opentelemetry-configuration/archive/$configurationRef.zip"
 val buildDirectory = layout.buildDirectory.asFile.get()
 
 val downloadConfigurationSchema by tasks.registering(Download::class) {

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

@@ -15,8 +15,8 @@
 import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.StructuredConfigProperties;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeNameValueModel;
-import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.DetectorAttributesModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.DetectorsModel;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.IncludeExcludeModel;
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.resources.ResourceBuilder;
 import java.io.Closeable;
@@ -150,12 +150,12 @@ private static Predicate<String> detectorAttributeFilter(
     if (detectorsModel == null) {
       return ResourceFactory::matchAll;
     }
-    DetectorAttributesModel detectorAttributesModel = detectorsModel.getAttributes();
-    if (detectorAttributesModel == null) {
+    IncludeExcludeModel includedExcludeModel = detectorsModel.getAttributes();
+    if (includedExcludeModel == null) {
       return ResourceFactory::matchAll;
     }
-    List<String> included = detectorAttributesModel.getIncluded();
-    List<String> excluded = detectorAttributesModel.getExcluded();
+    List<String> included = includedExcludeModel.getIncluded();
+    List<String> excluded = includedExcludeModel.getExcluded();
     if (included == null && excluded == null) {
       return ResourceFactory::matchAll;
     }

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

@@ -18,7 +18,6 @@
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.BatchSpanProcessorModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ClientModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ConsoleModel;
-import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.DetectorAttributesModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.DetectorsModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExplicitBucketHistogramModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.GeneralInstrumentationModel;
@@ -139,7 +138,7 @@ void parse_KitchenSinkExampleFile() throws IOException {
             .withDetectors(
                 new DetectorsModel()
                     .withAttributes(
-                        new DetectorAttributesModel()
+                        new IncludeExcludeModel()
                             .withIncluded(Collections.singletonList("process.*"))
                             .withExcluded(Collections.singletonList("process.command_args"))))
             .withSchemaUrl("https://opentelemetry.io/schemas/1.16.0");
@@ -301,7 +300,7 @@ void parse_KitchenSinkExampleFile() throws IOException {
         new MetricReaderModel()
             .withPeriodic(
                 new PeriodicMetricReaderModel()
-                    .withInterval(5_000)
+                    .withInterval(60_000)
                     .withTimeout(30_000)
                     .withExporter(
                         new PushMetricExporterModel()
@@ -321,14 +320,14 @@ void parse_KitchenSinkExampleFile() throws IOException {
                                     .withCompression("gzip")
                                     .withTimeout(10_000)
                                     .withInsecure(false)
-                                    .withTemporalityPreference("delta")
+                                    .withTemporalityPreference(
+                                        OtlpMetricModel.TemporalityPreference.DELTA)
                                     .withDefaultHistogramAggregation(
                                         OtlpMetricModel.DefaultHistogramAggregation
                                             .BASE_2_EXPONENTIAL_BUCKET_HISTOGRAM))))
             .withProducers(
                 Collections.singletonList(
-                    new MetricProducerModel()
-                        .withAdditionalProperty("prometheus", Collections.emptyMap())));
+                    new MetricProducerModel().withAdditionalProperty("prometheus", null)));
     MetricReaderModel metricReader3 =
         new MetricReaderModel()
             .withPeriodic(
@@ -364,6 +363,7 @@ void parse_KitchenSinkExampleFile() throws IOException {
                             .withIncluded(Arrays.asList("key1", "key2"))
                             .withExcluded(Collections.singletonList("key3"))));
     meterProvider.withViews(Collections.singletonList(view));
+    meterProvider.withExemplarFilter(MeterProviderModel.ExemplarFilter.TRACE_BASED);
 
     expected.withMeterProvider(meterProvider);
     // end MeterProvider config

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

@@ -147,7 +147,7 @@ void create_OtlpConfigured(@TempDir Path tempDir)
                             .withCertificate(certificatePath)
                             .withClientKey(clientKeyPath)
                             .withClientCertificate(clientCertificatePath)
-                            .withTemporalityPreference("delta")
+                            .withTemporalityPreference(OtlpMetricModel.TemporalityPreference.DELTA)
                             .withDefaultHistogramAggregation(
                                 OtlpMetricModel.DefaultHistogramAggregation
                                     .BASE_2_EXPONENTIAL_BUCKET_HISTOGRAM)),

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

@@ -10,8 +10,8 @@
 
 import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeNameValueModel;
-import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.DetectorAttributesModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.DetectorsModel;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.IncludeExcludeModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ResourceModel;
 import io.opentelemetry.sdk.resources.Resource;
 import java.util.Arrays;
@@ -68,9 +68,7 @@ void createWithDetectors(
             .withDetectors(
                 new DetectorsModel()
                     .withAttributes(
-                        new DetectorAttributesModel()
-                            .withIncluded(included)
-                            .withExcluded(excluded)));
+                        new IncludeExcludeModel().withIncluded(included).withExcluded(excluded)));
     Resource resource =
         ResourceFactory.getInstance().create(resourceModel, spiHelper, Collections.emptyList());
     assertThat(resource).isEqualTo(expectedResource);