normalize system props before lookup to avoid ambiguity of "experimental-foo" and "experimental.foo" that both translate to "foo/development"

Author: zeitlinger

javaagent-tooling/build.gradle.kts

@@ -105,6 +105,7 @@ testing {
 
     val testConfigFile by registering(JvmTestSuite::class) {
       dependencies {
+        implementation(project(":instrumentation-api"))
         implementation(project(":javaagent-tooling"))
         // requires mockito-inline
         implementation("uk.org.webcompere:system-stubs-jupiter")

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

@@ -7,6 +7,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
 import java.io.ByteArrayInputStream;
@@ -33,6 +34,7 @@ void addSpanLoggingExporter(String propertyValue, boolean alreadyAdded, boolean
     if (propertyValue != null) {
       System.setProperty("otel.javaagent.debug", propertyValue);
     }
+    ConfigPropertiesUtil.resetForTest();
     String yaml =
         alreadyAdded
             ? "file_format: \"1.0-rc.1\"\n"

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

@@ -10,6 +10,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil;
 import io.opentelemetry.javaagent.tooling.OpenTelemetryInstaller;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
@@ -33,6 +34,7 @@ class ConfigurationPropertiesSupplierTest {
   void setUp() {
     GlobalOpenTelemetry.resetForTest();
     ConfigurationFile.resetForTest();
+    ConfigPropertiesUtil.resetForTest();
   }
 
   // regression for https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/6696
@@ -43,6 +45,7 @@ void fileConfigOverwritesUserPropertiesSupplier(@TempDir Path tempDir) throws IO
     Path configFile = tempDir.resolve("test-config.properties");
     Files.write(configFile, singleton("custom.key = 42"));
     System.setProperty(ConfigurationFile.CONFIGURATION_FILE_PROPERTY, configFile.toString());
+    ConfigPropertiesUtil.resetForTest();
 
     // when
     AutoConfiguredOpenTelemetrySdk autoConfiguredSdk =

javaagent-tooling/src/testConfigFile/java/io/opentelemetry/javaagent/tooling/config/ConfigurationFileTest.java

@@ -7,6 +7,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
@@ -36,19 +37,15 @@ void shouldUseEnvVar() throws IOException {
     String path = createFile("config", "property1=val-env");
     environmentVariables.set("OTEL_JAVAAGENT_CONFIGURATION_FILE", path);
 
-    Map<String, String> properties = ConfigurationFile.loadConfigFile();
-
-    assertThat(properties).containsEntry("property1", "val-env");
+    assertThat(load()).containsEntry("property1", "val-env");
   }
 
   @Test
   void shouldUseSystemProperty() throws IOException {
     String path = createFile("config", "property1=val-sys");
     systemProperties.set("otel.javaagent.configuration-file", path);
 
-    Map<String, String> properties = ConfigurationFile.loadConfigFile();
-
-    assertThat(properties).containsEntry("property1", "val-sys");
+    assertThat(load()).containsEntry("property1", "val-sys");
   }
 
   @Test
@@ -58,25 +55,19 @@ void shouldUseSystemPropertyOverEnvVar() throws IOException {
     systemProperties.set("otel.javaagent.configuration-file", path);
     environmentVariables.set("OTEL_JAVAAGENT_CONFIGURATION_FILE", pathEnv);
 
-    Map<String, String> properties = ConfigurationFile.loadConfigFile();
-
-    assertThat(properties).containsEntry("property1", "val-sys");
+    assertThat(load()).containsEntry("property1", "val-sys");
   }
 
   @Test
   void shouldReturnEmptyPropertiesIfFileDoesNotExist() {
     systemProperties.set("otel.javaagent.configuration-file", "somePath");
 
-    Map<String, String> properties = ConfigurationFile.loadConfigFile();
-
-    assertThat(properties).isEmpty();
+    assertThat(load()).isEmpty();
   }
 
   @Test
   void shouldReturnEmptyPropertiesIfPropertyIsNotSet() {
-    Map<String, String> properties = ConfigurationFile.loadConfigFile();
-
-    assertThat(properties).isEmpty();
+    assertThat(load()).isEmpty();
   }
 
   private String createFile(String name, String contents) throws IOException {
@@ -87,4 +78,9 @@ private String createFile(String name, String contents) throws IOException {
     }
     return file.getAbsolutePath();
   }
+
+  private static Map<String, String> load() {
+    ConfigPropertiesUtil.resetForTest();
+    return ConfigurationFile.loadConfigFile();
+  }
 }