more gradle

trask · trask · commit 59098a3cbecf · 2024-11-09T12:30:00.000-08:00
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts
@@ -164,4 +164,12 @@ tasks {
       include("software/amazon/awssdk/global/handlers/execution.interceptors")
     }
   }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/build.gradle.kts
@@ -31,4 +31,12 @@ tasks {
     systemProperty("otel.instrumentation.messaging.experimental.capture-headers", "test-message-header")
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
   }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
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
@@ -72,4 +72,12 @@ tasks {
     systemProperty("otel.instrumentation.aws-sdk.experimental-span-attributes", true)
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
   }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
diff --git a/instrumentation/camel-2.20/javaagent/build.gradle.kts b/instrumentation/camel-2.20/javaagent/build.gradle.kts
@@ -79,6 +79,14 @@ tasks {
 
     jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
   }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
 
 configurations.testRuntimeClasspath {
diff --git a/instrumentation/clickhouse-client-0.5/javaagent/build.gradle.kts b/instrumentation/clickhouse-client-0.5/javaagent/build.gradle.kts
@@ -25,4 +25,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/hibernate/hibernate-3.3/javaagent/build.gradle.kts b/instrumentation/hibernate/hibernate-3.3/javaagent/build.gradle.kts
@@ -48,10 +48,20 @@ if (findProperty("testLatestDeps") as Boolean) {
   }
 }
 
