http server builder

Author: zeitlinger

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

@@ -224,6 +224,10 @@ InstrumenterBuilder<BUILDERREQUEST, BUILDERRESPONSE> instrumenterBuilder(
     return Instrumenter.builder(openTelemetry, instrumentationName, spanNameExtractor);
   }
 
+  public String getInstrumentationName() {
+    return instrumentationName;
+  }
+
   @CanIgnoreReturnValue
   public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> configure(CommonConfig config) {
     set(config::getKnownHttpRequestMethods, this::setKnownMethods);

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

@@ -172,6 +172,15 @@ public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> setBuilderCustomi
   }
 
   public Instrumenter<REQUEST, RESPONSE> build() {
+    InstrumenterBuilder<REQUEST, RESPONSE> builder = builder();
+
+    if (headerGetter != null) {
+      return builder.buildServerInstrumenter(headerGetter);
+    }
+    return builder.buildInstrumenter(SpanKindExtractor.alwaysServer());
+  }
+
+  public InstrumenterBuilder<REQUEST, RESPONSE> builder() {
     SpanNameExtractor<? super REQUEST> spanNameExtractor =
         spanNameExtractorTransformer.apply(httpSpanNameExtractorBuilder.build());
 

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerSingletons.java

@@ -7,50 +7,20 @@
 
 import akka.http.scaladsl.model.HttpRequest;
 import akka.http.scaladsl.model.HttpResponse;
-import io.opentelemetry.api.GlobalOpenTelemetry;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpExperimentalAttributesExtractor;
-import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpServerExperimentalMetrics;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractor;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpServerMetrics;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRoute;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractor;
-import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanStatusExtractor;
-import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
+import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenters;
 import io.opentelemetry.javaagent.instrumentation.akkahttp.AkkaHttpUtil;
 
 public final class AkkaHttpServerSingletons {
 
   private static final Instrumenter<HttpRequest, HttpResponse> INSTRUMENTER;
 
   static {
-    AkkaHttpServerAttributesGetter httpAttributesGetter = new AkkaHttpServerAttributesGetter();
-    InstrumenterBuilder<HttpRequest, HttpResponse> builder =
-        Instrumenter.<HttpRequest, HttpResponse>builder(
-                GlobalOpenTelemetry.get(),
-                AkkaHttpUtil.instrumentationName(),
-                HttpSpanNameExtractor.builder(httpAttributesGetter)
-                    .setKnownMethods(AgentCommonConfig.get().getKnownHttpRequestMethods())
-                    .build())
-            .setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributesGetter))
-            .addAttributesExtractor(
-                HttpServerAttributesExtractor.builder(httpAttributesGetter)
-                    .setCapturedRequestHeaders(AgentCommonConfig.get().getServerRequestHeaders())
-                    .setCapturedResponseHeaders(AgentCommonConfig.get().getServerResponseHeaders())
-                    .setKnownMethods(AgentCommonConfig.get().getKnownHttpRequestMethods())
-                    .build())
-            .addOperationMetrics(HttpServerMetrics.get())
-            .addContextCustomizer(
-                HttpServerRoute.builder(httpAttributesGetter)
-                    .setKnownMethods(AgentCommonConfig.get().getKnownHttpRequestMethods())
-                    .build());
-    if (AgentCommonConfig.get().shouldEmitExperimentalHttpServerTelemetry()) {
-      builder
-          .addAttributesExtractor(HttpExperimentalAttributesExtractor.create(httpAttributesGetter))
-          .addOperationMetrics(HttpServerExperimentalMetrics.get());
-    }
-    INSTRUMENTER = builder.buildServerInstrumenter(AkkaHttpServerHeaders.INSTANCE);
+    INSTRUMENTER =
+        JavaagentHttpServerInstrumenters.create(
+            AkkaHttpUtil.instrumentationName(),
+            new AkkaHttpServerAttributesGetter(),
+            AkkaHttpServerHeaders.INSTANCE);
   }
 
   public static Instrumenter<HttpRequest, HttpResponse> instrumenter() {

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

@@ -38,18 +38,12 @@ public final class ArmeriaTelemetryBuilder {
         ArmeriaTelemetryBuilder::getServerBuilder);
   }
 
+  @SuppressWarnings({"rawtypes", "unchecked"})
   ArmeriaTelemetryBuilder(OpenTelemetry openTelemetry) {
     clientBuilder = ArmeriaInstrumenterBuilderFactory.getClientBuilder(openTelemetry);
     serverBuilder = ArmeriaInstrumenterBuilderFactory.getServerBuilder(openTelemetry);
   }
 
