create instrumenter directly, aligning code between agent and library

Author: zeitlinger

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

@@ -7,13 +7,15 @@
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.context.propagation.TextMapSetter;
 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;
 import io.opentelemetry.instrumentation.api.incubator.semconv.net.PeerServiceResolver;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
+import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractor;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
@@ -24,7 +26,9 @@
 import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanStatusExtractor;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
+import java.util.function.Consumer;
 import java.util.function.Function;
 
 public abstract class AbstractHttpClientTelemetryBuilder<SELF, REQUEST, RESPONSE> {
@@ -37,6 +41,7 @@ public abstract class AbstractHttpClientTelemetryBuilder<SELF, REQUEST, RESPONSE
   private final HttpClientAttributesExtractorBuilder<REQUEST, RESPONSE>
       httpAttributesExtractorBuilder;
   private final HttpClientAttributesGetter<REQUEST, RESPONSE> attributesGetter;
+  private final Optional<TextMapSetter<REQUEST>> headerSetter;
   private final HttpSpanNameExtractorBuilder<REQUEST> httpSpanNameExtractorBuilder;
   private Function<SpanNameExtractor<REQUEST>, ? extends SpanNameExtractor<? super REQUEST>>
       spanNameExtractorTransformer = Function.identity();
@@ -45,12 +50,14 @@ public abstract class AbstractHttpClientTelemetryBuilder<SELF, REQUEST, RESPONSE
   public AbstractHttpClientTelemetryBuilder(
       String instrumentationName,
       OpenTelemetry openTelemetry,
-      HttpClientAttributesGetter<REQUEST, RESPONSE> attributesGetter) {
+      HttpClientAttributesGetter<REQUEST, RESPONSE> attributesGetter,
+      Optional<TextMapSetter<REQUEST>> headerSetter) {
     this.instrumentationName = instrumentationName;
     this.openTelemetry = openTelemetry;
     httpSpanNameExtractorBuilder = HttpSpanNameExtractor.builder(attributesGetter);
     httpAttributesExtractorBuilder = HttpClientAttributesExtractor.builder(attributesGetter);
     this.attributesGetter = attributesGetter;
+    this.headerSetter = headerSetter;
   }
 
   /**
@@ -134,7 +141,12 @@ public SELF setPeerServiceResolver(PeerServiceResolver peerServiceResolver) {
         HttpClientPeerServiceAttributesExtractor.create(attributesGetter, peerServiceResolver));
   }
 
-  public InstrumenterBuilder<REQUEST, RESPONSE> instrumenterBuilder() {
+  public Instrumenter<REQUEST, RESPONSE> instrumenter() {
+    return instrumenter(b -> {});
+  }
+
+  public Instrumenter<REQUEST, RESPONSE> instrumenter(
+      Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> instrumenterBuilderConsumer) {
     SpanNameExtractor<? super REQUEST> spanNameExtractor =
         spanNameExtractorTransformer.apply(httpSpanNameExtractorBuilder.build());
 
@@ -150,8 +162,12 @@ public InstrumenterBuilder<REQUEST, RESPONSE> instrumenterBuilder() {
           .addAttributesExtractor(HttpExperimentalAttributesExtractor.create(attributesGetter))
           .addOperationMetrics(HttpClientExperimentalMetrics.get());
     }
+    instrumenterBuilderConsumer.accept(builder);
 
-    return builder;
+    if (headerSetter.isPresent()) {
+      return builder.buildClientInstrumenter(headerSetter.get());
+    }
+    return builder.buildInstrumenter(SpanKindExtractor.alwaysClient());
   }
 
   @SuppressWarnings("unchecked")

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientSingletons.java

@@ -9,9 +9,9 @@
 import akka.http.scaladsl.model.HttpResponse;
 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.JavaagentHttpClientInstrumenterBuilder;
 import io.opentelemetry.javaagent.instrumentation.akkahttp.AkkaHttpUtil;
+import java.util.Optional;
 
 public class AkkaHttpClientSingletons {
 
@@ -22,8 +22,9 @@ public class AkkaHttpClientSingletons {
     SETTER = new HttpHeaderSetter(GlobalOpenTelemetry.getPropagators());
     INSTRUMENTER =
         JavaagentHttpClientInstrumenterBuilder.create(
-                AkkaHttpUtil.instrumentationName(), new AkkaHttpClientAttributesGetter())
-            .buildInstrumenter(SpanKindExtractor.alwaysClient());
+            AkkaHttpUtil.instrumentationName(),
+            new AkkaHttpClientAttributesGetter(),
+            Optional.empty());
   }
 
   public static Instrumenter<HttpRequest, HttpResponse> instrumenter() {

instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientSingletons.java

@@ -7,6 +7,7 @@
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenterBuilder;
+import java.util.Optional;
 import org.apache.http.HttpResponse;
 
 public final class ApacheHttpAsyncClientSingletons {
@@ -17,8 +18,9 @@ public final class ApacheHttpAsyncClientSingletons {
   static {
     INSTRUMENTER =
         JavaagentHttpClientInstrumenterBuilder.create(
-                INSTRUMENTATION_NAME, new ApacheHttpAsyncClientHttpAttributesGetter())
-            .buildClientInstrumenter(HttpHeaderSetter.INSTANCE);
+            INSTRUMENTATION_NAME,
+            new ApacheHttpAsyncClientHttpAttributesGetter(),
+            Optional.of(HttpHeaderSetter.INSTANCE));
   }
 
   public static Instrumenter<ApacheHttpClientRequest, HttpResponse> instrumenter() {

instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientSingletons.java

@@ -7,6 +7,7 @@
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenterBuilder;
+import java.util.Optional;
 import org.apache.commons.httpclient.HttpMethod;
 
 public final class ApacheHttpClientSingletons {
@@ -17,8 +18,9 @@ public final class ApacheHttpClientSingletons {
   static {
     INSTRUMENTER =
         JavaagentHttpClientInstrumenterBuilder.create(
-                INSTRUMENTATION_NAME, new ApacheHttpClientHttpAttributesGetter())
-            .buildClientInstrumenter(HttpHeaderSetter.INSTANCE);
+            INSTRUMENTATION_NAME,
+            new ApacheHttpClientHttpAttributesGetter(),
+            Optional.of(HttpHeaderSetter.INSTANCE));
   }
 
   public static Instrumenter<HttpMethod, HttpMethod> instrumenter() {

instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientSingletons.java

@@ -7,6 +7,7 @@
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenterBuilder;
+import java.util.Optional;
 import org.apache.http.HttpResponse;
 
 public final class ApacheHttpClientSingletons {
@@ -17,8 +18,9 @@ public final class ApacheHttpClientSingletons {
   static {
     INSTRUMENTER =
         JavaagentHttpClientInstrumenterBuilder.create(
-                INSTRUMENTATION_NAME, new ApacheHttpClientHttpAttributesGetter())
-            .buildClientInstrumenter(HttpHeaderSetter.INSTANCE);
+            INSTRUMENTATION_NAME,
+            new ApacheHttpClientHttpAttributesGetter(),
+            Optional.of(HttpHeaderSetter.INSTANCE));
   }
 
   public static Instrumenter<ApacheHttpClientRequest, HttpResponse> instrumenter() {

instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTelemetryBuilder.java

@@ -7,7 +7,7 @@
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.api.incubator.builder.AbstractHttpClientTelemetryBuilder;
-import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
+import java.util.Optional;
 import org.apache.http.HttpResponse;
 
 /** A builder for {@link ApacheHttpClientTelemetry}. */
@@ -18,7 +18,11 @@ public final class ApacheHttpClientTelemetryBuilder
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.apache-httpclient-4.3";
 
   ApacheHttpClientTelemetryBuilder(OpenTelemetry openTelemetry) {
-    super(INSTRUMENTATION_NAME, openTelemetry, ApacheHttpClientHttpAttributesGetter.INSTANCE);
+    super(
+        INSTRUMENTATION_NAME,
+        openTelemetry,
+        ApacheHttpClientHttpAttributesGetter.INSTANCE,
+        Optional.empty());
   }
 
   /**
@@ -27,8 +31,6 @@ public final class ApacheHttpClientTelemetryBuilder
    */
   public ApacheHttpClientTelemetry build() {
     // We manually inject because we need to inject internal requests for redirects.
-    return new ApacheHttpClientTelemetry(
-        instrumenterBuilder().buildInstrumenter(SpanKindExtractor.alwaysClient()),
-        openTelemetry.getPropagators());
+    return new ApacheHttpClientTelemetry(instrumenter(), openTelemetry.getPropagators());
   }
 }

instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientSingletons.java

@@ -7,6 +7,7 @@
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenterBuilder;
+import java.util.Optional;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
 
@@ -18,8 +19,9 @@ public final class ApacheHttpClientSingletons {
   static {
     INSTRUMENTER =
         JavaagentHttpClientInstrumenterBuilder.create(
-                INSTRUMENTATION_NAME, new ApacheHttpClientHttpAttributesGetter())
-            .buildClientInstrumenter(HttpHeaderSetter.INSTANCE);
+            INSTRUMENTATION_NAME,
+            new ApacheHttpClientHttpAttributesGetter(),
+            Optional.of(HttpHeaderSetter.INSTANCE));
   }
 
   public static Instrumenter<HttpRequest, HttpResponse> instrumenter() {

instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClient5TelemetryBuilder.java

@@ -7,8 +7,7 @@
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.api.incubator.builder.AbstractHttpClientTelemetryBuilder;
-import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
+import java.util.Optional;
 import org.apache.hc.core5.http.HttpResponse;
 
 /** A builder for {@link ApacheHttpClient5Telemetry}. */
@@ -19,19 +18,19 @@ public final class ApacheHttpClient5TelemetryBuilder
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.apache-httpclient-5.2";
 
   ApacheHttpClient5TelemetryBuilder(OpenTelemetry openTelemetry) {
-    super(INSTRUMENTATION_NAME, openTelemetry, ApacheHttpClient5HttpAttributesGetter.INSTANCE);
+    super(
+        INSTRUMENTATION_NAME,
+        openTelemetry,
+        ApacheHttpClient5HttpAttributesGetter.INSTANCE,
+        // We manually inject because we need to inject internal requests for redirects.
+        Optional.empty());
   }
 
   /**
    * Returns a new {@link ApacheHttpClient5Telemetry} configured with this {@link
    * ApacheHttpClient5TelemetryBuilder}.
    */
   public ApacheHttpClient5Telemetry build() {
-    Instrumenter<ApacheHttpClient5Request, HttpResponse> instrumenter =
-        instrumenterBuilder()
-            // We manually inject because we need to inject internal requests for redirects.
-            .buildInstrumenter(SpanKindExtractor.alwaysClient());
-
-    return new ApacheHttpClient5Telemetry(instrumenter, openTelemetry.getPropagators());
+    return new ApacheHttpClient5Telemetry(instrumenter(), openTelemetry.getPropagators());
   }
 }

instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientSingletons.java

@@ -9,6 +9,7 @@
 import com.ning.http.client.Response;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenterBuilder;
+import java.util.Optional;
 
 public final class AsyncHttpClientSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.async-http-client-1.9";
@@ -18,8 +19,9 @@ public final class AsyncHttpClientSingletons {
   static {
     INSTRUMENTER =
         JavaagentHttpClientInstrumenterBuilder.create(
-                INSTRUMENTATION_NAME, new AsyncHttpClientHttpAttributesGetter())
-            .buildClientInstrumenter(HttpHeaderSetter.INSTANCE);
+            INSTRUMENTATION_NAME,
+            new AsyncHttpClientHttpAttributesGetter(),
+            Optional.of(HttpHeaderSetter.INSTANCE));
   }
 
   public static Instrumenter<Request, Response> instrumenter() {

instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientSingletons.java

@@ -7,6 +7,7 @@
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenterBuilder;
+import java.util.Optional;
 import org.asynchttpclient.Response;
 
 public final class AsyncHttpClientSingletons {
@@ -17,8 +18,9 @@ public final class AsyncHttpClientSingletons {
   static {
     INSTRUMENTER =
         JavaagentHttpClientInstrumenterBuilder.create(
-                INSTRUMENTATION_NAME, new AsyncHttpClientHttpAttributesGetter())
-            .buildClientInstrumenter(HttpHeaderSetter.INSTANCE);
+            INSTRUMENTATION_NAME,
+            new AsyncHttpClientHttpAttributesGetter(),
+            Optional.of(HttpHeaderSetter.INSTANCE));
   }
 
   public static Instrumenter<RequestContext, Response> instrumenter() {

instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientSingletons.java

@@ -9,6 +9,7 @@
 import com.google.api.client.http.HttpResponse;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenterBuilder;
+import java.util.Optional;
 
 public class GoogleHttpClientSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.google-http-client-1.19";
@@ -18,8 +19,9 @@ public class GoogleHttpClientSingletons {
   static {
     INSTRUMENTER =
         JavaagentHttpClientInstrumenterBuilder.create(
-                INSTRUMENTATION_NAME, new GoogleHttpClientHttpAttributesGetter())
-            .buildClientInstrumenter(HttpHeaderSetter.INSTANCE);
+            INSTRUMENTATION_NAME,
+            new GoogleHttpClientHttpAttributesGetter(),
+            Optional.of(HttpHeaderSetter.INSTANCE));
   }
 
   public static Instrumenter<HttpRequest, HttpResponse> instrumenter() {

instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionSingletons.java

@@ -9,22 +9,26 @@
 import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig;
 import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenterBuilder;
 import java.net.HttpURLConnection;
+import java.util.Optional;
 
 public final class HttpUrlConnectionSingletons {
 
   private static final Instrumenter<HttpURLConnection, Integer> INSTRUMENTER;
 
   static {
     INSTRUMENTER =
-        JavaagentHttpClientInstrumenterBuilder.create(
-                "io.opentelemetry.http-url-connection", new HttpUrlHttpAttributesGetter())
-            .addAttributesExtractor(
-                HttpMethodAttributeExtractor.create(
-                    CommonConfig.get().getKnownHttpRequestMethods()))
-            .addContextCustomizer(
-                (context, httpRequestPacket, startAttributes) ->
-                    GetOutputStreamContext.init(context))
-            .buildClientInstrumenter(RequestPropertySetter.INSTANCE);
+        JavaagentHttpClientInstrumenterBuilder.createWithCustomizer(
+            "io.opentelemetry.http-url-connection",
+            new HttpUrlHttpAttributesGetter(),
+            Optional.of(RequestPropertySetter.INSTANCE),
+            builder ->
+                builder
+                    .addAttributesExtractor(
+                        HttpMethodAttributeExtractor.create(
+                            CommonConfig.get().getKnownHttpRequestMethods()))
+                    .addContextCustomizer(
+                        (context, httpRequestPacket, startAttributes) ->
+                            GetOutputStreamContext.init(context)));
   }
 
   public static Instrumenter<HttpURLConnection, Integer> instrumenter() {

instrumentation/java-http-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/JavaHttpClientSingletons.java

@@ -7,7 +7,6 @@
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
 import io.opentelemetry.instrumentation.httpclient.JavaHttpClientTelemetry;
 import io.opentelemetry.instrumentation.httpclient.internal.HttpHeadersSetter;
 import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenterBuilder;
@@ -24,8 +23,7 @@ public class JavaHttpClientSingletons {
 
     INSTRUMENTER =
         JavaagentHttpClientInstrumenterBuilder.create(
-                JavaHttpClientTelemetry.builder(GlobalOpenTelemetry.get()))
-            .buildInstrumenter(SpanKindExtractor.alwaysClient());
+            JavaHttpClientTelemetry.builder(GlobalOpenTelemetry.get()));
   }
 
   public static Instrumenter<HttpRequest, HttpResponse<?>> instrumenter() {

instrumentation/java-http-client/library/src/main/java/io/opentelemetry/instrumentation/httpclient/JavaHttpClientTelemetryBuilder.java

@@ -7,12 +7,11 @@
 
 import io.opentelemetry.api.OpenTelemetry;
 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;
 import io.opentelemetry.instrumentation.httpclient.internal.JavaHttpClientAttributesGetter;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
+import java.util.Optional;
 
 public final class JavaHttpClientTelemetryBuilder
     extends AbstractHttpClientTelemetryBuilder<
@@ -21,14 +20,15 @@ public final class JavaHttpClientTelemetryBuilder
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.java-http-client";
 
   JavaHttpClientTelemetryBuilder(OpenTelemetry openTelemetry) {
-    super(INSTRUMENTATION_NAME, openTelemetry, JavaHttpClientAttributesGetter.INSTANCE);
+    super(
+        INSTRUMENTATION_NAME,
+        openTelemetry,
+        JavaHttpClientAttributesGetter.INSTANCE,
+        Optional.empty());
   }
 
   public JavaHttpClientTelemetry build() {
-    Instrumenter<HttpRequest, HttpResponse<?>> instrumenter =
-        instrumenterBuilder().buildInstrumenter(SpanKindExtractor.alwaysClient());
-
     return new JavaHttpClientTelemetry(
-        instrumenter, new HttpHeadersSetter(openTelemetry.getPropagators()));
+        instrumenter(), new HttpHeadersSetter(openTelemetry.getPropagators()));
   }
 }