wip

Author: jack-berg

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 = "348beb6e6dc68394b3862267de1d146d546a6661"
+val configurationRef = "4258a37a665d2509b8750d2f76570c8722faba02"
 val configurationRepoZip = "https://github.com/jack-berg/opentelemetry-configuration/archive/$configurationRef.zip"
 val buildDirectory = layout.buildDirectory.asFile.get()
 

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

@@ -10,6 +10,7 @@
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerConfigModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerConfiguratorModel;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerMatcherAndConfigModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel;
 import io.opentelemetry.sdk.internal.ScopeConfigurator;
 import io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder;
@@ -22,6 +23,8 @@
 import java.io.Closeable;
 import java.util.List;
 
+import static io.opentelemetry.sdk.extension.incubator.fileconfig.FileConfigUtil.requireNonNull;
+
 final class TracerProviderFactory
     implements Factory<TracerProviderAndAttributeLimits, SdkTracerProviderBuilder> {
 
@@ -74,11 +77,11 @@ public SdkTracerProviderBuilder create(
         configuratorBuilder.setDefault(
             TracerConfigFactory.INSTANCE.create(defaultConfigModel, spiHelper, closeables));
       }
-      List<ScopeMatcherAndConfigModel> scopeConfigs = tracerConfiguratorModel.getScopeConfigs();
-      if (scopeConfigs != null) {
-        for (ScopeMatcherAndConfigModel scopeMatcherAndConfigModel : scopeConfigs) {
-          String name = scopeMatcherAndConfigModel.getName();
-          TracerConfigModel config = scopeMatcherAndConfigModel.getConfig();
+      List<TracerMatcherAndConfigModel> tracerMatcherAndConfigs = tracerConfiguratorModel.getTracers();
+      if (tracerMatcherAndConfigs != null) {
+        for (TracerMatcherAndConfigModel tracerMatcherAndConfig : tracerMatcherAndConfigs) {
+          String name = requireNonNull(tracerMatcherAndConfig.getName(), "tracer matcher name");
+          TracerConfigModel config = tracerMatcherAndConfig.getConfig();
           if (name == null || config == null) {
             continue;
           }