-  /**
-   * Sets the status extractor for both client and server spans.
-   *
-   * @deprecated Use {@link #setClientStatusExtractor(Function)} or {@link
-   *     #setServerStatusExtractor(Function)} instead.
-   */
-  @Deprecated
   @SuppressWarnings({"unchecked", "rawtypes"})
   @CanIgnoreReturnValue
   public ArmeriaTelemetryBuilder setStatusExtractor(
@@ -62,36 +56,10 @@ public ArmeriaTelemetryBuilder setStatusExtractor(
     return this;
   }
 
-  /** Sets the status extractor for client spans. */
-  @CanIgnoreReturnValue
-  public ArmeriaTelemetryBuilder setClientStatusExtractor(
-      Function<
-              SpanStatusExtractor<? super ClientRequestContext, ? super RequestLog>,
-              ? extends SpanStatusExtractor<? super ClientRequestContext, ? super RequestLog>>
-          statusExtractor) {
-    clientBuilder.setStatusExtractor(statusExtractor);
-    return this;
-  }
-
-  /** Sets the status extractor for server spans. */
-  @CanIgnoreReturnValue
-  public ArmeriaTelemetryBuilder setServerStatusExtractor(
-      Function<
-              SpanStatusExtractor<? super ServiceRequestContext, ? super RequestLog>,
-              ? extends SpanStatusExtractor<? super ServiceRequestContext, ? super RequestLog>>
-          statusExtractor) {
-    serverBuilder.setStatusExtractor(statusExtractor);
-    return this;
-  }
-
   /**
    * Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
    * items. The {@link AttributesExtractor} will be executed after all default extractors.
-   *
-   * @deprecated Use {@link #addClientAttributeExtractor(AttributesExtractor)} or {@link
-   *     #addServerAttributeExtractor(AttributesExtractor)} instead.
    */
-  @Deprecated
   @CanIgnoreReturnValue
   public ArmeriaTelemetryBuilder addAttributeExtractor(
       AttributesExtractor<? super RequestContext, ? super RequestLog> attributesExtractor) {
@@ -112,18 +80,6 @@ public ArmeriaTelemetryBuilder addClientAttributeExtractor(
     return this;
   }
 
-  /**
-   * Adds an extra server-only {@link AttributesExtractor} to invoke to set attributes to
-   * instrumented items. The {@link AttributesExtractor} will be executed after all default
-   * extractors.
-   */
-  @CanIgnoreReturnValue
-  public ArmeriaTelemetryBuilder addServerAttributeExtractor(
-      AttributesExtractor<? super ServiceRequestContext, ? super RequestLog> attributesExtractor) {
-    serverBuilder.addAttributesExtractor(attributesExtractor);
-    return this;
-  }
-
   /** Sets the {@code peer.service} attribute for http client spans. */
   @CanIgnoreReturnValue
   public ArmeriaTelemetryBuilder setPeerService(String peerService) {
@@ -206,6 +162,7 @@ public ArmeriaTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
   public ArmeriaTelemetryBuilder setEmitExperimentalHttpClientMetrics(
       boolean emitExperimentalHttpClientMetrics) {
     clientBuilder.setEmitExperimentalHttpClientMetrics(emitExperimentalHttpClientMetrics);
+    serverBuilder.setEmitExperimentalHttpServerMetrics(emitExperimentalHttpClientMetrics);
     return this;
   }
 
@@ -218,29 +175,32 @@ public ArmeriaTelemetryBuilder setEmitExperimentalHttpClientMetrics(
   @CanIgnoreReturnValue
   public ArmeriaTelemetryBuilder setEmitExperimentalHttpServerMetrics(
       boolean emitExperimentalHttpServerMetrics) {
+    clientBuilder.setEmitExperimentalHttpClientMetrics(emitExperimentalHttpServerMetrics);
     serverBuilder.setEmitExperimentalHttpServerMetrics(emitExperimentalHttpServerMetrics);
     return this;
   }
 
   /** Sets custom client {@link SpanNameExtractor} via transform function. */
+  @SuppressWarnings({"rawtypes", "unchecked"})
   @CanIgnoreReturnValue
   public ArmeriaTelemetryBuilder setClientSpanNameExtractor(
       Function<
-              SpanNameExtractor<? super ClientRequestContext>,
-              ? extends SpanNameExtractor<? super ClientRequestContext>>
+              SpanNameExtractor<RequestContext>,
+              ? extends SpanNameExtractor<? super RequestContext>>
           clientSpanNameExtractor) {
-    clientBuilder.setSpanNameExtractor(clientSpanNameExtractor);
+    clientBuilder.setSpanNameExtractor((Function) clientSpanNameExtractor);
     return this;
   }
 
   /** Sets custom server {@link SpanNameExtractor} via transform function. */
+  @SuppressWarnings({"rawtypes", "unchecked"})
   @CanIgnoreReturnValue
   public ArmeriaTelemetryBuilder setServerSpanNameExtractor(
       Function<
-              SpanNameExtractor<? super ServiceRequestContext>,
-              ? extends SpanNameExtractor<? super ServiceRequestContext>>
+              SpanNameExtractor<RequestContext>,
+              ? extends SpanNameExtractor<? super RequestContext>>
           serverSpanNameExtractor) {
-    serverBuilder.setSpanNameExtractor(serverSpanNameExtractor);
+    serverBuilder.setSpanNameExtractor((Function) serverSpanNameExtractor);
     return this;
   }
 

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

@@ -5,9 +5,9 @@
 
 package io.opentelemetry.instrumentation.armeria.v1_3.internal;
 
-import com.linecorp.armeria.client.ClientRequestContext;
 import com.linecorp.armeria.common.HttpRequest;
 import com.linecorp.armeria.common.HttpStatus;
+import com.linecorp.armeria.common.RequestContext;
 import com.linecorp.armeria.common.SessionProtocol;
 import com.linecorp.armeria.common.logging.RequestLog;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesGetter;
@@ -17,7 +17,7 @@
 import javax.annotation.Nullable;
 
 enum ArmeriaHttpClientAttributesGetter
-    implements HttpClientAttributesGetter<ClientRequestContext, RequestLog> {
+    implements HttpClientAttributesGetter<RequestContext, RequestLog> {
   INSTANCE;
 
   private static final ClassValue<Method> authorityMethodCache =
@@ -34,12 +34,12 @@ protected Method computeValue(Class<?> type) {
       };
 
   @Override
-  public String getHttpRequestMethod(ClientRequestContext ctx) {
+  public String getHttpRequestMethod(RequestContext ctx) {
     return ctx.method().name();
   }
 
   @Override
-  public String getUrlFull(ClientRequestContext ctx) {
+  public String getUrlFull(RequestContext ctx) {
     HttpRequest request = request(ctx);
     StringBuilder uri = new StringBuilder();
     String scheme = request.scheme();
@@ -61,14 +61,14 @@ public String getUrlFull(ClientRequestContext ctx) {
   }
 
   @Override
-  public List<String> getHttpRequestHeader(ClientRequestContext ctx, String name) {
+  public List<String> getHttpRequestHeader(RequestContext ctx, String name) {
     return request(ctx).headers().getAll(name);
   }
 
   @Override
   @Nullable
   public Integer getHttpResponseStatusCode(
-      ClientRequestContext ctx, RequestLog requestLog, @Nullable Throwable error) {
+      RequestContext ctx, RequestLog requestLog, @Nullable Throwable error) {
     HttpStatus status = requestLog.responseHeaders().status();
     if (!status.equals(HttpStatus.UNKNOWN)) {
       return status.code();
@@ -78,26 +78,25 @@ public Integer getHttpResponseStatusCode(
 
   @Override
   public List<String> getHttpResponseHeader(
-      ClientRequestContext ctx, RequestLog requestLog, String name) {
+      RequestContext ctx, RequestLog requestLog, String name) {
     return requestLog.responseHeaders().getAll(name);
   }
 
   @Override
-  public String getNetworkProtocolName(ClientRequestContext ctx, @Nullable RequestLog requestLog) {
+  public String getNetworkProtocolName(RequestContext ctx, @Nullable RequestLog requestLog) {
     return "http";
   }
 
   @Override
-  public String getNetworkProtocolVersion(
-      ClientRequestContext ctx, @Nullable RequestLog requestLog) {
+  public String getNetworkProtocolVersion(RequestContext ctx, @Nullable RequestLog requestLog) {
     SessionProtocol protocol =
         requestLog != null ? requestLog.sessionProtocol() : ctx.sessionProtocol();
     return protocol.isMultiplex() ? "2" : "1.1";
   }
 
   @Nullable
   @Override
-  public String getServerAddress(ClientRequestContext ctx) {
+  public String getServerAddress(RequestContext ctx) {
     String authority = authority(ctx);
     if (authority == null) {
       return null;
@@ -108,7 +107,7 @@ public String getServerAddress(ClientRequestContext ctx) {
 
   @Nullable
   @Override
-  public Integer getServerPort(ClientRequestContext ctx) {
+  public Integer getServerPort(RequestContext ctx) {
     String authority = authority(ctx);
     if (authority == null) {
       return null;
@@ -127,12 +126,12 @@ public Integer getServerPort(ClientRequestContext ctx) {
   @Override
   @Nullable
   public InetSocketAddress getNetworkPeerInetSocketAddress(
-      ClientRequestContext ctx, @Nullable RequestLog requestLog) {
+      RequestContext ctx, @Nullable RequestLog requestLog) {
     return RequestContextAccess.remoteAddress(ctx);
   }
 
   @Nullable
-  private static String authority(ClientRequestContext ctx) {
+  private static String authority(RequestContext ctx) {
     // newer armeria versions expose authority through DefaultClientRequestContext#authority
     // we are using this method as it provides default values based on endpoint
     // in older versions armeria wraps the request, and we can get the same default values through
@@ -150,7 +149,7 @@ private static String authority(ClientRequestContext ctx) {
     return request.authority();
   }
 
-  private static HttpRequest request(ClientRequestContext ctx) {
+  private static HttpRequest request(RequestContext ctx) {
     HttpRequest request = ctx.request();
     if (request == null) {
       throw new IllegalStateException(