zeitlinger · zeitlinger · Jun 19, 2024 · Jun 18, 2024
diff --git a/...ator/builder/HttpClientConfigBuilder.java → ...r/AbstractHttpClientTelemetryBuilder.java b/...ator/builder/HttpClientConfigBuilder.java → ...r/AbstractHttpClientTelemetryBuilder.java
@@ -27,7 +27,7 @@
 import java.util.Set;
 import java.util.function.Function;
 
-public abstract class HttpClientConfigBuilder<SELF, REQUEST, RESPONSE> {
+public abstract class AbstractHttpClientTelemetryBuilder<SELF, REQUEST, RESPONSE> {
 
   private final String instrumentationName;
   protected final OpenTelemetry openTelemetry;
@@ -42,7 +42,7 @@ public abstract class HttpClientConfigBuilder<SELF, REQUEST, RESPONSE> {
       spanNameExtractorTransformer = Function.identity();
   private boolean emitExperimentalHttpClientMetrics = false;
 
-  protected HttpClientConfigBuilder(
+  public AbstractHttpClientTelemetryBuilder(
       String instrumentationName,
       OpenTelemetry openTelemetry,
       HttpClientAttributesGetter<REQUEST, RESPONSE> attributesGetter) {

diff --git a/.../io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientSingletons.java b/.../io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientSingletons.java
@@ -10,7 +10,7 @@
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
-import io.opentelemetry.javaagent.bootstrap.internal.HttpClientInstrumenterFactory;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenterBuilder;
 import io.opentelemetry.javaagent.instrumentation.akkahttp.AkkaHttpUtil;
 
 public class AkkaHttpClientSingletons {
@@ -21,7 +21,7 @@ public class AkkaHttpClientSingletons {
   static {
     SETTER = new HttpHeaderSetter(GlobalOpenTelemetry.getPropagators());
     INSTRUMENTER =
-        HttpClientInstrumenterFactory.builder(
+        JavaagentHttpClientInstrumenterBuilder.create(
                 AkkaHttpUtil.instrumentationName(), new AkkaHttpClientAttributesGetter())
             .buildInstrumenter(SpanKindExtractor.alwaysClient());
   }

diff --git a/...etry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientSingletons.java b/...etry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientSingletons.java
@@ -6,7 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.apachehttpasyncclient;
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.javaagent.bootstrap.internal.HttpClientInstrumenterFactory;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenterBuilder;
 import org.apache.http.HttpResponse;
 
 public final class ApacheHttpAsyncClientSingletons {
@@ -16,7 +16,7 @@ public final class ApacheHttpAsyncClientSingletons {
 
   static {
     INSTRUMENTER =
-        HttpClientInstrumenterFactory.builder(
+        JavaagentHttpClientInstrumenterBuilder.create(
                 INSTRUMENTATION_NAME, new ApacheHttpAsyncClientHttpAttributesGetter())
             .buildClientInstrumenter(HttpHeaderSetter.INSTANCE);
   }

diff --git a/...telemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientSingletons.java b/...telemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientSingletons.java
@@ -6,7 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v2_0;
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.javaagent.bootstrap.internal.HttpClientInstrumenterFactory;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenterBuilder;
 import org.apache.commons.httpclient.HttpMethod;
 
 public final class ApacheHttpClientSingletons {
@@ -16,7 +16,7 @@ public final class ApacheHttpClientSingletons {
 
   static {
     INSTRUMENTER =
-        HttpClientInstrumenterFactory.builder(
+        JavaagentHttpClientInstrumenterBuilder.create(
                 INSTRUMENTATION_NAME, new ApacheHttpClientHttpAttributesGetter())
             .buildClientInstrumenter(HttpHeaderSetter.INSTANCE);
   }

diff --git a/...telemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientSingletons.java b/...telemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientSingletons.java
@@ -6,7 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v4_0;
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.javaagent.bootstrap.internal.HttpClientInstrumenterFactory;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenterBuilder;
 import org.apache.http.HttpResponse;
 
 public final class ApacheHttpClientSingletons {
@@ -16,7 +16,7 @@ public final class ApacheHttpClientSingletons {
 
   static {
     INSTRUMENTER =
-        HttpClientInstrumenterFactory.builder(
+        JavaagentHttpClientInstrumenterBuilder.create(
                 INSTRUMENTATION_NAME, new ApacheHttpClientHttpAttributesGetter())
             .buildClientInstrumenter(HttpHeaderSetter.INSTANCE);
   }

diff --git a/...opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTelemetryBuilder.java b/...opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTelemetryBuilder.java
@@ -6,13 +6,13 @@
 package io.opentelemetry.instrumentation.apachehttpclient.v4_3;
 
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.instrumentation.api.incubator.builder.HttpClientConfigBuilder;
+import io.opentelemetry.instrumentation.api.incubator.builder.AbstractHttpClientTelemetryBuilder;
 import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
 import org.apache.http.HttpResponse;
 
 /** A builder for {@link ApacheHttpClientTelemetry}. */
 public final class ApacheHttpClientTelemetryBuilder
-    extends HttpClientConfigBuilder<
+    extends AbstractHttpClientTelemetryBuilder<
         ApacheHttpClientTelemetryBuilder, ApacheHttpClientRequest, HttpResponse> {
 
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.apache-httpclient-4.3";

diff --git a/...telemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientSingletons.java b/...telemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientSingletons.java
@@ -6,7 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v5_0;
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.javaagent.bootstrap.internal.HttpClientInstrumenterFactory;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenterBuilder;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
 
@@ -17,7 +17,7 @@ public final class ApacheHttpClientSingletons {
 
   static {
     INSTRUMENTER =
-        HttpClientInstrumenterFactory.builder(
+        JavaagentHttpClientInstrumenterBuilder.create(
                 INSTRUMENTATION_NAME, new ApacheHttpClientHttpAttributesGetter())
             .buildClientInstrumenter(HttpHeaderSetter.INSTANCE);
   }

diff --git a/...entelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientSingletons.java b/...entelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientSingletons.java
@@ -8,7 +8,7 @@
 import com.ning.http.client.Request;
 import com.ning.http.client.Response;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.javaagent.bootstrap.internal.HttpClientInstrumenterFactory;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenterBuilder;
 
 public final class AsyncHttpClientSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.async-http-client-1.9";
@@ -17,7 +17,7 @@ public final class AsyncHttpClientSingletons {
 
   static {
     INSTRUMENTER =
-        HttpClientInstrumenterFactory.builder(
+        JavaagentHttpClientInstrumenterBuilder.create(
                 INSTRUMENTATION_NAME, new AsyncHttpClientHttpAttributesGetter())
             .buildClientInstrumenter(HttpHeaderSetter.INSTANCE);
   }

diff --git a/...entelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientSingletons.java b/...entelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientSingletons.java
@@ -6,7 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v2_0;
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.javaagent.bootstrap.internal.HttpClientInstrumenterFactory;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenterBuilder;
 import org.asynchttpclient.Response;
 
 public final class AsyncHttpClientSingletons {
@@ -16,7 +16,7 @@ public final class AsyncHttpClientSingletons {
 
   static {
     INSTRUMENTER =
-        HttpClientInstrumenterFactory.builder(
+        JavaagentHttpClientInstrumenterBuilder.create(
                 INSTRUMENTATION_NAME, new AsyncHttpClientHttpAttributesGetter())
             .buildClientInstrumenter(HttpHeaderSetter.INSTANCE);
   }

diff --git a/.../opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientSingletons.java b/.../opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientSingletons.java
@@ -8,7 +8,7 @@
 import com.google.api.client.http.HttpRequest;
 import com.google.api.client.http.HttpResponse;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.javaagent.bootstrap.internal.HttpClientInstrumenterFactory;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenterBuilder;
 
 public class GoogleHttpClientSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.google-http-client-1.19";
@@ -17,7 +17,7 @@ public class GoogleHttpClientSingletons {
 
   static {
     INSTRUMENTER =
-        HttpClientInstrumenterFactory.builder(
+        JavaagentHttpClientInstrumenterBuilder.create(
                 INSTRUMENTATION_NAME, new GoogleHttpClientHttpAttributesGetter())
             .buildClientInstrumenter(HttpHeaderSetter.INSTANCE);
   }

diff --git a/...pentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionSingletons.java b/...pentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionSingletons.java
@@ -7,7 +7,7 @@
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig;
-import io.opentelemetry.javaagent.bootstrap.internal.HttpClientInstrumenterFactory;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenterBuilder;
 import java.net.HttpURLConnection;
 
 public final class HttpUrlConnectionSingletons {
@@ -16,7 +16,7 @@ public final class HttpUrlConnectionSingletons {
 
   static {
     INSTRUMENTER =
-        HttpClientInstrumenterFactory.builder(
+        JavaagentHttpClientInstrumenterBuilder.create(
                 "io.opentelemetry.http-url-connection", new HttpUrlHttpAttributesGetter())
             .addAttributesExtractor(
                 HttpMethodAttributeExtractor.create(

diff --git a/.../java/io/opentelemetry/javaagent/instrumentation/httpclient/JavaHttpClientSingletons.java b/.../java/io/opentelemetry/javaagent/instrumentation/httpclient/JavaHttpClientSingletons.java
@@ -11,7 +11,6 @@
 import io.opentelemetry.instrumentation.httpclient.JavaHttpClientTelemetryBuilder;
 import io.opentelemetry.instrumentation.httpclient.internal.HttpHeadersSetter;
 import io.opentelemetry.instrumentation.httpclient.internal.JavaHttpClientAttributesGetter;
-import io.opentelemetry.javaagent.bootstrap.internal.HttpClientInstrumenterFactory;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 
@@ -24,7 +23,7 @@ public class JavaHttpClientSingletons {
     SETTER = new HttpHeadersSetter(GlobalOpenTelemetry.getPropagators());
 
     INSTRUMENTER =
-        HttpClientInstrumenterFactory.builder(
+        ConfiguredHttpClientInstrumenterBuilder.create(
                 JavaHttpClientTelemetryBuilder.INSTRUMENTATION_NAME,
                 JavaHttpClientAttributesGetter.INSTANCE)
             .buildInstrumenter(SpanKindExtractor.alwaysClient());

diff --git a/...main/java/io/opentelemetry/instrumentation/httpclient/JavaHttpClientTelemetryBuilder.java b/...main/java/io/opentelemetry/instrumentation/httpclient/JavaHttpClientTelemetryBuilder.java
@@ -6,7 +6,7 @@
 package io.opentelemetry.instrumentation.httpclient;
 
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.instrumentation.api.incubator.builder.HttpClientConfigBuilder;
+import io.opentelemetry.instrumentation.api.incubator.builder.AbstractHttpClientTelemetryBuilder;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
 import io.opentelemetry.instrumentation.httpclient.internal.HttpHeadersSetter;
@@ -15,7 +15,8 @@
 import java.net.http.HttpResponse;
 
 public final class JavaHttpClientTelemetryBuilder
-    extends HttpClientConfigBuilder<JavaHttpClientTelemetryBuilder, HttpRequest, HttpResponse<?>> {
+    extends AbstractHttpClientTelemetryBuilder<
+        JavaHttpClientTelemetryBuilder, HttpRequest, HttpResponse<?>> {
 
   public static final String INSTRUMENTATION_NAME = "io.opentelemetry.java-http-client";
 

diff --git a/...ntelemetry/javaagent/instrumentation/jetty/httpclient/v9_2/JettyHttpClientSingletons.java b/...ntelemetry/javaagent/instrumentation/jetty/httpclient/v9_2/JettyHttpClientSingletons.java
@@ -9,14 +9,14 @@
 import io.opentelemetry.instrumentation.jetty.httpclient.v9_2.JettyClientTelemetry;
 import io.opentelemetry.instrumentation.jetty.httpclient.v9_2.internal.HttpHeaderSetter;
 import io.opentelemetry.instrumentation.jetty.httpclient.v9_2.internal.JettyClientHttpAttributesGetter;
-import io.opentelemetry.javaagent.bootstrap.internal.HttpClientInstrumenterFactory;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenterBuilder;
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.client.api.Response;
 
 public class JettyHttpClientSingletons {
 
   private static final Instrumenter<Request, Response> INSTRUMENTER =
-      HttpClientInstrumenterFactory.builder(
+      JavaagentHttpClientInstrumenterBuilder.create(
               JettyClientTelemetry.INSTRUMENTATION_NAME, JettyClientHttpAttributesGetter.INSTANCE)
           .buildClientInstrumenter(HttpHeaderSetter.INSTANCE);
 

diff --git a/...a/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/JettyClientTelemetryBuilder.java b/...a/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/JettyClientTelemetryBuilder.java
@@ -7,7 +7,7 @@
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.instrumentation.api.incubator.builder.HttpClientConfigBuilder;
+import io.opentelemetry.instrumentation.api.incubator.builder.AbstractHttpClientTelemetryBuilder;
 import io.opentelemetry.instrumentation.jetty.httpclient.v9_2.internal.HttpHeaderSetter;
 import io.opentelemetry.instrumentation.jetty.httpclient.v9_2.internal.JettyClientHttpAttributesGetter;
 import org.eclipse.jetty.client.HttpClientTransport;
@@ -17,7 +17,7 @@
 
 /** A builder of {@link JettyClientTelemetry}. */
 public final class JettyClientTelemetryBuilder
-    extends HttpClientConfigBuilder<JettyClientTelemetryBuilder, Request, Response> {
+    extends AbstractHttpClientTelemetryBuilder<JettyClientTelemetryBuilder, Request, Response> {
 
   private HttpClientTransport httpClientTransport;
   private SslContextFactory sslContextFactory;

diff --git a/...ain/java/io/opentelemetry/javaagent/instrumentation/joddhttp/v4_2/JoddHttpSingletons.java b/...ain/java/io/opentelemetry/javaagent/instrumentation/joddhttp/v4_2/JoddHttpSingletons.java
@@ -6,7 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.joddhttp.v4_2;
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.javaagent.bootstrap.internal.HttpClientInstrumenterFactory;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenterBuilder;
 import jodd.http.HttpRequest;
 import jodd.http.HttpResponse;
 
@@ -17,7 +17,7 @@ public final class JoddHttpSingletons {
 
   static {
     INSTRUMENTER =
-        HttpClientInstrumenterFactory.builder(
+        JavaagentHttpClientInstrumenterBuilder.create(
                 INSTRUMENTATION_NAME, new JoddHttpHttpAttributesGetter())
             .buildClientInstrumenter(HttpHeaderSetter.INSTANCE);
   }

diff --git a/...a/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyClientSingletons.java b/...a/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyClientSingletons.java
@@ -13,7 +13,7 @@
 import io.opentelemetry.instrumentation.netty.common.internal.NettyConnectionRequest;
 import io.opentelemetry.instrumentation.netty.common.internal.NettyErrorHolder;
 import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig;
-import io.opentelemetry.javaagent.bootstrap.internal.HttpClientInstrumenterFactory;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenterBuilder;
 import io.opentelemetry.javaagent.instrumentation.netty.v3_8.HttpRequestAndChannel;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.handler.codec.http.HttpResponse;
@@ -27,7 +27,7 @@ public final class NettyClientSingletons {
 
   static {
     INSTRUMENTER =
-        HttpClientInstrumenterFactory.builder(
+        JavaagentHttpClientInstrumenterBuilder.create(
                 INSTRUMENTATION_NAME, new NettyHttpClientAttributesGetter())
             .addContextCustomizer(
                 (context, requestAndChannel, startAttributes) -> NettyErrorHolder.init(context))

diff --git a/...c/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2Singletons.java b/...c/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2Singletons.java
@@ -12,7 +12,7 @@
 import com.squareup.okhttp.Response;
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.javaagent.bootstrap.internal.HttpClientInstrumenterFactory;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenterBuilder;
 
 public final class OkHttp2Singletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.okhttp-2.2";
@@ -22,7 +22,7 @@ public final class OkHttp2Singletons {
 
   static {
     INSTRUMENTER =
-        HttpClientInstrumenterFactory.builder(
+        JavaagentHttpClientInstrumenterBuilder.create(
                 INSTRUMENTATION_NAME, new OkHttp2HttpAttributesGetter())
             .buildInstrumenter(alwaysClient());
 

diff --git a/...ntelemetry/javaagent/instrumentation/pekkohttp/v1_0/client/PekkoHttpClientSingletons.java b/...ntelemetry/javaagent/instrumentation/pekkohttp/v1_0/client/PekkoHttpClientSingletons.java
@@ -8,7 +8,7 @@
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
-import io.opentelemetry.javaagent.bootstrap.internal.HttpClientInstrumenterFactory;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenterBuilder;
 import io.opentelemetry.javaagent.instrumentation.pekkohttp.v1_0.PekkoHttpUtil;
 import org.apache.pekko.http.scaladsl.model.HttpRequest;
 import org.apache.pekko.http.scaladsl.model.HttpResponse;
@@ -22,7 +22,7 @@ public class PekkoHttpClientSingletons {
     SETTER = new HttpHeaderSetter(GlobalOpenTelemetry.getPropagators());
 
     INSTRUMENTER =
-        HttpClientInstrumenterFactory.builder(
+        JavaagentHttpClientInstrumenterBuilder.create(
                 PekkoHttpUtil.instrumentationName(), new PekkoHttpClientAttributesGetter())
             .buildInstrumenter(SpanKindExtractor.alwaysClient());
   }

diff --git a/...va/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientInstrumenterFactory.java b/...va/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientInstrumenterFactory.java
@@ -6,14 +6,14 @@
 package io.opentelemetry.javaagent.instrumentation.playws;
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.javaagent.bootstrap.internal.HttpClientInstrumenterFactory;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenterBuilder;
 import play.shaded.ahc.org.asynchttpclient.Request;
 import play.shaded.ahc.org.asynchttpclient.Response;
 
 public final class PlayWsClientInstrumenterFactory {
 
   public static Instrumenter<Request, Response> createInstrumenter(String instrumentationName) {
-    return HttpClientInstrumenterFactory.builder(
+    return JavaagentHttpClientInstrumenterBuilder.create(
             instrumentationName, new PlayWsClientHttpAttributesGetter())
         .buildClientInstrumenter(HttpHeaderSetter.INSTANCE);
   }

diff --git a/.../io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettySingletons.java b/.../io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettySingletons.java
@@ -11,7 +11,7 @@
 import io.opentelemetry.instrumentation.netty.v4.common.internal.client.NettyConnectionInstrumentationFlag;
 import io.opentelemetry.instrumentation.netty.v4.common.internal.client.NettyConnectionInstrumenter;
 import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig;
-import io.opentelemetry.javaagent.bootstrap.internal.HttpClientInstrumenterFactory;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenterBuilder;
 import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig;
 import reactor.netty.http.client.HttpClientRequest;
 import reactor.netty.http.client.HttpClientResponse;
@@ -29,7 +29,7 @@ public final class ReactorNettySingletons {
 
   static {
     INSTRUMENTER =
-        HttpClientInstrumenterFactory.builder(
+        JavaagentHttpClientInstrumenterBuilder.create(
                 INSTRUMENTATION_NAME, new ReactorNettyHttpClientAttributesGetter())
             .buildClientInstrumenter(HttpClientRequestHeadersSetter.INSTANCE);
 

diff --git a/...main/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebTelemetryBuilder.java b/...main/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebTelemetryBuilder.java
@@ -6,13 +6,14 @@
 package io.opentelemetry.instrumentation.spring.web.v3_1;
 
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.instrumentation.api.incubator.builder.HttpClientConfigBuilder;
+import io.opentelemetry.instrumentation.api.incubator.builder.AbstractHttpClientTelemetryBuilder;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.client.ClientHttpResponse;
 
 /** A builder of {@link SpringWebTelemetry}. */
 public final class SpringWebTelemetryBuilder
-    extends HttpClientConfigBuilder<SpringWebTelemetryBuilder, HttpRequest, ClientHttpResponse> {
+    extends AbstractHttpClientTelemetryBuilder<
+        SpringWebTelemetryBuilder, HttpRequest, ClientHttpResponse> {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.spring-web-3.1";
 
   SpringWebTelemetryBuilder(OpenTelemetry openTelemetry) {