add tests

zeitlinger · zeitlinger · commit 7ef1f30d25dd · 2026-01-16T18:32:33.000+01:00
diff --git a/instrumentation/apache-dubbo-2.7/library-autoconfigure/build.gradle.kts b/instrumentation/apache-dubbo-2.7/library-autoconfigure/build.gradle.kts
@@ -21,3 +21,16 @@ tasks.withType<Test>().configureEach {
   // required on jdk17
   jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
 }
+
+tasks {
+  val testStableSemconv by registering(Test::class) {
+    testClassesDirs = sourceSets.test.get().output.classesDirs
+    classpath = sourceSets.test.get().runtimeClasspath
+
+    jvmArgs("-Dotel.semconv-stability.opt-in=rpc")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
+}
diff --git a/instrumentation/armeria/armeria-grpc-1.14/javaagent/build.gradle.kts b/instrumentation/armeria/armeria-grpc-1.14/javaagent/build.gradle.kts
@@ -59,12 +59,25 @@ afterEvaluate {
   }
 }
 
-tasks.test {
-  systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-}
+tasks {
+  test {
+    systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
+  }
+
+  val testStableSemconv by registering(Test::class) {
+    testClassesDirs = sourceSets.test.get().output.classesDirs
+    classpath = sourceSets.test.get().runtimeClasspath
+
+    jvmArgs("-Dotel.semconv-stability.opt-in=rpc")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 
-if (findProperty("denyUnsafe") as Boolean) {
-  tasks.withType<Test>().configureEach {
-    enabled = false
+  if (findProperty("denyUnsafe") as Boolean) {
+    withType<Test>().configureEach {
+      enabled = false
+    }
   }
 }
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
@@ -159,9 +159,9 @@ tasks {
     testClassesDirs = sourceSets.test.get().output.classesDirs
     classpath = sourceSets.test.get().runtimeClasspath
 
-    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+    jvmArgs("-Dotel.semconv-stability.opt-in=rpc,database")
     systemProperty("collectMetadata", collectMetadata)
-    systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
+    systemProperty("metadataConfig", "otel.semconv-stability.opt-in=rpc,database")
   }
 
   check {
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/build.gradle.kts
@@ -46,8 +46,15 @@ tasks {
     jvmArgs("-Dotel.instrumentation.messaging.experimental.receive-telemetry.enabled=true")
   }
 
+  val testStableSemconv by registering(Test::class) {
+    testClassesDirs = sourceSets.test.get().output.classesDirs
+    classpath = sourceSets.test.get().runtimeClasspath
+
+    jvmArgs("-Dotel.semconv-stability.opt-in=rpc")
+  }
+
   check {
-    dependsOn(testReceiveSpansDisabled)
+    dependsOn(testReceiveSpansDisabled, testStableSemconv)
   }
 }
 
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts
@@ -55,7 +55,7 @@ tasks {
   val testStableSemconv by registering(Test::class) {
     testClassesDirs = sourceSets.test.get().output.classesDirs
     classpath = sourceSets.test.get().runtimeClasspath
-    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+    jvmArgs("-Dotel.semconv-stability.opt-in=rpc,database")
   }
 
   check {
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
@@ -203,9 +203,9 @@ tasks {
       excludeTestsMatching("Aws2SqsSuppressReceiveSpansTest")
     }
     systemProperty("otel.instrumentation.messaging.experimental.receive-telemetry.enabled", "true")
-    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+    jvmArgs("-Dotel.semconv-stability.opt-in=rpc,database")
 
-    systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
+    systemProperty("metadataConfig", "otel.semconv-stability.opt-in=rpc,database")
   }
 
   test {
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
@@ -36,7 +36,7 @@ tasks {
     testClassesDirs = sourceSets.test.get().output.classesDirs
     classpath = sourceSets.test.get().runtimeClasspath
 
-    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+    jvmArgs("-Dotel.semconv-stability.opt-in=rpc,database")
   }
 
   check {
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
@@ -81,7 +81,7 @@ tasks {
     testClassesDirs = sourceSets.test.get().output.classesDirs
     classpath = sourceSets.test.get().runtimeClasspath
 
-    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+    jvmArgs("-Dotel.semconv-stability.opt-in=rpc,database")
   }
 
   check {
diff --git a/instrumentation/camel-2.20/javaagent/build.gradle.kts b/instrumentation/camel-2.20/javaagent/build.gradle.kts
@@ -101,8 +101,15 @@ tasks {
     systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
   }
 
+  val testStableSemconvRpc by registering(Test::class) {
+    testClassesDirs = sourceSets.test.get().output.classesDirs
+    classpath = sourceSets.test.get().runtimeClasspath
+
+    jvmArgs("-Dotel.semconv-stability.opt-in=rpc")
+  }
+
   check {
-    dependsOn(testStableSemconv, testExperimental)
+    dependsOn(testStableSemconv, testStableSemconvRpc, testExperimental)
   }
 
   if (findProperty("denyUnsafe") as Boolean) {
diff --git a/instrumentation/grpc-1.6/javaagent/build.gradle.kts b/instrumentation/grpc-1.6/javaagent/build.gradle.kts
@@ -74,8 +74,15 @@ tasks {
     jvmArgs("-Dotel.instrumentation.grpc.experimental-span-attributes=true")
   }
 
+  val testStableSemconv by registering(Test::class) {
+    testClassesDirs = sourceSets.test.get().output.classesDirs
+    classpath = sourceSets.test.get().runtimeClasspath
+
+    jvmArgs("-Dotel.semconv-stability.opt-in=rpc")
+  }
+
   check {
-    dependsOn(testExperimental)
+    dependsOn(testExperimental, testStableSemconv)
   }
 }
 
diff --git a/instrumentation/grpc-1.6/library/build.gradle.kts b/instrumentation/grpc-1.6/library/build.gradle.kts
@@ -24,6 +24,17 @@ tasks {
     // and peer address is 0:0:0:0:0:0:0:1 instead of 127.0.0.1
     jvmArgs("-Djava.net.preferIPv4Stack=true")
   }
+
+  val testStableSemconv by registering(Test::class) {
+    testClassesDirs = sourceSets.test.get().output.classesDirs
+    classpath = sourceSets.test.get().runtimeClasspath
+
+    jvmArgs("-Dotel.semconv-stability.opt-in=rpc")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
 
 if (!(findProperty("testLatestDeps") as Boolean)) {
diff --git a/instrumentation/gwt-2.0/javaagent/build.gradle.kts b/instrumentation/gwt-2.0/javaagent/build.gradle.kts
@@ -115,6 +115,17 @@ tasks {
 
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
+
+  val testStableSemconv by registering(Test::class) {
+    testClassesDirs = sourceSets.test.get().output.classesDirs
+    classpath = sourceSets.test.get().runtimeClasspath
+
+    jvmArgs("-Dotel.semconv-stability.opt-in=rpc")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
 
 tasks.withType<Test>().configureEach {
diff --git a/instrumentation/rmi/javaagent/build.gradle.kts b/instrumentation/rmi/javaagent/build.gradle.kts
@@ -35,4 +35,15 @@ tasks {
   withType<Test>().configureEach {
     jvmArgs("-Djava.rmi.server.hostname=127.0.0.1")
   }
+
+  val testStableSemconv by registering(Test::class) {
+    testClassesDirs = sourceSets.test.get().output.classesDirs
+    classpath = sourceSets.test.get().runtimeClasspath
+
+    jvmArgs("-Dotel.semconv-stability.opt-in=rpc")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }
diff --git a/instrumentation/spring/spring-cloud-aws-3.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-cloud-aws-3.0/javaagent/build.gradle.kts
@@ -32,6 +32,19 @@ otelJava {
   minJavaVersionSupported.set(JavaVersion.VERSION_17)
 }
 
+tasks {
+  val testStableSemconv by registering(Test::class) {
+    testClassesDirs = sourceSets.test.get().output.classesDirs
+    classpath = sourceSets.test.get().runtimeClasspath
+
+    jvmArgs("-Dotel.semconv-stability.opt-in=rpc")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
+}
+
 if (findProperty("denyUnsafe") as Boolean) {
   // org.elasticmq:elasticmq-rest-sqs_2.13 uses unsafe. Future versions are likely to fix this.
   tasks.withType<Test>().configureEach {
diff --git a/instrumentation/spring/spring-rmi-4.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-rmi-4.0/javaagent/build.gradle.kts
@@ -34,9 +34,22 @@ otelJava {
   maxJavaVersionForTests.set(JavaVersion.VERSION_23)
 }
 
-tasks.withType<Test>().configureEach {
-  jvmArgs("-Djava.rmi.server.hostname=127.0.0.1")
-  systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
+tasks {
+  val testStableSemconv by registering(Test::class) {
+    testClassesDirs = sourceSets.test.get().output.classesDirs
+    classpath = sourceSets.test.get().runtimeClasspath
+
+    jvmArgs("-Dotel.semconv-stability.opt-in=rpc")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
+
+  withType<Test>().configureEach {
+    jvmArgs("-Djava.rmi.server.hostname=127.0.0.1")
+    systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
+  }
 }
 
 configurations.testRuntimeClasspath {

Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,15 @@ tasks {`
`46`	`46`	`jvmArgs("-Dotel.instrumentation.messaging.experimental.receive-telemetry.enabled=true")`
`47`	`47`	`}`
`48`	`48`
	`49`	`+ val testStableSemconv by registering(Test::class) {`
	`50`	`+ testClassesDirs = sourceSets.test.get().output.classesDirs`
	`51`	`+ classpath = sourceSets.test.get().runtimeClasspath`
	`52`	`+`
	`53`	`+ jvmArgs("-Dotel.semconv-stability.opt-in=rpc")`
	`54`	`+ }`
	`55`	`+`
`49`	`56`	`check {`
`50`		`- dependsOn(testReceiveSpansDisabled)`
	`57`	`+ dependsOn(testReceiveSpansDisabled, testStableSemconv)`
`51`	`58`	`}`
`52`	`59`	`}`
`53`	`60`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ tasks {`
`55`	`55`	`val testStableSemconv by registering(Test::class) {`
`56`	`56`	`testClassesDirs = sourceSets.test.get().output.classesDirs`
`57`	`57`	`classpath = sourceSets.test.get().runtimeClasspath`
`58`		`- jvmArgs("-Dotel.semconv-stability.opt-in=database")`
	`58`	`+ jvmArgs("-Dotel.semconv-stability.opt-in=rpc,database")`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`check {`
Original file line number	Diff line number	Diff line change
`@@ -203,9 +203,9 @@ tasks {`
`203`	`203`	`excludeTestsMatching("Aws2SqsSuppressReceiveSpansTest")`
`204`	`204`	`}`
`205`	`205`	`systemProperty("otel.instrumentation.messaging.experimental.receive-telemetry.enabled", "true")`
`206`		`- jvmArgs("-Dotel.semconv-stability.opt-in=database")`
	`206`	`+ jvmArgs("-Dotel.semconv-stability.opt-in=rpc,database")`
`207`	`207`
`208`		`- systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")`
	`208`	`+ systemProperty("metadataConfig", "otel.semconv-stability.opt-in=rpc,database")`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`test {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ tasks {`
`36`	`36`	`testClassesDirs = sourceSets.test.get().output.classesDirs`
`37`	`37`	`classpath = sourceSets.test.get().runtimeClasspath`
`38`	`38`
`39`		`- jvmArgs("-Dotel.semconv-stability.opt-in=database")`
	`39`	`+ jvmArgs("-Dotel.semconv-stability.opt-in=rpc,database")`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`check {`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ tasks {`
`81`	`81`	`testClassesDirs = sourceSets.test.get().output.classesDirs`
`82`	`82`	`classpath = sourceSets.test.get().runtimeClasspath`
`83`	`83`
`84`		`- jvmArgs("-Dotel.semconv-stability.opt-in=database")`
	`84`	`+ jvmArgs("-Dotel.semconv-stability.opt-in=rpc,database")`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`check {`
Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,15 @@ tasks {`
`74`	`74`	`jvmArgs("-Dotel.instrumentation.grpc.experimental-span-attributes=true")`
`75`	`75`	`}`
`76`	`76`
	`77`	`+ val testStableSemconv by registering(Test::class) {`
	`78`	`+ testClassesDirs = sourceSets.test.get().output.classesDirs`
	`79`	`+ classpath = sourceSets.test.get().runtimeClasspath`
	`80`	`+`
	`81`	`+ jvmArgs("-Dotel.semconv-stability.opt-in=rpc")`
	`82`	`+ }`
	`83`	`+`
`77`	`84`	`check {`
`78`		`- dependsOn(testExperimental)`
	`85`	`+ dependsOn(testExperimental, testStableSemconv)`
`79`	`86`	`}`
`80`	`87`	`}`
`81`	`88`