Move shaded testing dependencies to internal package. (#3305)
This commit is contained in:
parent
aca8deff9c
commit
7ad9e7a50b
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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<SERVER, CONTEXT> extends HttpServerTest<SERVER> implements AgentTestTrait {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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<SERVER, CONTEXT> extends HttpServerTest<SERVER> implements AgentTestTrait {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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()
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue