Remove http stable semconv tests (#10087)

Author: laurit

instrumentation/akka/akka-http-10.0/javaagent/build.gradle.kts

@@ -43,10 +43,6 @@ dependencies {
 }
 
 tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=http")
-  }
-
   withType<Test>().configureEach {
     // required on jdk17
     jvmArgs("--add-exports=java.base/sun.security.util=ALL-UNNAMED")
@@ -56,10 +52,6 @@ tasks {
 
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
   }
-
-  check {
-    dependsOn(testStableSemconv)
-  }
 }
 
 if (findProperty("testLatestDeps") as Boolean) {

instrumentation/apache-httpasyncclient-4.1/javaagent/build.gradle.kts

@@ -16,13 +16,3 @@ muzzle {
 dependencies {
   library("org.apache.httpcomponents:httpasyncclient:4.1")
 }
-
-tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=http")
-  }
-
-  check {
-    dependsOn(testStableSemconv)
-  }
-}

instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/build.gradle.kts

@@ -17,15 +17,7 @@ dependencies {
 }
 
 tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=http")
-  }
-
   withType<Test>().configureEach {
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
   }
-
-  check {
-    dependsOn(testStableSemconv)
-  }
 }

instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/build.gradle.kts

@@ -29,13 +29,3 @@ dependencies {
   library("org.apache.httpcomponents:httpclient:4.0")
   testCompileOnly("net.jcip:jcip-annotations:1.0")
 }
-
-tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=http")
-  }
-
-  check {
-    dependsOn(testStableSemconv)
-  }
-}

instrumentation/apache-httpclient/apache-httpclient-4.3/library/build.gradle.kts

@@ -11,13 +11,3 @@ dependencies {
 
   latestDepTestLibrary("org.apache.httpcomponents:httpclient:4.+") // see apache-httpclient-5.0 module
 }
-
-tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=http")
-  }
-
-  check {
-    dependsOn(testStableSemconv)
-  }
-}

instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/build.gradle.kts

@@ -18,12 +18,4 @@ tasks {
   withType<Test>().configureEach {
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
   }
-
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=http")
-  }
-
-  check {
-    dependsOn(testStableSemconv)
-  }
 }

instrumentation/armeria-1.3/javaagent/build.gradle.kts

@@ -22,15 +22,7 @@ dependencies {
 }
 
 tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=http")
-  }
-
   withType<Test>().configureEach {
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
   }
-
-  check {
-    dependsOn(testStableSemconv)
-  }
 }

instrumentation/armeria-1.3/library/build.gradle.kts

@@ -10,15 +10,7 @@ dependencies {
 }
 
 tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=http")
-  }
-
   withType<Test>().configureEach {
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
   }
-
-  check {
-    dependsOn(testStableSemconv)
-  }
 }

instrumentation/async-http-client/async-http-client-1.9/javaagent/build.gradle.kts

@@ -21,19 +21,11 @@ dependencies {
 }
 
 tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=http")
-  }
-
   withType<Test>().configureEach {
     // required on jdk17
     jvmArgs("--add-exports=java.base/sun.security.util=ALL-UNNAMED")
     jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
 
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
   }
-
-  check {
-    dependsOn(testStableSemconv)
-  }
 }

instrumentation/async-http-client/async-http-client-2.0/javaagent/build.gradle.kts

@@ -23,16 +23,6 @@ otelJava {
   maxJavaVersionForTests.set(JavaVersion.VERSION_1_8)
 }
 
-tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=http")
-  }
-
-  check {
-    dependsOn(testStableSemconv)
-  }
-}
-
 // async-http-client 2.0.0 does not work with Netty versions newer than this due to referencing an
 // internal file.
 if (!(findProperty("testLatestDeps") as Boolean)) {

instrumentation/finatra-2.9/javaagent/build.gradle.kts

@@ -87,12 +87,4 @@ tasks {
     jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
     jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
   }
-
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=http")
-  }
-
-  check {
-    dependsOn(testStableSemconv)
-  }
 }

instrumentation/google-http-client-1.19/javaagent/build.gradle.kts

@@ -15,13 +15,3 @@ muzzle {
 dependencies {
   library("com.google.http-client:google-http-client:1.19.0")
 }
-
-tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=http")
-  }
-
-  check {
-    dependsOn(testStableSemconv)
-  }
-}

instrumentation/grails-3.0/javaagent/build.gradle.kts

@@ -68,19 +68,11 @@ configurations.testRuntimeClasspath {
 val latestDepTest = findProperty("testLatestDeps") as Boolean
 
 tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=http")
-  }
-
   withType<Test>().configureEach {
     systemProperty("testLatestDeps", latestDepTest)
 
     // required on jdk17
     jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
     jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
   }
-
-  check {
-    dependsOn(testStableSemconv)
-  }
 }

instrumentation/grizzly-2.3/javaagent/build.gradle.kts

@@ -20,19 +20,11 @@ dependencies {
 }
 
 tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=http")
-  }
-
   withType<Test>().configureEach {
     // required on jdk17
     jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
     jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
   }