-tasks.withType<Test>().configureEach {
-  // TODO run tests both with and without experimental span attributes
-  jvmArgs("-Dotel.instrumentation.hibernate.experimental-span-attributes=true")
-  // required on jdk17
-  jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
-  jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+tasks {
+  withType<Test>().configureEach {
+    // TODO run tests both with and without experimental span attributes
+    jvmArgs("-Dotel.instrumentation.hibernate.experimental-span-attributes=true")
+    // required on jdk17
+    jvmArgs("--add-opens=java.base/java.lang=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/hibernate/hibernate-4.0/javaagent/build.gradle.kts b/instrumentation/hibernate/hibernate-4.0/javaagent/build.gradle.kts
@@ -71,20 +71,25 @@ testing {
   }
 }
 
-tasks.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")
+tasks {
+  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")
 
-  // TODO run tests both with and without experimental span attributes
-  jvmArgs("-Dotel.instrumentation.hibernate.experimental-span-attributes=true")
+    // TODO run tests both with and without experimental span attributes
+    jvmArgs("-Dotel.instrumentation.hibernate.experimental-span-attributes=true")
 
-  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
-}
+    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+  }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
 
-tasks {
   check {
     dependsOn(testing.suites)
+    dependsOn(testStableSemconv)
   }
 }
diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/build.gradle.kts b/instrumentation/hibernate/hibernate-6.0/javaagent/build.gradle.kts
@@ -35,7 +35,17 @@ otelJava {
   minJavaVersionSupported.set(JavaVersion.VERSION_11)
 }
 
-tasks.withType<Test>().configureEach {
-  // TODO run tests both with and without experimental span attributes
-  jvmArgs("-Dotel.instrumentation.hibernate.experimental-span-attributes=true")
+tasks {
+  withType<Test>().configureEach {
+    // TODO run tests both with and without experimental span attributes
+    jvmArgs("-Dotel.instrumentation.hibernate.experimental-span-attributes=true")
+  }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
diff --git a/instrumentation/hibernate/hibernate-6.0/spring-testing/build.gradle.kts b/instrumentation/hibernate/hibernate-6.0/spring-testing/build.gradle.kts
@@ -26,11 +26,21 @@ otelJava {
   minJavaVersionSupported.set(JavaVersion.VERSION_17)
 }
 
-tasks.withType<Test>().configureEach {
-  jvmArgs("-javaagent:" + springAgent.singleFile.absolutePath)
+tasks {
+  withType<Test>().configureEach {
+    jvmArgs("-javaagent:" + springAgent.singleFile.absolutePath)
 
-  // TODO run tests both with and without experimental span attributes
-  jvmArgs("-Dotel.instrumentation.hibernate.experimental-span-attributes=true")
+    // TODO run tests both with and without experimental span attributes
+    jvmArgs("-Dotel.instrumentation.hibernate.experimental-span-attributes=true")
 
-  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+  }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
diff --git a/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/build.gradle.kts b/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/build.gradle.kts
@@ -31,7 +31,17 @@ dependencies {
   latestDepTestLibrary("org.hibernate:hibernate-entitymanager:5.+") // documented limitation
 }
 
-tasks.withType<Test>().configureEach {
-  // TODO run tests both with and without experimental span attributes
-  jvmArgs("-Dotel.instrumentation.hibernate.experimental-span-attributes=true")
+tasks {
+  withType<Test>().configureEach {
+    // TODO run tests both with and without experimental span attributes
+    jvmArgs("-Dotel.instrumentation.hibernate.experimental-span-attributes=true")
+  }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
diff --git a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/build.gradle.kts b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/build.gradle.kts
@@ -79,8 +79,13 @@ tasks {
     }
   }
 
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
   check {
     dependsOn(testing.suites)
+    dependsOn(testStableSemconv)
   }
 }
 
diff --git a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/build.gradle.kts b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/build.gradle.kts
@@ -40,4 +40,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/spring/spring-boot-autoconfigure/build.gradle.kts b/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts
@@ -180,10 +180,6 @@ configurations.configureEach {
 }
 
 tasks {
-  check {
-    dependsOn(testing.suites)
-  }
-
   compileTestJava {
     options.compilerArgs.add("-parameters")
   }
@@ -215,4 +211,13 @@ tasks {
   withType(Jar::class) {
     from(sourceSets["javaSpring3"].output)
   }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testing.suites)
+    dependsOn(testStableSemconv)
+  }
 }
diff --git a/instrumentation/spring/spring-data/spring-data-1.8/javaagent/build.gradle.kts b/instrumentation/spring/spring-data/spring-data-1.8/javaagent/build.gradle.kts
@@ -52,4 +52,12 @@ tasks {
     jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
     jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
   }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
diff --git a/instrumentation/spring/spring-data/spring-data-3.0/testing/build.gradle.kts b/instrumentation/spring/spring-data/spring-data-3.0/testing/build.gradle.kts
@@ -49,7 +49,12 @@ tasks {
     jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
   }
 
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
   check {
     dependsOn(testing.suites)
+    dependsOn(testStableSemconv)
   }
 }
diff --git a/instrumentation/spymemcached-2.12/javaagent/build.gradle.kts b/instrumentation/spymemcached-2.12/javaagent/build.gradle.kts
@@ -20,8 +20,19 @@ dependencies {
   testImplementation("com.google.guava:guava")
 }
 
-tasks.withType<Test>().configureEach {
-  // TODO run tests both with and without experimental span attributes
-  jvmArgs("-Dotel.instrumentation.spymemcached.experimental-span-attributes=true")
-  usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
+tasks {
+  withType<Test>().configureEach {
+    // TODO run tests both with and without experimental span attributes
+    jvmArgs("-Dotel.instrumentation.spymemcached.experimental-span-attributes=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/vertx/vertx-sql-client-4.0/javaagent/build.gradle.kts b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/build.gradle.kts
@@ -25,6 +25,14 @@ tasks {
   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)
+  }
 }
 
 val latestDepTest = findProperty("testLatestDeps") as Boolean

Original file line number	Diff line number	Diff line change
`@@ -164,4 +164,12 @@ tasks {`
`164`	`164`	`include("software/amazon/awssdk/global/handlers/execution.interceptors")`
`165`	`165`	`}`
`166`	`166`	`}`
	`167`	`+`
	`168`	`+ val testStableSemconv by registering(Test::class) {`
	`169`	`+ jvmArgs("-Dotel.semconv-stability.opt-in=database")`
	`170`	`+ }`
	`171`	`+`
	`172`	`+ check {`
	`173`	`+ dependsOn(testStableSemconv)`
	`174`	`+ }`
`167`	`175`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,4 +31,12 @@ tasks {`
`31`	`31`	`systemProperty("otel.instrumentation.messaging.experimental.capture-headers", "test-message-header")`
`32`	`32`	`systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)`
`33`	`33`	`}`
	`34`	`+`
	`35`	`+ val testStableSemconv by registering(Test::class) {`
	`36`	`+ jvmArgs("-Dotel.semconv-stability.opt-in=database")`
	`37`	`+ }`
	`38`	`+`
	`39`	`+ check {`
	`40`	`+ dependsOn(testStableSemconv)`
	`41`	`+ }`
`34`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,4 +72,12 @@ tasks {`
`72`	`72`	`systemProperty("otel.instrumentation.aws-sdk.experimental-span-attributes", true)`
`73`	`73`	`systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)`
`74`	`74`	`}`
	`75`	`+`
	`76`	`+ val testStableSemconv by registering(Test::class) {`
	`77`	`+ jvmArgs("-Dotel.semconv-stability.opt-in=database")`
	`78`	`+ }`
	`79`	`+`
	`80`	`+ check {`
	`81`	`+ dependsOn(testStableSemconv)`
	`82`	`+ }`
`75`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,14 @@ tasks {`
`79`	`79`
`80`	`80`	`jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")`
`81`	`81`	`}`
	`82`	`+`
	`83`	`+ val testStableSemconv by registering(Test::class) {`
	`84`	`+ jvmArgs("-Dotel.semconv-stability.opt-in=database")`
	`85`	`+ }`
	`86`	`+`
	`87`	`+ check {`
	`88`	`+ dependsOn(testStableSemconv)`
	`89`	`+ }`
`82`	`90`	`}`
`83`	`91`
`84`	`92`	`configurations.testRuntimeClasspath {`
Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,12 @@ tasks {`
`25`	`25`	`test {`
`26`	`26`	`usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)`
`27`	`27`	`}`
	`28`	`+`
	`29`	`+ val testStableSemconv by registering(Test::class) {`
	`30`	`+ jvmArgs("-Dotel.semconv-stability.opt-in=database")`
	`31`	`+ }`
	`32`	`+`
	`33`	`+ check {`
	`34`	`+ dependsOn(testStableSemconv)`
	`35`	`+ }`
`28`	`36`	`}`