fix rebase

Author: zeitlinger

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

@@ -5,8 +5,9 @@
 
 package io.opentelemetry.instrumentation.api.incubator.builder.internal;
 
-import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.instrumentation.api.incubator.config.internal.CoreCommonConfig;
+import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
+import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
 import java.lang.reflect.Field;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
@@ -18,18 +19,20 @@
 public class HttpClientInstrumenterBuilder {
   private HttpClientInstrumenterBuilder() {}
 
-  @CanIgnoreReturnValue
-  public static <REQUEST, RESPONSE> DefaultHttpClientTelemetryBuilder<REQUEST, RESPONSE> configure(
-      CoreCommonConfig config, Object builder) {
-    DefaultHttpClientTelemetryBuilder<REQUEST, RESPONSE> defaultBuilder = unwrapBuilder(builder);
+  public static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> configure(
+      CoreCommonConfig config,
+      Object builder,
+      Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> builderCustomizer) {
+    DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> defaultBuilder = unwrapBuilder(builder);
     set(config::getKnownHttpRequestMethods, defaultBuilder::setKnownMethods);
     set(config::getClientRequestHeaders, defaultBuilder::setCapturedRequestHeaders);
     set(config::getClientResponseHeaders, defaultBuilder::setCapturedResponseHeaders);
     set(config::getPeerServiceResolver, defaultBuilder::setPeerServiceResolver);
     set(
         config::shouldEmitExperimentalHttpClientTelemetry,
         defaultBuilder::setEmitExperimentalHttpClientMetrics);
-    return defaultBuilder;
+    defaultBuilder.setBuilderCustomizer(builderCustomizer);
+    return defaultBuilder.build();
   }
 
   private static <T> void set(Supplier<T> supplier, Consumer<T> consumer) {
@@ -46,14 +49,14 @@ private static <T> void set(Supplier<T> supplier, Consumer<T> consumer) {
    */
   @SuppressWarnings("unchecked")
   private static <REQUEST, RESPONSE>
-      DefaultHttpClientTelemetryBuilder<REQUEST, RESPONSE> unwrapBuilder(Object builder) {
-    if (builder instanceof DefaultHttpClientTelemetryBuilder<?, ?>) {
-      return (DefaultHttpClientTelemetryBuilder<REQUEST, RESPONSE>) builder;
+      DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> unwrapBuilder(Object builder) {
+    if (builder instanceof DefaultHttpClientInstrumenterBuilder<?, ?>) {
+      return (DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE>) builder;
     }
     try {
       Field field = builder.getClass().getDeclaredField("builder");
       field.setAccessible(true);
-      return (DefaultHttpClientTelemetryBuilder<REQUEST, RESPONSE>) field.get(builder);
+      return (DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE>) field.get(builder);
     } catch (Exception e) {
       throw new IllegalStateException("Could not access builder field", e);
     }

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

@@ -12,8 +12,6 @@
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesGetter;
-import java.util.Optional;
-import java.lang.reflect.Field;
 import java.util.function.Consumer;
 
 /**
@@ -40,8 +38,7 @@ public static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(
   // this is where an HttpClientTelemetryBuilder interface would be nice
   // instead of having to pass Object and using reflection to unwrap the underlying builder
   public static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(Object builder) {
-    DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> defaultBuilder = unwrapBuilder(builder);
-    return create(defaultBuilder, customizer -> {});
+    return create(builder, customizer -> {});
   }
 
   public static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(
@@ -59,46 +56,7 @@ public static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(
   }
 
   private static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(
-      DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> builder,
-      Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> builderCustomizer) {
-    CommonConfig config = CommonConfig.get();
-    set(config::getKnownHttpRequestMethods, builder::setKnownMethods);
-    set(config::getClientRequestHeaders, builder::setCapturedRequestHeaders);
-    set(config::getClientResponseHeaders, builder::setCapturedResponseHeaders);
-    // is not exposed in the public API
-    set(config::getPeerServiceResolver, builder::setPeerServiceResolver);
-    set(
-        config::shouldEmitExperimentalHttpClientTelemetry,
-        builder::setEmitExperimentalHttpClientMetrics);
-    // is not exposed in the public API
-    builder.setBuilderCustomizer(builderCustomizer);
-    return builder.build();
-  }
-
-  /**
-   * 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>
-      DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> unwrapBuilder(Object builder) {
-    if (builder instanceof DefaultHttpClientInstrumenterBuilder<?, ?>) {
-      return (DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE>) builder;
-    }
-    try {
-      Field field = builder.getClass().getDeclaredField("builder");
-      field.setAccessible(true);
-      return (DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE>) field.get(builder);
-    } catch (Exception e) {
-      throw new IllegalStateException("Could not access builder field", e);
-    }
-  }
-
-  private static <T> void set(Supplier<T> supplier, Consumer<T> consumer) {
-    T t = supplier.get();
-    if (t != null) {
-      consumer.accept(t);
-    }
+      Object builder, Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> builderCustomizer) {
+    return HttpClientInstrumenterBuilder.configure(CommonConfig.get(), builder, builderCustomizer);
   }
 }