httpconfigure

trask · trask · commit c75be49b1e1d · 2025-12-12T07:58:05.000-08:00
diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpClientInstrumenterBuilder.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpClientInstrumenterBuilder.java
@@ -10,7 +10,7 @@
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.propagation.TextMapSetter;
-import io.opentelemetry.instrumentation.api.incubator.config.internal.CommonConfig;
+import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
 import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpClientExperimentalMetrics;
 import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpClientPeerServiceAttributesExtractor;
 import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpExperimentalAttributesExtractor;
@@ -35,8 +35,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
 import javax.annotation.Nullable;
 
@@ -265,22 +263,25 @@ InstrumenterBuilder<BUILDERREQUEST, BUILDERRESPONSE> instrumenterBuilder(
   }
 
   @CanIgnoreReturnValue
-  public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> configure(CommonConfig config) {
-    set(config::getKnownHttpRequestMethods, this::setKnownMethods);
-    set(config::getClientRequestHeaders, this::setCapturedRequestHeaders);
-    set(config::getClientResponseHeaders, this::setCapturedResponseHeaders);
-    set(config::getPeerServiceResolver, this::setPeerServiceResolver);
-    set(
-        config::shouldEmitExperimentalHttpClientTelemetry,
-        this::setEmitExperimentalHttpClientTelemetry);
-    set(config::redactQueryParameters, this::setRedactQueryParameters);
+  public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> configure(
+      OpenTelemetry openTelemetry) {
+    DeclarativeConfigUtil.getList(openTelemetry, "general", "http", "known_methods")
+        .ifPresent(this::setKnownMethods);
+    DeclarativeConfigUtil.getList(
+            openTelemetry, "general", "http", "client", "request_captured_headers")
+        .ifPresent(this::setCapturedRequestHeaders);
+    DeclarativeConfigUtil.getList(
+            openTelemetry, "general", "http", "client", "response_captured_headers")
+        .ifPresent(this::setCapturedResponseHeaders);
+    setPeerServiceResolver(PeerServiceResolver.create(openTelemetry));
+    setEmitExperimentalHttpClientTelemetry(
+        DeclarativeConfigUtil.getBoolean(
+                openTelemetry, "general", "http", "client", "emit_telemetry/development")
+            .orElse(false));
+    setRedactQueryParameters(
+        DeclarativeConfigUtil.getBoolean(
+                openTelemetry, "general", "http", "client", "redact_query_parameters/development")
+            .orElse(true));
     return this;
   }
-
-  private static <T> void set(Supplier<T> supplier, Consumer<T> consumer) {
-    T t = supplier.get();
-    if (t != null) {
-      consumer.accept(t);
-    }
-  }
 }
diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpServerInstrumenterBuilder.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpServerInstrumenterBuilder.java
@@ -8,7 +8,7 @@
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.context.propagation.TextMapGetter;
-import io.opentelemetry.instrumentation.api.incubator.config.internal.CommonConfig;
+import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
 import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpExperimentalAttributesExtractor;
 import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpServerExperimentalMetrics;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
@@ -31,8 +31,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
 import javax.annotation.Nullable;
 
@@ -224,20 +222,20 @@ public InstrumenterBuilder<REQUEST, RESPONSE> instrumenterBuilder() {
   }
 
   @CanIgnoreReturnValue
-  public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> configure(CommonConfig config) {
-    set(config::getKnownHttpRequestMethods, this::setKnownMethods);
-    set(config::getServerRequestHeaders, this::setCapturedRequestHeaders);
-    set(config::getServerResponseHeaders, this::setCapturedResponseHeaders);
-    set(
-        config::shouldEmitExperimentalHttpServerTelemetry,
-        this::setEmitExperimentalHttpServerTelemetry);
+  public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> configure(
+      OpenTelemetry openTelemetry) {
+    DeclarativeConfigUtil.getList(openTelemetry, "general", "http", "known_methods")
+        .ifPresent(this::setKnownMethods);
+    DeclarativeConfigUtil.getList(
+            openTelemetry, "general", "http", "server", "request_captured_headers")
+        .ifPresent(this::setCapturedRequestHeaders);
+    DeclarativeConfigUtil.getList(
+            openTelemetry, "general", "http", "server", "response_captured_headers")
+        .ifPresent(this::setCapturedResponseHeaders);
+    setEmitExperimentalHttpServerTelemetry(
+        DeclarativeConfigUtil.getBoolean(
+                openTelemetry, "general", "http", "server", "emit_telemetry/development")
+            .orElse(false));
     return this;
   }
-
-  private static <T> void set(Supplier<T> supplier, Consumer<T> consumer) {
-    T t = supplier.get();
-    if (t != null) {
-      consumer.accept(t);
-    }
-  }
 }
diff --git a/instrumentation/armeria/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaSingletons.java b/instrumentation/armeria/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaSingletons.java
@@ -8,13 +8,11 @@
 import com.linecorp.armeria.client.HttpClient;
 import com.linecorp.armeria.server.HttpService;
 import io.opentelemetry.api.GlobalOpenTelemetry;
-import io.opentelemetry.instrumentation.api.incubator.config.internal.CommonConfig;
 import io.opentelemetry.instrumentation.armeria.v1_3.ArmeriaClientTelemetry;
 import io.opentelemetry.instrumentation.armeria.v1_3.ArmeriaClientTelemetryBuilder;
 import io.opentelemetry.instrumentation.armeria.v1_3.ArmeriaServerTelemetry;
 import io.opentelemetry.instrumentation.armeria.v1_3.ArmeriaServerTelemetryBuilder;
 import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderUtil;
-import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
 import java.util.function.Function;
 
 // Holds singleton references to decorators to match against during suppression.
@@ -25,20 +23,18 @@ public final class ArmeriaSingletons {
   public static final Function<? super HttpService, ? extends HttpService> SERVER_DECORATOR;
 
   static {
-    CommonConfig config = AgentCommonConfig.get();
-
     ArmeriaClientTelemetryBuilder clientBuilder =
         ArmeriaClientTelemetry.builder(GlobalOpenTelemetry.get());
     ArmeriaInstrumenterBuilderUtil.getClientBuilderExtractor()
         .apply(clientBuilder)
-        .configure(config);
+        .configure(GlobalOpenTelemetry.get());
     ArmeriaClientTelemetry clientTelemetry = clientBuilder.build();
 
     ArmeriaServerTelemetryBuilder serverBuilder =
         ArmeriaServerTelemetry.builder(GlobalOpenTelemetry.get());
     ArmeriaInstrumenterBuilderUtil.getServerBuilderExtractor()
         .apply(serverBuilder)
-        .configure(config);
+        .configure(GlobalOpenTelemetry.get());
     ArmeriaServerTelemetry serverTelemetry = serverBuilder.build();
 
     CLIENT_DECORATOR = clientTelemetry.newDecorator();
diff --git a/instrumentation/helidon-4.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/helidon/v4_3/HelidonSingletons.java b/instrumentation/helidon-4.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/helidon/v4_3/HelidonSingletons.java
@@ -9,7 +9,6 @@
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.helidon.v4_3.HelidonTelemetry;
 import io.opentelemetry.instrumentation.helidon.v4_3.internal.HelidonInstrumenterBuilderUtil;
-import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
 import java.util.List;
 
 public final class HelidonSingletons {
@@ -20,7 +19,7 @@ public final class HelidonSingletons {
     var serverBuilder = HelidonTelemetry.builder(GlobalOpenTelemetry.get());
     HelidonInstrumenterBuilderUtil.getServerBuilderExtractor()
         .apply(serverBuilder)
-        .configure(AgentCommonConfig.get());
+        .configure(GlobalOpenTelemetry.get());
     var serverTelemetry = serverBuilder.build();
 
     FILTERS = List.of(serverTelemetry.createFilter(), new ResponseCustomizingFilter());
diff --git a/instrumentation/java-http-server/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javahttpserver/JavaHttpServerSingletons.java b/instrumentation/java-http-server/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javahttpserver/JavaHttpServerSingletons.java
@@ -7,11 +7,9 @@
 
 import com.sun.net.httpserver.Filter;
 import io.opentelemetry.api.GlobalOpenTelemetry;
-import io.opentelemetry.instrumentation.api.incubator.config.internal.CommonConfig;
 import io.opentelemetry.instrumentation.javahttpserver.JavaHttpServerTelemetry;
 import io.opentelemetry.instrumentation.javahttpserver.JavaHttpServerTelemetryBuilder;
 import io.opentelemetry.instrumentation.javahttpserver.internal.JavaHttpServerInstrumenterBuilderUtil;
-import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
 import java.util.Arrays;
 import java.util.List;
 
@@ -20,13 +18,11 @@ public final class JavaHttpServerSingletons {
   public static final List<Filter> FILTERS;
 
   static {
-    CommonConfig config = AgentCommonConfig.get();
-
     JavaHttpServerTelemetryBuilder serverBuilder =
         JavaHttpServerTelemetry.builder(GlobalOpenTelemetry.get());
     JavaHttpServerInstrumenterBuilderUtil.getServerBuilderExtractor()
         .apply(serverBuilder)
-        .configure(config);
+        .configure(GlobalOpenTelemetry.get());
     JavaHttpServerTelemetry serverTelemetry = serverBuilder.build();
 
     FILTERS = Arrays.asList(serverTelemetry.newFilter(), new ResponseCustomizingFilter());
diff --git a/instrumentation/ktor/ktor-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v2_0/HttpClientInstrumentation.java b/instrumentation/ktor/ktor-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v2_0/HttpClientInstrumentation.java
@@ -16,7 +16,6 @@
 import io.opentelemetry.instrumentation.ktor.v2_0.KtorClientTelemetry;
 import io.opentelemetry.instrumentation.ktor.v2_0.KtorClientTelemetryBuilder;
 import io.opentelemetry.instrumentation.ktor.v2_0.common.internal.KtorBuilderUtil;
-import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import kotlin.Unit;
@@ -55,7 +54,7 @@ public static class SetupFunction implements Function1<KtorClientTelemetryBuilde
     @Override
     public Unit invoke(KtorClientTelemetryBuilder builder) {
       builder.setOpenTelemetry(GlobalOpenTelemetry.get());
-      KtorBuilderUtil.clientBuilderExtractor.invoke(builder).configure(AgentCommonConfig.get());
+      KtorBuilderUtil.clientBuilderExtractor.invoke(builder).configure(GlobalOpenTelemetry.get());
       return kotlin.Unit.INSTANCE;
     }
   }
diff --git a/instrumentation/ktor/ktor-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v2_0/ServerInstrumentation.java b/instrumentation/ktor/ktor-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v2_0/ServerInstrumentation.java
@@ -14,7 +14,6 @@
 import io.opentelemetry.instrumentation.ktor.v2_0.KtorServerTelemetryBuilderKt;
 import io.opentelemetry.instrumentation.ktor.v2_0.common.AbstractKtorServerTelemetryBuilder;
 import io.opentelemetry.instrumentation.ktor.v2_0.common.internal.KtorBuilderUtil;
-import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import kotlin.Unit;
@@ -51,7 +50,7 @@ public static class SetupFunction
     @Override
     public Unit invoke(AbstractKtorServerTelemetryBuilder builder) {
       builder.setOpenTelemetry(GlobalOpenTelemetry.get());
-      KtorBuilderUtil.serverBuilderExtractor.invoke(builder).configure(AgentCommonConfig.get());
+      KtorBuilderUtil.serverBuilderExtractor.invoke(builder).configure(GlobalOpenTelemetry.get());
       return kotlin.Unit.INSTANCE;
     }
   }
diff --git a/instrumentation/ktor/ktor-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v3_0/HttpClientInstrumentation.java b/instrumentation/ktor/ktor-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v3_0/HttpClientInstrumentation.java
@@ -16,7 +16,6 @@
 import io.opentelemetry.instrumentation.ktor.v2_0.common.internal.KtorBuilderUtil;
 import io.opentelemetry.instrumentation.ktor.v3_0.KtorClientTelemetry;
 import io.opentelemetry.instrumentation.ktor.v3_0.KtorClientTelemetryBuilder;
-import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import kotlin.Unit;
@@ -55,7 +54,7 @@ public static class SetupFunction implements Function1<KtorClientTelemetryBuilde
     @Override
     public Unit invoke(KtorClientTelemetryBuilder builder) {
       builder.setOpenTelemetry(GlobalOpenTelemetry.get());
-      KtorBuilderUtil.clientBuilderExtractor.invoke(builder).configure(AgentCommonConfig.get());
+      KtorBuilderUtil.clientBuilderExtractor.invoke(builder).configure(GlobalOpenTelemetry.get());
       return Unit.INSTANCE;
     }
   }
diff --git a/instrumentation/ktor/ktor-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v3_0/ServerInstrumentation.java b/instrumentation/ktor/ktor-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v3_0/ServerInstrumentation.java
@@ -15,7 +15,6 @@
 import io.opentelemetry.instrumentation.ktor.v2_0.common.AbstractKtorServerTelemetryBuilder;
 import io.opentelemetry.instrumentation.ktor.v2_0.common.internal.KtorBuilderUtil;
 import io.opentelemetry.instrumentation.ktor.v3_0.KtorServerTelemetryBuilderKt;
-import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import java.lang.invoke.MethodHandle;
@@ -64,7 +63,7 @@ public static class SetupFunction implements Function1<AbstractKtorServerTelemet
     @Override
     public Unit invoke(AbstractKtorServerTelemetryBuilder builder) {
       builder.setOpenTelemetry(GlobalOpenTelemetry.get());
-      KtorBuilderUtil.serverBuilderExtractor.invoke(builder).configure(AgentCommonConfig.get());
+      KtorBuilderUtil.serverBuilderExtractor.invoke(builder).configure(GlobalOpenTelemetry.get());
       return Unit.INSTANCE;
     }
   }
diff --git a/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientSingletons.java b/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientSingletons.java
@@ -11,7 +11,6 @@
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpClientInstrumenterBuilder;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
 import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
 import okhttp3.Request;
 
@@ -29,7 +28,7 @@ public class KubernetesClientSingletons {
                 "io.opentelemetry.kubernetes-client-7.0",
                 GlobalOpenTelemetry.get(),
                 new KubernetesHttpAttributesGetter())
-            .configure(AgentCommonConfig.get())
+            .configure(GlobalOpenTelemetry.get())
             .setBuilderCustomizer(
                 instrumenterBuilder -> {
                   if (CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES) {
diff --git a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyClientSingletons.java b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyClientSingletons.java
@@ -17,7 +17,6 @@
 import io.opentelemetry.instrumentation.netty.common.v4_0.internal.client.NettyClientInstrumenterFactory;
 import io.opentelemetry.instrumentation.netty.common.v4_0.internal.client.NettyConnectionInstrumenter;
 import io.opentelemetry.instrumentation.netty.common.v4_0.internal.client.NettySslInstrumenter;
-import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
 import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
 
 public final class NettyClientSingletons {
@@ -37,7 +36,7 @@ public final class NettyClientSingletons {
     DefaultHttpClientInstrumenterBuilder<NettyRequest, HttpResponse> builder =
         NettyClientInstrumenterBuilderFactory.create(
                 "io.opentelemetry.netty-4.0", GlobalOpenTelemetry.get())
-            .configure(AgentCommonConfig.get());
+            .configure(GlobalOpenTelemetry.get());
 
     NettyClientInstrumenterFactory factory =
         new NettyClientInstrumenterFactory(
diff --git a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyClientSingletons.java b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyClientSingletons.java
@@ -19,7 +19,6 @@
 import io.opentelemetry.instrumentation.netty.common.v4_0.internal.client.NettyConnectionInstrumenter;
 import io.opentelemetry.instrumentation.netty.common.v4_0.internal.client.NettySslInstrumenter;
 import io.opentelemetry.instrumentation.netty.v4_1.internal.client.NettyClientHandlerFactory;
-import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
 import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
 
 public final class NettyClientSingletons {
@@ -40,7 +39,7 @@ public final class NettyClientSingletons {
     DefaultHttpClientInstrumenterBuilder<NettyRequest, HttpResponse> builder =
         NettyClientInstrumenterBuilderFactory.create(
                 "io.opentelemetry.netty-4.1", GlobalOpenTelemetry.get())
-            .configure(AgentCommonConfig.get());
+            .configure(GlobalOpenTelemetry.get());
     NettyClientInstrumenterFactory factory =
         new NettyClientInstrumenterFactory(
             builder,
diff --git a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyServerSingletons.java b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyServerSingletons.java
@@ -17,7 +17,7 @@ public final class NettyServerSingletons {
     NettyServerTelemetryBuilder builder = NettyServerTelemetry.builder(GlobalOpenTelemetry.get());
     NettyServerInstrumenterBuilderUtil.getBuilderExtractor()
         .apply(builder)
-        .configure(AgentCommonConfig.get());
+        .configure(GlobalOpenTelemetry.get());
     if (DeclarativeConfigUtil.getBoolean(
             GlobalOpenTelemetry.get(), "general", "http", "server", "emit_telemetry/development")
         .orElse(false)) {
diff --git a/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/RatpackSingletons.java b/instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/RatpackSingletons.java
@@ -12,7 +12,6 @@
 import io.opentelemetry.instrumentation.ratpack.v1_7.internal.ContextHolder;
 import io.opentelemetry.instrumentation.ratpack.v1_7.internal.OpenTelemetryHttpClient;
 import io.opentelemetry.instrumentation.ratpack.v1_7.internal.RatpackClientInstrumenterBuilderFactory;
-import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
 import ratpack.exec.Execution;
 
 public final class RatpackSingletons {
@@ -22,7 +21,7 @@ public final class RatpackSingletons {
         new OpenTelemetryHttpClient(
             RatpackClientInstrumenterBuilderFactory.create(
                     "io.opentelemetry.ratpack-1.7", GlobalOpenTelemetry.get())
-                .configure(AgentCommonConfig.get())
+                .configure(GlobalOpenTelemetry.get())
                 .build());
   }
 
diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettySingletons.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettySingletons.java
@@ -17,7 +17,6 @@
 import io.opentelemetry.instrumentation.netty.common.v4_0.internal.client.NettyClientInstrumenterFactory;
 import io.opentelemetry.instrumentation.netty.common.v4_0.internal.client.NettyConnectionInstrumentationFlag;
 import io.opentelemetry.instrumentation.netty.common.v4_0.internal.client.NettyConnectionInstrumenter;
-import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
 import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
 import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenters;
 import reactor.netty.http.client.HttpClientRequest;
@@ -48,7 +47,7 @@ public final class ReactorNettySingletons {
     DefaultHttpClientInstrumenterBuilder<NettyRequest, HttpResponse> builder =
         NettyClientInstrumenterBuilderFactory.create(
                 INSTRUMENTATION_NAME, GlobalOpenTelemetry.get())
-            .configure(AgentCommonConfig.get());
+            .configure(GlobalOpenTelemetry.get());
     NettyClientInstrumenterFactory instrumenterFactory =
         new NettyClientInstrumenterFactory(
             builder,
diff --git a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/AgentServletInstrumenterBuilder.java b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/AgentServletInstrumenterBuilder.java
@@ -21,7 +21,6 @@
 import io.opentelemetry.instrumentation.servlet.internal.ServletInstrumenterBuilder;
 import io.opentelemetry.instrumentation.servlet.internal.ServletRequestContext;
 import io.opentelemetry.instrumentation.servlet.internal.ServletResponseContext;
-import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
 import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -84,7 +83,7 @@ public Instrumenter<ServletRequestContext<REQUEST>, ServletResponseContext<RESPO
     if (propagateOperationListenersToOnEnd) {
       builder.propagateOperationListenersToOnEnd();
     }
-    builder.getBuilder().configure(AgentCommonConfig.get());
+    builder.getBuilder().configure(GlobalOpenTelemetry.get());
 
     return builder.build(spanNameExtractor);
   }
diff --git a/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/JavaagentHttpClientInstrumenters.java b/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/JavaagentHttpClientInstrumenters.java
@@ -57,7 +57,7 @@ private static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(
       DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> builder,
       Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> builderCustomizer) {
     return builder
-        .configure(AgentCommonConfig.get())
+        .configure(GlobalOpenTelemetry.get())
         .setBuilderCustomizer(builderCustomizer)
         .build();
   }
diff --git a/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/JavaagentHttpServerInstrumenters.java b/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/JavaagentHttpServerInstrumenters.java
@@ -48,7 +48,7 @@ public static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(
       DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> builder,
       Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> builderCustomizer) {
     return builder
-        .configure(AgentCommonConfig.get())
+        .configure(GlobalOpenTelemetry.get())
         .setBuilderCustomizer(builderCustomizer)
         .build();
   }
