pr review

Author: zeitlinger

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

@@ -59,8 +59,8 @@ public DeclarativeConfigPropertiesBridgeBuilder addOverride(String propertyName,
     return this;
   }
 
-  /** Resolve {@link ConfigProperties} from the {@code autoConfiguredOpenTelemetrySdk}. */
-  public ConfigProperties resolveConfigProperties(
+  /** Build {@link ConfigProperties} from the {@code autoConfiguredOpenTelemetrySdk}. */
+  public ConfigProperties build(
       AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) {
     ConfigProperties sdkConfigProperties =
         AutoConfigureUtil.getConfig(autoConfiguredOpenTelemetrySdk);
@@ -70,15 +70,27 @@ public ConfigProperties resolveConfigProperties(
     ConfigProvider configProvider =
         AutoConfigureUtil.getConfigProvider(autoConfiguredOpenTelemetrySdk);
     if (configProvider != null) {
-      return resolveInstrumentationConfig(configProvider.getInstrumentationConfig());
+      return buildFromInstrumentationConfig(configProvider.getInstrumentationConfig());
     }
     // Should never happen
     throw new IllegalStateException(
         "AutoConfiguredOpenTelemetrySdk does not have ConfigProperties or DeclarativeConfigProperties. This is likely a programming error in opentelemetry-java");
   }
 
-  public ConfigProperties resolveInstrumentationConfig(
+  /**
+   * Build {@link ConfigProperties} from the {@link DeclarativeConfigProperties} provided by the
+   * instrumentation configuration.
+   *
+   * <p>If the provided {@code instrumentationConfig} is null, an empty {@link
+   * DeclarativeConfigProperties} will be used.
+   *
+   * @param instrumentationConfig the instrumentation configuration to build from
+   * @return a new instance of {@link ConfigProperties}
+   */
+  public ConfigProperties buildFromInstrumentationConfig(
       @Nullable DeclarativeConfigProperties instrumentationConfig) {
+    // leave the name "build" for a future method that builds from a DeclarativeConfigProperties
+    // instance that doesn't come from the top-level instrumentation config
     if (instrumentationConfig == null) {
       instrumentationConfig = DeclarativeConfigProperties.empty();
     }

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

@@ -33,7 +33,7 @@ void shouldUseConfigPropertiesForAutoConfiguration() {
           .thenReturn(configPropertiesMock);
 
       ConfigProperties configProperties =
-          new DeclarativeConfigPropertiesBridgeBuilder().resolveConfigProperties(sdkMock);
+          new DeclarativeConfigPropertiesBridgeBuilder().build(sdkMock);
 
       assertThat(configProperties).isSameAs(configPropertiesMock);
     }
@@ -62,7 +62,7 @@ void shouldUseConfigProviderForDeclarativeConfiguration() {
           .thenReturn(configProviderMock);
 
       ConfigProperties configProperties =
-          new DeclarativeConfigPropertiesBridgeBuilder().resolveConfigProperties(sdkMock);
+          new DeclarativeConfigPropertiesBridgeBuilder().build(sdkMock);
 
       assertThat(configProperties.getString(propertyName)).isEqualTo(expectedValue);
     }
@@ -82,7 +82,7 @@ void shouldUseConfigProviderForDeclarativeConfiguration_noInstrumentationConfig(
           .thenReturn(configProviderMock);
 
       ConfigProperties configProperties =
-          new DeclarativeConfigPropertiesBridgeBuilder().resolveConfigProperties(sdkMock);
+          new DeclarativeConfigPropertiesBridgeBuilder().build(sdkMock);
 
       assertThat(configProperties.getString("testProperty")).isNull();
     }

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

@@ -35,7 +35,7 @@ void setup() {
     SdkConfigProvider emptyConfigProvider = SdkConfigProvider.create(emptyModel);
     emptyBridge =
         new DeclarativeConfigPropertiesBridgeBuilder()
-            .resolveInstrumentationConfig(
+            .buildFromInstrumentationConfig(
                 Objects.requireNonNull(emptyConfigProvider.getInstrumentationConfig()));
   }
 
@@ -45,7 +45,7 @@ private static ConfigProperties create(DeclarativeConfigPropertiesBridgeBuilder
             DeclarativeConfigPropertiesBridgeTest.class
                 .getClassLoader()
                 .getResourceAsStream("config.yaml"));
-    return builder.resolveInstrumentationConfig(
+    return builder.buildFromInstrumentationConfig(
         SdkConfigProvider.create(model).getInstrumentationConfig());
   }
 

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

@@ -58,7 +58,7 @@ public static AutoConfiguredOpenTelemetrySdk installOpenTelemetrySdk(
                   "otel.javaagent.debug", earlyConfig.getBoolean("otel.javaagent.debug", false))
               .addOverride(
                   "otel.javaagent.logging", earlyConfig.getString("otel.javaagent.logging"))
-              .resolveInstrumentationConfig(configProvider.getInstrumentationConfig()),
+              .buildFromInstrumentationConfig(configProvider.getInstrumentationConfig()),
           configProvider);
     }