-
-  check {
-    dependsOn(testStableSemconv)
-  }
 }
 
 // Requires old Guava. Can't use enforcedPlatform since predates BOM

instrumentation/http-url-connection/javaagent/build.gradle.kts

@@ -7,13 +7,3 @@ muzzle {
     coreJdk()
   }
 }
-
-tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=http")
-  }
-
-  check {
-    dependsOn(testStableSemconv)
-  }
-}

instrumentation/java-http-client/javaagent/build.gradle.kts

@@ -16,13 +16,3 @@ dependencies {
   implementation(project(":instrumentation:java-http-client:library"))
   testImplementation(project(":instrumentation:java-http-client:testing"))
 }
-
-tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=http")
-  }
-
-  check {
-    dependsOn(testStableSemconv)
-  }
-}

instrumentation/java-http-client/library/build.gradle.kts

@@ -10,13 +10,3 @@ otelJava {
 dependencies {
   testImplementation(project(":instrumentation:java-http-client:testing"))
 }
-
-tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=http")
-  }
-
-  check {
-    dependsOn(testStableSemconv)
-  }
-}

instrumentation/jetty-httpclient/jetty-httpclient-9.2/javaagent/build.gradle.kts

@@ -22,13 +22,3 @@ dependencies {
 
   latestDepTestLibrary("org.eclipse.jetty:jetty-client:9.+") // documented limitation
 }
-
-tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=http")
-  }
-
-  check {
-    dependsOn(testStableSemconv)
-  }
-}

instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/build.gradle.kts

@@ -12,13 +12,3 @@ dependencies {
 
   latestDepTestLibrary("org.eclipse.jetty:jetty-client:9.+")
 }
-
-tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=http")
-  }
-
-  check {
-    dependsOn(testStableSemconv)
-  }
-}

instrumentation/jetty/jetty-11.0/javaagent/build.gradle.kts

@@ -27,13 +27,3 @@ dependencies {
 otelJava {
   minJavaVersionSupported.set(JavaVersion.VERSION_11)
 }
-
-tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=http")
-  }
-
-  check {
-    dependsOn(testStableSemconv)
-  }
-}

instrumentation/jetty/jetty-8.0/javaagent/build.gradle.kts

@@ -37,13 +37,3 @@ if (latestDepTest) {
     minJavaVersionSupported.set(JavaVersion.VERSION_11)
   }
 }
-
-tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=http")
-  }
-
-  check {
-    dependsOn(testStableSemconv)
-  }
-}

instrumentation/jodd-http-4.2/javaagent/build.gradle.kts

@@ -17,18 +17,3 @@ dependencies {
   testImplementation(project(":instrumentation:jodd-http-4.2:javaagent"))
   testImplementation(project(":instrumentation-api-incubator"))
 }
-
-tasks {
-  val testStableSemconv by registering(Test::class) {
-    filter {
-      includeTestsMatching("JoddHttpTest")
-    }
-    include("**/JoddHttpTest.*")
-
-    jvmArgs("-Dotel.semconv-stability.opt-in=http")
-  }
-
-  check {
-    dependsOn(testStableSemconv)
-  }
-}

instrumentation/netty/netty-3.8/javaagent/build.gradle.kts

@@ -35,16 +35,6 @@ dependencies {
   latestDepTestLibrary("com.ning:async-http-client:1.9.+")
 }
 
-tasks {
-  val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=http")
-  }
-
-  check {
-    dependsOn(testStableSemconv)
-  }
-}
-
 // We need to force the dependency to the earliest supported version because other libraries declare newer versions.
 if (!(findProperty("testLatestDeps") as Boolean)) {
   configurations.configureEach {

instrumentation/netty/netty-4.0/javaagent/build.gradle.kts

@@ -47,27 +47,6 @@ tasks {
     jvmArgs("-Dotel.instrumentation.netty.ssl-telemetry.enabled=true")
   }
 
-  val testStableSemconv by registering(Test::class) {
-    filter {
-      excludeTestsMatching("Netty40ConnectionSpanTest")
-      excludeTestsMatching("Netty40ClientSslTest")
-    }
-
-    jvmArgs("-Dotel.semconv-stability.opt-in=http")
-  }
-
-  val testStableSemconvConnectionSpan by registering(Test::class) {
-    filter {
-      includeTestsMatching("Netty40ConnectionSpanTest")
-      includeTestsMatching("Netty40ClientSslTest")
-    }
-    include("**/Netty40ConnectionSpanTest.*", "**/Netty40ClientSslTest.*")
-
-    jvmArgs("-Dotel.instrumentation.netty.connection-telemetry.enabled=true")
-    jvmArgs("-Dotel.instrumentation.netty.ssl-telemetry.enabled=true")
-    jvmArgs("-Dotel.semconv-stability.opt-in=http")
-  }
-
   test {
     filter {
       excludeTestsMatching("Netty40ConnectionSpanTest")
@@ -77,8 +56,6 @@ tasks {
 
   check {
     dependsOn(testConnectionSpan)
-    dependsOn(testStableSemconv)
-    dependsOn(testStableSemconvConnectionSpan)
   }
 }