remove setHeaderSetter

Author: zeitlinger

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpClientInstrumenterBuilder.java

@@ -65,6 +65,18 @@ public final class DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> {
   private Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> builderCustomizer = b -> {};
 
   public DefaultHttpClientInstrumenterBuilder(
+      String instrumentationName,
+      OpenTelemetry openTelemetry,
+      HttpClientAttributesGetter<REQUEST, RESPONSE> attributesGetter,
+              TextMapSetter<REQUEST> headerSetter) {
+    this(
+      instrumentationName,
+      openTelemetry,
+      attributesGetter);
+    this.headerSetter = headerSetter;
+    }
+
+    public DefaultHttpClientInstrumenterBuilder(
       String instrumentationName,
       OpenTelemetry openTelemetry,
       HttpClientAttributesGetter<REQUEST, RESPONSE> attributesGetter) {
@@ -141,13 +153,6 @@ public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setKnownMethods(
     return this;
   }
 
-  @CanIgnoreReturnValue
-  public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setHeaderSetter(
-      @Nullable TextMapSetter<REQUEST> headerSetter) {
-    this.headerSetter = headerSetter;
-    return this;
-  }
-
   /**
    * Configures the instrumentation to emit experimental HTTP client metrics.
    *

instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaInstrumenterBuilderFactory.java

@@ -33,7 +33,6 @@ private ArmeriaInstrumenterBuilderFactory() {}
   public static DefaultHttpClientInstrumenterBuilder<ClientRequestContext, RequestLog>
       getClientBuilder(OpenTelemetry openTelemetry) {
     return new DefaultHttpClientInstrumenterBuilder<>(
-            INSTRUMENTATION_NAME, openTelemetry, ArmeriaHttpClientAttributesGetter.INSTANCE)
-        .setHeaderSetter(ClientRequestContextSetter.INSTANCE);
+            INSTRUMENTATION_NAME, openTelemetry, ArmeriaHttpClientAttributesGetter.INSTANCE,ClientRequestContextSetter.INSTANCE);
   }
 }

instrumentation/jetty-httpclient/jetty-httpclient-12.0/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/internal/JettyHttpClientInstrumenterBuilderFactory.java

@@ -22,7 +22,6 @@ private JettyHttpClientInstrumenterBuilderFactory() {}
   public static DefaultHttpClientInstrumenterBuilder<Request, Response> create(
       OpenTelemetry openTelemetry) {
     return new DefaultHttpClientInstrumenterBuilder<>(
-            INSTRUMENTATION_NAME, openTelemetry, JettyClientHttpAttributesGetter.INSTANCE)
-        .setHeaderSetter(HttpHeaderSetter.INSTANCE);
+            INSTRUMENTATION_NAME, openTelemetry, JettyClientHttpAttributesGetter.INSTANCE,HttpHeaderSetter.INSTANCE);
   }
 }

instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/internal/JettyHttpClientInstrumenterBuilderFactory.java

@@ -22,7 +22,6 @@ private JettyHttpClientInstrumenterBuilderFactory() {}
   public static DefaultHttpClientInstrumenterBuilder<Request, Response> create(
       OpenTelemetry openTelemetry) {
     return new DefaultHttpClientInstrumenterBuilder<>(
-            INSTRUMENTATION_NAME, openTelemetry, JettyClientHttpAttributesGetter.INSTANCE)
-        .setHeaderSetter(HttpHeaderSetter.INSTANCE);
+            INSTRUMENTATION_NAME, openTelemetry, JettyClientHttpAttributesGetter.INSTANCE,HttpHeaderSetter.INSTANCE);
   }
 }

instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyClientInstrumenterBuilderFactory.java

@@ -21,7 +21,6 @@ public static DefaultHttpClientInstrumenterBuilder<HttpRequestAndChannel, HttpRe
       String instrumentationName, OpenTelemetry openTelemetry) {
 
     return new DefaultHttpClientInstrumenterBuilder<>(
-            instrumentationName, openTelemetry, new NettyHttpClientAttributesGetter())
-        .setHeaderSetter(HttpRequestHeadersSetter.INSTANCE);
+            instrumentationName, openTelemetry, new NettyHttpClientAttributesGetter(),HttpRequestHeadersSetter.INSTANCE);
   }
 }

instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackTelemetryBuilder.java

@@ -32,8 +32,7 @@ public final class RatpackTelemetryBuilder {
   RatpackTelemetryBuilder(OpenTelemetry openTelemetry) {
     clientBuilder =
         new DefaultHttpClientInstrumenterBuilder<>(
-                INSTRUMENTATION_NAME, openTelemetry, RatpackHttpClientAttributesGetter.INSTANCE)
-            .setHeaderSetter(RequestHeaderSetter.INSTANCE);
+                INSTRUMENTATION_NAME, openTelemetry, RatpackHttpClientAttributesGetter.INSTANCE,RequestHeaderSetter.INSTANCE);
     serverBuilder =
         new DefaultHttpServerInstrumenterBuilder<>(
             INSTRUMENTATION_NAME,

instrumentation/spring/spring-web/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebTelemetryBuilder.java

@@ -30,8 +30,7 @@ public final class SpringWebTelemetryBuilder {
   SpringWebTelemetryBuilder(OpenTelemetry openTelemetry) {
     builder =
         new DefaultHttpClientInstrumenterBuilder<>(
-                INSTRUMENTATION_NAME, openTelemetry, SpringWebHttpAttributesGetter.INSTANCE)
-            .setHeaderSetter(HttpRequestSetter.INSTANCE);
+                INSTRUMENTATION_NAME, openTelemetry, SpringWebHttpAttributesGetter.INSTANCE,HttpRequestSetter.INSTANCE);
   }
 
   private DefaultHttpClientInstrumenterBuilder<HttpRequest, ClientHttpResponse> getBuilder() {

javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/JavaagentHttpClientInstrumenters.java

@@ -44,13 +44,12 @@ public static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(
       HttpClientAttributesGetter<REQUEST, RESPONSE> httpAttributesGetter,
       TextMapSetter<REQUEST> headerSetter,
       Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> instrumenterBuilderConsumer) {
-    DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> defaultHttpClientTelemetryBuilder =
-        new DefaultHttpClientInstrumenterBuilder<>(
-            instrumentationName, GlobalOpenTelemetry.get(), httpAttributesGetter);
     if (headerSetter != null) {
-      defaultHttpClientTelemetryBuilder.setHeaderSetter(headerSetter);
+      return create(new DefaultHttpClientInstrumenterBuilder<>(
+          instrumentationName, GlobalOpenTelemetry.get(), httpAttributesGetter, headerSetter), instrumenterBuilderConsumer);
     }
-    return create(defaultHttpClientTelemetryBuilder, instrumenterBuilderConsumer);
+    return create(new DefaultHttpClientInstrumenterBuilder<>(
+        instrumentationName, GlobalOpenTelemetry.get(), httpAttributesGetter), instrumenterBuilderConsumer);
   }
 
   private static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(