config bridge

Author: zeitlinger

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java

@@ -5,14 +5,16 @@
 
 package io.opentelemetry.instrumentation.spring.autoconfigure;
 
-import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.api.incubator.config.GlobalConfigProvider;
 import io.opentelemetry.api.trace.TracerProvider;
+import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
 import io.opentelemetry.instrumentation.api.internal.EmbeddedInstrumentationProperties;
 import io.opentelemetry.instrumentation.sdk.DeclarativeConfigPropertiesBridge;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.OtelMapConverter;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.SdkEnabled;
+import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.ConfigPropertiesBridge;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtelResourceProperties;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtelSpringProperties;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtlpExporterProperties;
@@ -72,8 +74,7 @@ public OpenTelemetryAutoConfiguration() {}
   static class OpenTelemetrySdkConfig {
 
     @Bean
-    public ComponentLoader openTelemetrySdkComponentLoader(
-        ApplicationContext applicationContext) {
+    public ComponentLoader openTelemetrySdkComponentLoader(ApplicationContext applicationContext) {
       return new OpenTelemetrySdkComponentLoader(applicationContext);
     }
 
@@ -158,14 +159,14 @@ public OpenTelemetryConfigurationModel openTelemetryConfigurationModel(
     }
 
     @Bean
-    public OpenTelemetry openTelemetry(OpenTelemetryConfigurationModel model, ComponentLoader componentLoader) {
-      OpenTelemetrySdk sdk =
-          DeclarativeConfiguration.create(model, componentLoader);
+    public OpenTelemetry openTelemetry(
+        OpenTelemetryConfigurationModel model, ComponentLoader componentLoader) {
+      OpenTelemetrySdk sdk = DeclarativeConfiguration.create(model, componentLoader);
 
       Runtime.getRuntime().addShutdownHook(new Thread(sdk::close));
 
-      GlobalOpenTelemetry.set(sdk);
-      GlobalConfigProvider.set(SdkConfigProvider.create(model));
+      SdkConfigProvider configProvider = SdkConfigProvider.create(model);
+      GlobalConfigProvider.set(configProvider);
 
       System.out.println(
           "OpenTelemetry SDK initialized with configuration from: " + sdk); // todo remove
@@ -179,6 +180,17 @@ public OpenTelemetry openTelemetry(OpenTelemetryConfigurationModel model, Compon
       return null;
     }
 
+    @Bean
+    public ConfigProvider configProvider(OpenTelemetryConfigurationModel model) {
+      return SdkConfigProvider.create(model);
+    }
+
+    @Bean
+    public InstrumentationConfig instrumentationConfig(
+        ConfigProperties properties, ConfigProvider configProvider) {
+      return new ConfigPropertiesBridge(properties, configProvider);
+    }
+
     /**
      * Expose the {@link ConfigProperties} bean for use in other auto-configurations.
      *

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/properties/ConfigPropertiesBridge.java

@@ -5,7 +5,9 @@
 
 package io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties;
 
+import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
+import io.opentelemetry.api.incubator.config.InstrumentationConfigUtil;
 import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
@@ -23,9 +25,16 @@
 public final class ConfigPropertiesBridge implements InstrumentationConfig {
 
   private final ConfigProperties configProperties;
+  @Nullable private final ConfigProvider configProvider;
 
   public ConfigPropertiesBridge(ConfigProperties configProperties) {
+    this(configProperties, null);
+  }
+
+  public ConfigPropertiesBridge(
+      ConfigProperties configProperties, @Nullable ConfigProvider configProvider) {
     this.configProperties = configProperties;
+    this.configProvider = configProvider;
   }
 
   @Nullable
@@ -113,7 +122,8 @@ public Map<String, String> getMap(String name, Map<String, String> defaultValue)
   @Nullable
   @Override
   public DeclarativeConfigProperties getDeclarativeConfig(String instrumentationName) {
-    // create a spring boot bridge for DeclarativeConfigProperties
-    return null;
+    return configProvider != null
+        ? InstrumentationConfigUtil.javaInstrumentationConfig(configProvider, instrumentationName)
+        : null;
   }
 }