pr review

Author: zeitlinger

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

@@ -39,18 +39,21 @@ public static AutoConfiguredOpenTelemetrySdk installOpenTelemetrySdk(
     setForceFlush(sdk);
 
     if (configProvider != null) {
+      // We create a new instance of AutoConfiguredOpenTelemetrySdk, which has a ConfigProperties
+      // instance that can be used to read properties from the configuration file.
+      // This allows most instrumentations to be unaware of which configuration style is used.
       return SdkAutoconfigureAccess.create(
           sdk,
+          // the Resource from the original instance is also the default Resource,
+          // so this is functionally equivalent
           Resource.getDefault(),
           ConfigPropertiesFactory.builder()
               .addTranslation(
                   "otel.instrumentation.common.default-enabled", "common.default.enabled")
               .addTranslation("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}
+              // 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}
               .addFixedValue(
                   "otel.javaagent.debug", earlyConfig.getBoolean("otel.javaagent.debug", false))
               .addFixedValue(

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/ConfigPropertiesBridge.java

@@ -115,7 +115,7 @@ public Map<String, String> getMap(String name, Map<String, String> defaultValue)
   @Override
   public DeclarativeConfigProperties getDeclarativeConfig(String node) {
     if (configProvider == null) {
-      // declarative config is not supported at all
+      // declarative config is not used
       return null;
     }
 

javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/OpenTelemetryInstallerTest.java

@@ -11,12 +11,14 @@
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.javaagent.tooling.config.EarlyInitAgentConfig;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 class OpenTelemetryInstallerTest {
 
   @BeforeEach
+  @AfterEach
   void setUp() {
     GlobalOpenTelemetry.resetForTest();
   }

javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/config/ConfigurationPropertiesSupplierTest.java

@@ -18,6 +18,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -28,6 +29,7 @@
 class ConfigurationPropertiesSupplierTest {
 
   @BeforeEach
+  @AfterEach
   void setUp() {
     GlobalOpenTelemetry.resetForTest();
     ConfigurationFile.resetForTest();

javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/config/OtlpProtocolPropertiesSupplierTest.java

@@ -11,13 +11,15 @@
 import io.opentelemetry.javaagent.tooling.OpenTelemetryInstaller;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junitpioneer.jupiter.SetSystemProperty;
 
 class OtlpProtocolPropertiesSupplierTest {
 
   @BeforeEach
+  @AfterEach
   void setUp() {
     GlobalOpenTelemetry.resetForTest();
   }