remove setHeaderSetter

zeitlinger · zeitlinger · commit 33536f9f088e · 2024-10-02T11:47:49.000+02: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
@@ -29,6 +29,7 @@
 import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanStatusExtractor;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -68,23 +69,20 @@ public DefaultHttpClientInstrumenterBuilder(
       String instrumentationName,
       OpenTelemetry openTelemetry,
       HttpClientAttributesGetter<REQUEST, RESPONSE> attributesGetter,
-              TextMapSetter<REQUEST> headerSetter) {
-    this(
-      instrumentationName,
-      openTelemetry,
-      attributesGetter);
-    this.headerSetter = headerSetter;
-    }
+      TextMapSetter<REQUEST> headerSetter) {
+    this(instrumentationName, openTelemetry, attributesGetter);
+    this.headerSetter = Objects.requireNonNull(headerSetter, "headerSetter");
+  }
 
-    public DefaultHttpClientInstrumenterBuilder(
+  public DefaultHttpClientInstrumenterBuilder(
       String instrumentationName,
       OpenTelemetry openTelemetry,
       HttpClientAttributesGetter<REQUEST, RESPONSE> attributesGetter) {
-    this.instrumentationName = instrumentationName;
-    this.openTelemetry = openTelemetry;
+    this.instrumentationName = Objects.requireNonNull(instrumentationName, "instrumentationName");
+    this.openTelemetry = Objects.requireNonNull(openTelemetry, "openTelemetry");
+    this.attributesGetter = Objects.requireNonNull(attributesGetter, "attributesGetter");
     httpSpanNameExtractorBuilder = HttpSpanNameExtractor.builder(attributesGetter);
     httpAttributesExtractorBuilder = HttpClientAttributesExtractor.builder(attributesGetter);
-    this.attributesGetter = attributesGetter;
   }
 
   /**
diff --git a/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaInstrumenterBuilderFactory.java b/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaInstrumenterBuilderFactory.java
@@ -33,6 +33,9 @@ private ArmeriaInstrumenterBuilderFactory() {}
   public static DefaultHttpClientInstrumenterBuilder<ClientRequestContext, RequestLog>
       getClientBuilder(OpenTelemetry openTelemetry) {
     return new DefaultHttpClientInstrumenterBuilder<>(
-            INSTRUMENTATION_NAME, openTelemetry, ArmeriaHttpClientAttributesGetter.INSTANCE,ClientRequestContextSetter.INSTANCE);
+        INSTRUMENTATION_NAME,
+        openTelemetry,
+        ArmeriaHttpClientAttributesGetter.INSTANCE,
+        ClientRequestContextSetter.INSTANCE);
   }
 }
diff --git a/instrumentation/jetty-httpclient/jetty-httpclient-12.0/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/internal/JettyHttpClientInstrumenterBuilderFactory.java b/instrumentation/jetty-httpclient/jetty-httpclient-12.0/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/internal/JettyHttpClientInstrumenterBuilderFactory.java
@@ -22,6 +22,9 @@ private JettyHttpClientInstrumenterBuilderFactory() {}
   public static DefaultHttpClientInstrumenterBuilder<Request, Response> create(
       OpenTelemetry openTelemetry) {
     return new DefaultHttpClientInstrumenterBuilder<>(
-            INSTRUMENTATION_NAME, openTelemetry, JettyClientHttpAttributesGetter.INSTANCE,HttpHeaderSetter.INSTANCE);
+        INSTRUMENTATION_NAME,
+        openTelemetry,
+        JettyClientHttpAttributesGetter.INSTANCE,
+        HttpHeaderSetter.INSTANCE);
   }
 }
diff --git a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/internal/JettyHttpClientInstrumenterBuilderFactory.java b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/internal/JettyHttpClientInstrumenterBuilderFactory.java
@@ -22,6 +22,9 @@ private JettyHttpClientInstrumenterBuilderFactory() {}
   public static DefaultHttpClientInstrumenterBuilder<Request, Response> create(
       OpenTelemetry openTelemetry) {
     return new DefaultHttpClientInstrumenterBuilder<>(
-            INSTRUMENTATION_NAME, openTelemetry, JettyClientHttpAttributesGetter.INSTANCE,HttpHeaderSetter.INSTANCE);
+        INSTRUMENTATION_NAME,
+        openTelemetry,
+        JettyClientHttpAttributesGetter.INSTANCE,
+        HttpHeaderSetter.INSTANCE);
   }
 }
diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyClientSingletons.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyClientSingletons.java
@@ -31,10 +31,10 @@ public final class NettyClientSingletons {
             INSTRUMENTATION_NAME,
             new NettyHttpClientAttributesGetter(),
             HttpRequestHeadersSetter.INSTANCE,
-            builder -> {
-              builder.addContextCustomizer(
-                  (context, requestAndChannel, startAttributes) -> NettyErrorHolder.init(context));
-            });
+            builder ->
+                builder.addContextCustomizer(
+                    (context, requestAndChannel, startAttributes) ->
+                        NettyErrorHolder.init(context)));
 
     CONNECTION_INSTRUMENTER =
         Instrumenter.<NettyConnectionRequest, Channel>builder(
diff --git a/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyClientInstrumenterBuilderFactory.java b/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyClientInstrumenterBuilderFactory.java
@@ -21,6 +21,9 @@ public static DefaultHttpClientInstrumenterBuilder<HttpRequestAndChannel, HttpRe
       String instrumentationName, OpenTelemetry openTelemetry) {
 
     return new DefaultHttpClientInstrumenterBuilder<>(
-            instrumentationName, openTelemetry, new NettyHttpClientAttributesGetter(),HttpRequestHeadersSetter.INSTANCE);
+        instrumentationName,
+        openTelemetry,
+        new NettyHttpClientAttributesGetter(),
+        HttpRequestHeadersSetter.INSTANCE);
   }
 }
diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackTelemetryBuilder.java b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackTelemetryBuilder.java
@@ -32,7 +32,10 @@ public final class RatpackTelemetryBuilder {
   RatpackTelemetryBuilder(OpenTelemetry openTelemetry) {
     clientBuilder =
         new DefaultHttpClientInstrumenterBuilder<>(
-                INSTRUMENTATION_NAME, openTelemetry, RatpackHttpClientAttributesGetter.INSTANCE,RequestHeaderSetter.INSTANCE);
+            INSTRUMENTATION_NAME,
+            openTelemetry,
+            RatpackHttpClientAttributesGetter.INSTANCE,
+            RequestHeaderSetter.INSTANCE);
     serverBuilder =
         new DefaultHttpServerInstrumenterBuilder<>(
             INSTRUMENTATION_NAME,
diff --git a/instrumentation/spring/spring-web/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebTelemetryBuilder.java b/instrumentation/spring/spring-web/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebTelemetryBuilder.java
@@ -30,7 +30,10 @@ public final class SpringWebTelemetryBuilder {
   SpringWebTelemetryBuilder(OpenTelemetry openTelemetry) {
     builder =
         new DefaultHttpClientInstrumenterBuilder<>(
-                INSTRUMENTATION_NAME, openTelemetry, SpringWebHttpAttributesGetter.INSTANCE,HttpRequestSetter.INSTANCE);
+            INSTRUMENTATION_NAME,
+            openTelemetry,
+            SpringWebHttpAttributesGetter.INSTANCE,
+            HttpRequestSetter.INSTANCE);
   }
 
   private DefaultHttpClientInstrumenterBuilder<HttpRequest, ClientHttpResponse> getBuilder() {
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
@@ -24,7 +24,10 @@ private JavaagentHttpClientInstrumenters() {}
   public static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(
       String instrumentationName,
       HttpClientAttributesGetter<REQUEST, RESPONSE> httpAttributesGetter) {
-    return create(instrumentationName, httpAttributesGetter, null);
+    return create(
+        new DefaultHttpClientInstrumenterBuilder<>(
+            instrumentationName, GlobalOpenTelemetry.get(), httpAttributesGetter),
+        b -> {});
   }
 
   public static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(
@@ -44,12 +47,10 @@ public static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(
       HttpClientAttributesGetter<REQUEST, RESPONSE> httpAttributesGetter,
       TextMapSetter<REQUEST> headerSetter,
       Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> instrumenterBuilderConsumer) {
-    if (headerSetter != null) {
-      return create(new DefaultHttpClientInstrumenterBuilder<>(
-          instrumentationName, GlobalOpenTelemetry.get(), httpAttributesGetter, headerSetter), instrumenterBuilderConsumer);
-    }
-    return create(new DefaultHttpClientInstrumenterBuilder<>(
-        instrumentationName, GlobalOpenTelemetry.get(), httpAttributesGetter), instrumenterBuilderConsumer);
+    return create(
+        new DefaultHttpClientInstrumenterBuilder<>(
+            instrumentationName, GlobalOpenTelemetry.get(), httpAttributesGetter, headerSetter),
+        instrumenterBuilderConsumer);
   }
 
   private static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,9 @@ private ArmeriaInstrumenterBuilderFactory() {}`
`33`	`33`	`public static DefaultHttpClientInstrumenterBuilder<ClientRequestContext, RequestLog>`
`34`	`34`	`getClientBuilder(OpenTelemetry openTelemetry) {`
`35`	`35`	`return new DefaultHttpClientInstrumenterBuilder<>(`
`36`		`- INSTRUMENTATION_NAME, openTelemetry, ArmeriaHttpClientAttributesGetter.INSTANCE,ClientRequestContextSetter.INSTANCE);`
	`36`	`+ INSTRUMENTATION_NAME,`
	`37`	`+ openTelemetry,`
	`38`	`+ ArmeriaHttpClientAttributesGetter.INSTANCE,`
	`39`	`+ ClientRequestContextSetter.INSTANCE);`
`37`	`40`	`}`
`38`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,9 @@ private JettyHttpClientInstrumenterBuilderFactory() {}`
`22`	`22`	`public static DefaultHttpClientInstrumenterBuilder<Request, Response> create(`
`23`	`23`	`OpenTelemetry openTelemetry) {`
`24`	`24`	`return new DefaultHttpClientInstrumenterBuilder<>(`
`25`		`- INSTRUMENTATION_NAME, openTelemetry, JettyClientHttpAttributesGetter.INSTANCE,HttpHeaderSetter.INSTANCE);`
	`25`	`+ INSTRUMENTATION_NAME,`
	`26`	`+ openTelemetry,`
	`27`	`+ JettyClientHttpAttributesGetter.INSTANCE,`
	`28`	`+ HttpHeaderSetter.INSTANCE);`
`26`	`29`	`}`
`27`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,9 @@ public static DefaultHttpClientInstrumenterBuilder<HttpRequestAndChannel, HttpRe`
`21`	`21`	`String instrumentationName, OpenTelemetry openTelemetry) {`
`22`	`22`
`23`	`23`	`return new DefaultHttpClientInstrumenterBuilder<>(`
`24`		`- instrumentationName, openTelemetry, new NettyHttpClientAttributesGetter(),HttpRequestHeadersSetter.INSTANCE);`
	`24`	`+ instrumentationName,`
	`25`	`+ openTelemetry,`
	`26`	`+ new NettyHttpClientAttributesGetter(),`
	`27`	`+ HttpRequestHeadersSetter.INSTANCE);`
`25`	`28`	`}`
`26`	`29`	`}`