gradle

trask · trask · commit 7490037eef82 · 2024-11-09T11:25:43.000-08:00
diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/build.gradle.kts b/instrumentation/cassandra/cassandra-3.0/javaagent/build.gradle.kts
@@ -44,14 +44,14 @@ dependencies {
 configurations.testRuntimeClasspath.get().resolutionStrategy.force("com.google.guava:guava:19.0")
 
 tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=database")
-  }
-
   withType<Test>().configureEach {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
 
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
   check {
     dependsOn(testStableSemconv)
   }
diff --git a/instrumentation/cassandra/cassandra-4.4/javaagent/build.gradle.kts b/instrumentation/cassandra/cassandra-4.4/javaagent/build.gradle.kts
@@ -30,4 +30,12 @@ tasks {
   test {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
diff --git a/instrumentation/cassandra/cassandra-4.4/library/build.gradle.kts b/instrumentation/cassandra/cassandra-4.4/library/build.gradle.kts
@@ -12,6 +12,10 @@ dependencies {
 }
 
 tasks {
+  test {
+    usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
+  }
+
   val testStableSemconv by registering(Test::class) {
     jvmArgs("-Dotel.semconv-stability.opt-in=database")
   }
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,17 @@ dependencies {
 }
 
 tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=database")
-  }
-
-  withType<Test>().configureEach {
+  test {
     // 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("-Dotel.semconv-stability.opt-in=database")
+  }
+
   check {
     dependsOn(testStableSemconv)
   }
diff --git a/instrumentation/couchbase/couchbase-2.6/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-2.6/javaagent/build.gradle.kts
@@ -35,11 +35,7 @@ dependencies {
 }
 
 tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=database")
-  }
-
-  withType<Test>().configureEach {
+  test {
     // TODO run tests both with and without experimental span attributes
     jvmArgs("-Dotel.instrumentation.couchbase.experimental-span-attributes=true")
 
@@ -48,6 +44,10 @@ tasks {
     jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
   }
 
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
   check {
     dependsOn(testStableSemconv)
   }
diff --git a/instrumentation/couchbase/couchbase-3.1.6/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-3.1.6/javaagent/build.gradle.kts
@@ -42,4 +42,12 @@ tasks {
   test {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
diff --git a/instrumentation/couchbase/couchbase-3.1/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-3.1/javaagent/build.gradle.kts
@@ -43,4 +43,12 @@ tasks {
   test {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
diff --git a/instrumentation/couchbase/couchbase-3.2/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-3.2/javaagent/build.gradle.kts
@@ -41,4 +41,12 @@ tasks {
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
diff --git a/instrumentation/geode-1.4/javaagent/build.gradle.kts b/instrumentation/geode-1.4/javaagent/build.gradle.kts
@@ -16,3 +16,13 @@ dependencies {
   compileOnly("com.google.auto.value:auto-value-annotations")
   annotationProcessor("com.google.auto.value:auto-value")
 }
+
+tasks {
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
+}
diff --git a/instrumentation/influxdb-2.4/javaagent/build.gradle.kts b/instrumentation/influxdb-2.4/javaagent/build.gradle.kts
@@ -47,8 +47,18 @@ tasks {
   }
 }
 
-tasks.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")
+tasks {
+  test {
+    // 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.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
diff --git a/instrumentation/jedis/jedis-3.0/javaagent/build.gradle.kts b/instrumentation/jedis/jedis-3.0/javaagent/build.gradle.kts
@@ -32,4 +32,12 @@ tasks {
   test {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
diff --git a/instrumentation/jedis/jedis-4.0/javaagent/build.gradle.kts b/instrumentation/jedis/jedis-4.0/javaagent/build.gradle.kts
@@ -30,4 +30,12 @@ tasks {
     jvmArgs("-Djava.net.preferIPv4Stack=true")
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/build.gradle.kts b/instrumentation/lettuce/lettuce-4.0/javaagent/build.gradle.kts
@@ -17,9 +17,19 @@ dependencies {
   latestDepTestLibrary("biz.paluch.redis:lettuce:4.+") // see lettuce-5.0 module
 }
 
-tasks.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)
+tasks {
+  test {
+    usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
+    // 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")
+  }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/build.gradle.kts b/instrumentation/lettuce/lettuce-5.0/javaagent/build.gradle.kts
@@ -22,9 +22,19 @@ dependencies {
   latestDepTestLibrary("io.lettuce:lettuce-core:5.0.+") // see lettuce-5.1 module
 }
 
-tasks.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)
+tasks {
+  test {
+    usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
+    // 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")
+  }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
diff --git a/instrumentation/lettuce/lettuce-5.1/javaagent/build.gradle.kts b/instrumentation/lettuce/lettuce-5.1/javaagent/build.gradle.kts
@@ -28,4 +28,12 @@ tasks {
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
diff --git a/instrumentation/lettuce/lettuce-5.1/library/build.gradle.kts b/instrumentation/lettuce/lettuce-5.1/library/build.gradle.kts
@@ -17,4 +17,12 @@ tasks {
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
diff --git a/instrumentation/mongo/mongo-3.1/javaagent/build.gradle.kts b/instrumentation/mongo/mongo-3.1/javaagent/build.gradle.kts
@@ -27,4 +27,12 @@ tasks {
   test {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
diff --git a/instrumentation/mongo/mongo-3.1/library/build.gradle.kts b/instrumentation/mongo/mongo-3.1/library/build.gradle.kts
@@ -16,4 +16,12 @@ tasks {
   test {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
diff --git a/instrumentation/mongo/mongo-3.7/javaagent/build.gradle.kts b/instrumentation/mongo/mongo-3.7/javaagent/build.gradle.kts
@@ -37,4 +37,12 @@ tasks {
   test {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
diff --git a/instrumentation/mongo/mongo-4.0/javaagent/build.gradle.kts b/instrumentation/mongo/mongo-4.0/javaagent/build.gradle.kts
@@ -31,4 +31,12 @@ tasks {
   test {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
diff --git a/instrumentation/mongo/mongo-async-3.3/javaagent/build.gradle.kts b/instrumentation/mongo/mongo-async-3.3/javaagent/build.gradle.kts
@@ -28,4 +28,12 @@ tasks {
   test {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
diff --git a/instrumentation/r2dbc-1.0/javaagent/build.gradle.kts b/instrumentation/r2dbc-1.0/javaagent/build.gradle.kts
@@ -30,6 +30,17 @@ dependencies {
   testInstrumentation(project(":instrumentation:reactor:reactor-3.1:javaagent"))
 }
 
-tasks.withType<Test>().configureEach {
-  usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
+
+tasks {
+  test {
+    usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
+  }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
diff --git a/instrumentation/r2dbc-1.0/library/build.gradle.kts b/instrumentation/r2dbc-1.0/library/build.gradle.kts
@@ -10,6 +10,16 @@ dependencies {
   testImplementation(project(":instrumentation:reactor:reactor-3.1:library"))
 }
 
-tasks.withType<Test>().configureEach {
-  usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
+tasks {
+  test {
+    usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
+  }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,12 @@ tasks {`
`30`	`30`	`test {`
`31`	`31`	`usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)`
`32`	`32`	`}`
	`33`	`+`
	`34`	`+ val testStableSemconv by registering(Test::class) {`
	`35`	`+ jvmArgs("-Dotel.semconv-stability.opt-in=database")`
	`36`	`+ }`
	`37`	`+`
	`38`	`+ check {`
	`39`	`+ dependsOn(testStableSemconv)`
	`40`	`+ }`
`33`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,10 @@ dependencies {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`tasks {`
	`15`	`+ test {`
	`16`	`+ usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)`
	`17`	`+ }`
	`18`	`+`
`15`	`19`	`val testStableSemconv by registering(Test::class) {`
`16`	`20`	`jvmArgs("-Dotel.semconv-stability.opt-in=database")`
`17`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,4 +42,12 @@ tasks {`
`42`	`42`	`test {`
`43`	`43`	`usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)`
`44`	`44`	`}`
	`45`	`+`
	`46`	`+ val testStableSemconv by registering(Test::class) {`
	`47`	`+ jvmArgs("-Dotel.semconv-stability.opt-in=database")`
	`48`	`+ }`
	`49`	`+`
	`50`	`+ check {`
	`51`	`+ dependsOn(testStableSemconv)`
	`52`	`+ }`
`45`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,4 +43,12 @@ tasks {`
`43`	`43`	`test {`
`44`	`44`	`usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)`
`45`	`45`	`}`
	`46`	`+`
	`47`	`+ val testStableSemconv by registering(Test::class) {`
	`48`	`+ jvmArgs("-Dotel.semconv-stability.opt-in=database")`
	`49`	`+ }`
	`50`	`+`
	`51`	`+ check {`
	`52`	`+ dependsOn(testStableSemconv)`
	`53`	`+ }`
`46`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,4 +41,12 @@ tasks {`
`41`	`41`	`systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)`
`42`	`42`	`usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)`
`43`	`43`	`}`
	`44`	`+`
	`45`	`+ val testStableSemconv by registering(Test::class) {`
	`46`	`+ jvmArgs("-Dotel.semconv-stability.opt-in=database")`
	`47`	`+ }`
	`48`	`+`
	`49`	`+ check {`
	`50`	`+ dependsOn(testStableSemconv)`
	`51`	`+ }`
`44`	`52`	`}`