pr review

Author: zeitlinger

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

@@ -56,15 +56,15 @@ final class DeclarativeConfigPropertiesBridge implements ConfigProperties {
   @Nullable private final DeclarativeConfigProperties baseNode;
 
   // lookup order matters - we choose the first match
-  private final Map<String, String> translationMap;
+  private final Map<String, String> mappings;
   private final Map<String, Object> overrideValues;
 
   DeclarativeConfigPropertiesBridge(
       @Nullable DeclarativeConfigProperties baseNode,
-      Map<String, String> translationMap,
+      Map<String, String> mappings,
       Map<String, Object> overrideValues) {
     this.baseNode = baseNode;
-    this.translationMap = translationMap;
+    this.mappings = mappings;
     this.overrideValues = overrideValues;
   }
 
@@ -205,7 +205,7 @@ private static String[] getSegments(String property) {
   }
 
   private String translateProperty(String property) {
-    for (Map.Entry<String, String> entry : translationMap.entrySet()) {
+    for (Map.Entry<String, String> entry : mappings.entrySet()) {
       if (property.startsWith(entry.getKey())) {
         return entry.getValue() + property.substring(entry.getKey().length());
       }

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

@@ -25,13 +25,13 @@
  * at any time.
  */
 public class DeclarativeConfigPropertiesBridgeBuilder {
-  private final LinkedHashMap<String, String> translationMap = new LinkedHashMap<>();
+  private final LinkedHashMap<String, String> mappings = new LinkedHashMap<>();
   private final Map<String, Object> overrideValues = new LinkedHashMap<>();
 
   public DeclarativeConfigPropertiesBridgeBuilder() {}
 
   /**
-   * Adds a translation from a property prefix to a YAML path.
+   * Adds a mapping from a property prefix to a YAML path.
    *
    * <p>For example, if the property prefix is "otel.javaagent" and the YAML path is "agent", then
    * any property starting with "otel.javaagent." will be resolved against the "agent" node in the
@@ -41,9 +41,9 @@ public DeclarativeConfigPropertiesBridgeBuilder() {}
    * @param yamlPath the YAML path to resolve the property against
    */
   @CanIgnoreReturnValue
-  public DeclarativeConfigPropertiesBridgeBuilder addTranslation(
+  public DeclarativeConfigPropertiesBridgeBuilder addMapping(
       String propertyPrefix, String yamlPath) {
-    translationMap.put(propertyPrefix, yamlPath);
+    mappings.put(propertyPrefix, yamlPath);
     return this;
   }
 
@@ -95,6 +95,6 @@ public ConfigProperties buildFromInstrumentationConfig(
       instrumentationConfig = DeclarativeConfigProperties.empty();
     }
     return new DeclarativeConfigPropertiesBridge(
-        instrumentationConfig.getStructured("java", empty()), translationMap, overrideValues);
+        instrumentationConfig.getStructured("java", empty()), mappings, overrideValues);
   }
 }

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

@@ -126,7 +126,7 @@ void vendorTranslation() {
     ConfigProperties propertiesBridge =
         create(
             new DeclarativeConfigPropertiesBridgeBuilder()
-                .addTranslation("acme", "acme.full_name"));
+                .addMapping("acme", "acme.full_name"));
     assertThat(propertiesBridge.getBoolean("acme.preserved")).isTrue();
   }
 
@@ -135,7 +135,7 @@ void agentCommonTranslation() {
     assertThat(
             create(
                     new DeclarativeConfigPropertiesBridgeBuilder()
-                        .addTranslation(
+                        .addMapping(
                             "otel.instrumentation.common.default-enabled",
                             "common.default.enabled"))
                 .getBoolean("otel.instrumentation.common.default-enabled"))
@@ -147,7 +147,7 @@ void agentTranslation() {
     ConfigProperties bridge =
         create(
             new DeclarativeConfigPropertiesBridgeBuilder()
-                .addTranslation("otel.javaagent", "agent")
+                .addMapping("otel.javaagent", "agent")
                 .addOverride("otel.javaagent.debug", true)
                 .addOverride("otel.javaagent.logging", "application"));
 

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

@@ -48,9 +48,9 @@ public static AutoConfiguredOpenTelemetrySdk installOpenTelemetrySdk(
           // so this is functionally equivalent
           Resource.getDefault(),
           new DeclarativeConfigPropertiesBridgeBuilder()
-              .addTranslation(
+              .addMapping(
                   "otel.instrumentation.common.default-enabled", "common.default.enabled")
-              .addTranslation("otel.javaagent", "agent")
+                .addMapping("otel.javaagent", "agent")
               // these properties are used to initialize the SDK before the configuration file
               // is loaded for consistency, we pass them to the bridge, so that they can be read
               // later with the same value from the {@link DeclarativeConfigPropertiesBridge}