delete

Author: trask

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

@@ -35,6 +35,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
+import java.util.function.Consumer;
 import java.util.function.UnaryOperator;
 import javax.annotation.Nullable;
 

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

@@ -31,6 +31,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
+import java.util.function.Consumer;
 import java.util.function.UnaryOperator;
 import javax.annotation.Nullable;
 

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/internal/CommonConfig.java

@@ -25,6 +25,7 @@ static RestTemplate addIfNotPresent(
 
     ClientHttpRequestInterceptor instrumentationInterceptor =
         InstrumentationConfigUtil.configureClientBuilder(
+                openTelemetry,
                 config,
                 SpringWebTelemetry.builder(openTelemetry),
                 WebTelemetryUtil.getBuilderExtractor())

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

@@ -35,6 +35,7 @@ final class WebClientBeanPostProcessor implements BeanPostProcessor {
   static SpringWebfluxClientTelemetry getWebfluxClientTelemetry(
       OpenTelemetry openTelemetry, InstrumentationConfig config) {
     return InstrumentationConfigUtil.configureClientBuilder(
+            openTelemetry,
             config,
             SpringWebfluxClientTelemetry.builder(openTelemetry),
             SpringWebfluxBuilderUtil.getClientBuilderExtractor())
@@ -44,6 +45,7 @@ static SpringWebfluxClientTelemetry getWebfluxClientTelemetry(
   static SpringWebfluxServerTelemetry getWebfluxServerTelemetry(
       OpenTelemetry openTelemetry, InstrumentationConfig config) {
     return InstrumentationConfigUtil.configureServerBuilder(
+            openTelemetry,
             config,
             SpringWebfluxServerTelemetry.builder(openTelemetry),
             SpringWebfluxBuilderUtil.getServerBuilderExtractor())

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/webflux/WebClientBeanPostProcessor.java

@@ -30,6 +30,7 @@ public class SpringWebMvc5InstrumentationAutoConfiguration {
   @Bean
   Filter otelWebMvcFilter(OpenTelemetry openTelemetry, InstrumentationConfig config) {
     return InstrumentationConfigUtil.configureServerBuilder(
+            openTelemetry,
             config,
             SpringWebMvcTelemetry.builder(openTelemetry),
             SpringMvcBuilderUtil.getBuilderExtractor())

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/webmvc/SpringWebMvc5InstrumentationAutoConfiguration.java

@@ -6,9 +6,9 @@
 package io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties;
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpClientInstrumenterBuilder;
 import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpServerInstrumenterBuilder;
-import io.opentelemetry.instrumentation.api.incubator.config.internal.CommonConfig;
 import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
 import java.util.function.Function;
 
@@ -21,26 +21,24 @@ private InstrumentationConfigUtil() {}
 
   @CanIgnoreReturnValue
   public static <T, REQUEST, RESPONSE> T configureClientBuilder(
+      OpenTelemetry openTelemetry,
       InstrumentationConfig config,
       T builder,
       Function<T, DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE>> getBuilder) {
-    getBuilder.apply(builder).configure(getConfig(config));
+    getBuilder.apply(builder).configure(openTelemetry);
     return builder;
   }
 
   @CanIgnoreReturnValue
   public static <T, REQUEST, RESPONSE> T configureServerBuilder(
+      OpenTelemetry openTelemetry,
       InstrumentationConfig config,
       T builder,
       Function<T, DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE>> getBuilder) {
-    getBuilder.apply(builder).configure(getConfig(config));
+    getBuilder.apply(builder).configure(openTelemetry);
     return builder;
   }
 
-  private static CommonConfig getConfig(InstrumentationConfig config) {
-    return new CommonConfig(config);
-  }
-
   public static boolean isStatementSanitizationEnabled(InstrumentationConfig config, String key) {
     return config.getBoolean(
         key, config.getBoolean("otel.instrumentation.common.db-statement-sanitizer.enabled", true));

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

@@ -57,6 +57,7 @@ private static RestClient addRestClientInterceptorIfNotPresent(
   static ClientHttpRequestInterceptor getInterceptor(
       OpenTelemetry openTelemetry, InstrumentationConfig config) {
     return InstrumentationConfigUtil.configureClientBuilder(
+            openTelemetry,
             config,
             SpringWebTelemetry.builder(openTelemetry),
             WebTelemetryUtil.getBuilderExtractor())

instrumentation/spring/spring-boot-autoconfigure/src/main/javaSpring3/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/RestClientBeanPostProcessor.java

@@ -30,6 +30,7 @@ public class SpringWebMvc6InstrumentationAutoConfiguration {
   @Bean
   Filter otelWebMvcFilter(OpenTelemetry openTelemetry, InstrumentationConfig config) {
     return InstrumentationConfigUtil.configureServerBuilder(
+            openTelemetry,
             config,
             SpringWebMvcTelemetry.builder(openTelemetry),
             SpringMvcBuilderUtil.getBuilderExtractor())