rename

Author: zeitlinger

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java

@@ -19,7 +19,6 @@
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.context.propagation.TextMapSetter;
-import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesSimpleBridge;
 import io.opentelemetry.instrumentation.api.internal.EmbeddedInstrumentationProperties;
 import io.opentelemetry.instrumentation.api.internal.Experimental;
 import io.opentelemetry.instrumentation.api.internal.InstrumenterBuilderAccess;
@@ -28,6 +27,7 @@
 import io.opentelemetry.instrumentation.api.internal.InternalInstrumenterCustomizerProvider;
 import io.opentelemetry.instrumentation.api.internal.InternalInstrumenterCustomizerUtil;
 import io.opentelemetry.instrumentation.api.internal.SchemaUrlProvider;
+import io.opentelemetry.instrumentation.api.internal.SimpleConfigPropertiesBridge;
 import io.opentelemetry.instrumentation.api.internal.SpanKey;
 import io.opentelemetry.instrumentation.api.internal.SpanKeyProvider;
 import java.util.ArrayList;
@@ -370,7 +370,7 @@ private String getSchemaUrl() {
   SpanSuppressor buildSpanSuppressor() {
     return new SpanSuppressors.ByContextKey(
         SpanSuppressionStrategy.fromConfig(
-                new ConfigPropertiesSimpleBridge(openTelemetry)
+                new SimpleConfigPropertiesBridge(openTelemetry)
                     .getString("otel.instrumentation.experimental.span-suppression-strategy"))
             .create(getSpanKeysFromAttributesExtractors()));
   }

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/ConfigPropertiesSimpleBridge.java renamed to instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/SimpleConfigPropertiesBridge.java

@@ -19,11 +19,11 @@
  * This class is internal and is hence not for public use. Its APIs are unstable and can change at
  * any time.
  */
-public final class ConfigPropertiesSimpleBridge {
+public final class SimpleConfigPropertiesBridge {
 
   @Nullable private final SimpleDeclarativeConfigPropertiesBridge bridge;
 
-  public ConfigPropertiesSimpleBridge(OpenTelemetry openTelemetry) {
+  public SimpleConfigPropertiesBridge(OpenTelemetry openTelemetry) {
     if (openTelemetry instanceof ExtendedOpenTelemetry) {
       ExtendedOpenTelemetry extendedOpenTelemetry = (ExtendedOpenTelemetry) openTelemetry;
       ConfigProvider configProvider = extendedOpenTelemetry.getConfigProvider();

instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/autoconfigure/TracingRequestHandler.java

@@ -13,7 +13,7 @@
 import com.amazonaws.handlers.RequestHandler2;
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesSimpleBridge;
+import io.opentelemetry.instrumentation.api.internal.SimpleConfigPropertiesBridge;
 import io.opentelemetry.instrumentation.awssdk.v1_11.AwsSdkTelemetry;
 
 /**
@@ -24,7 +24,7 @@ public class TracingRequestHandler extends RequestHandler2 {
   private static final RequestHandler2 DELEGATE = buildDelegate(GlobalOpenTelemetry.get());
 
   private static RequestHandler2 buildDelegate(OpenTelemetry openTelemetry) {
-    ConfigPropertiesSimpleBridge bridge = new ConfigPropertiesSimpleBridge(openTelemetry);
+    SimpleConfigPropertiesBridge bridge = new SimpleConfigPropertiesBridge(openTelemetry);
     return AwsSdkTelemetry.builder(openTelemetry)
         .setCaptureExperimentalSpanAttributes(
             bridge.getBoolean("otel.instrumentation.aws-sdk.experimental-span-attributes", false))

instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/autoconfigure/AwsSdkSingletons.java

@@ -8,7 +8,7 @@
 import static java.util.Collections.emptyList;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
-import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesSimpleBridge;
+import io.opentelemetry.instrumentation.api.internal.SimpleConfigPropertiesBridge;
 import io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkTelemetry;
 import io.opentelemetry.instrumentation.awssdk.v2_2.internal.AbstractAwsSdkTelemetryFactory;
 import java.util.List;
@@ -23,8 +23,8 @@ public static AwsSdkTelemetry telemetry() {
 
   private static class AwsSdkTelemetryFactory extends AbstractAwsSdkTelemetryFactory {
 
-    private ConfigPropertiesSimpleBridge bridge =
-        new ConfigPropertiesSimpleBridge(GlobalOpenTelemetry.get());
+    private SimpleConfigPropertiesBridge bridge =
+        new SimpleConfigPropertiesBridge(GlobalOpenTelemetry.get());
 
     @Override
     protected List<String> getCapturedHeaders() {

instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcInstrumenterFactory.java

@@ -16,7 +16,7 @@
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
-import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesSimpleBridge;
+import io.opentelemetry.instrumentation.api.internal.SimpleConfigPropertiesBridge;
 import io.opentelemetry.instrumentation.api.semconv.network.ServerAttributesExtractor;
 import io.opentelemetry.instrumentation.jdbc.internal.dbinfo.DbInfo;
 import java.util.List;
@@ -33,7 +33,7 @@ public final class JdbcInstrumenterFactory {
       new JdbcNetworkAttributesGetter();
 
   public static boolean captureQueryParameters(OpenTelemetry openTelemetry) {
-    return new ConfigPropertiesSimpleBridge(openTelemetry)
+    return new SimpleConfigPropertiesBridge(openTelemetry)
         .getBoolean("otel.instrumentation.jdbc.experimental.capture-query-parameters", false);
   }
 
@@ -48,7 +48,7 @@ static Instrumenter<DbRequest, Void> createStatementInstrumenter(
         openTelemetry,
         emptyList(),
         true,
-        new ConfigPropertiesSimpleBridge(openTelemetry)
+        new SimpleConfigPropertiesBridge(openTelemetry)
             .getBoolean("otel.instrumentation.common.db-statement-sanitizer.enabled", true),
         captureQueryParameters);
   }
@@ -99,7 +99,7 @@ public static Instrumenter<DbRequest, Void> createTransactionInstrumenter(
       OpenTelemetry openTelemetry) {
     return createTransactionInstrumenter(
         openTelemetry,
-        new ConfigPropertiesSimpleBridge(openTelemetry)
+        new SimpleConfigPropertiesBridge(openTelemetry)
             .getBoolean("otel.instrumentation.jdbc.experimental.transaction.enabled", false));
   }
 

instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/TracingConsumerInterceptor.java

@@ -11,7 +11,7 @@
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesSimpleBridge;
+import io.opentelemetry.instrumentation.api.internal.SimpleConfigPropertiesBridge;
 import io.opentelemetry.instrumentation.api.internal.Timer;
 import io.opentelemetry.instrumentation.kafkaclients.common.v0_11.internal.KafkaConsumerContext;
 import io.opentelemetry.instrumentation.kafkaclients.common.v0_11.internal.KafkaConsumerContextUtil;
@@ -37,7 +37,7 @@ public class TracingConsumerInterceptor<K, V> implements ConsumerInterceptor<K,
 
   private static KafkaTelemetry buildTelemetry() {
     OpenTelemetry openTelemetry = GlobalOpenTelemetry.get();
-    ConfigPropertiesSimpleBridge bridge = new ConfigPropertiesSimpleBridge(openTelemetry);
+    SimpleConfigPropertiesBridge bridge = new SimpleConfigPropertiesBridge(openTelemetry);
     return KafkaTelemetry.builder(openTelemetry)
         .setMessagingReceiveInstrumentationEnabled(
             bridge.getBoolean(

instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/TracingProducerInterceptor.java

@@ -10,7 +10,7 @@
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesSimpleBridge;
+import io.opentelemetry.instrumentation.api.internal.SimpleConfigPropertiesBridge;
 import java.util.Map;
 import java.util.Objects;
 import javax.annotation.Nullable;
@@ -33,7 +33,7 @@ public class TracingProducerInterceptor<K, V> implements ProducerInterceptor<K,
 
   private static KafkaTelemetry buildTelemetry() {
     OpenTelemetry openTelemetry = GlobalOpenTelemetry.get();
-    ConfigPropertiesSimpleBridge bridge = new ConfigPropertiesSimpleBridge(openTelemetry);
+    SimpleConfigPropertiesBridge bridge = new SimpleConfigPropertiesBridge(openTelemetry);
     return KafkaTelemetry.builder(openTelemetry)
         .setCapturedHeaders(
             bridge.getList(

instrumentation/log4j/log4j-context-data/log4j-context-data-2.17/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/log4j/contextdata/v2_17/OpenTelemetryContextDataProvider.java

@@ -11,7 +11,7 @@
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanContext;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesSimpleBridge;
+import io.opentelemetry.instrumentation.api.internal.SimpleConfigPropertiesBridge;
 import io.opentelemetry.instrumentation.log4j.contextdata.v2_17.internal.ContextDataKeys;
 import io.opentelemetry.javaagent.bootstrap.internal.ConfiguredResourceAttributesHolder;
 import java.util.Collections;
@@ -26,7 +26,7 @@
  */
 public class OpenTelemetryContextDataProvider implements ContextDataProvider {
   private static final boolean BAGGAGE_ENABLED =
-      new ConfigPropertiesSimpleBridge(GlobalOpenTelemetry.get())
+      new SimpleConfigPropertiesBridge(GlobalOpenTelemetry.get())
           .getBoolean("otel.instrumentation.log4j-context-data.add-baggage", false);
   private static final boolean configuredResourceAttributeAccessible =
       isConfiguredResourceAttributeAccessible();

instrumentation/log4j/log4j-context-data/log4j-context-data-2.17/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/log4j/contextdata/v2_17/internal/ContextDataKeys.java

@@ -7,23 +7,23 @@
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.api.incubator.log.LoggingContextConstants;
-import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesSimpleBridge;
+import io.opentelemetry.instrumentation.api.internal.SimpleConfigPropertiesBridge;
 
 /**
  * This class is internal and is hence not for public use. Its APIs are unstable and can change at
  * any time.
  */
 public final class ContextDataKeys {
   public static final String TRACE_ID_KEY =
-      new ConfigPropertiesSimpleBridge(GlobalOpenTelemetry.get())
+      new SimpleConfigPropertiesBridge(GlobalOpenTelemetry.get())
           .getString(
               "otel.instrumentation.common.logging.trace-id", LoggingContextConstants.TRACE_ID);
   public static final String SPAN_ID_KEY =
-      new ConfigPropertiesSimpleBridge(GlobalOpenTelemetry.get())
+      new SimpleConfigPropertiesBridge(GlobalOpenTelemetry.get())
           .getString(
               "otel.instrumentation.common.logging.span-id", LoggingContextConstants.SPAN_ID);
   public static final String TRACE_FLAGS_KEY =
-      new ConfigPropertiesSimpleBridge(GlobalOpenTelemetry.get())
+      new SimpleConfigPropertiesBridge(GlobalOpenTelemetry.get())
           .getString(
               "otel.instrumentation.common.logging.trace-flags",
               LoggingContextConstants.TRACE_FLAGS);