From 7ad9e7a50bcf0c0165e2f76a581e5c4b2ffa577b Mon Sep 17 00:00:00 2001 From: Anuraag Agrawal Date: Tue, 15 Jun 2021 19:10:19 +0900 Subject: [PATCH] Move shaded testing dependencies to internal package. (#3305) --- .../apachecamel/SingleServiceCamelTest.groovy | 2 +- .../groovy/Aws0ClientTest.groovy | 8 +++--- .../v1_11/AbstractAws1ClientTest.groovy | 8 +++--- .../awssdk/v2_2/AbstractAws2ClientTest.groovy | 8 +++--- .../groovy/JaxMultithreadedClientTest.groovy | 10 +++---- .../src/main/groovy/ArquillianRestTest.groovy | 4 +-- .../src/test/groovy/CxfFilterTest.groovy | 2 +- .../src/main/groovy/BaseJsfTest.groovy | 14 +++++----- .../JspInstrumentationBasicTests.groovy | 10 +++---- .../JspInstrumentationForwardTests.groovy | 4 +-- .../test/groovy/KubernetesClientTest.groovy | 8 +++--- .../src/test/groovy/RatpackOtherTest.groovy | 2 +- .../groovy/AbstractServlet3MappingTest.groovy | 2 +- .../test/groovy/AbstractServlet3Test.groovy | 2 +- .../src/test/groovy/TomcatServlet3Test.groovy | 2 +- .../groovy/AbstractServlet5MappingTest.groovy | 2 +- .../test/groovy/AbstractServlet5Test.groovy | 2 +- .../src/test/groovy/TomcatServlet5Test.groovy | 2 +- .../src/test/groovy/SparkJavaBasedTest.groovy | 2 +- .../src/test/groovy/SpringWebfluxTest.groovy | 14 +++++----- .../test/boot/SpringBootBasedTest.groovy | 8 +++--- .../src/test/groovy/TapestryTest.groovy | 16 ++++++------ .../src/test/groovy/UndertowServerTest.groovy | 2 +- .../VertxReactivePropagationTest.groovy | 6 ++--- .../src/test/groovy/WicketTest.groovy | 2 +- .../opentelemetry/smoketest/SmokeTest.groovy | 2 +- .../smoketest/TelemetryRetriever.groovy | 2 +- .../windows/WindowsTestContainerManager.java | 4 +-- .../test/base/HttpClientTest.groovy | 26 +++++++++---------- .../test/base/HttpServerTest.groovy | 10 +++---- .../test/base/HttpServerTestTrait.groovy | 8 +++--- .../server/http/RequestContextGetter.java | 4 +-- .../armeria-shaded-for-testing.gradle | 8 +++--- 33 files changed, 103 insertions(+), 103 deletions(-) diff --git a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/SingleServiceCamelTest.groovy b/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/SingleServiceCamelTest.groovy index ff3d79f734..c9d7281788 100644 --- a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/SingleServiceCamelTest.groovy +++ b/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/SingleServiceCamelTest.groovy @@ -11,7 +11,7 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.RetryOnAddressAlreadyInUseTrait import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.trace.attributes.SemanticAttributes -import io.opentelemetry.testing.armeria.client.WebClient +import io.opentelemetry.testing.internal.armeria.client.WebClient import org.springframework.boot.SpringApplication import org.springframework.context.ConfigurableApplicationContext import spock.lang.Shared diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy index cb26ea53b3..315ed99afd 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy @@ -28,10 +28,10 @@ import com.amazonaws.services.s3.S3ClientOptions import io.opentelemetry.api.trace.Span import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.trace.attributes.SemanticAttributes -import io.opentelemetry.testing.armeria.common.HttpResponse -import io.opentelemetry.testing.armeria.common.HttpStatus -import io.opentelemetry.testing.armeria.common.MediaType -import io.opentelemetry.testing.armeria.testing.junit5.server.mock.MockWebServerExtension +import io.opentelemetry.testing.internal.armeria.common.HttpResponse +import io.opentelemetry.testing.internal.armeria.common.HttpStatus +import io.opentelemetry.testing.internal.armeria.common.MediaType +import io.opentelemetry.testing.internal.armeria.testing.junit5.server.mock.MockWebServerExtension import java.time.Duration import spock.lang.Shared diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy index fe69e48efb..96f69003fc 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy @@ -36,10 +36,10 @@ import com.amazonaws.services.s3.AmazonS3ClientBuilder import io.opentelemetry.api.trace.Span import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.semconv.trace.attributes.SemanticAttributes -import io.opentelemetry.testing.armeria.common.HttpResponse -import io.opentelemetry.testing.armeria.common.HttpStatus -import io.opentelemetry.testing.armeria.common.MediaType -import io.opentelemetry.testing.armeria.testing.junit5.server.mock.MockWebServerExtension +import io.opentelemetry.testing.internal.armeria.common.HttpResponse +import io.opentelemetry.testing.internal.armeria.common.HttpStatus +import io.opentelemetry.testing.internal.armeria.common.MediaType +import io.opentelemetry.testing.internal.armeria.testing.junit5.server.mock.MockWebServerExtension import java.time.Duration import spock.lang.Shared import spock.lang.Unroll diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy index f0b4904333..2d1248cafe 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy @@ -12,10 +12,10 @@ import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTr import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.semconv.trace.attributes.SemanticAttributes -import io.opentelemetry.testing.armeria.common.HttpResponse -import io.opentelemetry.testing.armeria.common.HttpStatus -import io.opentelemetry.testing.armeria.common.MediaType -import io.opentelemetry.testing.armeria.testing.junit5.server.mock.MockWebServerExtension +import io.opentelemetry.testing.internal.armeria.common.HttpResponse +import io.opentelemetry.testing.internal.armeria.common.HttpStatus +import io.opentelemetry.testing.internal.armeria.common.MediaType +import io.opentelemetry.testing.internal.armeria.testing.junit5.server.mock.MockWebServerExtension import java.time.Duration import java.util.concurrent.Future import software.amazon.awssdk.auth.credentials.AwsBasicCredentials diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/test/groovy/JaxMultithreadedClientTest.groovy b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/test/groovy/JaxMultithreadedClientTest.groovy index 6a20f2c8ef..40f749f438 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/test/groovy/JaxMultithreadedClientTest.groovy +++ b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/test/groovy/JaxMultithreadedClientTest.groovy @@ -4,11 +4,11 @@ */ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification -import io.opentelemetry.testing.armeria.common.HttpResponse -import io.opentelemetry.testing.armeria.common.HttpStatus -import io.opentelemetry.testing.armeria.common.MediaType -import io.opentelemetry.testing.armeria.server.ServerBuilder -import io.opentelemetry.testing.armeria.testing.junit5.server.ServerExtension +import io.opentelemetry.testing.internal.armeria.common.HttpResponse +import io.opentelemetry.testing.internal.armeria.common.HttpStatus +import io.opentelemetry.testing.internal.armeria.common.MediaType +import io.opentelemetry.testing.internal.armeria.server.ServerBuilder +import io.opentelemetry.testing.internal.armeria.testing.junit5.server.ServerExtension import javax.ws.rs.client.Client import org.glassfish.jersey.client.JerseyClientBuilder import spock.lang.Shared diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-arquillian-testing/src/main/groovy/ArquillianRestTest.groovy b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-arquillian-testing/src/main/groovy/ArquillianRestTest.groovy index ce393a52b8..5986cb0586 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-arquillian-testing/src/main/groovy/ArquillianRestTest.groovy +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-arquillian-testing/src/main/groovy/ArquillianRestTest.groovy @@ -6,8 +6,8 @@ import static io.opentelemetry.api.trace.SpanKind.SERVER import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification -import io.opentelemetry.testing.armeria.client.WebClient -import io.opentelemetry.testing.armeria.common.AggregatedHttpResponse +import io.opentelemetry.testing.internal.armeria.client.WebClient +import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse import org.jboss.arquillian.container.test.api.Deployment import org.jboss.arquillian.container.test.api.RunAsClient import org.jboss.arquillian.spock.ArquillianSputnik diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/test/groovy/CxfFilterTest.groovy b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/test/groovy/CxfFilterTest.groovy index 899224985c..513a0c8e2e 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/test/groovy/CxfFilterTest.groovy +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/test/groovy/CxfFilterTest.groovy @@ -8,7 +8,7 @@ import static Resource.Test2 import static Resource.Test3 import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait -import io.opentelemetry.testing.armeria.common.AggregatedHttpResponse +import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse import org.apache.cxf.endpoint.Server import org.apache.cxf.jaxrs.JAXRSServerFactoryBean diff --git a/instrumentation/jsf/jsf-testing-common/src/main/groovy/BaseJsfTest.groovy b/instrumentation/jsf/jsf-testing-common/src/main/groovy/BaseJsfTest.groovy index 97ed4fbbd3..18c6a5ecbf 100644 --- a/instrumentation/jsf/jsf-testing-common/src/main/groovy/BaseJsfTest.groovy +++ b/instrumentation/jsf/jsf-testing-common/src/main/groovy/BaseJsfTest.groovy @@ -11,13 +11,13 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait import io.opentelemetry.sdk.trace.data.SpanData -import io.opentelemetry.testing.armeria.common.AggregatedHttpRequest -import io.opentelemetry.testing.armeria.common.AggregatedHttpResponse -import io.opentelemetry.testing.armeria.common.HttpData -import io.opentelemetry.testing.armeria.common.HttpMethod -import io.opentelemetry.testing.armeria.common.MediaType -import io.opentelemetry.testing.armeria.common.QueryParams -import io.opentelemetry.testing.armeria.common.RequestHeaders +import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpRequest +import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse +import io.opentelemetry.testing.internal.armeria.common.HttpData +import io.opentelemetry.testing.internal.armeria.common.HttpMethod +import io.opentelemetry.testing.internal.armeria.common.MediaType +import io.opentelemetry.testing.internal.armeria.common.QueryParams +import io.opentelemetry.testing.internal.armeria.common.RequestHeaders import org.eclipse.jetty.annotations.AnnotationConfiguration import org.eclipse.jetty.server.Server import org.eclipse.jetty.util.resource.Resource diff --git a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy index 7c3c3f53f0..7b5e96205d 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy +++ b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy @@ -9,11 +9,11 @@ import static io.opentelemetry.api.trace.StatusCode.ERROR import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.trace.attributes.SemanticAttributes -import io.opentelemetry.testing.armeria.client.WebClient -import io.opentelemetry.testing.armeria.common.AggregatedHttpResponse -import io.opentelemetry.testing.armeria.common.HttpMethod -import io.opentelemetry.testing.armeria.common.MediaType -import io.opentelemetry.testing.armeria.common.RequestHeaders +import io.opentelemetry.testing.internal.armeria.client.WebClient +import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse +import io.opentelemetry.testing.internal.armeria.common.HttpMethod +import io.opentelemetry.testing.internal.armeria.common.MediaType +import io.opentelemetry.testing.internal.armeria.common.RequestHeaders import java.nio.file.Files import org.apache.catalina.Context import org.apache.catalina.startup.Tomcat diff --git a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy index 6c815b5ed9..7f7a2ab423 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy +++ b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy @@ -9,8 +9,8 @@ import static io.opentelemetry.api.trace.StatusCode.ERROR import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.trace.attributes.SemanticAttributes -import io.opentelemetry.testing.armeria.client.WebClient -import io.opentelemetry.testing.armeria.common.AggregatedHttpResponse +import io.opentelemetry.testing.internal.armeria.client.WebClient +import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse import java.nio.file.Files import org.apache.catalina.Context import org.apache.catalina.startup.Tomcat diff --git a/instrumentation/kubernetes-client-7.0/javaagent/src/test/groovy/KubernetesClientTest.groovy b/instrumentation/kubernetes-client-7.0/javaagent/src/test/groovy/KubernetesClientTest.groovy index c9dd8f1345..d530a55ff2 100644 --- a/instrumentation/kubernetes-client-7.0/javaagent/src/test/groovy/KubernetesClientTest.groovy +++ b/instrumentation/kubernetes-client-7.0/javaagent/src/test/groovy/KubernetesClientTest.groovy @@ -17,10 +17,10 @@ import io.kubernetes.client.openapi.apis.CoreV1Api import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.semconv.trace.attributes.SemanticAttributes -import io.opentelemetry.testing.armeria.common.HttpResponse -import io.opentelemetry.testing.armeria.common.HttpStatus -import io.opentelemetry.testing.armeria.common.MediaType -import io.opentelemetry.testing.armeria.testing.junit5.server.mock.MockWebServerExtension +import io.opentelemetry.testing.internal.armeria.common.HttpResponse +import io.opentelemetry.testing.internal.armeria.common.HttpStatus +import io.opentelemetry.testing.internal.armeria.common.MediaType +import io.opentelemetry.testing.internal.armeria.testing.junit5.server.mock.MockWebServerExtension import java.util.concurrent.CountDownLatch import java.util.concurrent.atomic.AtomicReference import spock.lang.Shared diff --git a/instrumentation/ratpack-1.4/javaagent/src/test/groovy/RatpackOtherTest.groovy b/instrumentation/ratpack-1.4/javaagent/src/test/groovy/RatpackOtherTest.groovy index 0abe7b112a..2667e3f625 100644 --- a/instrumentation/ratpack-1.4/javaagent/src/test/groovy/RatpackOtherTest.groovy +++ b/instrumentation/ratpack-1.4/javaagent/src/test/groovy/RatpackOtherTest.groovy @@ -8,7 +8,7 @@ import static io.opentelemetry.api.trace.SpanKind.SERVER import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.trace.attributes.SemanticAttributes -import io.opentelemetry.testing.armeria.client.WebClient +import io.opentelemetry.testing.internal.armeria.client.WebClient import ratpack.path.PathBinding import ratpack.server.RatpackServer import spock.lang.Shared diff --git a/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServlet3MappingTest.groovy b/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServlet3MappingTest.groovy index 2a10cd5e57..a30a7dd8da 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServlet3MappingTest.groovy +++ b/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServlet3MappingTest.groovy @@ -8,7 +8,7 @@ import static io.opentelemetry.api.trace.StatusCode.ERROR import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait -import io.opentelemetry.testing.armeria.common.AggregatedHttpResponse +import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse import javax.servlet.Servlet import javax.servlet.ServletException import javax.servlet.http.HttpServlet diff --git a/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServlet3Test.groovy b/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServlet3Test.groovy index 8d85f33725..c1999042f3 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServlet3Test.groovy +++ b/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServlet3Test.groovy @@ -14,7 +14,7 @@ import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEn import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest -import io.opentelemetry.testing.armeria.common.AggregatedHttpRequest +import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpRequest import javax.servlet.Servlet abstract class AbstractServlet3Test extends HttpServerTest implements AgentTestTrait { diff --git a/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/TomcatServlet3Test.groovy b/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/TomcatServlet3Test.groovy index bde30a4c0d..255e8cf473 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/TomcatServlet3Test.groovy +++ b/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/TomcatServlet3Test.groovy @@ -13,7 +13,7 @@ import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEn import static org.junit.Assume.assumeTrue import io.opentelemetry.instrumentation.test.asserts.TraceAssert -import io.opentelemetry.testing.armeria.common.AggregatedHttpResponse +import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse import java.nio.file.Files import java.util.concurrent.TimeUnit import java.util.concurrent.TimeoutException diff --git a/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/AbstractServlet5MappingTest.groovy b/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/AbstractServlet5MappingTest.groovy index 7237c9d22a..df43175125 100644 --- a/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/AbstractServlet5MappingTest.groovy +++ b/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/AbstractServlet5MappingTest.groovy @@ -8,7 +8,7 @@ import static io.opentelemetry.api.trace.StatusCode.ERROR import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait -import io.opentelemetry.testing.armeria.common.AggregatedHttpResponse +import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse import jakarta.servlet.Servlet import jakarta.servlet.ServletException import jakarta.servlet.http.HttpServlet diff --git a/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/AbstractServlet5Test.groovy b/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/AbstractServlet5Test.groovy index c26af43499..ef46f4c5dd 100644 --- a/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/AbstractServlet5Test.groovy +++ b/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/AbstractServlet5Test.groovy @@ -14,7 +14,7 @@ import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEn import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest -import io.opentelemetry.testing.armeria.common.AggregatedHttpRequest +import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpRequest import jakarta.servlet.Servlet abstract class AbstractServlet5Test extends HttpServerTest implements AgentTestTrait { diff --git a/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/TomcatServlet5Test.groovy b/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/TomcatServlet5Test.groovy index 96a48e1440..a268d073fa 100644 --- a/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/TomcatServlet5Test.groovy +++ b/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/TomcatServlet5Test.groovy @@ -13,7 +13,7 @@ import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEn import static org.junit.Assume.assumeTrue import io.opentelemetry.instrumentation.test.asserts.TraceAssert -import io.opentelemetry.testing.armeria.common.AggregatedHttpResponse +import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse import jakarta.servlet.Servlet import jakarta.servlet.ServletException import java.nio.file.Files diff --git a/instrumentation/spark-2.3/javaagent/src/test/groovy/SparkJavaBasedTest.groovy b/instrumentation/spark-2.3/javaagent/src/test/groovy/SparkJavaBasedTest.groovy index 94ca3ab478..9880cd23d7 100644 --- a/instrumentation/spark-2.3/javaagent/src/test/groovy/SparkJavaBasedTest.groovy +++ b/instrumentation/spark-2.3/javaagent/src/test/groovy/SparkJavaBasedTest.groovy @@ -8,7 +8,7 @@ import static io.opentelemetry.api.trace.SpanKind.SERVER import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.trace.attributes.SemanticAttributes -import io.opentelemetry.testing.armeria.client.WebClient +import io.opentelemetry.testing.internal.armeria.client.WebClient import spark.Spark import spock.lang.Shared diff --git a/instrumentation/spring/spring-webflux-5.0/javaagent/src/test/groovy/SpringWebfluxTest.groovy b/instrumentation/spring/spring-webflux-5.0/javaagent/src/test/groovy/SpringWebfluxTest.groovy index 8637d33e29..1715c07b34 100644 --- a/instrumentation/spring/spring-webflux-5.0/javaagent/src/test/groovy/SpringWebfluxTest.groovy +++ b/instrumentation/spring/spring-webflux-5.0/javaagent/src/test/groovy/SpringWebfluxTest.groovy @@ -9,13 +9,13 @@ import static io.opentelemetry.api.trace.StatusCode.ERROR import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.trace.attributes.SemanticAttributes -import io.opentelemetry.testing.armeria.client.ClientRequestContext -import io.opentelemetry.testing.armeria.client.DecoratingHttpClientFunction -import io.opentelemetry.testing.armeria.client.HttpClient -import io.opentelemetry.testing.armeria.client.WebClient -import io.opentelemetry.testing.armeria.common.HttpHeaderNames -import io.opentelemetry.testing.armeria.common.HttpRequest -import io.opentelemetry.testing.armeria.common.HttpResponse +import io.opentelemetry.testing.internal.armeria.client.ClientRequestContext +import io.opentelemetry.testing.internal.armeria.client.DecoratingHttpClientFunction +import io.opentelemetry.testing.internal.armeria.client.HttpClient +import io.opentelemetry.testing.internal.armeria.client.WebClient +import io.opentelemetry.testing.internal.armeria.common.HttpHeaderNames +import io.opentelemetry.testing.internal.armeria.common.HttpRequest +import io.opentelemetry.testing.internal.armeria.common.HttpResponse import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.context.TestConfiguration import org.springframework.boot.web.embedded.netty.NettyReactiveWebServerFactory diff --git a/instrumentation/spring/spring-webmvc-3.1/javaagent/src/test/groovy/test/boot/SpringBootBasedTest.groovy b/instrumentation/spring/spring-webmvc-3.1/javaagent/src/test/groovy/test/boot/SpringBootBasedTest.groovy index 5a70ddda3a..7d08e1ec33 100644 --- a/instrumentation/spring/spring-webmvc-3.1/javaagent/src/test/groovy/test/boot/SpringBootBasedTest.groovy +++ b/instrumentation/spring/spring-webmvc-3.1/javaagent/src/test/groovy/test/boot/SpringBootBasedTest.groovy @@ -19,10 +19,10 @@ import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.sdk.trace.data.SpanData -import io.opentelemetry.testing.armeria.common.AggregatedHttpRequest -import io.opentelemetry.testing.armeria.common.HttpData -import io.opentelemetry.testing.armeria.common.MediaType -import io.opentelemetry.testing.armeria.common.QueryParams +import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpRequest +import io.opentelemetry.testing.internal.armeria.common.HttpData +import io.opentelemetry.testing.internal.armeria.common.MediaType +import io.opentelemetry.testing.internal.armeria.common.QueryParams import org.springframework.boot.SpringApplication import org.springframework.context.ConfigurableApplicationContext import org.springframework.web.servlet.view.RedirectView diff --git a/instrumentation/tapestry-5.4/javaagent/src/test/groovy/TapestryTest.groovy b/instrumentation/tapestry-5.4/javaagent/src/test/groovy/TapestryTest.groovy index 907fbdc45d..734670c6b3 100644 --- a/instrumentation/tapestry-5.4/javaagent/src/test/groovy/TapestryTest.groovy +++ b/instrumentation/tapestry-5.4/javaagent/src/test/groovy/TapestryTest.groovy @@ -10,14 +10,14 @@ import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait -import io.opentelemetry.testing.armeria.client.ClientRequestContext -import io.opentelemetry.testing.armeria.client.DecoratingHttpClientFunction -import io.opentelemetry.testing.armeria.client.HttpClient -import io.opentelemetry.testing.armeria.client.WebClient -import io.opentelemetry.testing.armeria.common.AggregatedHttpResponse -import io.opentelemetry.testing.armeria.common.HttpHeaderNames -import io.opentelemetry.testing.armeria.common.HttpRequest -import io.opentelemetry.testing.armeria.common.HttpResponse +import io.opentelemetry.testing.internal.armeria.client.ClientRequestContext +import io.opentelemetry.testing.internal.armeria.client.DecoratingHttpClientFunction +import io.opentelemetry.testing.internal.armeria.client.HttpClient +import io.opentelemetry.testing.internal.armeria.client.WebClient +import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse +import io.opentelemetry.testing.internal.armeria.common.HttpHeaderNames +import io.opentelemetry.testing.internal.armeria.common.HttpRequest +import io.opentelemetry.testing.internal.armeria.common.HttpResponse import org.eclipse.jetty.server.Server import org.eclipse.jetty.util.resource.Resource import org.eclipse.jetty.webapp.WebAppContext diff --git a/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy b/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy index 5c1c8249de..b3fb1cb8ce 100644 --- a/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy +++ b/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy @@ -17,7 +17,7 @@ import io.opentelemetry.api.trace.StatusCode import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.semconv.trace.attributes.SemanticAttributes -import io.opentelemetry.testing.armeria.common.AggregatedHttpResponse +import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse import io.undertow.Handlers import io.undertow.Undertow import io.undertow.util.Headers diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/test/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx-reactive-3.5/javaagent/src/test/groovy/VertxReactivePropagationTest.groovy index 8d65b8f319..d4ab4733ef 100644 --- a/instrumentation/vertx-reactive-3.5/javaagent/src/test/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx-reactive-3.5/javaagent/src/test/groovy/VertxReactivePropagationTest.groovy @@ -19,9 +19,9 @@ import io.opentelemetry.context.Context import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.trace.attributes.SemanticAttributes -import io.opentelemetry.testing.armeria.client.WebClient -import io.opentelemetry.testing.armeria.common.HttpRequest -import io.opentelemetry.testing.armeria.common.HttpRequestBuilder +import io.opentelemetry.testing.internal.armeria.client.WebClient +import io.opentelemetry.testing.internal.armeria.common.HttpRequest +import io.opentelemetry.testing.internal.armeria.common.HttpRequestBuilder import io.vertx.reactivex.core.Vertx import java.util.concurrent.CountDownLatch import java.util.concurrent.Executors diff --git a/instrumentation/wicket-8.0/javaagent/src/test/groovy/WicketTest.groovy b/instrumentation/wicket-8.0/javaagent/src/test/groovy/WicketTest.groovy index abf169b4e6..7f0be996d1 100644 --- a/instrumentation/wicket-8.0/javaagent/src/test/groovy/WicketTest.groovy +++ b/instrumentation/wicket-8.0/javaagent/src/test/groovy/WicketTest.groovy @@ -8,7 +8,7 @@ import static io.opentelemetry.instrumentation.test.utils.TraceUtils.basicServer import hello.HelloApplication import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait -import io.opentelemetry.testing.armeria.common.AggregatedHttpResponse +import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse import javax.servlet.DispatcherType import org.apache.wicket.protocol.http.WicketFilter import org.eclipse.jetty.server.Server diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SmokeTest.groovy index 5c154f027c..05e10e20f1 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SmokeTest.groovy @@ -12,7 +12,7 @@ import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest import io.opentelemetry.proto.common.v1.AnyValue import io.opentelemetry.proto.trace.v1.Span import io.opentelemetry.smoketest.windows.WindowsTestContainerManager -import io.opentelemetry.testing.armeria.client.WebClient +import io.opentelemetry.testing.internal.armeria.client.WebClient import java.util.regex.Pattern import java.util.stream.Stream import org.testcontainers.containers.output.ToStringConsumer diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TelemetryRetriever.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TelemetryRetriever.groovy index 8b3f489d78..c068557524 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TelemetryRetriever.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TelemetryRetriever.groovy @@ -10,7 +10,7 @@ import com.google.protobuf.GeneratedMessageV3 import com.google.protobuf.util.JsonFormat import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest -import io.opentelemetry.testing.armeria.client.WebClient +import io.opentelemetry.testing.internal.armeria.client.WebClient import java.util.concurrent.TimeUnit import java.util.function.Supplier diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/windows/WindowsTestContainerManager.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/windows/WindowsTestContainerManager.java index 1d48a26082..63c267ade1 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/windows/WindowsTestContainerManager.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/windows/WindowsTestContainerManager.java @@ -19,8 +19,8 @@ import com.github.dockerjava.core.DockerClientImpl; import com.github.dockerjava.httpclient5.ApacheDockerHttpClient; import io.opentelemetry.smoketest.AbstractTestContainerManager; import io.opentelemetry.smoketest.TargetWaitStrategy; -import io.opentelemetry.testing.armeria.client.WebClient; -import io.opentelemetry.testing.armeria.common.AggregatedHttpResponse; +import io.opentelemetry.testing.internal.armeria.client.WebClient; +import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.FileInputStream; diff --git a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpClientTest.groovy b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpClientTest.groovy index c27df3933d..dd776d05d5 100644 --- a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpClientTest.groovy +++ b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpClientTest.groovy @@ -14,7 +14,7 @@ import static io.opentelemetry.instrumentation.test.utils.TraceUtils.basicSpan import static io.opentelemetry.instrumentation.test.utils.TraceUtils.runUnderParentClientSpan import static io.opentelemetry.instrumentation.test.utils.TraceUtils.runUnderTrace import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP -import static io.opentelemetry.testing.armeria.common.MediaType.PLAIN_TEXT_UTF_8 +import static io.opentelemetry.testing.internal.armeria.common.MediaType.PLAIN_TEXT_UTF_8 import static org.junit.Assume.assumeTrue import groovy.transform.stc.ClosureParams @@ -32,18 +32,18 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.server.http.RequestContextGetter import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.trace.attributes.SemanticAttributes -import io.opentelemetry.testing.armeria.common.HttpData -import io.opentelemetry.testing.armeria.common.HttpRequest -import io.opentelemetry.testing.armeria.common.HttpResponse -import io.opentelemetry.testing.armeria.common.HttpStatus -import io.opentelemetry.testing.armeria.common.ResponseHeaders -import io.opentelemetry.testing.armeria.common.ResponseHeadersBuilder -import io.opentelemetry.testing.armeria.server.DecoratingHttpServiceFunction -import io.opentelemetry.testing.armeria.server.HttpService -import io.opentelemetry.testing.armeria.server.ServerBuilder -import io.opentelemetry.testing.armeria.server.ServiceRequestContext -import io.opentelemetry.testing.armeria.server.logging.LoggingService -import io.opentelemetry.testing.armeria.testing.junit5.server.ServerExtension +import io.opentelemetry.testing.internal.armeria.common.HttpData +import io.opentelemetry.testing.internal.armeria.common.HttpRequest +import io.opentelemetry.testing.internal.armeria.common.HttpResponse +import io.opentelemetry.testing.internal.armeria.common.HttpStatus +import io.opentelemetry.testing.internal.armeria.common.ResponseHeaders +import io.opentelemetry.testing.internal.armeria.common.ResponseHeadersBuilder +import io.opentelemetry.testing.internal.armeria.server.DecoratingHttpServiceFunction +import io.opentelemetry.testing.internal.armeria.server.HttpService +import io.opentelemetry.testing.internal.armeria.server.ServerBuilder +import io.opentelemetry.testing.internal.armeria.server.ServiceRequestContext +import io.opentelemetry.testing.internal.armeria.server.logging.LoggingService +import io.opentelemetry.testing.internal.armeria.testing.junit5.server.ServerExtension import java.security.KeyStore import java.util.concurrent.CountDownLatch import java.util.concurrent.ExecutionException diff --git a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy index 331ef884d1..56dedf8aea 100644 --- a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy +++ b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy @@ -28,11 +28,11 @@ import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.trace.attributes.SemanticAttributes -import io.opentelemetry.testing.armeria.common.AggregatedHttpRequest -import io.opentelemetry.testing.armeria.common.AggregatedHttpResponse -import io.opentelemetry.testing.armeria.common.HttpMethod -import io.opentelemetry.testing.armeria.common.HttpRequest -import io.opentelemetry.testing.armeria.common.HttpRequestBuilder +import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpRequest +import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse +import io.opentelemetry.testing.internal.armeria.common.HttpMethod +import io.opentelemetry.testing.internal.armeria.common.HttpRequest +import io.opentelemetry.testing.internal.armeria.common.HttpRequestBuilder import java.util.concurrent.Callable import java.util.concurrent.CountDownLatch import java.util.concurrent.Executors diff --git a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTestTrait.groovy b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTestTrait.groovy index 94fb627597..7f4a22fe7c 100644 --- a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTestTrait.groovy +++ b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTestTrait.groovy @@ -9,10 +9,10 @@ import ch.qos.logback.classic.Level import io.opentelemetry.instrumentation.test.RetryOnAddressAlreadyInUseTrait import io.opentelemetry.instrumentation.test.utils.LoggerUtils import io.opentelemetry.instrumentation.test.utils.PortUtils -import io.opentelemetry.testing.armeria.client.ClientFactory -import io.opentelemetry.testing.armeria.client.WebClient -import io.opentelemetry.testing.armeria.client.logging.LoggingClient -import io.opentelemetry.testing.armeria.common.HttpHeaderNames +import io.opentelemetry.testing.internal.armeria.client.ClientFactory +import io.opentelemetry.testing.internal.armeria.client.WebClient +import io.opentelemetry.testing.internal.armeria.client.logging.LoggingClient +import io.opentelemetry.testing.internal.armeria.common.HttpHeaderNames import java.time.Duration import org.junit.AfterClass import org.junit.BeforeClass diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/test/server/http/RequestContextGetter.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/test/server/http/RequestContextGetter.java index 91cfc00b80..263aeabb13 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/test/server/http/RequestContextGetter.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/test/server/http/RequestContextGetter.java @@ -6,8 +6,8 @@ package io.opentelemetry.instrumentation.test.server.http; import io.opentelemetry.context.propagation.TextMapGetter; -import io.opentelemetry.testing.armeria.server.ServiceRequestContext; -import io.opentelemetry.testing.io.netty.util.AsciiString; +import io.opentelemetry.testing.internal.armeria.server.ServiceRequestContext; +import io.opentelemetry.testing.internal.io.netty.util.AsciiString; import java.util.Collections; import java.util.stream.Collectors; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/testing/armeria-shaded-for-testing/armeria-shaded-for-testing.gradle b/testing/armeria-shaded-for-testing/armeria-shaded-for-testing.gradle index b21cd7d3e3..fb6c98f0df 100644 --- a/testing/armeria-shaded-for-testing/armeria-shaded-for-testing.gradle +++ b/testing/armeria-shaded-for-testing/armeria-shaded-for-testing.gradle @@ -13,13 +13,13 @@ dependencies { shadowJar { // Ensures tests are not affected by Armeria instrumentation - relocate "com.linecorp.armeria", "io.opentelemetry.testing.armeria" + relocate "com.linecorp.armeria", "io.opentelemetry.testing.internal.armeria" // Allows tests of Netty instrumentations which would otherwise conflict. // The relocation must end with io.netty to allow Netty to detect shaded native libraries. // https://github.com/netty/netty/blob/e69107ceaf247099ad9a198b8ef557bdff994a99/common/src/main/java/io/netty/util/internal/NativeLibraryLoader.java#L120 - relocate "io.netty", "io.opentelemetry.testing.io.netty" + relocate "io.netty", "io.opentelemetry.testing.internal.io.netty" exclude "META-INF/maven/**" - relocate "META-INF/native/libnetty", "META-INF/native/libio_opentelemetry_testing_netty" - relocate "META-INF/native/netty", "META-INF/native/io_opentelemetry_testing_netty" + relocate "META-INF/native/libnetty", "META-INF/native/libio_opentelemetry_testing_internal_netty" + relocate "META-INF/native/netty", "META-INF/native/io_opentelemetry_testing_internal_netty" mergeServiceFiles() }