rename

Author: zeitlinger

declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/ConfigPropertiesUtil.java

@@ -13,7 +13,7 @@ public static String propertyYamlPath(String propertyName) {
   }
 
   static String yamlPath(String property) {
-    String[] segments = SimpleDeclarativeConfigPropertiesBridge.getSegments(property);
+    String[] segments = DeclarativeConfigPropertiesApiBridge.getSegments(property);
     if (segments.length == 0) {
       throw new IllegalArgumentException("Invalid property: " + property);
     }

declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/SimpleDeclarativeConfigPropertiesBridge.java renamed to declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesApiBridge.java

@@ -17,14 +17,14 @@
 import java.util.function.BiFunction;
 import javax.annotation.Nullable;
 
-public class SimpleDeclarativeConfigPropertiesBridge {
+public class DeclarativeConfigPropertiesApiBridge {
   private static final String OTEL_INSTRUMENTATION_PREFIX = "otel.instrumentation.";
   protected final DeclarativeConfigProperties baseNode;
   // lookup order matters - we choose the first match
   protected final Map<String, String> mappings;
   protected final Map<String, Object> overrideValues;
 
-  public SimpleDeclarativeConfigPropertiesBridge(
+  public DeclarativeConfigPropertiesApiBridge(
       DeclarativeConfigProperties baseNode,
       Map<String, String> mappings,
       Map<String, Object> overrideValues) {

declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridge.java

@@ -38,7 +38,7 @@
  *         string_key: value
  * </pre>
  */
-final class DeclarativeConfigPropertiesBridge extends SimpleDeclarativeConfigPropertiesBridge
+final class DeclarativeConfigPropertiesBridge extends DeclarativeConfigPropertiesApiBridge
     implements ConfigProperties {
 
   DeclarativeConfigPropertiesBridge(

declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridgeBuilder.java

@@ -90,9 +90,9 @@ public ConfigProperties build(@Nullable DeclarativeConfigProperties node) {
         node == null ? empty() : node, mappings, overrideValues);
   }
 
-  public SimpleDeclarativeConfigPropertiesBridge buildSimple(
+  public DeclarativeConfigPropertiesApiBridge buildApiBridge(
       @Nullable DeclarativeConfigProperties node) {
-    return new SimpleDeclarativeConfigPropertiesBridge(
+    return new DeclarativeConfigPropertiesApiBridge(
         node == null ? empty() : node, mappings, overrideValues);
   }
 
@@ -112,9 +112,9 @@ public ConfigProperties buildFromInstrumentationConfig(
         instrumentationConfig == null ? null : instrumentationConfig.getStructured("java"));
   }
 
-  public SimpleDeclarativeConfigPropertiesBridge buildSimpleFromInstrumentationConfig(
+  public DeclarativeConfigPropertiesApiBridge buildApiBridgeFromInstrumentationConfig(
       @Nullable DeclarativeConfigProperties instrumentationConfig) {
-    return buildSimple(
+    return buildApiBridge(
         instrumentationConfig == null ? null : instrumentationConfig.getStructured("java"));
   }
 }

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

@@ -19,6 +19,7 @@
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.context.propagation.TextMapSetter;
+import io.opentelemetry.instrumentation.api.internal.ApiConfigProperties;
 import io.opentelemetry.instrumentation.api.internal.EmbeddedInstrumentationProperties;
 import io.opentelemetry.instrumentation.api.internal.Experimental;
 import io.opentelemetry.instrumentation.api.internal.InstrumenterBuilderAccess;
@@ -27,7 +28,6 @@
 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 SimpleConfigPropertiesBridge(openTelemetry)
+                new ApiConfigProperties(openTelemetry)
                     .getString("otel.instrumentation.experimental.span-suppression-strategy"))
             .create(getSpanKeysFromAttributesExtractors()));
   }

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

@@ -8,8 +8,8 @@
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.incubator.ExtendedOpenTelemetry;
 import io.opentelemetry.api.incubator.config.ConfigProvider;
+import io.opentelemetry.instrumentation.config.bridge.DeclarativeConfigPropertiesApiBridge;
 import io.opentelemetry.instrumentation.config.bridge.DeclarativeConfigPropertiesBridgeBuilder;
-import io.opentelemetry.instrumentation.config.bridge.SimpleDeclarativeConfigPropertiesBridge;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -19,17 +19,17 @@
  * This class is internal and is hence not for public use. Its APIs are unstable and can change at
  * any time.
  */
-public final class SimpleConfigPropertiesBridge {
+public final class ApiConfigProperties {
 
-  @Nullable private final SimpleDeclarativeConfigPropertiesBridge bridge;
+  @Nullable private final DeclarativeConfigPropertiesApiBridge bridge;
 
-  public SimpleConfigPropertiesBridge(OpenTelemetry openTelemetry) {
+  public ApiConfigProperties(OpenTelemetry openTelemetry) {
     if (openTelemetry instanceof ExtendedOpenTelemetry) {
       ExtendedOpenTelemetry extendedOpenTelemetry = (ExtendedOpenTelemetry) openTelemetry;
       ConfigProvider configProvider = extendedOpenTelemetry.getConfigProvider();
       this.bridge =
           new DeclarativeConfigPropertiesBridgeBuilder()
-              .buildSimpleFromInstrumentationConfig(configProvider.getInstrumentationConfig());
+               .buildApiBridgeFromInstrumentationConfig(configProvider.getInstrumentationConfig());
     } else {
       this.bridge = null;
     }

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.SimpleConfigPropertiesBridge;
+import io.opentelemetry.instrumentation.api.internal.ApiConfigProperties;
 import io.opentelemetry.instrumentation.awssdk.v1_11.AwsSdkTelemetry;
 
 /**
@@ -24,15 +24,15 @@ public class TracingRequestHandler extends RequestHandler2 {
   private static final RequestHandler2 DELEGATE = buildDelegate(GlobalOpenTelemetry.get());
 
   private static RequestHandler2 buildDelegate(OpenTelemetry openTelemetry) {
-    SimpleConfigPropertiesBridge bridge = new SimpleConfigPropertiesBridge(openTelemetry);
+    ApiConfigProperties config = new ApiConfigProperties(openTelemetry);
     return AwsSdkTelemetry.builder(openTelemetry)
         .setCaptureExperimentalSpanAttributes(
-            bridge.getBoolean("otel.instrumentation.aws-sdk.experimental-span-attributes", false))
+            config.getBoolean("otel.instrumentation.aws-sdk.experimental-span-attributes", false))
         .setMessagingReceiveInstrumentationEnabled(
-            bridge.getBoolean(
+            config.getBoolean(
                 "otel.instrumentation.messaging.experimental.receive-telemetry.enabled", false))
         .setCapturedHeaders(
-            bridge.getList(
+            config.getList(
                 "otel.instrumentation.messaging.experimental.capture-headers", emptyList()))
         .build()
         .newRequestHandler();

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.SimpleConfigPropertiesBridge;
+import io.opentelemetry.instrumentation.api.internal.ApiConfigProperties;
 import io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkTelemetry;
 import io.opentelemetry.instrumentation.awssdk.v2_2.internal.AbstractAwsSdkTelemetryFactory;
 import java.util.List;
@@ -23,24 +23,23 @@ public static AwsSdkTelemetry telemetry() {
 
   private static class AwsSdkTelemetryFactory extends AbstractAwsSdkTelemetryFactory {
 
-    private final SimpleConfigPropertiesBridge bridge =
-        new SimpleConfigPropertiesBridge(GlobalOpenTelemetry.get());
+    private final ApiConfigProperties config = new ApiConfigProperties(GlobalOpenTelemetry.get());
 
     @Override
     protected List<String> getCapturedHeaders() {
-      return bridge.getList(
+      return config.getList(
           "otel.instrumentation.messaging.experimental.capture-headers", emptyList());
     }
 
     @Override
     protected boolean messagingReceiveInstrumentationEnabled() {
-      return bridge.getBoolean(
+      return config.getBoolean(
           "otel.instrumentation.messaging.experimental.receive-telemetry.enabled", false);
     }
 
     @Override
     protected boolean getBoolean(String name, boolean defaultValue) {
-      return bridge.getBoolean(name, defaultValue);
+      return config.getBoolean(name, defaultValue);
     }
   }
 

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.SimpleConfigPropertiesBridge;
+import io.opentelemetry.instrumentation.api.internal.ApiConfigProperties;
 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 SimpleConfigPropertiesBridge(openTelemetry)
+    return new ApiConfigProperties(openTelemetry)
         .getBoolean("otel.instrumentation.jdbc.experimental.capture-query-parameters", false);
   }
 
@@ -48,7 +48,7 @@ static Instrumenter<DbRequest, Void> createStatementInstrumenter(
         openTelemetry,
         emptyList(),
         true,
-        new SimpleConfigPropertiesBridge(openTelemetry)
+        new ApiConfigProperties(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 SimpleConfigPropertiesBridge(openTelemetry)
+        new ApiConfigProperties(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.SimpleConfigPropertiesBridge;
+import io.opentelemetry.instrumentation.api.internal.ApiConfigProperties;
 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,13 +37,13 @@ public class TracingConsumerInterceptor<K, V> implements ConsumerInterceptor<K,
 
   private static KafkaTelemetry buildTelemetry() {
     OpenTelemetry openTelemetry = GlobalOpenTelemetry.get();
-    SimpleConfigPropertiesBridge bridge = new SimpleConfigPropertiesBridge(openTelemetry);
+    ApiConfigProperties config = new ApiConfigProperties(openTelemetry);
     return KafkaTelemetry.builder(openTelemetry)
         .setMessagingReceiveInstrumentationEnabled(
-            bridge.getBoolean(
+            config.getBoolean(
                 "otel.instrumentation.messaging.experimental.receive-telemetry.enabled", false))
         .setCapturedHeaders(
-            bridge.getList(
+            config.getList(
                 "otel.instrumentation.messaging.experimental.capture-headers", emptyList()))
         .build();
   }