pr review

Author: zeitlinger

javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/internal/ConfigPropertyTranslator.java renamed to javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/internal/ConfigPropertiesFactory.java

@@ -22,7 +22,7 @@
  * any time.
  */
 @SuppressWarnings("NonApiType")
-public class ConfigPropertyTranslator {
+public class ConfigPropertiesFactory {
   // lookup order matters - we choose the first match
   private final LinkedHashMap<String, String> translationMap;
   private final Map<String, Object> fixedValues;
@@ -31,7 +31,7 @@ public static Builder builder() {
     return new Builder();
   }
 
-  ConfigPropertyTranslator(
+  ConfigPropertiesFactory(
       LinkedHashMap<String, String> translationMap, Map<String, Object> fixedValues) {
     this.translationMap = translationMap;
     this.fixedValues = fixedValues;
@@ -100,7 +100,7 @@ public ConfigProperties resolveInstrumentationConfig(
 
     public ConfigProperties resolveConfig(@Nullable DeclarativeConfigProperties config) {
       return new DeclarativeConfigPropertiesBridge(
-          config, new ConfigPropertyTranslator(translationMap, fixedValues));
+          config, new ConfigPropertiesFactory(translationMap, fixedValues));
     }
   }
 }

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

@@ -53,11 +53,11 @@ final class DeclarativeConfigPropertiesBridge implements ConfigProperties {
 
   private static final String OTEL_INSTRUMENTATION_PREFIX = "otel.instrumentation.";
 
-  private final ConfigPropertyTranslator translator;
+  private final ConfigPropertiesFactory translator;
   @Nullable private final DeclarativeConfigProperties baseNode;
 
   DeclarativeConfigPropertiesBridge(
-      @Nullable DeclarativeConfigProperties baseNode, ConfigPropertyTranslator translator) {
+      @Nullable DeclarativeConfigProperties baseNode, ConfigPropertiesFactory translator) {
     this.baseNode = baseNode;
     this.translator = translator;
   }

javaagent-extension-api/src/test/java/io/opentelemetry/javaagent/extension/internal/ConfigPropertyTranslatorTest.java renamed to javaagent-extension-api/src/test/java/io/opentelemetry/javaagent/extension/internal/ConfigPropertiesFactoryTest.java

@@ -21,7 +21,7 @@
 import org.mockito.Mockito;
 
 @SuppressWarnings("DoNotMockAutoValue")
-class ConfigPropertyTranslatorTest {
+class ConfigPropertiesFactoryTest {
   @Test
   void shouldUseConfigPropertiesForAutoConfiguration() {
     ConfigProperties configPropertiesMock = mock(ConfigProperties.class);
@@ -33,7 +33,7 @@ void shouldUseConfigPropertiesForAutoConfiguration() {
           .thenReturn(configPropertiesMock);
 
       ConfigProperties configProperties =
-          ConfigPropertyTranslator.builder().resolveConfigProperties(sdkMock);
+          ConfigPropertiesFactory.builder().resolveConfigProperties(sdkMock);
 
       assertThat(configProperties).isSameAs(configPropertiesMock);
     }
@@ -62,7 +62,7 @@ void shouldUseConfigProviderForDeclarativeConfiguration() {
           .thenReturn(configProviderMock);
 
       ConfigProperties configProperties =
-          ConfigPropertyTranslator.builder().resolveConfigProperties(sdkMock);
+          ConfigPropertiesFactory.builder().resolveConfigProperties(sdkMock);
 
       assertThat(configProperties.getString(propertyName)).isEqualTo(expectedValue);
     }
@@ -82,7 +82,7 @@ void shouldUseConfigProviderForDeclarativeConfiguration_noInstrumentationConfig(
           .thenReturn(configProviderMock);
 
       ConfigProperties configProperties =
-          ConfigPropertyTranslator.builder().resolveConfigProperties(sdkMock);
+          ConfigPropertiesFactory.builder().resolveConfigProperties(sdkMock);
 
       assertThat(configProperties.getString("testProperty")).isEqualTo(null);
     }

javaagent-extension-api/src/test/java/io/opentelemetry/javaagent/extension/internal/DeclarativeConfigPropertiesBridgeTest.java

@@ -27,19 +27,19 @@ class DeclarativeConfigPropertiesBridgeTest {
 
   @BeforeEach
   void setup() {
-    bridge = create(ConfigPropertyTranslator.builder());
+    bridge = create(ConfigPropertiesFactory.builder());
 
     OpenTelemetryConfigurationModel emptyModel =
         new OpenTelemetryConfigurationModel()
             .withAdditionalProperty("instrumentation/development", new InstrumentationModel());
     SdkConfigProvider emptyConfigProvider = SdkConfigProvider.create(emptyModel);
     emptyBridge =
-        ConfigPropertyTranslator.builder()
+        ConfigPropertiesFactory.builder()
             .resolveInstrumentationConfig(
                 Objects.requireNonNull(emptyConfigProvider.getInstrumentationConfig()));
   }
 
-  private static ConfigProperties create(ConfigPropertyTranslator.Builder builder) {
+  private static ConfigProperties create(ConfigPropertiesFactory.Builder builder) {
     OpenTelemetryConfigurationModel model =
         DeclarativeConfiguration.parse(
             DeclarativeConfigPropertiesBridgeTest.class
@@ -124,15 +124,15 @@ void vendor() {
   @Test
   void vendorTranslation() {
     ConfigProperties propertiesBridge =
-        create(ConfigPropertyTranslator.builder().addTranslation("acme", "acme.full_name"));
+        create(ConfigPropertiesFactory.builder().addTranslation("acme", "acme.full_name"));
     assertThat(propertiesBridge.getBoolean("acme.preserved")).isTrue();
   }
 
   @Test
   void agentCommonTranslation() {
     assertThat(
             create(
-                    ConfigPropertyTranslator.builder()
+                    ConfigPropertiesFactory.builder()
                         .addTranslation(
                             "otel.instrumentation.common.default-enabled",
                             "common.default.enabled"))
@@ -144,7 +144,7 @@ void agentCommonTranslation() {
   void agentTranslation() {
     ConfigProperties bridge =
         create(
-            ConfigPropertyTranslator.builder()
+            ConfigPropertiesFactory.builder()
                 .addTranslation("otel.javaagent", "agent")
                 .addFixedValue("otel.javaagent.debug", true)
                 .addFixedValue("otel.javaagent.logging", "application"));

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/OpenTelemetryInstaller.java

@@ -7,7 +7,7 @@
 
 import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.javaagent.bootstrap.OpenTelemetrySdkAccess;
-import io.opentelemetry.javaagent.extension.internal.ConfigPropertyTranslator;
+import io.opentelemetry.javaagent.extension.internal.ConfigPropertiesFactory;
 import io.opentelemetry.javaagent.tooling.config.EarlyInitAgentConfig;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
@@ -42,7 +42,7 @@ public static AutoConfiguredOpenTelemetrySdk installOpenTelemetrySdk(
       return SdkAutoconfigureAccess.create(
           sdk,
           Resource.getDefault(),
-          ConfigPropertyTranslator.builder()
+          ConfigPropertiesFactory.builder()
               .addTranslation(
                   "otel.instrumentation.common.default-enabled", "common.default.enabled")
               .addTranslation("otel.javaagent", "agent")