fix rebase

Author: zeitlinger

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

@@ -84,7 +84,7 @@ public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> addAttributeExtra
   }
 
   @CanIgnoreReturnValue
-  public DefaultHttpClientTelemetryBuilder<REQUEST, RESPONSE> setStatusExtractor(
+  public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setStatusExtractor(
       Function<
               SpanStatusExtractor<? super REQUEST, ? super RESPONSE>,
               ? extends SpanStatusExtractor<? super REQUEST, ? super RESPONSE>>
@@ -249,7 +249,7 @@ DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> unwrapBuilder(Object bui
       return (DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE>) builder;
     }
     try {
-      Field field = builder.getClass().getDeclaredField("builder");
+      Field field = builder.getClass().getDeclaredField("clientBuilder");
       field.setAccessible(true);
       return (DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE>) field.get(builder);
     } catch (Exception e) {

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

@@ -8,6 +8,7 @@
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.context.propagation.TextMapGetter;
+import io.opentelemetry.instrumentation.api.incubator.config.internal.CoreCommonConfig;
 import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpExperimentalAttributesExtractor;
 import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpServerExperimentalMetrics;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
@@ -25,18 +26,20 @@
 import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractor;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractorBuilder;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanStatusExtractor;
+import java.lang.reflect.Field;
 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;
+import java.util.function.Supplier;
+import javax.annotation.Nullable;
 
 /**
  * This class is internal and is hence not for public use. Its APIs are unstable and can change at
  * any time.
  */
-public final class DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> {
+public final class DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> {
 
   private final String instrumentationName;
   private final OpenTelemetry openTelemetry;
@@ -50,40 +53,39 @@ public final class DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> {
   private final HttpServerAttributesExtractorBuilder<REQUEST, RESPONSE>
       httpAttributesExtractorBuilder;
   private final HttpSpanNameExtractorBuilder<REQUEST> httpSpanNameExtractorBuilder;
+
+  @Nullable private TextMapGetter<REQUEST> headerGetter;
   private Function<SpanNameExtractor<REQUEST>, ? extends SpanNameExtractor<? super REQUEST>>
       spanNameExtractorTransformer = Function.identity();
   private final HttpServerRouteBuilder<REQUEST> httpServerRouteBuilder;
   private final HttpServerAttributesGetter<REQUEST, RESPONSE> attributesGetter;
-  private final Optional<TextMapGetter<REQUEST>> headerSetter;
   private boolean emitExperimentalHttpServerMetrics = false;
 
-  public DefaultHttpServerTelemetryBuilder(
+  public DefaultHttpServerInstrumenterBuilder(
       String instrumentationName,
       OpenTelemetry openTelemetry,
-      HttpServerAttributesGetter<REQUEST, RESPONSE> attributesGetter,
-      Optional<TextMapGetter<REQUEST>> headerSetter) {
+      HttpServerAttributesGetter<REQUEST, RESPONSE> attributesGetter) {
     this.instrumentationName = instrumentationName;
     this.openTelemetry = openTelemetry;
     httpAttributesExtractorBuilder = HttpServerAttributesExtractor.builder(attributesGetter);
     httpSpanNameExtractorBuilder = HttpSpanNameExtractor.builder(attributesGetter);
     httpServerRouteBuilder = HttpServerRoute.builder(attributesGetter);
     this.attributesGetter = attributesGetter;
-    this.headerSetter = headerSetter;
   }
 
   /**
    * Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
    * items.
    */
   @CanIgnoreReturnValue
-  public DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> addAttributesExtractor(
+  public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> addAttributesExtractor(
       AttributesExtractor<? super REQUEST, ? super RESPONSE> attributesExtractor) {
     additionalExtractors.add(attributesExtractor);
     return this;
   }
 
   @CanIgnoreReturnValue
-  public DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> setStatusExtractor(
+  public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> setStatusExtractor(
       Function<
               SpanStatusExtractor<? super REQUEST, ? super RESPONSE>,
               ? extends SpanStatusExtractor<? super REQUEST, ? super RESPONSE>>
@@ -98,7 +100,7 @@ public DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> setStatusExtractor(
    * @param requestHeaders A list of HTTP header names.
    */
   @CanIgnoreReturnValue
-  public DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> setCapturedRequestHeaders(
+  public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> setCapturedRequestHeaders(
       List<String> requestHeaders) {
     httpAttributesExtractorBuilder.setCapturedRequestHeaders(requestHeaders);
     return this;
@@ -110,7 +112,7 @@ public DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> setCapturedRequestHe
    * @param responseHeaders A list of HTTP header names.
    */
   @CanIgnoreReturnValue
-  public DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> setCapturedResponseHeaders(
+  public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> setCapturedResponseHeaders(
       List<String> responseHeaders) {
     httpAttributesExtractorBuilder.setCapturedResponseHeaders(responseHeaders);
     return this;
@@ -130,54 +132,60 @@ public DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> setCapturedResponseH
    * @see HttpServerAttributesExtractorBuilder#setKnownMethods(Set)
    */
   @CanIgnoreReturnValue
-  public DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> setKnownMethods(
+  public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> setKnownMethods(
       Set<String> knownMethods) {
     httpAttributesExtractorBuilder.setKnownMethods(knownMethods);
     httpSpanNameExtractorBuilder.setKnownMethods(knownMethods);
     httpServerRouteBuilder.setKnownMethods(knownMethods);
     return this;
   }
 
+  @CanIgnoreReturnValue
+  public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> setHeaderGetter(
+      @Nullable TextMapGetter<REQUEST> headerGetter) {
+    this.headerGetter = headerGetter;
+    return this;
+  }
+
   /**
    * Configures the instrumentation to emit experimental HTTP server metrics.
    *
    * @param emitExperimentalHttpServerMetrics {@code true} if the experimental HTTP server metrics
    *     are to be emitted.
    */
   @CanIgnoreReturnValue
-  public DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> setEmitExperimentalHttpServerMetrics(
-      boolean emitExperimentalHttpServerMetrics) {
+  public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE>
+      setEmitExperimentalHttpServerMetrics(boolean emitExperimentalHttpServerMetrics) {
     this.emitExperimentalHttpServerMetrics = emitExperimentalHttpServerMetrics;
     return this;
   }
 
   /** Sets custom {@link SpanNameExtractor} via transform function. */
   @CanIgnoreReturnValue
-  public DefaultHttpServerTelemetryBuilder<REQUEST, RESPONSE> setSpanNameExtractor(
+  public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> setSpanNameExtractor(
       Function<SpanNameExtractor<REQUEST>, ? extends SpanNameExtractor<? super REQUEST>>
           spanNameExtractorTransformer) {
     this.spanNameExtractorTransformer = spanNameExtractorTransformer;
     return this;
   }
 
-  public Instrumenter<REQUEST, RESPONSE> instrumenter() {
-    return instrumenter(b -> {});
+  public Instrumenter<REQUEST, RESPONSE> build() {
+    return build(b -> {});
   }
 
-  public Instrumenter<REQUEST, RESPONSE> instrumenter(
+  public Instrumenter<REQUEST, RESPONSE> build(
       Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> instrumenterBuilderConsumer) {
 
-    InstrumenterBuilder<REQUEST, RESPONSE> builder =
-        instrumenterBuilder(instrumenterBuilderConsumer);
+    InstrumenterBuilder<REQUEST, RESPONSE> builder = builder();
+    instrumenterBuilderConsumer.accept(builder);
 
-    if (headerSetter.isPresent()) {
-      return builder.buildServerInstrumenter(headerSetter.get());
+    if (headerGetter != null) {
+      return builder.buildServerInstrumenter(headerGetter);
     }
     return builder.buildInstrumenter(SpanKindExtractor.alwaysServer());
   }
 
-  public InstrumenterBuilder<REQUEST, RESPONSE> instrumenterBuilder(
-      Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> instrumenterBuilderConsumer) {
+  public InstrumenterBuilder<REQUEST, RESPONSE> builder() {
     SpanNameExtractor<? super REQUEST> spanNameExtractor =
         spanNameExtractorTransformer.apply(httpSpanNameExtractorBuilder.build());
 
@@ -196,11 +204,51 @@ public InstrumenterBuilder<REQUEST, RESPONSE> instrumenterBuilder(
           .addOperationMetrics(HttpServerExperimentalMetrics.get());
     }
 
-    instrumenterBuilderConsumer.accept(builder);
     return builder;
   }
 
   public OpenTelemetry getOpenTelemetry() {
     return openTelemetry;
   }
+
+  @CanIgnoreReturnValue
+  public static <REQUEST, RESPONSE>
+      DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> unwrapAndConfigure(
+          CoreCommonConfig config, Object builder) {
+    DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> defaultBuilder = unwrapBuilder(builder);
+    set(config::getKnownHttpRequestMethods, defaultBuilder::setKnownMethods);
+    set(config::getServerRequestHeaders, defaultBuilder::setCapturedRequestHeaders);
+    set(config::getServerResponseHeaders, defaultBuilder::setCapturedResponseHeaders);
+    set(
+        config::shouldEmitExperimentalHttpServerTelemetry,
+        defaultBuilder::setEmitExperimentalHttpServerMetrics);
+    return defaultBuilder;
+  }
+
+  private static <T> void set(Supplier<T> supplier, Consumer<T> consumer) {
+    T t = supplier.get();
+    if (t != null) {
+      consumer.accept(t);
+    }
+  }
+
+  /**
+   * This method is used to access the builder field of the builder object.
+   *
+   * <p>This approach allows us to re-use the existing builder classes from the library modules
+   */
+  @SuppressWarnings("unchecked")
+  private static <REQUEST, RESPONSE>
+      DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> unwrapBuilder(Object builder) {
+    if (builder instanceof DefaultHttpServerInstrumenterBuilder<?, ?>) {
+      return (DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE>) builder;
+    }
+    try {
+      Field field = builder.getClass().getDeclaredField("serverBuilder");
+      field.setAccessible(true);
+      return (DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE>) field.get(builder);
+    } catch (Exception e) {
+      throw new IllegalStateException("Could not access builder field", e);
+    }
+  }
 }

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

@@ -8,8 +8,8 @@
 import com.linecorp.armeria.client.HttpClient;
 import com.linecorp.armeria.server.HttpService;
 import io.opentelemetry.api.GlobalOpenTelemetry;
-import io.opentelemetry.instrumentation.api.incubator.builder.internal.HttpClientInstrumenterBuilder;
-import io.opentelemetry.instrumentation.api.incubator.builder.internal.HttpServerInstrumenterBuilder;
+import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpClientInstrumenterBuilder;
+import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpServerInstrumenterBuilder;
 import io.opentelemetry.instrumentation.armeria.v1_3.ArmeriaTelemetry;
 import io.opentelemetry.instrumentation.armeria.v1_3.ArmeriaTelemetryBuilder;
 import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig;
@@ -24,8 +24,8 @@ public final class ArmeriaSingletons {
 
   static {
     ArmeriaTelemetryBuilder builder = ArmeriaTelemetry.builder(GlobalOpenTelemetry.get());
-    HttpClientInstrumenterBuilder.configure(CommonConfig.get(), builder);
-    HttpServerInstrumenterBuilder.configure(CommonConfig.get(), builder);
+    DefaultHttpClientInstrumenterBuilder.unwrapAndConfigure(CommonConfig.get(), builder);
+    DefaultHttpServerInstrumenterBuilder.unwrapAndConfigure(CommonConfig.get(), builder);
     ArmeriaTelemetry telemetry = builder.build();
 
     CLIENT_DECORATOR = telemetry.newClientDecorator();