rename

Author: zeitlinger

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

@@ -6,8 +6,6 @@
 package io.opentelemetry.instrumentation.api.incubator.builder.internal;
 
 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;
@@ -19,10 +17,9 @@
 public class HttpClientInstrumenterBuilder {
   private HttpClientInstrumenterBuilder() {}
 
-  public static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> configure(
-      CoreCommonConfig config,
-      Object builder,
-      Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> builderCustomizer) {
+  public static <REQUEST, RESPONSE>
+      DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> configure(
+          CoreCommonConfig config, Object builder) {
     DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> defaultBuilder = unwrapBuilder(builder);
     set(config::getKnownHttpRequestMethods, defaultBuilder::setKnownMethods);
     set(config::getClientRequestHeaders, defaultBuilder::setCapturedRequestHeaders);
@@ -31,8 +28,7 @@ public static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> configure(
     set(
         config::shouldEmitExperimentalHttpClientTelemetry,
         defaultBuilder::setEmitExperimentalHttpClientMetrics);
-    defaultBuilder.setBuilderCustomizer(builderCustomizer);
-    return defaultBuilder.build();
+    return defaultBuilder;
   }
 
   private static <T> void set(Supplier<T> supplier, Consumer<T> consumer) {

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/web/RestTemplateInstrumentation.java

@@ -7,10 +7,8 @@
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.instrumentation.api.incubator.builder.internal.HttpClientInstrumenterBuilder;
-import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.CommonConfigUtil;
+import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.InstrumentationConfigUtil;
 import io.opentelemetry.instrumentation.spring.web.v3_1.SpringWebTelemetry;
-import io.opentelemetry.instrumentation.spring.web.v3_1.SpringWebTelemetryBuilder;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import java.util.List;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
@@ -24,9 +22,11 @@ private RestTemplateInstrumentation() {}
   static RestTemplate addIfNotPresent(
       RestTemplate restTemplate, OpenTelemetry openTelemetry, ConfigProperties config) {
 
-    SpringWebTelemetryBuilder builder = SpringWebTelemetry.builder(openTelemetry);
-    HttpClientInstrumenterBuilder.configure(CommonConfigUtil.getCommonConfig(config), builder);
-    ClientHttpRequestInterceptor instrumentationInterceptor = builder.build().newInterceptor();
+    ClientHttpRequestInterceptor instrumentationInterceptor =
+        InstrumentationConfigUtil.configureBuilder(
+                config, SpringWebTelemetry.builder(openTelemetry))
+            .build()
+            .newInterceptor();
 
     List<ClientHttpRequestInterceptor> restTemplateInterceptors = restTemplate.getInterceptors();
     if (restTemplateInterceptors.stream()

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/properties/ConfigPropertiesBridge.java

@@ -13,11 +13,7 @@
 import java.util.Map;
 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 ConfigPropertiesBridge implements CoreInstrumentationConfig {
+final class ConfigPropertiesBridge implements CoreInstrumentationConfig {
 
   private final ConfigProperties configProperties;
 

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/properties/CommonConfigUtil.java renamed to instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/properties/InstrumentationConfigUtil.java

@@ -5,17 +5,20 @@
 
 package io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties;
 
+import io.opentelemetry.instrumentation.api.incubator.builder.internal.HttpClientInstrumenterBuilder;
 import io.opentelemetry.instrumentation.api.incubator.config.internal.CoreCommonConfig;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 
 /**
  * This class is internal and is hence not for public use. Its APIs are unstable and can change at
  * any time.
  */
-public class CommonConfigUtil {
-  private CommonConfigUtil() {}
+public class InstrumentationConfigUtil {
+  private InstrumentationConfigUtil() {}
 
-  public static CoreCommonConfig getCommonConfig(ConfigProperties config) {
-    return new CoreCommonConfig(new ConfigPropertiesBridge(config));
+  public static <T> T configureBuilder(ConfigProperties config, T builder) {
+    HttpClientInstrumenterBuilder.configure(
+        new CoreCommonConfig(new ConfigPropertiesBridge(config)), builder);
+    return builder;
   }
 }

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

@@ -57,6 +57,9 @@ public static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(
 
   private static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> create(
       Object builder, Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> builderCustomizer) {
-    return HttpClientInstrumenterBuilder.configure(CommonConfig.get(), builder, builderCustomizer);
+    DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> defaultBuilder =
+        HttpClientInstrumenterBuilder.configure(CommonConfig.get(), builder);
+    defaultBuilder.setBuilderCustomizer(builderCustomizer);
+    return defaultBuilder.build();
   }
 }