withType

trask · trask · commit a9d3395d70d3 · 2024-11-09T12:22:27.000-08:00
diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/build.gradle.kts b/instrumentation/cassandra/cassandra-4.0/javaagent/build.gradle.kts
@@ -24,7 +24,7 @@ dependencies {
 }
 
 tasks {
-  test {
+  withType<Test>().configureEach {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
 
diff --git a/instrumentation/cassandra/cassandra-4.4/javaagent/build.gradle.kts b/instrumentation/cassandra/cassandra-4.4/javaagent/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
 }
 
 tasks {
-  test {
+  withType<Test>().configureEach {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
 
diff --git a/instrumentation/cassandra/cassandra-4.4/library/build.gradle.kts b/instrumentation/cassandra/cassandra-4.4/library/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
 }
 
 tasks {
-  test {
+  withType<Test>().configureEach {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
 
diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts
@@ -32,17 +32,14 @@ dependencies {
 }
 
 tasks {
-  test {
+  withType<Test>().configureEach {
     // required on jdk17
     jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
     jvmArgs("--add-opens=java.base/java.lang.invoke=ALL-UNNAMED")
     jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
   }
 
   val testStableSemconv by registering(Test::class) {
-    jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
-    jvmArgs("--add-opens=java.base/java.lang.invoke=ALL-UNNAMED")
-    jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
     jvmArgs("-Dotel.semconv-stability.opt-in=database")
   }
 
diff --git a/instrumentation/couchbase/couchbase-2.6/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-2.6/javaagent/build.gradle.kts
@@ -35,7 +35,7 @@ dependencies {
 }
 
 tasks {
-  test {
+  withType<Test>().configureEach {
     // TODO run tests both with and without experimental span attributes
     jvmArgs("-Dotel.instrumentation.couchbase.experimental-span-attributes=true")
 
@@ -45,9 +45,6 @@ tasks {
   }
 
   val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.instrumentation.couchbase.experimental-span-attributes=true")
-    jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
-    jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
     jvmArgs("-Dotel.semconv-stability.opt-in=database")
   }
 
diff --git a/instrumentation/couchbase/couchbase-3.1.6/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-3.1.6/javaagent/build.gradle.kts
@@ -39,7 +39,7 @@ dependencies {
 }
 
 tasks {
-  test {
+  withType<Test>().configureEach {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
 
diff --git a/instrumentation/couchbase/couchbase-3.1/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-3.1/javaagent/build.gradle.kts
@@ -40,7 +40,7 @@ dependencies {
 }
 
 tasks {
-  test {
+  withType<Test>().configureEach {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
 
diff --git a/instrumentation/couchbase/couchbase-3.2/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-3.2/javaagent/build.gradle.kts
@@ -37,7 +37,7 @@ dependencies {
 }
 
 tasks {
-  test {
+  withType<Test>().configureEach {
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
diff --git a/instrumentation/influxdb-2.4/javaagent/build.gradle.kts b/instrumentation/influxdb-2.4/javaagent/build.gradle.kts
@@ -48,14 +48,13 @@ tasks {
 }
 
 tasks {
-  test {
+  withType<Test>().configureEach {
     // we disable the okhttp instrumentation, so we don't need to assert on the okhttp spans
     // from the okhttp instrumentation we need OkHttp3IgnoredTypesConfigurer to fix context leaks
     jvmArgs("-Dotel.instrumentation.okhttp.enabled=false")
   }
 
   val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.instrumentation.okhttp.enabled=false")
     jvmArgs("-Dotel.semconv-stability.opt-in=database")
   }
 
diff --git a/instrumentation/jedis/jedis-1.4/javaagent/build.gradle.kts b/instrumentation/jedis/jedis-1.4/javaagent/build.gradle.kts
@@ -39,7 +39,7 @@ testing {
 }
 
 tasks {
-  test {
+  withType<Test>().configureEach {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
 
diff --git a/instrumentation/jedis/jedis-3.0/javaagent/build.gradle.kts b/instrumentation/jedis/jedis-3.0/javaagent/build.gradle.kts
@@ -29,7 +29,7 @@ dependencies {
 }
 
 tasks {
-  test {
+  withType<Test>().configureEach {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
 
diff --git a/instrumentation/jedis/jedis-4.0/javaagent/build.gradle.kts b/instrumentation/jedis/jedis-4.0/javaagent/build.gradle.kts
@@ -25,7 +25,7 @@ dependencies {
 }
 
 tasks {
-  test {
+  withType<Test>().configureEach {
     // latest dep test fails because peer ip is 0:0:0:0:0:0:0:1 instead of 127.0.0.1
     jvmArgs("-Djava.net.preferIPv4Stack=true")
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/build.gradle.kts b/instrumentation/lettuce/lettuce-4.0/javaagent/build.gradle.kts
@@ -18,16 +18,14 @@ dependencies {
 }
 
 tasks {
-  test {
+  withType<Test>().configureEach {
     // TODO run tests both with and without experimental span attributes
     jvmArgs("-Dotel.instrumentation.lettuce.experimental-span-attributes=true")
     jvmArgs("-Dotel.instrumentation.lettuce.connection-telemetry.enabled=true")
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
 
   val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.instrumentation.lettuce.experimental-span-attributes=true")
-    jvmArgs("-Dotel.instrumentation.lettuce.connection-telemetry.enabled=true")
     jvmArgs("-Dotel.semconv-stability.opt-in=database")
   }
 
diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/build.gradle.kts b/instrumentation/lettuce/lettuce-5.0/javaagent/build.gradle.kts
@@ -23,16 +23,14 @@ dependencies {
 }
 
 tasks {
-  test {
+  withType<Test>().configureEach {
     // TODO run tests both with and without experimental span attributes
     jvmArgs("-Dotel.instrumentation.lettuce.experimental-span-attributes=true")
     jvmArgs("-Dotel.instrumentation.lettuce.connection-telemetry.enabled=true")
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
 
   val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.instrumentation.lettuce.experimental-span-attributes=true")
-    jvmArgs("-Dotel.instrumentation.lettuce.connection-telemetry.enabled=true")
     jvmArgs("-Dotel.semconv-stability.opt-in=database")
   }
 
diff --git 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 {
-  test {
+  withType<Test>().configureEach {
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
diff --git 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 {
-  test {
+  withType<Test>().configureEach {
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
diff --git a/instrumentation/mongo/mongo-3.1/javaagent/build.gradle.kts b/instrumentation/mongo/mongo-3.1/javaagent/build.gradle.kts
@@ -24,7 +24,7 @@ dependencies {
 }
 
 tasks {
-  test {
+  withType<Test>().configureEach {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
 
diff --git a/instrumentation/mongo/mongo-3.1/library/build.gradle.kts b/instrumentation/mongo/mongo-3.1/library/build.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
 }
 
 tasks {
-  test {
+  withType<Test>().configureEach {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
 
diff --git a/instrumentation/mongo/mongo-3.7/javaagent/build.gradle.kts b/instrumentation/mongo/mongo-3.7/javaagent/build.gradle.kts
@@ -34,7 +34,7 @@ dependencies {
 }
 
 tasks {
-  test {
+  withType<Test>().configureEach {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
 
diff --git a/instrumentation/mongo/mongo-4.0/javaagent/build.gradle.kts b/instrumentation/mongo/mongo-4.0/javaagent/build.gradle.kts
@@ -28,7 +28,7 @@ dependencies {
 }
 
 tasks {
-  test {
+  withType<Test>().configureEach {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
 
diff --git a/instrumentation/mongo/mongo-async-3.3/javaagent/build.gradle.kts b/instrumentation/mongo/mongo-async-3.3/javaagent/build.gradle.kts
@@ -25,7 +25,7 @@ dependencies {
 }
 
 tasks {
-  test {
+  withType<Test>().configureEach {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
 
diff --git a/instrumentation/r2dbc-1.0/javaagent/build.gradle.kts b/instrumentation/r2dbc-1.0/javaagent/build.gradle.kts
@@ -31,7 +31,7 @@ dependencies {
 }
 
 tasks {
-  test {
+  withType<Test>().configureEach {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
 
diff --git a/instrumentation/r2dbc-1.0/library/build.gradle.kts b/instrumentation/r2dbc-1.0/library/build.gradle.kts
@@ -11,7 +11,7 @@ dependencies {
 }
 
 tasks {
-  test {
+  withType<Test>().configureEach {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
 
diff --git a/instrumentation/redisson/redisson-3.17/javaagent/build.gradle.kts b/instrumentation/redisson/redisson-3.17/javaagent/build.gradle.kts
@@ -25,7 +25,7 @@ dependencies {
 }
 
 tasks {
-  test {
+  withType<Test>().configureEach {
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ dependencies {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`tasks {`
`27`		`- test {`
	`27`	`+ withType<Test>().configureEach {`
`28`	`28`	`usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ dependencies {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`tasks {`
`30`		`- test {`
	`30`	`+ withType<Test>().configureEach {`
`31`	`31`	`usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ dependencies {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`tasks {`
`15`		`- test {`
	`15`	`+ withType<Test>().configureEach {`
`16`	`16`	`usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)`
`17`	`17`	`}`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -32,17 +32,14 @@ dependencies {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`tasks {`
`35`		`- test {`
	`35`	`+ withType<Test>().configureEach {`
`36`	`36`	`// required on jdk17`
`37`	`37`	`jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")`
`38`	`38`	`jvmArgs("--add-opens=java.base/java.lang.invoke=ALL-UNNAMED")`
`39`	`39`	`jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`val testStableSemconv by registering(Test::class) {`
`43`		`- jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")`
`44`		`- jvmArgs("--add-opens=java.base/java.lang.invoke=ALL-UNNAMED")`
`45`		`- jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")`
`46`	`43`	`jvmArgs("-Dotel.semconv-stability.opt-in=database")`
`47`	`44`	`}`
`48`	`45`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ dependencies {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`tasks {`
`38`		`- test {`
	`38`	`+ withType<Test>().configureEach {`
`39`	`39`	`// TODO run tests both with and without experimental span attributes`
`40`	`40`	`jvmArgs("-Dotel.instrumentation.couchbase.experimental-span-attributes=true")`
`41`	`41`
`@@ -45,9 +45,6 @@ tasks {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`val testStableSemconv by registering(Test::class) {`
`48`		`- jvmArgs("-Dotel.instrumentation.couchbase.experimental-span-attributes=true")`
`49`		`- jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")`
`50`		`- jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")`
`51`	`48`	`jvmArgs("-Dotel.semconv-stability.opt-in=database")`
`52`	`49`	`}`
`53`	`50`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ dependencies {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`tasks {`
`42`		`- test {`
	`42`	`+ withType<Test>().configureEach {`
`43`	`43`	`usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ dependencies {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`tasks {`
`43`		`- test {`
	`43`	`+ withType<Test>().configureEach {`
`44`	`44`	`usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ dependencies {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`tasks {`
`40`		`- test {`
	`40`	`+ withType<Test>().configureEach {`
`41`	`41`	`systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)`
`42`	`42`	`usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,14 +48,13 @@ tasks {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`tasks {`
`51`		`- test {`
	`51`	`+ withType<Test>().configureEach {`
`52`	`52`	`// we disable the okhttp instrumentation, so we don't need to assert on the okhttp spans`
`53`	`53`	`// from the okhttp instrumentation we need OkHttp3IgnoredTypesConfigurer to fix context leaks`
`54`	`54`	`jvmArgs("-Dotel.instrumentation.okhttp.enabled=false")`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`val testStableSemconv by registering(Test::class) {`
`58`		`- jvmArgs("-Dotel.instrumentation.okhttp.enabled=false")`
`59`	`58`	`jvmArgs("-Dotel.semconv-stability.opt-in=database")`
`60`	`59`	`}`
`61`	`60`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ testing {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`tasks {`
`42`		`- test {`
	`42`	`+ withType<Test>().configureEach {`
`43`	`43`	`usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)`
`44`	`44`	`}`
`45`	`45`