Changes as of 3/10/2025

Author: jack-berg

docs/apidiffs/current_vs_latest/opentelemetry-sdk-extension-autoconfigure.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-sdk-extension-autoconfigure-1.48.0-SNAPSHOT.jar against opentelemetry-sdk-extension-autoconfigure-1.47.0.jar
+Comparing source compatibility of opentelemetry-sdk-extension-autoconfigure-1.48.0-SNAPSHOT.jar against opentelemetry-sdk-extension-autoconfigure-1.48.0.jar
 No changes.

sdk-extensions/incubator/build.gradle.kts

@@ -60,7 +60,7 @@ 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 = "bd511a6a16b321a7bb3135fa783dda1fbd40706f"
+val configurationRef = "ebb5dba5735425e8785ac55450cad6f7aa1b9f2d"
 val configurationRepoZip = "https://github.com/open-telemetry/opentelemetry-configuration/archive/$configurationRef.zip"
 val buildDirectory = layout.buildDirectory.asFile.get()
 

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

@@ -9,9 +9,9 @@
 
 import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalPrometheusMetricExporterModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.MetricReaderModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PeriodicMetricReaderModel;
-import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PrometheusMetricExporterModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PullMetricExporterModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PullMetricReaderModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PushMetricExporterModel;
@@ -54,7 +54,8 @@ public MetricReader create(
     if (pullModel != null) {
       PullMetricExporterModel exporterModel =
           requireNonNull(pullModel.getExporter(), "pull metric reader exporter");
-      PrometheusMetricExporterModel prometheusModel = exporterModel.getPrometheus();
+      ExperimentalPrometheusMetricExporterModel prometheusModel =
+          exporterModel.getPrometheusDevelopment();
       if (prometheusModel != null) {
         MetricReader metricReader =
             FileConfigUtil.loadComponent(

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

@@ -15,7 +15,7 @@
 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.DetectorsModel;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalDetectorsModel;
 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;
@@ -52,7 +52,8 @@ public Resource create(ResourceModel model, SpiHelper spiHelper, List<Closeable>
     for (Resource resourceProviderResource : resourceDetectorResources) {
       detectedResourceBuilder.putAll(resourceProviderResource);
     }
-    Predicate<String> detectorAttributeFilter = detectorAttributeFilter(model.getDetectors());
+    Predicate<String> detectorAttributeFilter =
+        detectorAttributeFilter(model.getDetectorsDevelopment());
     builder
         .putAll(
             detectedResourceBuilder.build().getAttributes().toBuilder()
@@ -141,7 +142,7 @@ private static boolean matchAll(String attributeKey) {
   }
 
   private static Predicate<String> detectorAttributeFilter(
-      @Nullable DetectorsModel detectorsModel) {
+      @Nullable ExperimentalDetectorsModel detectorsModel) {
     if (detectorsModel == null) {
       return ResourceFactory::matchAll;
     }