Revert "split tests to separate PR"

This reverts commit 32a4000.

Author: zeitlinger

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

@@ -10,9 +10,9 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
 import io.opentelemetry.javaagent.tooling.OpenTelemetryInstaller;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
-import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
 import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizer;
 import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider;
 import java.io.IOException;
@@ -41,7 +41,7 @@ void setUp() {
   void fileConfigOverwritesUserPropertiesSupplier(@TempDir Path tempDir) throws IOException {
     // given
     Path configFile = tempDir.resolve("test-config.properties");
-    Files.write(configFile, singleton("custom.key = 42"));
+    Files.write(configFile, singleton("otel.instrumentation.custom.key = 42"));
     System.setProperty(ConfigurationFile.CONFIGURATION_FILE_PROPERTY, configFile.toString());
 
     // when
@@ -50,16 +50,38 @@ void fileConfigOverwritesUserPropertiesSupplier(@TempDir Path tempDir) throws IO
             this.getClass().getClassLoader(), EarlyInitAgentConfig.create());
 
     // then
-    assertThat(AutoConfigureUtil.getConfig(autoConfiguredSdk).getString("custom.key"))
+    assertThat(
+            DeclarativeConfigUtil.getInstrumentationConfig(
+                    autoConfiguredSdk.getOpenTelemetrySdk(), "custom")
+                .getString("key"))
         .isEqualTo("42");
   }
 
+  // baseline for the test above to make sure UserCustomPropertiesSupplier
+  // is actually working
+  @SetSystemProperty(key = "otel.sdk.disabled", value = "true") // don't setup the SDK
+  @Test
+  void userPropertiesSupplier() {
+    // when
+    AutoConfiguredOpenTelemetrySdk autoConfiguredSdk =
+        OpenTelemetryInstaller.installOpenTelemetrySdk(
+            this.getClass().getClassLoader(), EarlyInitAgentConfig.create());
+
+    // then
+    assertThat(
+            DeclarativeConfigUtil.getInstrumentationConfig(
+                    autoConfiguredSdk.getOpenTelemetrySdk(), "custom")
+                .getString("key"))
+        .isEqualTo("123");
+  }
+
   // SPI used in test
   public static class UserCustomPropertiesSupplier implements AutoConfigurationCustomizerProvider {
 
     @Override
     public void customize(AutoConfigurationCustomizer autoConfiguration) {
-      autoConfiguration.addPropertiesSupplier(() -> singletonMap("custom.key", "123"));
+      autoConfiguration.addPropertiesSupplier(
+          () -> singletonMap("otel.instrumentation.custom.key", "123"));
     }
   }
 }

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

@@ -10,7 +10,6 @@
 import io.opentelemetry.api.GlobalOpenTelemetry;
 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;
@@ -35,9 +34,9 @@ void keepUserOtlpProtocolConfiguration() {
             this.getClass().getClassLoader(), EarlyInitAgentConfig.create());
 
     // then
-    assertThat(
-            AutoConfigureUtil.getConfig(autoConfiguredSdk).getString("otel.exporter.otlp.protocol"))
-        .isEqualTo("grpc");
+    assertThat(autoConfiguredSdk.getOpenTelemetrySdk().toString())
+        .contains("OtlpGrpc")
+        .doesNotContain("OtlpHttp");
   }
 
   @Test
@@ -48,8 +47,8 @@ void defaultHttpProtobufOtlpProtocolConfiguration() {
             this.getClass().getClassLoader(), EarlyInitAgentConfig.create());
 
     // then
-    assertThat(
-            AutoConfigureUtil.getConfig(autoConfiguredSdk).getString("otel.exporter.otlp.protocol"))
-        .isEqualTo("http/protobuf");
+    assertThat(autoConfiguredSdk.getOpenTelemetrySdk().toString())
+        .contains("OtlpHttp")
+        .doesNotContain("OtlpGrpc");
   }
 }