From dafc97f96eb7961261059f09229f00b2282bc8ae Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 4 Oct 2021 21:53:35 -0700 Subject: [PATCH] Simplify gradle files (#4292) --- .../kotlin/otel.java-conventions.gradle.kts | 2 +- instrumentation-api/build.gradle.kts | 2 +- .../aws-sdk-1.11/javaagent/build.gradle.kts | 2 +- .../aws-sdk-2.2/library/build.gradle.kts | 2 +- .../cassandra-3.0/javaagent/build.gradle.kts | 2 +- .../cassandra-4.0/javaagent/build.gradle.kts | 2 +- .../couchbase-3.1.6/javaagent/build.gradle.kts | 14 +++++++++++--- .../couchbase-3.1/javaagent/build.gradle.kts | 14 +++++++++++--- .../couchbase-3.2/javaagent/build.gradle.kts | 14 +++++++++++--- .../javaagent/build.gradle.kts | 2 +- .../javaagent/build.gradle.kts | 2 +- .../javaagent/build.gradle.kts | 2 +- .../grpc-1.6/javaagent/build.gradle.kts | 2 +- .../gwt-2.0/javaagent/build.gradle.kts | 2 +- .../hibernate-4.0/javaagent/build.gradle.kts | 2 +- .../javaagent/build.gradle.kts | 2 +- .../javaagent/build.gradle.kts | 2 +- .../javaagent/build.gradle.kts | 2 +- .../jaxrs-2.0-wildfly-testing/build.gradle.kts | 2 +- .../jaxws-2.0-wildfly-testing/build.gradle.kts | 2 +- .../jedis/jedis-1.4/javaagent/build.gradle.kts | 2 +- .../jedis/jedis-3.0/javaagent/build.gradle.kts | 2 +- .../jsf/mojarra-1.2/javaagent/build.gradle.kts | 2 +- .../jsf/myfaces-1.2/javaagent/build.gradle.kts | 2 +- .../lettuce-5.1/javaagent/build.gradle.kts | 2 +- .../lettuce-5.1/library/build.gradle.kts | 2 +- .../log4j-2.13.2/javaagent/build.gradle.kts | 2 +- .../mongo/mongo-3.1/javaagent/build.gradle.kts | 2 +- .../mongo/mongo-3.1/library/build.gradle.kts | 2 +- .../mongo/mongo-3.7/javaagent/build.gradle.kts | 2 +- .../mongo/mongo-4.0/javaagent/build.gradle.kts | 2 +- .../mongo-async-3.3/javaagent/build.gradle.kts | 2 +- .../netty/netty-4.0/javaagent/build.gradle.kts | 2 +- .../netty/netty-4.1/javaagent/build.gradle.kts | 2 +- .../javaagent/build.gradle.kts | 2 +- .../javaagent/build.gradle.kts | 2 +- .../javaagent/build.gradle.kts | 2 +- .../rediscala-1.8/javaagent/build.gradle.kts | 2 +- .../redisson-3.0/javaagent/build.gradle.kts | 2 +- instrumentation/rmi/javaagent/build.gradle.kts | 17 ++++++++++++++--- .../scala-executors/javaagent/build.gradle.kts | 2 +- .../spring-batch-3.0/javaagent/build.gradle.kts | 2 +- .../javaagent/build.gradle.kts | 2 +- .../library/build.gradle.kts | 2 +- .../spring-kafka-2.7/javaagent/build.gradle.kts | 2 +- .../javaagent/build.gradle.kts | 2 +- .../wildfly-testing/build.gradle.kts | 2 +- .../vaadin-14.2/javaagent/build.gradle.kts | 2 +- .../javaagent/build.gradle.kts | 2 +- .../javaagent/build.gradle.kts | 2 +- .../vertx-web-3.0/javaagent/build.gradle.kts | 2 +- 51 files changed, 94 insertions(+), 59 deletions(-) diff --git a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts b/conventions/src/main/kotlin/otel.java-conventions.gradle.kts index 1611c6d853..1177258171 100644 --- a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/conventions/src/main/kotlin/otel.java-conventions.gradle.kts @@ -179,7 +179,7 @@ class TestcontainersBuildService : BuildService { } // To limit number of concurrently running resource intensive tests add // tasks { -// named("test") { +// test { // usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService()) // } // } diff --git a/instrumentation-api/build.gradle.kts b/instrumentation-api/build.gradle.kts index 13800d2943..7891ab940c 100644 --- a/instrumentation-api/build.gradle.kts +++ b/instrumentation-api/build.gradle.kts @@ -57,7 +57,7 @@ tasks { jvmArgs("-Dotel.instrumentation.common.db-statement-sanitizer.enabled=false") } - named("test") { + test { dependsOn(testStatementSanitizerConfig) filter { diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts index 587f416824..7f392d2a63 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts @@ -102,7 +102,7 @@ tasks { } } - named("test") { + test { systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) } diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts index 0d34322a68..23dabc2e27 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts +++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { } tasks { - named("test") { + test { systemProperty("otel.instrumentation.aws-sdk.experimental-span-attributes", true) } } diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/build.gradle.kts b/instrumentation/cassandra/cassandra-3.0/javaagent/build.gradle.kts index 997c003988..a52c80a5f8 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/build.gradle.kts +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/build.gradle.kts @@ -41,7 +41,7 @@ dependencies { configurations.testRuntimeClasspath.resolutionStrategy.force("com.google.guava:guava:19.0") tasks { - named("test") { + test { usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService()) } } diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/build.gradle.kts b/instrumentation/cassandra/cassandra-4.0/javaagent/build.gradle.kts index ac9419d9d2..37cb560c7c 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/build.gradle.kts +++ b/instrumentation/cassandra/cassandra-4.0/javaagent/build.gradle.kts @@ -21,7 +21,7 @@ dependencies { } tasks { - named("test") { + test { usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService()) } } diff --git a/instrumentation/couchbase/couchbase-3.1.6/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-3.1.6/javaagent/build.gradle.kts index 4d1d83b58f..cf1af57088 100644 --- a/instrumentation/couchbase/couchbase-3.1.6/javaagent/build.gradle.kts +++ b/instrumentation/couchbase/couchbase-3.1.6/javaagent/build.gradle.kts @@ -16,12 +16,20 @@ muzzle { sourceSets { main { val shadedDep = project(":instrumentation:couchbase:couchbase-3.1.6:tracing-opentelemetry-shaded") - output.dir(shadedDep.file("build/extracted/shadow"), "builtBy" to ":instrumentation:couchbase:couchbase-3.1.6:tracing-opentelemetry-shaded:extractShadowJar") + output.dir( + shadedDep.file("build/extracted/shadow"), + "builtBy" to ":instrumentation:couchbase:couchbase-3.1.6:tracing-opentelemetry-shaded:extractShadowJar" + ) } } dependencies { - compileOnly(project(path = ":instrumentation:couchbase:couchbase-3.1.6:tracing-opentelemetry-shaded", configuration = "shadow")) + compileOnly( + project( + path = ":instrumentation:couchbase:couchbase-3.1.6:tracing-opentelemetry-shaded", + configuration = "shadow" + ) + ) library("com.couchbase.client:core-io:2.1.6") @@ -34,7 +42,7 @@ dependencies { } tasks { - named("test") { + test { usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService()) } } diff --git a/instrumentation/couchbase/couchbase-3.1/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-3.1/javaagent/build.gradle.kts index 27eb3c5daf..03032147e1 100644 --- a/instrumentation/couchbase/couchbase-3.1/javaagent/build.gradle.kts +++ b/instrumentation/couchbase/couchbase-3.1/javaagent/build.gradle.kts @@ -16,12 +16,20 @@ muzzle { sourceSets { main { val shadedDep = project(":instrumentation:couchbase:couchbase-3.1:tracing-opentelemetry-shaded") - output.dir(shadedDep.file("build/extracted/shadow"), "builtBy" to ":instrumentation:couchbase:couchbase-3.1:tracing-opentelemetry-shaded:extractShadowJar") + output.dir( + shadedDep.file("build/extracted/shadow"), + "builtBy" to ":instrumentation:couchbase:couchbase-3.1:tracing-opentelemetry-shaded:extractShadowJar" + ) } } dependencies { - compileOnly(project(path = ":instrumentation:couchbase:couchbase-3.1:tracing-opentelemetry-shaded", configuration = "shadow")) + compileOnly( + project( + path = ":instrumentation:couchbase:couchbase-3.1:tracing-opentelemetry-shaded", + configuration = "shadow" + ) + ) library("com.couchbase.client:core-io:2.1.0") @@ -34,7 +42,7 @@ dependencies { } tasks { - named("test") { + test { usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService()) } } diff --git a/instrumentation/couchbase/couchbase-3.2/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-3.2/javaagent/build.gradle.kts index 8c81c5a7bd..f3c88347b5 100644 --- a/instrumentation/couchbase/couchbase-3.2/javaagent/build.gradle.kts +++ b/instrumentation/couchbase/couchbase-3.2/javaagent/build.gradle.kts @@ -16,12 +16,20 @@ muzzle { sourceSets { main { val shadedDep = project(":instrumentation:couchbase:couchbase-3.2:tracing-opentelemetry-shaded") - output.dir(shadedDep.file("build/extracted/shadow"), "builtBy" to ":instrumentation:couchbase:couchbase-3.2:tracing-opentelemetry-shaded:extractShadowJar") + output.dir( + shadedDep.file("build/extracted/shadow"), + "builtBy" to ":instrumentation:couchbase:couchbase-3.2:tracing-opentelemetry-shaded:extractShadowJar" + ) } } dependencies { - compileOnly(project(path = ":instrumentation:couchbase:couchbase-3.2:tracing-opentelemetry-shaded", configuration = "shadow")) + compileOnly( + project( + path = ":instrumentation:couchbase:couchbase-3.2:tracing-opentelemetry-shaded", + configuration = "shadow" + ) + ) library("com.couchbase.client:core-io:2.1.6") @@ -31,7 +39,7 @@ dependencies { } tasks { - named("test") { + test { usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService()) } } diff --git a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/build.gradle.kts index d3e5eebbe3..b6f93608bb 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/build.gradle.kts +++ b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/build.gradle.kts @@ -38,7 +38,7 @@ dependencies { } tasks { - named("test") { + test { usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService()) } } diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/build.gradle.kts index eea834cbd9..a55eca2bcb 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/build.gradle.kts +++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/build.gradle.kts @@ -35,7 +35,7 @@ dependencies { } tasks { - named("test") { + test { usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService()) } } diff --git a/instrumentation/external-annotations/javaagent/build.gradle.kts b/instrumentation/external-annotations/javaagent/build.gradle.kts index c6e2e4e784..ffde07c919 100644 --- a/instrumentation/external-annotations/javaagent/build.gradle.kts +++ b/instrumentation/external-annotations/javaagent/build.gradle.kts @@ -47,7 +47,7 @@ tasks { jvmArgs("-Dotel.instrumentation.external-annotations.exclude-methods=TracedMethodsExclusionTest\$TestClass[excluded,annotatedButExcluded]") } - named("test") { + test { dependsOn(testIncludeProperty) dependsOn(testExcludeMethodsProperty) filter { diff --git a/instrumentation/grpc-1.6/javaagent/build.gradle.kts b/instrumentation/grpc-1.6/javaagent/build.gradle.kts index 258c437a5a..d9222557ad 100644 --- a/instrumentation/grpc-1.6/javaagent/build.gradle.kts +++ b/instrumentation/grpc-1.6/javaagent/build.gradle.kts @@ -29,7 +29,7 @@ dependencies { } tasks { - named("test") { + test { // The agent context debug mechanism isn't compatible with the bridge approach which may add a // gRPC context to the root. jvmArgs("-Dotel.javaagent.experimental.thread-propagation-debugger.enabled=false") diff --git a/instrumentation/gwt-2.0/javaagent/build.gradle.kts b/instrumentation/gwt-2.0/javaagent/build.gradle.kts index c107ed4f3c..42bae2918b 100644 --- a/instrumentation/gwt-2.0/javaagent/build.gradle.kts +++ b/instrumentation/gwt-2.0/javaagent/build.gradle.kts @@ -88,7 +88,7 @@ tasks { into(file("$buildDir/testapp/web")) } - named("test") { + test { dependsOn(sourceSets["testapp"].output) dependsOn(copyTestWebapp) diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/build.gradle.kts b/instrumentation/hibernate/hibernate-4.0/javaagent/build.gradle.kts index 1c270f3d08..ddb78f4578 100644 --- a/instrumentation/hibernate/hibernate-4.0/javaagent/build.gradle.kts +++ b/instrumentation/hibernate/hibernate-4.0/javaagent/build.gradle.kts @@ -26,7 +26,7 @@ testSets { } tasks { - named("test") { + test { dependsOn("version5Test") dependsOn("version6Test") } diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/build.gradle.kts index 8832392a7d..042b31141e 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/build.gradle.kts +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/build.gradle.kts @@ -47,7 +47,7 @@ dependencies { } tasks { - named("test") { + test { systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) } diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts index dbe87db0a2..5a222a31d5 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts @@ -50,7 +50,7 @@ dependencies { } tasks { - named("test") { + test { systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) } diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/build.gradle.kts index 36a32613b7..a0bc72f99d 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/build.gradle.kts +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/build.gradle.kts @@ -45,7 +45,7 @@ dependencies { } tasks { - named("test") { + test { systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) } diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/build.gradle.kts index 254b87dfc5..43649da810 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/build.gradle.kts +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/build.gradle.kts @@ -42,7 +42,7 @@ tasks { } } - named("test") { + test { dependsOn(modifyLogbackJar) dependsOn(setupServer) diff --git a/instrumentation/jaxws/jaxws-2.0-wildfly-testing/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0-wildfly-testing/build.gradle.kts index b118034cca..66b30ca262 100644 --- a/instrumentation/jaxws/jaxws-2.0-wildfly-testing/build.gradle.kts +++ b/instrumentation/jaxws/jaxws-2.0-wildfly-testing/build.gradle.kts @@ -43,7 +43,7 @@ tasks { } } - named("test") { + test { dependsOn(modifyLogbackJar) dependsOn(setupServer) diff --git a/instrumentation/jedis/jedis-1.4/javaagent/build.gradle.kts b/instrumentation/jedis/jedis-1.4/javaagent/build.gradle.kts index 2580706a39..5ef86322ba 100644 --- a/instrumentation/jedis/jedis-1.4/javaagent/build.gradle.kts +++ b/instrumentation/jedis/jedis-1.4/javaagent/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { } tasks { - named("test") { + test { usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService()) } } diff --git a/instrumentation/jedis/jedis-3.0/javaagent/build.gradle.kts b/instrumentation/jedis/jedis-3.0/javaagent/build.gradle.kts index 5d050e06b9..d62c082c01 100644 --- a/instrumentation/jedis/jedis-3.0/javaagent/build.gradle.kts +++ b/instrumentation/jedis/jedis-3.0/javaagent/build.gradle.kts @@ -32,7 +32,7 @@ dependencies { } tasks { - named("test") { + test { usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService()) } } diff --git a/instrumentation/jsf/mojarra-1.2/javaagent/build.gradle.kts b/instrumentation/jsf/mojarra-1.2/javaagent/build.gradle.kts index 22d936f3c0..3267608835 100644 --- a/instrumentation/jsf/mojarra-1.2/javaagent/build.gradle.kts +++ b/instrumentation/jsf/mojarra-1.2/javaagent/build.gradle.kts @@ -55,7 +55,7 @@ testSets { } tasks { - named("test") { + test { dependsOn("mojarra12Test") dependsOn("mojarra2Test") } diff --git a/instrumentation/jsf/myfaces-1.2/javaagent/build.gradle.kts b/instrumentation/jsf/myfaces-1.2/javaagent/build.gradle.kts index 5e1ede035d..c6b33fab12 100644 --- a/instrumentation/jsf/myfaces-1.2/javaagent/build.gradle.kts +++ b/instrumentation/jsf/myfaces-1.2/javaagent/build.gradle.kts @@ -23,7 +23,7 @@ testSets { } tasks { - named("test") { + test { dependsOn("myfaces12Test") dependsOn("myfaces2Test") } diff --git a/instrumentation/lettuce/lettuce-5.1/javaagent/build.gradle.kts b/instrumentation/lettuce/lettuce-5.1/javaagent/build.gradle.kts index 86930b4c15..84050a2d50 100644 --- a/instrumentation/lettuce/lettuce-5.1/javaagent/build.gradle.kts +++ b/instrumentation/lettuce/lettuce-5.1/javaagent/build.gradle.kts @@ -24,7 +24,7 @@ dependencies { } tasks { - named("test") { + test { systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService()) } diff --git a/instrumentation/lettuce/lettuce-5.1/library/build.gradle.kts b/instrumentation/lettuce/lettuce-5.1/library/build.gradle.kts index f5deb5c1e3..9d8241fc5d 100644 --- a/instrumentation/lettuce/lettuce-5.1/library/build.gradle.kts +++ b/instrumentation/lettuce/lettuce-5.1/library/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { } tasks { - named("test") { + test { systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService()) } diff --git a/instrumentation/log4j/log4j-2.13.2/javaagent/build.gradle.kts b/instrumentation/log4j/log4j-2.13.2/javaagent/build.gradle.kts index d1f66a20a3..79eec06b33 100644 --- a/instrumentation/log4j/log4j-2.13.2/javaagent/build.gradle.kts +++ b/instrumentation/log4j/log4j-2.13.2/javaagent/build.gradle.kts @@ -36,7 +36,7 @@ tasks { // Threadlocals are always false if is.webapp is true, so we make sure to override it because as of // now testing-common includes jetty / servlet. - named("test") { + test { jvmArgs("-Dlog4j2.is.webapp=false") jvmArgs("-Dlog4j2.enable.threadlocals=true") } diff --git a/instrumentation/mongo/mongo-3.1/javaagent/build.gradle.kts b/instrumentation/mongo/mongo-3.1/javaagent/build.gradle.kts index f70dac16ec..dd3258c61e 100644 --- a/instrumentation/mongo/mongo-3.1/javaagent/build.gradle.kts +++ b/instrumentation/mongo/mongo-3.1/javaagent/build.gradle.kts @@ -20,7 +20,7 @@ dependencies { } tasks { - named("test") { + test { usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService()) } } diff --git a/instrumentation/mongo/mongo-3.1/library/build.gradle.kts b/instrumentation/mongo/mongo-3.1/library/build.gradle.kts index accaeb62f5..888c834826 100644 --- a/instrumentation/mongo/mongo-3.1/library/build.gradle.kts +++ b/instrumentation/mongo/mongo-3.1/library/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { } tasks { - named("test") { + test { usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService()) } } diff --git a/instrumentation/mongo/mongo-3.7/javaagent/build.gradle.kts b/instrumentation/mongo/mongo-3.7/javaagent/build.gradle.kts index 9bc3f52b36..8cc0b240ae 100644 --- a/instrumentation/mongo/mongo-3.7/javaagent/build.gradle.kts +++ b/instrumentation/mongo/mongo-3.7/javaagent/build.gradle.kts @@ -30,7 +30,7 @@ dependencies { } tasks { - named("test") { + test { usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService()) } } diff --git a/instrumentation/mongo/mongo-4.0/javaagent/build.gradle.kts b/instrumentation/mongo/mongo-4.0/javaagent/build.gradle.kts index ec4048c43d..af86d0b012 100644 --- a/instrumentation/mongo/mongo-4.0/javaagent/build.gradle.kts +++ b/instrumentation/mongo/mongo-4.0/javaagent/build.gradle.kts @@ -24,7 +24,7 @@ dependencies { } tasks { - named("test") { + test { usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService()) } } diff --git a/instrumentation/mongo/mongo-async-3.3/javaagent/build.gradle.kts b/instrumentation/mongo/mongo-async-3.3/javaagent/build.gradle.kts index fbc244fefd..7fcdda50e1 100644 --- a/instrumentation/mongo/mongo-async-3.3/javaagent/build.gradle.kts +++ b/instrumentation/mongo/mongo-async-3.3/javaagent/build.gradle.kts @@ -23,7 +23,7 @@ dependencies { } tasks { - named("test") { + test { usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService()) } } diff --git a/instrumentation/netty/netty-4.0/javaagent/build.gradle.kts b/instrumentation/netty/netty-4.0/javaagent/build.gradle.kts index 1ffac2b087..165aa43bde 100644 --- a/instrumentation/netty/netty-4.0/javaagent/build.gradle.kts +++ b/instrumentation/netty/netty-4.0/javaagent/build.gradle.kts @@ -39,7 +39,7 @@ tasks { jvmArgs("-Dotel.instrumentation.netty.always-create-connect-span=true") } - named("test") { + test { dependsOn(testConnectionSpan) filter { excludeTestsMatching("Netty40ConnectionSpanTest") diff --git a/instrumentation/netty/netty-4.1/javaagent/build.gradle.kts b/instrumentation/netty/netty-4.1/javaagent/build.gradle.kts index 848c5485c3..8ebea2fd47 100644 --- a/instrumentation/netty/netty-4.1/javaagent/build.gradle.kts +++ b/instrumentation/netty/netty-4.1/javaagent/build.gradle.kts @@ -52,7 +52,7 @@ tasks { jvmArgs("-Dotel.instrumentation.netty.always-create-connect-span=true") } - named("test") { + test { systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) dependsOn(testConnectionSpan) diff --git a/instrumentation/opentelemetry-annotations-1.0/javaagent/build.gradle.kts b/instrumentation/opentelemetry-annotations-1.0/javaagent/build.gradle.kts index 763e68fff0..2dbaf22dc4 100644 --- a/instrumentation/opentelemetry-annotations-1.0/javaagent/build.gradle.kts +++ b/instrumentation/opentelemetry-annotations-1.0/javaagent/build.gradle.kts @@ -26,7 +26,7 @@ tasks { compileTestJava { options.compilerArgs.add("-parameters") } - named("test") { + test { jvmArgs("-Dotel.instrumentation.opentelemetry-annotations.exclude-methods=io.opentelemetry.test.annotation.TracedWithSpan[ignored]") } } diff --git a/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/build.gradle.kts b/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/build.gradle.kts index c04340f218..acc4ddf08d 100644 --- a/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/build.gradle.kts +++ b/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/build.gradle.kts @@ -36,7 +36,7 @@ tasks { jvmArgs("-Dotel.instrumentation.netty.always-create-connect-span=true") } - named("test") { + test { dependsOn(testConnectionSpan) filter { excludeTestsMatching("ReactorNettyConnectionSpanTest") diff --git a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/build.gradle.kts b/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/build.gradle.kts index 403f7947ea..e70eaae9f2 100644 --- a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/build.gradle.kts +++ b/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/build.gradle.kts @@ -35,7 +35,7 @@ tasks { jvmArgs("-Dotel.instrumentation.reactor-netty.always-create-connect-span=true") } - named("test") { + test { dependsOn(testConnectionSpan) filter { excludeTestsMatching("ReactorNettyConnectionSpanTest") diff --git a/instrumentation/rediscala-1.8/javaagent/build.gradle.kts b/instrumentation/rediscala-1.8/javaagent/build.gradle.kts index ec69c9e179..c09ba44c05 100644 --- a/instrumentation/rediscala-1.8/javaagent/build.gradle.kts +++ b/instrumentation/rediscala-1.8/javaagent/build.gradle.kts @@ -51,7 +51,7 @@ dependencies { } tasks { - named("test") { + test { usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService()) } } diff --git a/instrumentation/redisson-3.0/javaagent/build.gradle.kts b/instrumentation/redisson-3.0/javaagent/build.gradle.kts index 5fb71c9058..3606c0e8e8 100644 --- a/instrumentation/redisson-3.0/javaagent/build.gradle.kts +++ b/instrumentation/redisson-3.0/javaagent/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { annotationProcessor("com.google.auto.value:auto-value") } -tasks.named("test") { +tasks.test { systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService()) } diff --git a/instrumentation/rmi/javaagent/build.gradle.kts b/instrumentation/rmi/javaagent/build.gradle.kts index 754768ef73..e6229e63e2 100644 --- a/instrumentation/rmi/javaagent/build.gradle.kts +++ b/instrumentation/rmi/javaagent/build.gradle.kts @@ -22,10 +22,19 @@ tasks { File(System.getProperty("java.home"), it).absoluteFile }.find { it.isFile() }?.let(File::toString) ?: "rmic" - commandLine(rmicBinaryPath, "-g", "-keep", "-classpath", sourceSets.test.get().output.classesDirs.asPath, "-d", "$buildDir/classes/java/test", clazz) + commandLine( + rmicBinaryPath, + "-g", + "-keep", + "-classpath", + sourceSets.test.get().output.classesDirs.asPath, + "-d", + "$buildDir/classes/java/test", + clazz + ) } - named("test") { + test { dependsOn(rmic) } } @@ -52,7 +61,9 @@ tasks { jvmArgs("-Djava.rmi.server.hostname=127.0.0.1") // Can only export on Java 9+ - val testJavaVersion = gradle.startParameter.projectProperties.get("testJavaVersion")?.let(JavaVersion::toVersion) ?: JavaVersion.current() + val testJavaVersion = + gradle.startParameter.projectProperties.get("testJavaVersion")?.let(JavaVersion::toVersion) + ?: JavaVersion.current() if (testJavaVersion.isJava9Compatible) { jvmArgs("--add-exports=java.rmi/sun.rmi.server=ALL-UNNAMED") jvmArgs("--add-exports=java.rmi/sun.rmi.transport=ALL-UNNAMED") diff --git a/instrumentation/scala-executors/javaagent/build.gradle.kts b/instrumentation/scala-executors/javaagent/build.gradle.kts index 61bc2f815f..bdc6656cf1 100644 --- a/instrumentation/scala-executors/javaagent/build.gradle.kts +++ b/instrumentation/scala-executors/javaagent/build.gradle.kts @@ -44,7 +44,7 @@ tasks { classpath = classpath.plus(files(sourceSets["slickTest"].scala.classesDirectory)) } - named("test") { + test { dependsOn(slickTest) } } diff --git a/instrumentation/spring/spring-batch-3.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-batch-3.0/javaagent/build.gradle.kts index e79618e962..1a28da8c13 100644 --- a/instrumentation/spring/spring-batch-3.0/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-batch-3.0/javaagent/build.gradle.kts @@ -39,7 +39,7 @@ tasks { jvmArgs("-Dotel.instrumentation.spring-batch.item.enabled=true") } - named("test") { + test { dependsOn(testChunkRootSpan) dependsOn(testItemLevelSpan) filter { diff --git a/instrumentation/spring/spring-integration-4.1/javaagent/build.gradle.kts b/instrumentation/spring/spring-integration-4.1/javaagent/build.gradle.kts index 2445e6fb1e..43575a9f2a 100644 --- a/instrumentation/spring/spring-integration-4.1/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-integration-4.1/javaagent/build.gradle.kts @@ -45,7 +45,7 @@ tasks { jvmArgs("-Dotel.instrumentation.spring-rabbit.enabled=true") } - named("test") { + test { dependsOn(testWithRabbitInstrumentation) filter { diff --git a/instrumentation/spring/spring-integration-4.1/library/build.gradle.kts b/instrumentation/spring/spring-integration-4.1/library/build.gradle.kts index 697d383361..750aec6d19 100644 --- a/instrumentation/spring/spring-integration-4.1/library/build.gradle.kts +++ b/instrumentation/spring/spring-integration-4.1/library/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { } tasks { - named("test") { + test { systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService()) } diff --git a/instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts b/instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts index 07edbfb9a8..73211af615 100644 --- a/instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts @@ -28,7 +28,7 @@ dependencies { } tasks { - named("test") { + test { usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) // TODO run tests both with and without experimental span attributes diff --git a/instrumentation/spring/spring-rabbit-1.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-rabbit-1.0/javaagent/build.gradle.kts index 57f3d4ab25..09f0bf3729 100644 --- a/instrumentation/spring/spring-rabbit-1.0/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-rabbit-1.0/javaagent/build.gradle.kts @@ -24,7 +24,7 @@ dependencies { } tasks { - named("test") { + test { usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService()) } } diff --git a/instrumentation/spring/spring-webmvc-3.1/wildfly-testing/build.gradle.kts b/instrumentation/spring/spring-webmvc-3.1/wildfly-testing/build.gradle.kts index 44b7a79dbf..025a4332aa 100644 --- a/instrumentation/spring/spring-webmvc-3.1/wildfly-testing/build.gradle.kts +++ b/instrumentation/spring/spring-webmvc-3.1/wildfly-testing/build.gradle.kts @@ -58,7 +58,7 @@ tasks { from(appLibrary).into("$buildDir/app-libs") } - named("test") { + test { dependsOn(modifyLogbackJar) dependsOn(setupServer) dependsOn(copyDependencies) diff --git a/instrumentation/vaadin-14.2/javaagent/build.gradle.kts b/instrumentation/vaadin-14.2/javaagent/build.gradle.kts index 0421ac840f..66b854f7b2 100644 --- a/instrumentation/vaadin-14.2/javaagent/build.gradle.kts +++ b/instrumentation/vaadin-14.2/javaagent/build.gradle.kts @@ -40,7 +40,7 @@ tasks { val vaadin16Test by existing val vaadin14LatestTest by existing - named("test") { + test { dependsOn(vaadin142Test) dependsOn(vaadin16Test) if (findProperty("testLatestDeps") as Boolean) { diff --git a/instrumentation/vertx-http-client/vertx-http-client-3.0/javaagent/build.gradle.kts b/instrumentation/vertx-http-client/vertx-http-client-3.0/javaagent/build.gradle.kts index a304c75acd..5c29119402 100644 --- a/instrumentation/vertx-http-client/vertx-http-client-3.0/javaagent/build.gradle.kts +++ b/instrumentation/vertx-http-client/vertx-http-client-3.0/javaagent/build.gradle.kts @@ -27,7 +27,7 @@ dependencies { } tasks { - named("test") { + test { systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) } } diff --git a/instrumentation/vertx-reactive-3.5/javaagent/build.gradle.kts b/instrumentation/vertx-reactive-3.5/javaagent/build.gradle.kts index 07cc8bc142..7884a747df 100644 --- a/instrumentation/vertx-reactive-3.5/javaagent/build.gradle.kts +++ b/instrumentation/vertx-reactive-3.5/javaagent/build.gradle.kts @@ -17,7 +17,7 @@ testSets { } tasks { - named("test") { + test { dependsOn("version35Test") } } diff --git a/instrumentation/vertx-web-3.0/javaagent/build.gradle.kts b/instrumentation/vertx-web-3.0/javaagent/build.gradle.kts index ca5ff45417..39843a063d 100644 --- a/instrumentation/vertx-web-3.0/javaagent/build.gradle.kts +++ b/instrumentation/vertx-web-3.0/javaagent/build.gradle.kts @@ -18,7 +18,7 @@ testSets { } tasks { - named("test") { + test { dependsOn("version3Test") } }