Remove usages of classes shaded in testcontainers from tests (#8551)

Co-authored-by: Trask Stalnaker <[email protected]>

Author: laurit

instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/S3CamelTest.groovy

@@ -6,7 +6,6 @@
 package io.opentelemetry.javaagent.instrumentation.apachecamel.aws
 
 import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification
-import org.testcontainers.shaded.com.google.common.collect.ImmutableMap
 import spock.lang.Ignore
 import spock.lang.Shared
 
@@ -22,7 +21,7 @@ class S3CamelTest extends AgentInstrumentationSpecification {
     setup:
     String bucketName = "bucket-test-s3-sqs-camel"
     String queueName = "s3SqsCamelTest"
-    def camelApp = new CamelSpringApp(awsConnector, S3Config, ImmutableMap.of("bucketName", bucketName, "queueName", queueName))
+    def camelApp = new CamelSpringApp(awsConnector, S3Config, [bucketName: bucketName, queueName: queueName])
 
     def queueUrl = setupTestInfrastructure(queueName, bucketName)
     waitAndClearSetupTraces(queueUrl, queueName, bucketName)

instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SnsCamelTest.groovy

@@ -6,7 +6,6 @@
 package io.opentelemetry.javaagent.instrumentation.apachecamel.aws
 
 import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification
-import org.testcontainers.shaded.com.google.common.collect.ImmutableMap
 import spock.lang.Ignore
 import spock.lang.Shared
 
@@ -22,7 +21,7 @@ class SnsCamelTest extends AgentInstrumentationSpecification {
     setup:
     String topicName = "snsCamelTest"
     String queueName = "snsCamelTest"
-    def camelApp = new CamelSpringApp(awsConnector, SnsConfig, ImmutableMap.of("topicName", topicName, "queueName", queueName))
+    def camelApp = new CamelSpringApp(awsConnector, SnsConfig, [topicName: topicName, queueName: queueName])
 
     def (queueUrl, topicArn) = setupTestInfrastructure(queueName, topicName)
     waitAndClearSetupTraces(queueUrl, queueName)
@@ -59,7 +58,7 @@ class SnsCamelTest extends AgentInstrumentationSpecification {
     setup:
     String topicName = "snsCamelTest"
     String queueName = "snsCamelTest"
-    def camelApp = new CamelSpringApp(awsConnector, SnsConfig, ImmutableMap.of("topicName", topicName, "queueName", queueName))
+    def camelApp = new CamelSpringApp(awsConnector, SnsConfig, [topicName: topicName, queueName: queueName])
 
     def (queueUrl, topicArn) = setupTestInfrastructure(queueName, topicName)
     waitAndClearSetupTraces(queueUrl, queueName)

instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SqsCamelTest.groovy

@@ -6,7 +6,6 @@
 package io.opentelemetry.javaagent.instrumentation.apachecamel.aws
 
 import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification
-import org.testcontainers.shaded.com.google.common.collect.ImmutableMap
 import spock.lang.Shared
 
 import static io.opentelemetry.api.trace.SpanKind.CONSUMER
@@ -24,7 +23,7 @@ class SqsCamelTest extends AgentInstrumentationSpecification {
   def "camel SQS producer - camel SQS consumer"() {
     setup:
     String queueName = "sqsCamelTest"
-    def camelApp = new CamelSpringApp(awsConnector, SqsConfig, ImmutableMap.of("queueName", queueName))
+    def camelApp = new CamelSpringApp(awsConnector, SqsConfig, ["queueName": queueName])
     def queueUrl = awsConnector.createQueue(queueName)
 
     waitAndClearSetupTraces(queueUrl, queueName)
@@ -59,7 +58,7 @@ class SqsCamelTest extends AgentInstrumentationSpecification {
   def "AWS SDK SQS producer - camel SQS consumer"() {
     setup:
     String queueName = "sqsCamelTest"
-    def camelApp = new CamelSpringApp(awsConnector, SqsConfig, ImmutableMap.of("queueName", queueName))
+    def camelApp = new CamelSpringApp(awsConnector, SqsConfig, ["queueName": queueName])
     def queueUrl = awsConnector.createQueue(queueName)
 
     waitAndClearSetupTraces(queueUrl, queueName)
@@ -95,7 +94,7 @@ class SqsCamelTest extends AgentInstrumentationSpecification {
   def "camel SQS producer - AWS SDK SQS consumer"() {
     setup:
     String queueName = "sqsCamelTestSdkConsumer"
-    def camelApp = new CamelSpringApp(awsConnector, SqsConfig, ImmutableMap.of("queueSdkConsumerName", queueName))
+    def camelApp = new CamelSpringApp(awsConnector, SqsConfig, [queueSdkConsumerName: queueName])
     def queueUrl = awsConnector.createQueue(queueName)
 
     waitAndClearSetupTraces(queueUrl, queueName)

instrumentation/guava-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/guava/v10_0/BaseGuavaWithSpanTest.java

@@ -5,11 +5,11 @@
 
 package io.opentelemetry.javaagent.instrumentation.guava.v10_0;
 
+import com.google.common.base.Throwables;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
 import io.opentelemetry.javaagent.instrumentation.otelannotations.AbstractWithSpanTest;
-import org.testcontainers.shaded.com.google.common.base.Throwables;
 
 abstract class BaseGuavaWithSpanTest
     extends AbstractWithSpanTest<SettableFuture<String>, ListenableFuture<String>> {

instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/server/base/SpringWebFluxServerTest.java

@@ -14,10 +14,11 @@
 import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
 import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint;
+import java.util.HashMap;
+import java.util.Map;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.springframework.boot.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
-import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
 
 public abstract class SpringWebFluxServerTest
     extends AbstractHttpServerTest<ConfigurableApplicationContext> {
@@ -33,16 +34,12 @@ public abstract class SpringWebFluxServerTest
   @Override
   public ConfigurableApplicationContext setupServer() {
     SpringApplication app = new SpringApplication(getApplicationClass());
-    app.setDefaultProperties(
-        ImmutableMap.of(
-            "server.port",
-            port,
-            "server.context-path",
-            getContextPath(),
-            "server.servlet.contextPath",
-            getContextPath(),
-            "server.error.include-message",
-            "always"));
+    Map<String, Object> properties = new HashMap<>();
+    properties.put("server.port", port);
+    properties.put("server.context-path", getContextPath());
+    properties.put("server.servlet.contextPath", getContextPath());
+    properties.put("server.error.include-message", "always");
+    app.setDefaultProperties(properties);
     return app.run();
   }