use bridge

zeitlinger · zeitlinger · commit bc177b40da56 · 2025-12-12T20:33:09.000+01:00
diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/internal/InstrumentationConfig.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/internal/InstrumentationConfig.java
@@ -119,7 +119,6 @@ default List<String> getList(String name) {
    * Returns a {@link DeclarativeConfigProperties} for the given node name, which is usually an
    * instrumentation name. If declarative configuration is not used, a bridge to ConfigProperties is
    *
-   *
    * <p>Declarative configuration is used to configure instrumentation properties in a declarative
    * way, such as through YAML or JSON files.
    *
diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java
@@ -153,7 +153,7 @@ public ConfigProvider configProvider(ConfigProperties properties) {
       @Bean
       public InstrumentationConfig instrumentationConfig(
           ConfigProperties properties, ConfigProvider configProvider) {
-        return new ConfigPropertiesBridge(properties, configProvider);
+        return new ConfigPropertiesBridge(properties, configProvider, false);
       }
     }
 
@@ -198,7 +198,7 @@ public ConfigProperties otelProperties(ConfigProvider configProvider) {
       @Bean
       public InstrumentationConfig instrumentationConfig(
           ConfigProperties properties, ConfigProvider configProvider) {
-        return new ConfigPropertiesBridge(properties, configProvider);
+        return new ConfigPropertiesBridge(properties, configProvider, true);
       }
 
       @Bean
@@ -245,7 +245,7 @@ public ConfigProvider configProvider() {
     @Bean
     public InstrumentationConfig instrumentationConfig(
         ConfigProperties properties, ConfigProvider configProvider) {
-      return new ConfigPropertiesBridge(properties, configProvider);
+      return new ConfigPropertiesBridge(properties, configProvider, false);
     }
 
     @Configuration
@@ -292,7 +292,7 @@ static class FallbackInstrumentationConfig {
     @Bean
     public InstrumentationConfig instrumentationConfig(
         ConfigProperties properties, ConfigProvider configProvider) {
-      return new ConfigPropertiesBridge(properties, configProvider);
+      return new ConfigPropertiesBridge(properties, configProvider, false);
     }
   }
 
diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/properties/ConfigPropertiesBridge.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/properties/ConfigPropertiesBridge.java
@@ -5,11 +5,7 @@
 
 package io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties;
 
-import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
-
 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;
diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/scheduling/SchedulingInstrumentationAspectTest.java b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/scheduling/SchedulingInstrumentationAspectTest.java
@@ -6,22 +6,19 @@
 package io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.scheduling;
 
 import static io.opentelemetry.api.trace.SpanKind.INTERNAL;
+import static io.opentelemetry.instrumentation.spring.autoconfigure.internal.AbstractKafkaInstrumentationAutoConfigurationTest.EMPTY_INSTRUMENTATION_CONFIG;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
-import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.ConfigPropertiesBridge;
 import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.code.SemconvCodeStabilityUtil;
-import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
 import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
 import io.opentelemetry.sdk.trace.data.StatusData;
-import java.util.Collections;
 import java.util.List;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -56,11 +53,7 @@ void setup() {
     factory.setTarget(unproxiedTester);
 
     SpringSchedulingInstrumentationAspect aspect =
-        newAspect(
-            testing.getOpenTelemetry(),
-            new ConfigPropertiesBridge(
-                DefaultConfigProperties.createFromMap(Collections.emptyMap()),
-                ConfigProvider.noop()));
+        newAspect(testing.getOpenTelemetry(), EMPTY_INSTRUMENTATION_CONFIG);
     factory.addAspect(aspect);
 
     schedulingTester = factory.getProxy();
diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/scheduling/SchedulingInstrumentationAutoConfigurationTest.java b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/scheduling/SchedulingInstrumentationAutoConfigurationTest.java
@@ -5,14 +5,11 @@
 
 package io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.scheduling;
 
+import static io.opentelemetry.instrumentation.spring.autoconfigure.internal.AbstractKafkaInstrumentationAutoConfigurationTest.EMPTY_INSTRUMENTATION_CONFIG;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
-import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.ConfigPropertiesBridge;
-import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
-import java.util.Collections;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@@ -21,12 +18,7 @@ class SchedulingInstrumentationAutoConfigurationTest {
   private final ApplicationContextRunner runner =
       new ApplicationContextRunner()
           .withBean(OpenTelemetry.class, OpenTelemetry::noop)
-          .withBean(
-              InstrumentationConfig.class,
-              () ->
-                  new ConfigPropertiesBridge(
-                      DefaultConfigProperties.createFromMap(Collections.emptyMap()),
-                      ConfigProvider.noop()))
+          .withBean(InstrumentationConfig.class, () -> EMPTY_INSTRUMENTATION_CONFIG)
           .withConfiguration(
               AutoConfigurations.of(SpringSchedulingInstrumentationAutoConfiguration.class));
 
diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/webflux/SpringWebfluxInstrumentationAutoConfigurationTest.java b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/webflux/SpringWebfluxInstrumentationAutoConfigurationTest.java
@@ -5,14 +5,11 @@
 
 package io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.webflux;
 
+import static io.opentelemetry.instrumentation.spring.autoconfigure.internal.AbstractKafkaInstrumentationAutoConfigurationTest.EMPTY_INSTRUMENTATION_CONFIG;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
-import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.ConfigPropertiesBridge;
-import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
-import java.util.Collections;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@@ -22,12 +19,7 @@ class SpringWebfluxInstrumentationAutoConfigurationTest {
   private final ApplicationContextRunner contextRunner =
       new ApplicationContextRunner()
           .withBean(OpenTelemetry.class, OpenTelemetry::noop)
-          .withBean(
-              InstrumentationConfig.class,
-              () ->
-                  new ConfigPropertiesBridge(
-                      DefaultConfigProperties.createFromMap(Collections.emptyMap()),
-                      ConfigProvider.noop()))
+          .withBean(InstrumentationConfig.class, () -> EMPTY_INSTRUMENTATION_CONFIG)
           .withConfiguration(
               AutoConfigurations.of(SpringWebfluxInstrumentationAutoConfiguration.class));
 
diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/webmvc/SpringWebMvcInstrumentation5AutoConfigurationTest.java b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/webmvc/SpringWebMvcInstrumentation5AutoConfigurationTest.java
@@ -5,15 +5,12 @@
 
 package io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.webmvc;
 
+import static io.opentelemetry.instrumentation.spring.autoconfigure.internal.AbstractKafkaInstrumentationAutoConfigurationTest.EMPTY_INSTRUMENTATION_CONFIG;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
-import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.ConfigPropertiesBridge;
-import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
-import java.util.Collections;
 import javax.servlet.Filter;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -25,12 +22,7 @@ class SpringWebMvcInstrumentation5AutoConfigurationTest {
   private final ApplicationContextRunner contextRunner =
       new ApplicationContextRunner()
           .withBean(OpenTelemetry.class, OpenTelemetry::noop)
-          .withBean(
-              InstrumentationConfig.class,
-              () ->
-                  new ConfigPropertiesBridge(
-                      DefaultConfigProperties.createFromMap(Collections.emptyMap()),
-                      ConfigProvider.noop()))
+          .withBean(InstrumentationConfig.class, () -> EMPTY_INSTRUMENTATION_CONFIG)
           .withConfiguration(
               AutoConfigurations.of(SpringWebMvc5InstrumentationAutoConfiguration.class));
 
diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/testSpring3/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/RestClientInstrumentationAutoConfigurationTest.java b/instrumentation/spring/spring-boot-autoconfigure/src/testSpring3/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/RestClientInstrumentationAutoConfigurationTest.java
@@ -28,7 +28,8 @@ class RestClientInstrumentationAutoConfigurationTest {
               () ->
                   new ConfigPropertiesBridge(
                       DefaultConfigProperties.createFromMap(Collections.emptyMap()),
-                      ConfigProvider.noop()))
+                      ConfigProvider.noop(),
+                      false))
           .withBean(RestClient.class, RestClient::create)
           .withConfiguration(
               AutoConfigurations.of(RestClientInstrumentationAutoConfiguration.class));
diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/testSpring3/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/webmvc/SpringWebMvcInstrumentation6AutoConfigurationTest.java b/instrumentation/spring/spring-boot-autoconfigure/src/testSpring3/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/webmvc/SpringWebMvcInstrumentation6AutoConfigurationTest.java
@@ -30,7 +30,8 @@ class SpringWebMvcInstrumentation6AutoConfigurationTest {
               () ->
                   new ConfigPropertiesBridge(
                       DefaultConfigProperties.createFromMap(Collections.emptyMap()),
-                      ConfigProvider.noop()))
+                      ConfigProvider.noop(),
+                      false))
           .withConfiguration(
               AutoConfigurations.of(SpringWebMvc6InstrumentationAutoConfiguration.class));
 
diff --git a/instrumentation/spring/spring-boot-autoconfigure/testing/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/AbstractJdbcInstrumentationAutoConfigurationTest.java b/instrumentation/spring/spring-boot-autoconfigure/testing/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/AbstractJdbcInstrumentationAutoConfigurationTest.java
@@ -5,17 +5,14 @@
 
 package io.opentelemetry.instrumentation.spring.autoconfigure.internal;
 
+import static io.opentelemetry.instrumentation.spring.autoconfigure.internal.AbstractKafkaInstrumentationAutoConfigurationTest.EMPTY_INSTRUMENTATION_CONFIG;
 import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT;
-import static java.util.Collections.emptyMap;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
-import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.ConfigPropertiesBridge;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
-import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
 import java.sql.Connection;
 import java.sql.Statement;
 import javax.sql.DataSource;
@@ -33,11 +30,7 @@ public abstract class AbstractJdbcInstrumentationAutoConfigurationTest {
 
   private final ApplicationContextRunner contextRunner =
       new ApplicationContextRunner()
-          .withBean(
-              InstrumentationConfig.class,
-              () ->
-                  new ConfigPropertiesBridge(
-                      DefaultConfigProperties.createFromMap(emptyMap()), ConfigProvider.noop()))
+          .withBean(InstrumentationConfig.class, () -> EMPTY_INSTRUMENTATION_CONFIG)
           .withConfiguration(autoConfigurations())
           .withBean("openTelemetry", OpenTelemetry.class, testing()::getOpenTelemetry);
 
diff --git a/instrumentation/spring/spring-boot-autoconfigure/testing/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/AbstractKafkaInstrumentationAutoConfigurationTest.java b/instrumentation/spring/spring-boot-autoconfigure/testing/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/AbstractKafkaInstrumentationAutoConfigurationTest.java
@@ -5,32 +5,34 @@
 
 package io.opentelemetry.instrumentation.spring.autoconfigure.internal;
 
-import static java.util.Collections.emptyMap;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.ConfigPropertiesBridge;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
+import java.util.Collections;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 
 public abstract class AbstractKafkaInstrumentationAutoConfigurationTest {
 
+  public static final ConfigPropertiesBridge EMPTY_INSTRUMENTATION_CONFIG =
+      new ConfigPropertiesBridge(
+          DefaultConfigProperties.createFromMap(Collections.emptyMap()),
+          ConfigProvider.noop(),
+          false);
+
   protected abstract AutoConfigurations autoConfigurations();
 
   protected abstract void factoryTestAssertion(AssertableApplicationContext context);
 
   protected final ApplicationContextRunner contextRunner =
       new ApplicationContextRunner()
-          .withBean(
-              InstrumentationConfig.class,
-              () ->
-                  new ConfigPropertiesBridge(
-                      DefaultConfigProperties.createFromMap(emptyMap()), ConfigProvider.noop()))
+          .withBean(InstrumentationConfig.class, () -> EMPTY_INSTRUMENTATION_CONFIG)
           .withConfiguration(autoConfigurations())
           .withBean("openTelemetry", OpenTelemetry.class, OpenTelemetry::noop);
 
diff --git a/instrumentation/spring/spring-boot-autoconfigure/testing/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/AbstractR2DbcInstrumentationAutoConfigurationTest.java b/instrumentation/spring/spring-boot-autoconfigure/testing/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/AbstractR2DbcInstrumentationAutoConfigurationTest.java
@@ -5,16 +5,13 @@
 
 package io.opentelemetry.instrumentation.spring.autoconfigure.internal;
 
+import static io.opentelemetry.instrumentation.spring.autoconfigure.internal.AbstractKafkaInstrumentationAutoConfigurationTest.EMPTY_INSTRUMENTATION_CONFIG;
 import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT;
 
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
-import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.ConfigPropertiesBridge;
 import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
-import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
-import java.util.Collections;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@@ -28,12 +25,7 @@ public abstract class AbstractR2DbcInstrumentationAutoConfigurationTest {
 
   protected final ApplicationContextRunner contextRunner =
       new ApplicationContextRunner()
-          .withBean(
-              InstrumentationConfig.class,
-              () ->
-                  new ConfigPropertiesBridge(
-                      DefaultConfigProperties.createFromMap(Collections.emptyMap()),
-                      ConfigProvider.noop()))
+          .withBean(InstrumentationConfig.class, () -> EMPTY_INSTRUMENTATION_CONFIG)
           .withConfiguration(autoConfigurations())
           .withBean("openTelemetry", OpenTelemetry.class, testing()::getOpenTelemetry);
 
diff --git a/instrumentation/spring/spring-boot-autoconfigure/testing/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/AbstractSpringWebInstrumentationAutoConfigurationTest.java b/instrumentation/spring/spring-boot-autoconfigure/testing/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/AbstractSpringWebInstrumentationAutoConfigurationTest.java
@@ -5,15 +5,12 @@
 
 package io.opentelemetry.instrumentation.spring.autoconfigure.internal;
 
+import static io.opentelemetry.instrumentation.spring.autoconfigure.internal.AbstractKafkaInstrumentationAutoConfigurationTest.EMPTY_INSTRUMENTATION_CONFIG;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.web.RestTemplateBeanPostProcessor;
-import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.ConfigPropertiesBridge;
-import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
-import java.util.Collections;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@@ -26,12 +23,7 @@ public abstract class AbstractSpringWebInstrumentationAutoConfigurationTest {
   protected final ApplicationContextRunner contextRunner =
       new ApplicationContextRunner()
           .withBean(OpenTelemetry.class, OpenTelemetry::noop)
-          .withBean(
-              InstrumentationConfig.class,
-              () ->
-                  new ConfigPropertiesBridge(
-                      DefaultConfigProperties.createFromMap(Collections.emptyMap()),
-                      ConfigProvider.noop()))
+          .withBean(InstrumentationConfig.class, () -> EMPTY_INSTRUMENTATION_CONFIG)
           .withBean(RestTemplate.class, RestTemplate::new)
           .withConfiguration(autoConfigurations());
 
diff --git a/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/EmptyInstrumentationConfig.java b/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/EmptyInstrumentationConfig.java
@@ -6,7 +6,6 @@
 package io.opentelemetry.javaagent.bootstrap.internal;
 
 import io.opentelemetry.api.incubator.config.ConfigProvider;
-import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
 import java.time.Duration;
 import java.util.List;
diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/ConfigPropertiesBridge.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/ConfigPropertiesBridge.java
@@ -5,11 +5,7 @@
 
 package io.opentelemetry.javaagent.tooling.config;
 
-import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
-
 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;

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,6 @@ default List<String> getList(String name) {`
`119`	`119`	`* Returns a {@link DeclarativeConfigProperties} for the given node name, which is usually an`
`120`	`120`	`* instrumentation name. If declarative configuration is not used, a bridge to ConfigProperties is`
`121`	`121`	`*`
`122`		`- *`
`123`	`122`	`* <p>Declarative configuration is used to configure instrumentation properties in a declarative`
`124`	`123`	`* way, such as through YAML or JSON files.`
`125`	`124`	`*`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ public ConfigProvider configProvider(ConfigProperties properties) {`
`153`	`153`	`@Bean`
`154`	`154`	`public InstrumentationConfig instrumentationConfig(`
`155`	`155`	`ConfigProperties properties, ConfigProvider configProvider) {`
`156`		`- return new ConfigPropertiesBridge(properties, configProvider);`
	`156`	`+ return new ConfigPropertiesBridge(properties, configProvider, false);`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`
`@@ -198,7 +198,7 @@ public ConfigProperties otelProperties(ConfigProvider configProvider) {`
`198`	`198`	`@Bean`
`199`	`199`	`public InstrumentationConfig instrumentationConfig(`
`200`	`200`	`ConfigProperties properties, ConfigProvider configProvider) {`
`201`		`- return new ConfigPropertiesBridge(properties, configProvider);`
	`201`	`+ return new ConfigPropertiesBridge(properties, configProvider, true);`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`@Bean`
`@@ -245,7 +245,7 @@ public ConfigProvider configProvider() {`
`245`	`245`	`@Bean`
`246`	`246`	`public InstrumentationConfig instrumentationConfig(`
`247`	`247`	`ConfigProperties properties, ConfigProvider configProvider) {`
`248`		`- return new ConfigPropertiesBridge(properties, configProvider);`
	`248`	`+ return new ConfigPropertiesBridge(properties, configProvider, false);`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`@Configuration`
`@@ -292,7 +292,7 @@ static class FallbackInstrumentationConfig {`
`292`	`292`	`@Bean`
`293`	`293`	`public InstrumentationConfig instrumentationConfig(`
`294`	`294`	`ConfigProperties properties, ConfigProvider configProvider) {`
`295`		`- return new ConfigPropertiesBridge(properties, configProvider);`
	`295`	`+ return new ConfigPropertiesBridge(properties, configProvider, false);`
`296`	`296`	`}`
`297`	`297`	`}`
`298`	`298`