diff --git a/conventions/src/main/kotlin/io.opentelemetry.instrumentation.library-instrumentation.gradle.kts b/conventions/src/main/kotlin/io.opentelemetry.instrumentation.library-instrumentation.gradle.kts index d58298f41b73..7d5431ec083f 100644 --- a/conventions/src/main/kotlin/io.opentelemetry.instrumentation.library-instrumentation.gradle.kts +++ b/conventions/src/main/kotlin/io.opentelemetry.instrumentation.library-instrumentation.gradle.kts @@ -10,3 +10,11 @@ dependencies { testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common") } + +testing { + suites.withType(JvmTestSuite::class).configureEach { + dependencies { + implementation("io.opentelemetry.javaagent:opentelemetry-testing-common") + } + } +} diff --git a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts b/conventions/src/main/kotlin/otel.java-conventions.gradle.kts index 28026e3f7337..2c6b8529008f 100644 --- a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/conventions/src/main/kotlin/otel.java-conventions.gradle.kts @@ -467,7 +467,7 @@ configurations.configureEach { substitute(module("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")).using(project(":javaagent-extension-api")) substitute(module("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")).using(project(":javaagent-tooling")) substitute(module("io.opentelemetry.javaagent:opentelemetry-agent-for-testing")).using(project(":testing:agent-for-testing")) - substitute(module("io.opentelemetry.javaagent:opentelemetry-testing-common")).using(project(":testing-common")) + substitute(module("io.opentelemetry.javaagent:opentelemetry-testing-common")).using(project(":testing-common:with-shaded-dependencies")) substitute(module("io.opentelemetry.javaagent:opentelemetry-muzzle")).using(project(":muzzle")) substitute(module("io.opentelemetry.javaagent:opentelemetry-javaagent")).using(project(":javaagent")) } diff --git a/instrumentation-annotations-support-testing/build.gradle.kts b/instrumentation-annotations-support-testing/build.gradle.kts index 484e04028aaa..153fc10d607c 100644 --- a/instrumentation-annotations-support-testing/build.gradle.kts +++ b/instrumentation-annotations-support-testing/build.gradle.kts @@ -3,5 +3,5 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") } diff --git a/instrumentation-annotations-support/build.gradle.kts b/instrumentation-annotations-support/build.gradle.kts index 37e69efd6e21..11c59f1afe8b 100644 --- a/instrumentation-annotations-support/build.gradle.kts +++ b/instrumentation-annotations-support/build.gradle.kts @@ -16,6 +16,6 @@ dependencies { compileOnly("com.google.auto.value:auto-value-annotations") annotationProcessor("com.google.auto.value:auto-value") - testImplementation(project(":testing-common")) + testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common") testImplementation("io.opentelemetry:opentelemetry-sdk-testing") } diff --git a/instrumentation-api-incubator/build.gradle.kts b/instrumentation-api-incubator/build.gradle.kts index 59cdf1bdda89..cf8224b99cdd 100644 --- a/instrumentation-api-incubator/build.gradle.kts +++ b/instrumentation-api-incubator/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { compileOnly("com.google.auto.value:auto-value-annotations") annotationProcessor("com.google.auto.value:auto-value") - testImplementation(project(":testing-common")) + testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common") testImplementation("io.opentelemetry:opentelemetry-sdk") testImplementation("io.opentelemetry:opentelemetry-sdk-testing") testImplementation("io.opentelemetry.semconv:opentelemetry-semconv-incubating") diff --git a/instrumentation-api/build.gradle.kts b/instrumentation-api/build.gradle.kts index faef1a4df263..3b798b826de2 100644 --- a/instrumentation-api/build.gradle.kts +++ b/instrumentation-api/build.gradle.kts @@ -19,7 +19,7 @@ dependencies { compileOnly("com.google.auto.value:auto-value-annotations") annotationProcessor("com.google.auto.value:auto-value") - testImplementation(project(":testing-common")) + testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common") testImplementation("io.opentelemetry:opentelemetry-sdk-testing") testImplementation("io.opentelemetry:opentelemetry-exporter-common") testImplementation("org.junit-pioneer:junit-pioneer") diff --git a/instrumentation/alibaba-druid-1.0/testing/build.gradle.kts b/instrumentation/alibaba-druid-1.0/testing/build.gradle.kts index 52c1bfd3adb1..7b2e99a59310 100644 --- a/instrumentation/alibaba-druid-1.0/testing/build.gradle.kts +++ b/instrumentation/alibaba-druid-1.0/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("org.mockito:mockito-core") api("org.mockito:mockito-junit-jupiter") diff --git a/instrumentation/apache-dbcp-2.0/testing/build.gradle.kts b/instrumentation/apache-dbcp-2.0/testing/build.gradle.kts index 44f387d940ef..644225438a5e 100644 --- a/instrumentation/apache-dbcp-2.0/testing/build.gradle.kts +++ b/instrumentation/apache-dbcp-2.0/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("org.mockito:mockito-core") api("org.mockito:mockito-junit-jupiter") diff --git a/instrumentation/apache-dubbo-2.7/testing/build.gradle.kts b/instrumentation/apache-dubbo-2.7/testing/build.gradle.kts index 8f14f721fee1..7e045ab8bb0d 100644 --- a/instrumentation/apache-dubbo-2.7/testing/build.gradle.kts +++ b/instrumentation/apache-dubbo-2.7/testing/build.gradle.kts @@ -5,7 +5,7 @@ plugins { val apacheDubboVersion = "2.7.5" dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("org.apache.dubbo:dubbo:$apacheDubboVersion") api("org.apache.dubbo:dubbo-config-api:$apacheDubboVersion") diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.3/testing/build.gradle.kts b/instrumentation/apache-httpclient/apache-httpclient-4.3/testing/build.gradle.kts index 9328255dc436..b04e66cbb291 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-4.3/testing/build.gradle.kts +++ b/instrumentation/apache-httpclient/apache-httpclient-4.3/testing/build.gradle.kts @@ -13,7 +13,7 @@ tasks { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("org.apache.httpcomponents:httpclient:4.3") diff --git a/instrumentation/armeria/armeria-1.3/testing/build.gradle.kts b/instrumentation/armeria/armeria-1.3/testing/build.gradle.kts index 6de80756b45e..8c18ed5ebf54 100644 --- a/instrumentation/armeria/armeria-1.3/testing/build.gradle.kts +++ b/instrumentation/armeria/armeria-1.3/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("com.linecorp.armeria:armeria:1.3.0") api("com.linecorp.armeria:armeria-junit4:1.3.0") diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/testing/build.gradle.kts b/instrumentation/aws-lambda/aws-lambda-core-1.0/testing/build.gradle.kts index 0f4dee2475ba..d6cec9ed7dab 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/testing/build.gradle.kts +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("com.amazonaws:aws-lambda-java-core:1.0.0") diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/testing/build.gradle.kts b/instrumentation/aws-lambda/aws-lambda-events-2.2/testing/build.gradle.kts index fa62cf0696bf..7964d9805bfe 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/testing/build.gradle.kts +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("com.amazonaws:aws-lambda-java-core:1.0.0") api("com.amazonaws:aws-lambda-java-events:2.2.1") diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-1.11/testing/build.gradle.kts index 4ae37295f997..831a5b2f9d15 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/build.gradle.kts +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("com.amazonaws:aws-java-sdk-core:1.11.0") diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-2.2/testing/build.gradle.kts index a75e40520d40..db4f73539bec 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/build.gradle.kts +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("software.amazon.awssdk:apache-client:2.2.0") // older versions don't play nice with armeria http server diff --git a/instrumentation/build.gradle.kts b/instrumentation/build.gradle.kts index 0726e850bdb8..7eca88d4950a 100644 --- a/instrumentation/build.gradle.kts +++ b/instrumentation/build.gradle.kts @@ -20,13 +20,6 @@ subprojects { instrumentationProjectTest.configure { dependsOn(subProj.tasks.named("test")) } - - // this only exists to make Intellij happy since it doesn't (currently at least) understand our - // inclusion of this artifact inside :testing-common - dependencies { - compileOnly(project(":testing:dependencies-shaded-for-testing", configuration = "shadow")) - testCompileOnly(project(":testing:dependencies-shaded-for-testing", configuration = "shadow")) - } } plugins.withId("io.opentelemetry.instrumentation.muzzle-check") { diff --git a/instrumentation/c3p0-0.9/testing/build.gradle.kts b/instrumentation/c3p0-0.9/testing/build.gradle.kts index 28f6dbd967f2..f860c63df13f 100644 --- a/instrumentation/c3p0-0.9/testing/build.gradle.kts +++ b/instrumentation/c3p0-0.9/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("org.mockito:mockito-core") api("org.mockito:mockito-junit-jupiter") diff --git a/instrumentation/cassandra/cassandra-4-common/testing/build.gradle.kts b/instrumentation/cassandra/cassandra-4-common/testing/build.gradle.kts index d8cac710ab13..ca18244ac50d 100644 --- a/instrumentation/cassandra/cassandra-4-common/testing/build.gradle.kts +++ b/instrumentation/cassandra/cassandra-4-common/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") compileOnly("com.datastax.oss:java-driver-core:4.0.0") implementation("org.testcontainers:testcontainers") diff --git a/instrumentation/cassandra/cassandra-4.4/testing/build.gradle.kts b/instrumentation/cassandra/cassandra-4.4/testing/build.gradle.kts index da0dd5e93c56..5336a4baff86 100644 --- a/instrumentation/cassandra/cassandra-4.4/testing/build.gradle.kts +++ b/instrumentation/cassandra/cassandra-4.4/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") compileOnly("com.datastax.oss:java-driver-core:4.4.0") implementation("io.projectreactor:reactor-core:3.5.3") diff --git a/instrumentation/couchbase/couchbase-common/testing/build.gradle.kts b/instrumentation/couchbase/couchbase-common/testing/build.gradle.kts index 49e5f8bf7bb9..d1465b110cef 100644 --- a/instrumentation/couchbase/couchbase-common/testing/build.gradle.kts +++ b/instrumentation/couchbase/couchbase-common/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("com.couchbase.mock:CouchbaseMock:1.5.19") // Earliest version that seems to allow queries with CouchbaseMock: diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/testing/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-transport-6.0/testing/build.gradle.kts index 2415542cdf8f..af1115c1df0a 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-6.0/testing/build.gradle.kts +++ b/instrumentation/elasticsearch/elasticsearch-transport-6.0/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") implementation("org.elasticsearch.client:transport:6.0.0") implementation(project(":instrumentation:elasticsearch:elasticsearch-transport-common:testing")) diff --git a/instrumentation/elasticsearch/elasticsearch-transport-common/testing/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-transport-common/testing/build.gradle.kts index 53e18259b055..89011efb9e0b 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-common/testing/build.gradle.kts +++ b/instrumentation/elasticsearch/elasticsearch-transport-common/testing/build.gradle.kts @@ -6,5 +6,5 @@ dependencies { compileOnly("org.elasticsearch.client:transport:5.3.0") compileOnly("org.elasticsearch:elasticsearch:5.3.0") - implementation(project(":testing-common")) + implementation("io.opentelemetry.javaagent:opentelemetry-testing-common") } diff --git a/instrumentation/executors/testing/build.gradle.kts b/instrumentation/executors/testing/build.gradle.kts index 6434276512f2..ba658e8152e5 100644 --- a/instrumentation/executors/testing/build.gradle.kts +++ b/instrumentation/executors/testing/build.gradle.kts @@ -5,5 +5,5 @@ plugins { dependencies { api("org.junit.jupiter:junit-jupiter-api") - implementation(project(":testing-common")) + implementation("io.opentelemetry.javaagent:opentelemetry-testing-common") } diff --git a/instrumentation/graphql-java/graphql-java-common/testing/build.gradle.kts b/instrumentation/graphql-java/graphql-java-common/testing/build.gradle.kts index e1870b0f4f84..48712efd95e6 100644 --- a/instrumentation/graphql-java/graphql-java-common/testing/build.gradle.kts +++ b/instrumentation/graphql-java/graphql-java-common/testing/build.gradle.kts @@ -3,6 +3,6 @@ plugins { } dependencies { - implementation(project(":testing-common")) + implementation("io.opentelemetry.javaagent:opentelemetry-testing-common") implementation("com.graphql-java:graphql-java:12.0") } diff --git a/instrumentation/grpc-1.6/testing/build.gradle.kts b/instrumentation/grpc-1.6/testing/build.gradle.kts index 374be72da2b2..ee778902de27 100644 --- a/instrumentation/grpc-1.6/testing/build.gradle.kts +++ b/instrumentation/grpc-1.6/testing/build.gradle.kts @@ -8,7 +8,7 @@ plugins { val grpcVersion = "1.6.0" dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("io.grpc:grpc-core:$grpcVersion") api("io.grpc:grpc-protobuf:$grpcVersion") diff --git a/instrumentation/helidon-4.3/testing/build.gradle.kts b/instrumentation/helidon-4.3/testing/build.gradle.kts index 56c8d2889546..d8a0ba10febf 100644 --- a/instrumentation/helidon-4.3/testing/build.gradle.kts +++ b/instrumentation/helidon-4.3/testing/build.gradle.kts @@ -7,6 +7,6 @@ otelJava { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") implementation("io.helidon.webserver:helidon-webserver:4.3.0") } diff --git a/instrumentation/hibernate/hibernate-reactive-1.0/hibernate-reactive-2.0-testing/build.gradle.kts b/instrumentation/hibernate/hibernate-reactive-1.0/hibernate-reactive-2.0-testing/build.gradle.kts index 83eea88dfb1b..5019edbd2506 100644 --- a/instrumentation/hibernate/hibernate-reactive-1.0/hibernate-reactive-2.0-testing/build.gradle.kts +++ b/instrumentation/hibernate/hibernate-reactive-1.0/hibernate-reactive-2.0-testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(project(":testing-common")) + implementation("io.opentelemetry.javaagent:opentelemetry-testing-common") implementation("org.testcontainers:testcontainers") compileOnly("org.hibernate.reactive:hibernate-reactive-core:2.0.0.Final") diff --git a/instrumentation/hibernate/testing/build.gradle.kts b/instrumentation/hibernate/testing/build.gradle.kts index 484e04028aaa..153fc10d607c 100644 --- a/instrumentation/hibernate/testing/build.gradle.kts +++ b/instrumentation/hibernate/testing/build.gradle.kts @@ -3,5 +3,5 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") } diff --git a/instrumentation/hikaricp-3.0/testing/build.gradle.kts b/instrumentation/hikaricp-3.0/testing/build.gradle.kts index 202e80b7020d..70991194a2e7 100644 --- a/instrumentation/hikaricp-3.0/testing/build.gradle.kts +++ b/instrumentation/hikaricp-3.0/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("org.mockito:mockito-core") api("org.mockito:mockito-junit-jupiter") diff --git a/instrumentation/java-http-client/testing/build.gradle.kts b/instrumentation/java-http-client/testing/build.gradle.kts index d3e058f95791..82f2037c7613 100644 --- a/instrumentation/java-http-client/testing/build.gradle.kts +++ b/instrumentation/java-http-client/testing/build.gradle.kts @@ -7,5 +7,5 @@ otelJava { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") } diff --git a/instrumentation/java-http-server/testing/build.gradle.kts b/instrumentation/java-http-server/testing/build.gradle.kts index 484e04028aaa..153fc10d607c 100644 --- a/instrumentation/java-http-server/testing/build.gradle.kts +++ b/instrumentation/java-http-server/testing/build.gradle.kts @@ -3,5 +3,5 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") } diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-arquillian-testing/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-arquillian-testing/build.gradle.kts index 2c1c05ec25bf..08925dc8be41 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-arquillian-testing/build.gradle.kts +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-arquillian-testing/build.gradle.kts @@ -5,7 +5,7 @@ plugins { dependencies { compileOnly("javax:javaee-api:7.0") - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") implementation("io.opentelemetry:opentelemetry-api") val arquillianVersion = "1.7.0.Alpha10" diff --git a/instrumentation/jaxrs/jaxrs-common/testing/build.gradle.kts b/instrumentation/jaxrs/jaxrs-common/testing/build.gradle.kts index a45243aa45a3..262572894498 100644 --- a/instrumentation/jaxrs/jaxrs-common/testing/build.gradle.kts +++ b/instrumentation/jaxrs/jaxrs-common/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") implementation("io.opentelemetry:opentelemetry-api") implementation("org.slf4j:slf4j-api") diff --git a/instrumentation/jaxws/jaxws-2.0-arquillian-testing/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0-arquillian-testing/build.gradle.kts index 47955f8654d6..22840e6a4d49 100644 --- a/instrumentation/jaxws/jaxws-2.0-arquillian-testing/build.gradle.kts +++ b/instrumentation/jaxws/jaxws-2.0-arquillian-testing/build.gradle.kts @@ -5,7 +5,7 @@ plugins { dependencies { compileOnly("javax:javaee-api:7.0") - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") implementation("io.opentelemetry:opentelemetry-api") implementation("org.jsoup:jsoup:1.13.1") diff --git a/instrumentation/jaxws/jaxws-2.0-common-testing/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0-common-testing/build.gradle.kts index 161408814315..c8ea881d97f3 100644 --- a/instrumentation/jaxws/jaxws-2.0-common-testing/build.gradle.kts +++ b/instrumentation/jaxws/jaxws-2.0-common-testing/build.gradle.kts @@ -22,5 +22,5 @@ dependencies { api("org.eclipse.jetty:jetty-webapp:9.4.35.v20201120") api("org.springframework.ws:spring-ws-core:3.0.0.RELEASE") - implementation(project(":testing-common")) + implementation("io.opentelemetry.javaagent:opentelemetry-testing-common") } diff --git a/instrumentation/jaxws/jaxws-3.0-common-testing/build.gradle.kts b/instrumentation/jaxws/jaxws-3.0-common-testing/build.gradle.kts index 4ec0ee7c4675..17f96340a04b 100644 --- a/instrumentation/jaxws/jaxws-3.0-common-testing/build.gradle.kts +++ b/instrumentation/jaxws/jaxws-3.0-common-testing/build.gradle.kts @@ -22,5 +22,5 @@ dependencies { api("org.eclipse.jetty:jetty-webapp:11.0.17") api("org.springframework.ws:spring-ws-core:4.0.0") - implementation(project(":testing-common")) + implementation("io.opentelemetry.javaagent:opentelemetry-testing-common") } diff --git a/instrumentation/jdbc/testing/build.gradle.kts b/instrumentation/jdbc/testing/build.gradle.kts index 1ce8f2c86de3..959aff8f2d2e 100644 --- a/instrumentation/jdbc/testing/build.gradle.kts +++ b/instrumentation/jdbc/testing/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("com.google.guava:guava") compileOnly("com.h2database:h2:1.3.169") diff --git a/instrumentation/jedis/jedis-1.4/testing/build.gradle.kts b/instrumentation/jedis/jedis-1.4/testing/build.gradle.kts index 38876e40dcf8..5817a74225cb 100644 --- a/instrumentation/jedis/jedis-1.4/testing/build.gradle.kts +++ b/instrumentation/jedis/jedis-1.4/testing/build.gradle.kts @@ -4,6 +4,6 @@ plugins { dependencies { compileOnly("redis.clients:jedis:1.4.0") - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") implementation("org.testcontainers:testcontainers") } diff --git a/instrumentation/jetty-httpclient/jetty-httpclient-12.0/testing/build.gradle.kts b/instrumentation/jetty-httpclient/jetty-httpclient-12.0/testing/build.gradle.kts index 6205a47c0461..da2dd52d8320 100644 --- a/instrumentation/jetty-httpclient/jetty-httpclient-12.0/testing/build.gradle.kts +++ b/instrumentation/jetty-httpclient/jetty-httpclient-12.0/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("org.eclipse.jetty:jetty-client:12.0.0") diff --git a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/testing/build.gradle.kts b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/testing/build.gradle.kts index 5a40059553b7..9ddb6a97301c 100644 --- a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/testing/build.gradle.kts +++ b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/testing/build.gradle.kts @@ -6,7 +6,7 @@ plugins { val jettyVers_base9 = "9.2.0.v20140526" dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("org.eclipse.jetty:jetty-client:$jettyVers_base9") diff --git a/instrumentation/jmx-metrics/library/build.gradle.kts b/instrumentation/jmx-metrics/library/build.gradle.kts index 986e73c756ca..fe34161e7332 100644 --- a/instrumentation/jmx-metrics/library/build.gradle.kts +++ b/instrumentation/jmx-metrics/library/build.gradle.kts @@ -7,7 +7,7 @@ plugins { dependencies { implementation("org.snakeyaml:snakeyaml-engine") - testImplementation(project(":testing-common")) + testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common") testImplementation("org.testcontainers:testcontainers") testImplementation("org.testcontainers:testcontainers-junit-jupiter") diff --git a/instrumentation/jsf/jsf-jakarta-common/testing/build.gradle.kts b/instrumentation/jsf/jsf-jakarta-common/testing/build.gradle.kts index b418c15a51f9..538290d9e2ec 100644 --- a/instrumentation/jsf/jsf-jakarta-common/testing/build.gradle.kts +++ b/instrumentation/jsf/jsf-jakarta-common/testing/build.gradle.kts @@ -15,7 +15,7 @@ dependencies { api("org.eclipse.jetty:apache-jstl:11.0.0") api("org.eclipse.jetty:apache-jsp:11.0.0") - implementation(project(":testing-common")) + implementation("io.opentelemetry.javaagent:opentelemetry-testing-common") implementation("org.jsoup:jsoup:1.13.1") implementation("org.glassfish:jakarta.el:4.0.2") diff --git a/instrumentation/jsf/jsf-javax-common/testing/build.gradle.kts b/instrumentation/jsf/jsf-javax-common/testing/build.gradle.kts index a8712d98d3f9..7f3a8c35fd4c 100644 --- a/instrumentation/jsf/jsf-javax-common/testing/build.gradle.kts +++ b/instrumentation/jsf/jsf-javax-common/testing/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { compileOnly("jakarta.faces:jakarta.faces-api:2.3.2") compileOnly("jakarta.el:jakarta.el-api:3.0.3") - implementation(project(":testing-common")) + implementation("io.opentelemetry.javaagent:opentelemetry-testing-common") implementation("org.jsoup:jsoup:1.13.1") val jettyVersion = "9.4.35.v20201120" diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/build.gradle.kts b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/build.gradle.kts index 75f9733ae28e..65c1f313a88e 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/build.gradle.kts +++ b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") implementation("org.apache.kafka:kafka-clients:0.11.0.0") diff --git a/instrumentation/kafka/kafka-connect-2.6/testing/build.gradle.kts b/instrumentation/kafka/kafka-connect-2.6/testing/build.gradle.kts index aed77d1225bd..36197d658d09 100644 --- a/instrumentation/kafka/kafka-connect-2.6/testing/build.gradle.kts +++ b/instrumentation/kafka/kafka-connect-2.6/testing/build.gradle.kts @@ -12,7 +12,7 @@ val agentShadowJar = project(":javaagent").tasks.named("shadowJar") dependencies { testImplementation(project(":smoke-tests")) - testImplementation(project(":testing-common")) + testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common") testImplementation("io.opentelemetry:opentelemetry-sdk-testing") testImplementation("org.apache.kafka:kafka-clients:3.6.1") testImplementation("io.opentelemetry:opentelemetry-exporter-logging") diff --git a/instrumentation/ktor/ktor-2.0/testing/build.gradle.kts b/instrumentation/ktor/ktor-2.0/testing/build.gradle.kts index cae989a04964..edfa57e7162e 100644 --- a/instrumentation/ktor/ktor-2.0/testing/build.gradle.kts +++ b/instrumentation/ktor/ktor-2.0/testing/build.gradle.kts @@ -9,7 +9,7 @@ plugins { val ktorVersion = "2.0.0" dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") implementation("io.ktor:ktor-client-core:$ktorVersion") implementation("io.ktor:ktor-server-core:$ktorVersion") diff --git a/instrumentation/ktor/ktor-3.0/testing/build.gradle.kts b/instrumentation/ktor/ktor-3.0/testing/build.gradle.kts index d3fb3f3d0acc..2c5a2bfe6649 100644 --- a/instrumentation/ktor/ktor-3.0/testing/build.gradle.kts +++ b/instrumentation/ktor/ktor-3.0/testing/build.gradle.kts @@ -9,7 +9,7 @@ plugins { val ktorVersion = "3.0.0" dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") implementation("io.ktor:ktor-client-core:$ktorVersion") implementation("io.ktor:ktor-server-core:$ktorVersion") diff --git a/instrumentation/lettuce/lettuce-5.1/testing/build.gradle.kts b/instrumentation/lettuce/lettuce-5.1/testing/build.gradle.kts index 577605b637a4..c70ee957846b 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/build.gradle.kts +++ b/instrumentation/lettuce/lettuce-5.1/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") // 6.0+ added protocolVersion access which allows forcing RESP2 for consistency in tests compileOnly("io.lettuce:lettuce-core:6.0.0.RELEASE") diff --git a/instrumentation/log4j/log4j-appender-2.17/testing/build.gradle.kts b/instrumentation/log4j/log4j-appender-2.17/testing/build.gradle.kts index aa2c294c2874..eb152c0bf346 100644 --- a/instrumentation/log4j/log4j-appender-2.17/testing/build.gradle.kts +++ b/instrumentation/log4j/log4j-appender-2.17/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("io.opentelemetry:opentelemetry-sdk-testing") api("org.apache.logging.log4j:log4j-api:2.17.0") diff --git a/instrumentation/log4j/log4j-context-data/log4j-context-data-common/testing/build.gradle.kts b/instrumentation/log4j/log4j-context-data/log4j-context-data-common/testing/build.gradle.kts index b3626f29fa58..54d526e7ec88 100644 --- a/instrumentation/log4j/log4j-context-data/log4j-context-data-common/testing/build.gradle.kts +++ b/instrumentation/log4j/log4j-context-data/log4j-context-data-common/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("org.apache.logging.log4j:log4j-core:2.7") diff --git a/instrumentation/logback/logback-appender-1.0/library/build.gradle.kts b/instrumentation/logback/logback-appender-1.0/library/build.gradle.kts index 61d21f3022d1..6f10a95cc766 100644 --- a/instrumentation/logback/logback-appender-1.0/library/build.gradle.kts +++ b/instrumentation/logback/logback-appender-1.0/library/build.gradle.kts @@ -71,7 +71,6 @@ testing { dependencies { implementation(project(":instrumentation:logback:logback-appender-1.0:library")) implementation("io.opentelemetry:opentelemetry-sdk-testing") - implementation(project(":testing-common")) if (latestDepTest) { implementation("ch.qos.logback:logback-classic:latest.release") @@ -95,7 +94,6 @@ testing { dependencies { implementation(project(":instrumentation:logback:logback-appender-1.0:library")) implementation("io.opentelemetry:opentelemetry-sdk-testing") - implementation(project(":testing-common")) if (latestDepTest) { implementation("ch.qos.logback:logback-classic:latest.release") @@ -125,7 +123,6 @@ testing { dependencies { implementation(project(":instrumentation:logback:logback-appender-1.0:library")) implementation("io.opentelemetry:opentelemetry-sdk-testing") - implementation(project(":testing-common")) if (latestDepTest) { implementation("ch.qos.logback:logback-classic:latest.release") @@ -155,7 +152,6 @@ testing { dependencies { implementation(project(":instrumentation:logback:logback-appender-1.0:library")) implementation("io.opentelemetry:opentelemetry-sdk-testing") - implementation(project(":testing-common")) if (latestDepTest) { implementation("ch.qos.logback:logback-classic:latest.release") diff --git a/instrumentation/logback/logback-appender-1.0/testing/build.gradle.kts b/instrumentation/logback/logback-appender-1.0/testing/build.gradle.kts index 76be232ba4cd..c8c62a906b70 100644 --- a/instrumentation/logback/logback-appender-1.0/testing/build.gradle.kts +++ b/instrumentation/logback/logback-appender-1.0/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("io.opentelemetry:opentelemetry-sdk-testing") api("ch.qos.logback:logback-classic:1.0.0") diff --git a/instrumentation/logback/logback-mdc-1.0/testing/build.gradle.kts b/instrumentation/logback/logback-mdc-1.0/testing/build.gradle.kts index 702189537904..9f2109d30e68 100644 --- a/instrumentation/logback/logback-mdc-1.0/testing/build.gradle.kts +++ b/instrumentation/logback/logback-mdc-1.0/testing/build.gradle.kts @@ -5,7 +5,7 @@ plugins { dependencies { compileOnly(project(":instrumentation:logback:logback-mdc-1.0:library")) - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("ch.qos.logback:logback-classic:1.0.0") diff --git a/instrumentation/micrometer/micrometer-1.5/testing/build.gradle.kts b/instrumentation/micrometer/micrometer-1.5/testing/build.gradle.kts index 86fabbe0e11a..6eda7f3eb2f8 100644 --- a/instrumentation/micrometer/micrometer-1.5/testing/build.gradle.kts +++ b/instrumentation/micrometer/micrometer-1.5/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("io.micrometer:micrometer-core:1.5.0") } diff --git a/instrumentation/mongo/mongo-common/testing/build.gradle.kts b/instrumentation/mongo/mongo-common/testing/build.gradle.kts index 8a9e9b43eacc..3e28004ce009 100644 --- a/instrumentation/mongo/mongo-common/testing/build.gradle.kts +++ b/instrumentation/mongo/mongo-common/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("org.testcontainers:testcontainers-mongodb") implementation("io.opentelemetry:opentelemetry-api") diff --git a/instrumentation/nats/nats-2.17/testing/build.gradle.kts b/instrumentation/nats/nats-2.17/testing/build.gradle.kts index 18ea3fbf6a5b..c0402ff14739 100644 --- a/instrumentation/nats/nats-2.17/testing/build.gradle.kts +++ b/instrumentation/nats/nats-2.17/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") compileOnly("io.nats:jnats:2.17.2") diff --git a/instrumentation/netty/netty-4.1/testing/build.gradle.kts b/instrumentation/netty/netty-4.1/testing/build.gradle.kts index 8b6a72e1ba5a..5998e881318d 100644 --- a/instrumentation/netty/netty-4.1/testing/build.gradle.kts +++ b/instrumentation/netty/netty-4.1/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("io.netty:netty-codec-http:4.1.0.Final") } diff --git a/instrumentation/okhttp/okhttp-3.0/testing/build.gradle.kts b/instrumentation/okhttp/okhttp-3.0/testing/build.gradle.kts index d5997c5785ba..f6bc8aaece95 100644 --- a/instrumentation/okhttp/okhttp-3.0/testing/build.gradle.kts +++ b/instrumentation/okhttp/okhttp-3.0/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("com.squareup.okhttp3:okhttp:3.0.0") diff --git a/instrumentation/openai/openai-java-1.1/openai3-testing/build.gradle.kts b/instrumentation/openai/openai-java-1.1/openai3-testing/build.gradle.kts index a78fafddd76b..e0a0d1906d36 100644 --- a/instrumentation/openai/openai-java-1.1/openai3-testing/build.gradle.kts +++ b/instrumentation/openai/openai-java-1.1/openai3-testing/build.gradle.kts @@ -3,6 +3,6 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") compileOnly("com.openai:openai-java:3.0.0") } diff --git a/instrumentation/openai/openai-java-1.1/testing/build.gradle.kts b/instrumentation/openai/openai-java-1.1/testing/build.gradle.kts index 7d66b7f229d7..b2113d72ab0d 100644 --- a/instrumentation/openai/openai-java-1.1/testing/build.gradle.kts +++ b/instrumentation/openai/openai-java-1.1/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("com.openai:openai-java:1.1.0") api(project(":instrumentation:openai:openai-java-1.1:openai3-testing")) } diff --git a/instrumentation/opensearch/opensearch-rest-common/testing/build.gradle.kts b/instrumentation/opensearch/opensearch-rest-common/testing/build.gradle.kts index 067273edd6b8..3dd058828218 100644 --- a/instrumentation/opensearch/opensearch-rest-common/testing/build.gradle.kts +++ b/instrumentation/opensearch/opensearch-rest-common/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("org.testcontainers:testcontainers") api("org.opensearch:opensearch-testcontainers:2.0.0") diff --git a/instrumentation/oracle-ucp-11.2/testing/build.gradle.kts b/instrumentation/oracle-ucp-11.2/testing/build.gradle.kts index cb20ca3b9b74..9cc353156315 100644 --- a/instrumentation/oracle-ucp-11.2/testing/build.gradle.kts +++ b/instrumentation/oracle-ucp-11.2/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") implementation("org.testcontainers:testcontainers-oracle-free") compileOnly("com.oracle.database.jdbc:ucp:11.2.0.4") diff --git a/instrumentation/oshi/testing/build.gradle.kts b/instrumentation/oshi/testing/build.gradle.kts index 484e04028aaa..153fc10d607c 100644 --- a/instrumentation/oshi/testing/build.gradle.kts +++ b/instrumentation/oshi/testing/build.gradle.kts @@ -3,5 +3,5 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") } diff --git a/instrumentation/pekko/pekko-http-1.0/javaagent/build.gradle.kts b/instrumentation/pekko/pekko-http-1.0/javaagent/build.gradle.kts index 6fcbb79aa6b4..f6719949eb8e 100644 --- a/instrumentation/pekko/pekko-http-1.0/javaagent/build.gradle.kts +++ b/instrumentation/pekko/pekko-http-1.0/javaagent/build.gradle.kts @@ -67,10 +67,6 @@ testing { suites { val tapirTest by registering(JvmTestSuite::class) { dependencies { - // this only exists to make Intellij happy since it doesn't (currently at least) understand our - // inclusion of this artifact inside :testing-common - compileOnly(project.dependencies.project(":testing:dependencies-shaded-for-testing", configuration = "shadow")) - if (findProperty("testLatestDeps") as Boolean) { implementation("com.typesafe.akka:akka-http_2.13:latest.release") implementation("com.typesafe.akka:akka-stream_2.13:latest.release") diff --git a/instrumentation/play/play-ws/play-ws-common/testing/build.gradle.kts b/instrumentation/play/play-ws/play-ws-common/testing/build.gradle.kts index c6668c7801e1..5af90a440213 100644 --- a/instrumentation/play/play-ws/play-ws-common/testing/build.gradle.kts +++ b/instrumentation/play/play-ws/play-ws-common/testing/build.gradle.kts @@ -5,7 +5,7 @@ plugins { val scalaVersion = "2.12" dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("com.typesafe.play:play-ahc-ws-standalone_$scalaVersion:1.0.2") implementation("io.opentelemetry:opentelemetry-api") diff --git a/instrumentation/quarkus-resteasy-reactive/common-testing/build.gradle.kts b/instrumentation/quarkus-resteasy-reactive/common-testing/build.gradle.kts index 023a880876af..ea4974569564 100644 --- a/instrumentation/quarkus-resteasy-reactive/common-testing/build.gradle.kts +++ b/instrumentation/quarkus-resteasy-reactive/common-testing/build.gradle.kts @@ -3,5 +3,5 @@ plugins { } dependencies { - implementation(project(":testing-common")) + implementation("io.opentelemetry.javaagent:opentelemetry-testing-common") } diff --git a/instrumentation/quartz-2.0/testing/build.gradle.kts b/instrumentation/quartz-2.0/testing/build.gradle.kts index a206094fcf20..f1e23025b951 100644 --- a/instrumentation/quartz-2.0/testing/build.gradle.kts +++ b/instrumentation/quartz-2.0/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("org.quartz-scheduler:quartz:2.0.0") } diff --git a/instrumentation/r2dbc-1.0/testing/build.gradle.kts b/instrumentation/r2dbc-1.0/testing/build.gradle.kts index d813311ff47a..f3a4cdc0f301 100644 --- a/instrumentation/r2dbc-1.0/testing/build.gradle.kts +++ b/instrumentation/r2dbc-1.0/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(project(":testing-common")) + implementation("io.opentelemetry.javaagent:opentelemetry-testing-common") implementation("io.r2dbc:r2dbc-spi:1.0.0.RELEASE") diff --git a/instrumentation/ratpack/ratpack-1.4/testing/build.gradle.kts b/instrumentation/ratpack/ratpack-1.4/testing/build.gradle.kts index 9b4dbe96cc83..172baac79b2e 100644 --- a/instrumentation/ratpack/ratpack-1.4/testing/build.gradle.kts +++ b/instrumentation/ratpack/ratpack-1.4/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") // it's important for these to not be api dependencies, because api dependencies pull in their // transitive dependencies as well, which causes issues for testLatestDep diff --git a/instrumentation/reactor/reactor-3.1/testing/build.gradle.kts b/instrumentation/reactor/reactor-3.1/testing/build.gradle.kts index ab943128d2aa..a9232c088238 100644 --- a/instrumentation/reactor/reactor-3.1/testing/build.gradle.kts +++ b/instrumentation/reactor/reactor-3.1/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("io.projectreactor:reactor-core:3.1.0.RELEASE") diff --git a/instrumentation/reactor/reactor-kafka-1.0/testing/build.gradle.kts b/instrumentation/reactor/reactor-kafka-1.0/testing/build.gradle.kts index 766aefb659d4..65668cf91ca8 100644 --- a/instrumentation/reactor/reactor-kafka-1.0/testing/build.gradle.kts +++ b/instrumentation/reactor/reactor-kafka-1.0/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") compileOnly("io.projectreactor.kafka:reactor-kafka:1.0.0.RELEASE") implementation("org.testcontainers:testcontainers-kafka") diff --git a/instrumentation/redisson/redisson-common/testing/build.gradle.kts b/instrumentation/redisson/redisson-common/testing/build.gradle.kts index 7b807126c8a3..48b5e70fe62f 100644 --- a/instrumentation/redisson/redisson-common/testing/build.gradle.kts +++ b/instrumentation/redisson/redisson-common/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") implementation("io.opentelemetry:opentelemetry-api") implementation("org.testcontainers:testcontainers") diff --git a/instrumentation/restlet/restlet-1.1/testing/build.gradle.kts b/instrumentation/restlet/restlet-1.1/testing/build.gradle.kts index 1e5f57422b19..734e5328ab40 100644 --- a/instrumentation/restlet/restlet-1.1/testing/build.gradle.kts +++ b/instrumentation/restlet/restlet-1.1/testing/build.gradle.kts @@ -9,7 +9,7 @@ repositories { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") implementation("org.restlet:org.restlet:1.1.5") implementation("com.noelios.restlet:com.noelios.restlet:1.1.5") diff --git a/instrumentation/restlet/restlet-2.0/testing/build.gradle.kts b/instrumentation/restlet/restlet-2.0/testing/build.gradle.kts index 09b07f152c7b..20d8097a7cdf 100644 --- a/instrumentation/restlet/restlet-2.0/testing/build.gradle.kts +++ b/instrumentation/restlet/restlet-2.0/testing/build.gradle.kts @@ -9,7 +9,7 @@ repositories { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") implementation("org.restlet.jse:org.restlet:2.0.2") implementation("org.restlet.jse:org.restlet.ext.spring:2.0.2") diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/testing/build.gradle.kts b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/testing/build.gradle.kts index 8ae00168a634..4fdf19f37e3b 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/testing/build.gradle.kts +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") implementation("org.apache.rocketmq:rocketmq-test:4.8.0") implementation("io.opentelemetry:opentelemetry-api") diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/build.gradle.kts b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/build.gradle.kts index 0483951a9630..bd90d3a1eda6 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/build.gradle.kts +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") // earlier versions have bugs that may make tests flaky. implementation("org.apache.rocketmq:rocketmq-client-java:5.0.2") diff --git a/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/build.gradle.kts b/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/build.gradle.kts index 8635d7ca532e..24be66977afe 100644 --- a/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/build.gradle.kts +++ b/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/build.gradle.kts @@ -4,6 +4,4 @@ plugins { dependencies { implementation(project(":instrumentation-api")) - - testImplementation(project(":testing-common")) } diff --git a/instrumentation/rxjava/rxjava-2.0/testing/build.gradle.kts b/instrumentation/rxjava/rxjava-2.0/testing/build.gradle.kts index d04d513688d8..aac2a770b0cd 100644 --- a/instrumentation/rxjava/rxjava-2.0/testing/build.gradle.kts +++ b/instrumentation/rxjava/rxjava-2.0/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("io.reactivex.rxjava2:rxjava:2.1.3") implementation("io.opentelemetry:opentelemetry-api") diff --git a/instrumentation/rxjava/rxjava-3-common/testing/build.gradle.kts b/instrumentation/rxjava/rxjava-3-common/testing/build.gradle.kts index 1e80fb6c9936..c01c89b59804 100644 --- a/instrumentation/rxjava/rxjava-3-common/testing/build.gradle.kts +++ b/instrumentation/rxjava/rxjava-3-common/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("io.reactivex.rxjava3:rxjava:3.0.12") diff --git a/instrumentation/servlet/servlet-5.0/testing/build.gradle.kts b/instrumentation/servlet/servlet-5.0/testing/build.gradle.kts index 8066fc7218b7..bf33a4bad6ee 100644 --- a/instrumentation/servlet/servlet-5.0/testing/build.gradle.kts +++ b/instrumentation/servlet/servlet-5.0/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api(project(":instrumentation:servlet:servlet-common:bootstrap")) compileOnly("jakarta.servlet:jakarta.servlet-api:5.0.0") diff --git a/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts b/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts index c3010d5e8aff..1989589aabc3 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts +++ b/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts @@ -85,7 +85,6 @@ dependencies { testRuntimeOnly("com.h2database:h2:1.4.197") testRuntimeOnly("io.r2dbc:r2dbc-h2:1.0.0.RELEASE") - testImplementation(project(":testing-common")) testImplementation("io.opentelemetry:opentelemetry-sdk") testImplementation("io.opentelemetry:opentelemetry-sdk-testing") testImplementation(project(":instrumentation:resources:library")) @@ -125,7 +124,6 @@ testing { val testLogbackAppender by registering(JvmTestSuite::class) { dependencies { implementation(project()) - implementation(project(":testing-common")) implementation("io.opentelemetry:opentelemetry-sdk") implementation("io.opentelemetry:opentelemetry-sdk-testing") implementation("org.mockito:mockito-inline") diff --git a/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-common/testing/build.gradle.kts b/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-common/testing/build.gradle.kts index 0a491303fd0c..87e7606308e9 100644 --- a/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-common/testing/build.gradle.kts +++ b/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-common/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(project(":testing-common")) + implementation("io.opentelemetry.javaagent:opentelemetry-testing-common") compileOnly("org.springframework.boot:spring-boot-starter-test:2.0.0.RELEASE") } diff --git a/instrumentation/spring/spring-data/spring-data-common/testing/build.gradle.kts b/instrumentation/spring/spring-data/spring-data-common/testing/build.gradle.kts index b794a90f609a..b610e8a5caa1 100644 --- a/instrumentation/spring/spring-data/spring-data-common/testing/build.gradle.kts +++ b/instrumentation/spring/spring-data/spring-data-common/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(project(":testing-common")) + implementation("io.opentelemetry.javaagent:opentelemetry-testing-common") compileOnly("org.hibernate:hibernate-core:4.3.0.Final") compileOnly("org.springframework.data:spring-data-commons:1.8.0.RELEASE") diff --git a/instrumentation/spring/spring-integration-4.1/testing/build.gradle.kts b/instrumentation/spring/spring-integration-4.1/testing/build.gradle.kts index ce36eebdf34c..f79e250afea0 100644 --- a/instrumentation/spring/spring-integration-4.1/testing/build.gradle.kts +++ b/instrumentation/spring/spring-integration-4.1/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("org.testcontainers:testcontainers") diff --git a/instrumentation/spring/spring-jms/spring-jms-2.0/testing/build.gradle.kts b/instrumentation/spring/spring-jms/spring-jms-2.0/testing/build.gradle.kts index 023a880876af..ea4974569564 100644 --- a/instrumentation/spring/spring-jms/spring-jms-2.0/testing/build.gradle.kts +++ b/instrumentation/spring/spring-jms/spring-jms-2.0/testing/build.gradle.kts @@ -3,5 +3,5 @@ plugins { } dependencies { - implementation(project(":testing-common")) + implementation("io.opentelemetry.javaagent:opentelemetry-testing-common") } diff --git a/instrumentation/spring/spring-kafka-2.7/testing/build.gradle.kts b/instrumentation/spring/spring-kafka-2.7/testing/build.gradle.kts index ad72c2c40557..6f8d2db1c9ed 100644 --- a/instrumentation/spring/spring-kafka-2.7/testing/build.gradle.kts +++ b/instrumentation/spring/spring-kafka-2.7/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(project(":testing-common")) + implementation("io.opentelemetry.javaagent:opentelemetry-testing-common") implementation("org.testcontainers:testcontainers-kafka") compileOnly("org.springframework.kafka:spring-kafka:2.7.0") diff --git a/instrumentation/spring/spring-pulsar-1.0/testing/build.gradle.kts b/instrumentation/spring/spring-pulsar-1.0/testing/build.gradle.kts index e3815016af5d..4d7360df7a62 100644 --- a/instrumentation/spring/spring-pulsar-1.0/testing/build.gradle.kts +++ b/instrumentation/spring/spring-pulsar-1.0/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(project(":testing-common")) + implementation("io.opentelemetry.javaagent:opentelemetry-testing-common") implementation("org.testcontainers:testcontainers-pulsar") compileOnly("org.springframework.pulsar:spring-pulsar:1.0.0") diff --git a/instrumentation/spring/spring-security-config-6.0/library/build.gradle.kts b/instrumentation/spring/spring-security-config-6.0/library/build.gradle.kts index 3641847ecf5f..6b15caf23a5f 100644 --- a/instrumentation/spring/spring-security-config-6.0/library/build.gradle.kts +++ b/instrumentation/spring/spring-security-config-6.0/library/build.gradle.kts @@ -16,7 +16,6 @@ dependencies { implementation(project(":instrumentation:reactor:reactor-3.1:library")) - testImplementation(project(":testing-common")) testLibrary("org.springframework:spring-test:6.0.0") } diff --git a/instrumentation/spring/spring-web/spring-web-3.1/library/build.gradle.kts b/instrumentation/spring/spring-web/spring-web-3.1/library/build.gradle.kts index 821617db2f96..714788bd2af5 100644 --- a/instrumentation/spring/spring-web/spring-web-3.1/library/build.gradle.kts +++ b/instrumentation/spring/spring-web/spring-web-3.1/library/build.gradle.kts @@ -7,7 +7,6 @@ dependencies { testLibrary("org.springframework:spring-web:3.1.0.RELEASE") - testImplementation(project(":testing-common")) testImplementation("io.opentelemetry:opentelemetry-sdk-testing") } diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/testing/build.gradle.kts b/instrumentation/spring/spring-webflux/spring-webflux-5.0/testing/build.gradle.kts index 42b60973aa11..e3f5c23a436c 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/testing/build.gradle.kts +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(project(":testing-common")) + implementation("io.opentelemetry.javaagent:opentelemetry-testing-common") compileOnly("org.springframework:spring-webflux:5.0.0.RELEASE") compileOnly("org.springframework.boot:spring-boot-starter-reactor-netty:2.0.0.RELEASE") diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/build.gradle.kts b/instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/build.gradle.kts index 6851a0221e6a..ff988484a79f 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/build.gradle.kts +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(project(":testing-common")) + implementation("io.opentelemetry.javaagent:opentelemetry-testing-common") compileOnly("org.springframework:spring-webflux:5.0.0.RELEASE") diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/build.gradle.kts b/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/build.gradle.kts index f848ceb4e468..f4bbfc2dc53c 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/build.gradle.kts +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/build.gradle.kts @@ -8,7 +8,6 @@ dependencies { compileOnly("org.springframework:spring-webmvc:5.3.0") compileOnly("javax.servlet:javax.servlet-api:4.0.1") - testImplementation(project(":testing-common")) testImplementation("org.springframework.boot:spring-boot-starter-web:$springBootVersion") testImplementation("org.springframework.boot:spring-boot-starter-test:$springBootVersion") { exclude("org.junit.vintage", "junit-vintage-engine") diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/build.gradle.kts b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/build.gradle.kts index 18188322f6e3..404b74b29671 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/build.gradle.kts +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/build.gradle.kts @@ -6,7 +6,6 @@ dependencies { compileOnly("org.springframework:spring-webmvc:6.0.0") compileOnly("jakarta.servlet:jakarta.servlet-api:5.0.0") - testImplementation(project(":testing-common")) testImplementation("org.springframework.boot:spring-boot-starter-web:3.0.0") testImplementation("org.springframework.boot:spring-boot-starter-test:3.0.0") } diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/build.gradle.kts b/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/build.gradle.kts index c4082773d3bb..da8367ebe8f1 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/build.gradle.kts +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(project(":testing-common")) + implementation("io.opentelemetry.javaagent:opentelemetry-testing-common") compileOnly("org.springframework.boot:spring-boot-starter-test:1.5.17.RELEASE") compileOnly("org.springframework.boot:spring-boot-starter-web:1.5.17.RELEASE") diff --git a/instrumentation/struts/struts-2.3/javaagent/build.gradle.kts b/instrumentation/struts/struts-2.3/javaagent/build.gradle.kts index 27e68fc4a0cb..3eb5b4a1a2f8 100644 --- a/instrumentation/struts/struts-2.3/javaagent/build.gradle.kts +++ b/instrumentation/struts/struts-2.3/javaagent/build.gradle.kts @@ -16,7 +16,6 @@ dependencies { library("org.apache.struts:struts2-core:2.3.1") - testImplementation(project(":testing-common")) testImplementation("org.eclipse.jetty:jetty-server:8.0.0.v20110901") testImplementation("org.eclipse.jetty:jetty-servlet:8.0.0.v20110901") testRuntimeOnly("javax.servlet:javax.servlet-api:3.0.1") diff --git a/instrumentation/struts/struts-7.0/javaagent/build.gradle.kts b/instrumentation/struts/struts-7.0/javaagent/build.gradle.kts index 6d0d99e84258..31ca748bcd8e 100644 --- a/instrumentation/struts/struts-7.0/javaagent/build.gradle.kts +++ b/instrumentation/struts/struts-7.0/javaagent/build.gradle.kts @@ -21,7 +21,6 @@ dependencies { library("org.apache.struts:struts2-core:7.0.0") - testImplementation(project(":testing-common")) testImplementation("org.eclipse.jetty:jetty-server:11.0.0") testImplementation("org.eclipse.jetty:jetty-servlet:11.0.0") testImplementation("jakarta.servlet:jakarta.servlet-api:5.0.0") diff --git a/instrumentation/vaadin-14.2/testing/build.gradle.kts b/instrumentation/vaadin-14.2/testing/build.gradle.kts index c82dc1270075..d23be6b0eb54 100644 --- a/instrumentation/vaadin-14.2/testing/build.gradle.kts +++ b/instrumentation/vaadin-14.2/testing/build.gradle.kts @@ -6,6 +6,6 @@ dependencies { compileOnly("com.vaadin:vaadin-spring-boot-starter:14.2.0") api("org.testcontainers:testcontainers-selenium") - implementation(project(":testing-common")) + implementation("io.opentelemetry.javaagent:opentelemetry-testing-common") implementation("org.seleniumhq.selenium:selenium-java:4.8.3") } diff --git a/instrumentation/vertx/vertx-kafka-client-3.6/testing/build.gradle.kts b/instrumentation/vertx/vertx-kafka-client-3.6/testing/build.gradle.kts index 5e438db392aa..45faa3666709 100644 --- a/instrumentation/vertx/vertx-kafka-client-3.6/testing/build.gradle.kts +++ b/instrumentation/vertx/vertx-kafka-client-3.6/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(project(":testing-common")) + implementation("io.opentelemetry.javaagent:opentelemetry-testing-common") implementation("org.testcontainers:testcontainers-kafka") compileOnly("io.vertx:vertx-kafka-client:3.6.0") diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/build.gradle.kts b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/build.gradle.kts index e1008beb69e4..29cbdc168568 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/build.gradle.kts +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/build.gradle.kts @@ -33,10 +33,6 @@ testing { suites { val version35Test by registering(JvmTestSuite::class) { dependencies { - // this only exists to make Intellij happy since it doesn't (currently at least) understand our - // inclusion of this artifact inside :testing-common - compileOnly(project.dependencies.project(":testing:dependencies-shaded-for-testing", configuration = "shadow")) - val version = if (testLatestDeps) "3.+" else "3.5.0" implementation("org.hsqldb:hsqldb:2.3.4") compileOnly("io.vertx:vertx-codegen:$version") @@ -50,10 +46,6 @@ testing { val version41Test by registering(JvmTestSuite::class) { dependencies { - // this only exists to make Intellij happy since it doesn't (currently at least) understand our - // inclusion of this artifact inside :testing-common - compileOnly(project.dependencies.project(":testing:dependencies-shaded-for-testing", configuration = "shadow")) - val version = if (testLatestDeps) "4.+" else "4.1.0" implementation("org.hsqldb:hsqldb:2.3.4") compileOnly("io.vertx:vertx-codegen:$version") @@ -67,10 +59,6 @@ testing { val version5Test by registering(JvmTestSuite::class) { dependencies { - // this only exists to make Intellij happy since it doesn't (currently at least) understand our - // inclusion of this artifact inside :testing-common - compileOnly(project.dependencies.project(":testing:dependencies-shaded-for-testing", configuration = "shadow")) - val version = if (testLatestDeps) "latest.release" else "5.0.0" implementation("org.hsqldb:hsqldb:2.3.4") compileOnly("io.vertx:vertx-codegen:$version") diff --git a/instrumentation/vertx/vertx-web-3.0/testing/build.gradle.kts b/instrumentation/vertx/vertx-web-3.0/testing/build.gradle.kts index a792ce98f334..5884ae7f4db9 100644 --- a/instrumentation/vertx/vertx-web-3.0/testing/build.gradle.kts +++ b/instrumentation/vertx/vertx-web-3.0/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") implementation("io.vertx:vertx-web:3.0.0") diff --git a/instrumentation/vibur-dbcp-11.0/testing/build.gradle.kts b/instrumentation/vibur-dbcp-11.0/testing/build.gradle.kts index 0d7c62cdf46e..252ee8e500f6 100644 --- a/instrumentation/vibur-dbcp-11.0/testing/build.gradle.kts +++ b/instrumentation/vibur-dbcp-11.0/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("org.mockito:mockito-core") api("org.mockito:mockito-junit-jupiter") diff --git a/instrumentation/wicket-8.0/common-testing/build.gradle.kts b/instrumentation/wicket-8.0/common-testing/build.gradle.kts index d99731170744..38ed894d1f94 100644 --- a/instrumentation/wicket-8.0/common-testing/build.gradle.kts +++ b/instrumentation/wicket-8.0/common-testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(project(":testing-common")) + implementation("io.opentelemetry.javaagent:opentelemetry-testing-common") implementation("org.apache.wicket:wicket:8.0.0") implementation("org.jsoup:jsoup:1.13.1") } diff --git a/instrumentation/xxl-job/xxl-job-common/testing/build.gradle.kts b/instrumentation/xxl-job/xxl-job-common/testing/build.gradle.kts index 0eb69a252ddf..de22fc972047 100644 --- a/instrumentation/xxl-job/xxl-job-common/testing/build.gradle.kts +++ b/instrumentation/xxl-job/xxl-job-common/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(project(":testing-common")) + implementation("io.opentelemetry.javaagent:opentelemetry-testing-common") compileOnly("com.xuxueli:xxl-job-core:2.1.2") { exclude("org.codehaus.groovy", "groovy") diff --git a/javaagent-bootstrap/build.gradle.kts b/javaagent-bootstrap/build.gradle.kts index 6aef45035e36..d0778a452f98 100644 --- a/javaagent-bootstrap/build.gradle.kts +++ b/javaagent-bootstrap/build.gradle.kts @@ -8,7 +8,7 @@ group = "io.opentelemetry.javaagent" dependencies { implementation(project(":instrumentation-api")) - testImplementation(project(":testing-common")) + testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common") testImplementation(project(":instrumentation:resources:library")) } diff --git a/javaagent-tooling/build.gradle.kts b/javaagent-tooling/build.gradle.kts index 91a41da1ff55..dc1017d14d5a 100644 --- a/javaagent-tooling/build.gradle.kts +++ b/javaagent-tooling/build.gradle.kts @@ -60,7 +60,7 @@ dependencies { compileOnly("com.google.code.findbugs:annotations") testCompileOnly("com.google.code.findbugs:annotations") - testImplementation(project(":testing-common")) + testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common") testImplementation("com.google.guava:guava") testImplementation("org.junit-pioneer:junit-pioneer") testImplementation("com.fasterxml.jackson.core:jackson-databind") diff --git a/javaagent/build.gradle.kts b/javaagent/build.gradle.kts index f7631c36673a..9a7c777f6bc5 100644 --- a/javaagent/build.gradle.kts +++ b/javaagent/build.gradle.kts @@ -108,7 +108,7 @@ dependencies { testCompileOnly(project(":javaagent-bootstrap")) testCompileOnly(project(":javaagent-extension-api")) - testImplementation(project(":testing-common")) + testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common") testImplementation("io.opentracing.contrib.dropwizard:dropwizard-opentracing:0.2.2") } diff --git a/muzzle/build.gradle.kts b/muzzle/build.gradle.kts index b4f917b43cf4..8924974d1c35 100644 --- a/muzzle/build.gradle.kts +++ b/muzzle/build.gradle.kts @@ -23,6 +23,6 @@ dependencies { // Used by byte-buddy but not brought in as a transitive dependency. compileOnly("com.google.code.findbugs:annotations") - testImplementation(project(":testing-common")) + testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common") testImplementation("com.google.guava:guava") } diff --git a/sdk-autoconfigure-support/build.gradle.kts b/sdk-autoconfigure-support/build.gradle.kts index c2948406f7e1..6584d339f25f 100644 --- a/sdk-autoconfigure-support/build.gradle.kts +++ b/sdk-autoconfigure-support/build.gradle.kts @@ -10,5 +10,5 @@ dependencies { compileOnly("com.google.code.findbugs:annotations") testCompileOnly("com.google.code.findbugs:annotations") - testImplementation(project(":testing-common")) + testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common") } diff --git a/settings.gradle.kts b/settings.gradle.kts index a402e78404e6..4488c3620b13 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -139,6 +139,7 @@ include(":testing:agent-exporter") include(":testing:agent-for-testing") include(":testing:dependencies-shaded-for-testing") include(":testing-common") +include(":testing-common:with-shaded-dependencies") include(":testing-common:integration-tests") include(":testing-common:library-for-integration-tests") diff --git a/smoke-tests-otel-starter/spring-smoke-testing/build.gradle.kts b/smoke-tests-otel-starter/spring-smoke-testing/build.gradle.kts index 0ffd2f38de95..9496d6a6f6ae 100644 --- a/smoke-tests-otel-starter/spring-smoke-testing/build.gradle.kts +++ b/smoke-tests-otel-starter/spring-smoke-testing/build.gradle.kts @@ -9,7 +9,7 @@ dependencies { compileOnly(platform("org.springframework.boot:spring-boot-dependencies:2.6.15")) compileOnly("org.springframework.boot:spring-boot-starter") compileOnly("org.springframework.boot:spring-boot-starter-test") - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") api("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi") implementation("com.google.guava:guava") } diff --git a/smoke-tests/build.gradle.kts b/smoke-tests/build.gradle.kts index 0c4aafb95000..de806e4096d7 100644 --- a/smoke-tests/build.gradle.kts +++ b/smoke-tests/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { compileOnly("com.google.auto.value:auto-value-annotations") annotationProcessor("com.google.auto.value:auto-value") - api(project(":testing-common")) + api("io.opentelemetry.javaagent:opentelemetry-testing-common") implementation(platform("io.grpc:grpc-bom:1.76.0")) implementation("org.slf4j:slf4j-api") @@ -31,10 +31,6 @@ dependencies { implementation("com.github.docker-java:docker-java-core:$dockerJavaVersion") implementation("com.github.docker-java:docker-java-transport-httpclient5:$dockerJavaVersion") - - // make IntelliJ see shaded Armeria and protobuf - compileOnly(project(":testing:dependencies-shaded-for-testing", configuration = "shadow")) - testCompileOnly(project(":testing:dependencies-shaded-for-testing", configuration = "shadow")) } tasks { diff --git a/testing-common/build.gradle.kts b/testing-common/build.gradle.kts index 0e1332154869..50ec4897c56d 100644 --- a/testing-common/build.gradle.kts +++ b/testing-common/build.gradle.kts @@ -66,9 +66,4 @@ tasks { javadoc { enabled = false } - - jar { - // When there are duplicates between multiple shaded dependencies, just ignore them. - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - } } diff --git a/testing-common/with-shaded-dependencies/build.gradle.kts b/testing-common/with-shaded-dependencies/build.gradle.kts new file mode 100644 index 000000000000..4e2747f5dbe2 --- /dev/null +++ b/testing-common/with-shaded-dependencies/build.gradle.kts @@ -0,0 +1,12 @@ +plugins { + id("otel.java-conventions") +} + +// this module exists to make Intellij happy since it doesn't (currently at least) understand our +// inclusion of shaded dependencies into testing-common +// we use dependency substitution to replace io.opentelemetry.javaagent:opentelemetry-testing-common +// with this module +dependencies { + api(project(":testing-common")) + api(project(":testing:dependencies-shaded-for-testing", configuration = "shadow")) +} diff --git a/testing/agent-for-testing/build.gradle.kts b/testing/agent-for-testing/build.gradle.kts index 5f9df0af2c28..d8c83986af5b 100644 --- a/testing/agent-for-testing/build.gradle.kts +++ b/testing/agent-for-testing/build.gradle.kts @@ -20,7 +20,7 @@ dependencies { extensionLibs(project(":testing:agent-exporter", configuration = "shadow")) agent(project(":javaagent", configuration = "baseJar")) - testImplementation(project(":testing-common")) + testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common") testImplementation("io.opentelemetry:opentelemetry-api") }