Remove controller telemetry flag from modules that don't emit it (#17190)

laurit · web-flow · commit fa68e6063729 · 2026-03-28T07:51:32.000-07:00
diff --git a/instrumentation/camel-2.20/javaagent/build.gradle.kts b/instrumentation/camel-2.20/javaagent/build.gradle.kts
@@ -82,8 +82,6 @@ tasks {
     jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
     jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
 
-    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
-
     systemProperty("collectMetadata", findProperty("collectMetadata"))
 
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
diff --git a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/build.gradle.kts
@@ -75,7 +75,6 @@ testing {
 
 tasks {
   withType<Test>().configureEach {
-    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
 
     systemProperty("collectMetadata", findProperty("collectMetadata"))
diff --git a/instrumentation/executors/javaagent/build.gradle.kts b/instrumentation/executors/javaagent/build.gradle.kts
@@ -55,7 +55,6 @@ tasks {
       "-Dotel.instrumentation.executors.include=io.opentelemetry.javaagent.instrumentation.executors.ExecutorInstrumentationTest\$CustomThreadPoolExecutor,io.opentelemetry.javaagent.instrumentation.executors.ThreadPoolExecutorTest\$RunnableCheckingThreadPoolExecutor"
     )
     jvmArgs("-Djava.awt.headless=true")
-    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
   }
 
   check {
diff --git a/instrumentation/grpc-1.6/javaagent/build.gradle.kts b/instrumentation/grpc-1.6/javaagent/build.gradle.kts
@@ -38,7 +38,6 @@ tasks {
     jvmArgs("-Dotel.javaagent.experimental.thread-propagation-debugger.enabled=false")
     jvmArgs("-Dotel.instrumentation.grpc.capture-metadata.client.request=some-client-key")
     jvmArgs("-Dotel.instrumentation.grpc.capture-metadata.server.request=some-server-key")
-    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
     // latest dep test occasionally fails because network type is ipv6 instead of the expected ipv4
     // and peer address is 0:0:0:0:0:0:0:1 instead of 127.0.0.1
     jvmArgs("-Djava.net.preferIPv4Stack=true")
diff --git a/instrumentation/grpc-1.6/library/build.gradle.kts b/instrumentation/grpc-1.6/library/build.gradle.kts
@@ -24,10 +24,6 @@ tasks {
     jvmArgs("-Djava.net.preferIPv4Stack=true")
   }
 
-  test {
-    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
-  }
-
   val testStableSemconv by registering(Test::class) {
     testClassesDirs = sourceSets.test.get().output.classesDirs
     classpath = sourceSets.test.get().runtimeClasspath
diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/build.gradle.kts b/instrumentation/hibernate/hibernate-4.0/javaagent/build.gradle.kts
@@ -85,8 +85,6 @@ tasks {
     jvmArgs("--add-opens=java.base/java.lang.invoke=ALL-UNNAMED")
     jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
 
-    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
-
     systemProperty("collectMetadata", findProperty("collectMetadata"))
   }
 
diff --git a/instrumentation/hibernate/hibernate-6.0/spring-testing/build.gradle.kts b/instrumentation/hibernate/hibernate-6.0/spring-testing/build.gradle.kts
@@ -30,8 +30,6 @@ tasks {
 
     // 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")
   }
 
   val testStableSemconv by registering(Test::class) {
diff --git a/instrumentation/log4j/log4j-appender-1.2/javaagent/build.gradle.kts b/instrumentation/log4j/log4j-appender-1.2/javaagent/build.gradle.kts
@@ -37,5 +37,4 @@ tasks.withType<Test>().configureEach {
   jvmArgs("-Dotel.instrumentation.log4j-appender.experimental.capture-code-attributes=true")
   jvmArgs("-Dotel.instrumentation.log4j-appender.experimental.capture-event-name=true")
   jvmArgs("-Dotel.instrumentation.log4j-appender.experimental-log-attributes=true")
-  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
 }
diff --git a/instrumentation/log4j/log4j-appender-2.17/library/build.gradle.kts b/instrumentation/log4j/log4j-appender-2.17/library/build.gradle.kts
@@ -21,7 +21,6 @@ dependencies {
 tasks {
   withType<Test>().configureEach {
     systemProperty("testLatestDeps", findProperty("testLatestDeps"))
-    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
   }
 
   val testAsyncLogger by registering(Test::class) {
diff --git a/instrumentation/logback/logback-appender-1.0/library/build.gradle.kts b/instrumentation/logback/logback-appender-1.0/library/build.gradle.kts
@@ -192,7 +192,3 @@ tasks {
     dependsOn(testing.suites, testStableSemconv, testBothSemconv)
   }
 }
-
-tasks.withType<Test>().configureEach {
-  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
-}
diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/build.gradle.kts b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/build.gradle.kts
@@ -44,7 +44,6 @@ tasks {
     }
     include("**/ReactorNettyConnectionSpanTest.*")
     jvmArgs("-Dotel.instrumentation.netty.connection-telemetry.enabled=true")
-    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
   }
 
   test {
diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/build.gradle.kts b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/build.gradle.kts
@@ -54,7 +54,6 @@ tasks {
     include("**/ReactorNettyConnectionSpanTest.*", "**/ReactorNettyClientSslTest.*")
     jvmArgs("-Dotel.instrumentation.netty.ssl-telemetry.enabled=true")
     jvmArgs("-Dotel.instrumentation.reactor-netty.connection-telemetry.enabled=true")
-    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
   }
 
   test {
diff --git a/instrumentation/rocketmq/rocketmq-client-4.8/library/build.gradle.kts b/instrumentation/rocketmq/rocketmq-client-4.8/library/build.gradle.kts
@@ -18,7 +18,6 @@ tasks.withType<Test>().configureEach {
   // required on jdk17
   jvmArgs("--add-opens=java.base/sun.nio.ch=ALL-UNNAMED")
   jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
-  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
   // with default settings tests will fail when disk is 90% full
   jvmArgs("-Drocketmq.broker.diskSpaceWarningLevelRatio=1.0")
 
diff --git a/instrumentation/rocketmq/rocketmq-client-5.0/javaagent/build.gradle.kts b/instrumentation/rocketmq/rocketmq-client-5.0/javaagent/build.gradle.kts
@@ -40,7 +40,6 @@ tasks {
       excludeTestsMatching("RocketMqClientSuppressReceiveSpanTest")
     }
     jvmArgs("-Dotel.instrumentation.messaging.experimental.receive-telemetry.enabled=true")
-    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
   }
 
   check {
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
@@ -51,7 +51,6 @@ tasks {
     jvmArgs("--add-opens=java.base/java.lang.invoke=ALL-UNNAMED")
     jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
     jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
-    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
 
     systemProperty("collectMetadata", findProperty("collectMetadata"))
   }
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
@@ -46,7 +46,6 @@ tasks {
     jvmArgs("--add-opens=java.base/java.lang.invoke=ALL-UNNAMED")
     jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
     jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
-    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
   }
 
   val stableSemconvSuites = testing.suites.withType(JvmTestSuite::class).map { suite ->
diff --git a/instrumentation/spring/spring-integration-4.1/library/build.gradle.kts b/instrumentation/spring/spring-integration-4.1/library/build.gradle.kts
@@ -37,7 +37,3 @@ configurations.testRuntimeClasspath {
     force("org.slf4j:slf4j-api:1.7.36")
   }
 }
-
-tasks.withType<Test>().configureEach {
-  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
-}
diff --git a/instrumentation/tomcat/tomcat-10.0/javaagent/build.gradle.kts b/instrumentation/tomcat/tomcat-10.0/javaagent/build.gradle.kts
@@ -29,7 +29,6 @@ dependencies {
 tasks {
   withType<Test>().configureEach {
     jvmArgs("-Dotel.instrumentation.servlet.experimental.capture-request-parameters=test-parameter")
-    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
     systemProperty("collectMetadata", findProperty("collectMetadata"))
   }
 }
diff --git a/instrumentation/tomcat/tomcat-7.0/javaagent/build.gradle.kts b/instrumentation/tomcat/tomcat-7.0/javaagent/build.gradle.kts
@@ -39,7 +39,6 @@ tasks {
     // required on jdk17
     jvmArgs("--add-opens=java.base/java.util=ALL-UNNAMED")
     jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
-    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
     systemProperty("collectMetadata", findProperty("collectMetadata"))
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,6 @@ tasks {`
`55`	`55`	`"-Dotel.instrumentation.executors.include=io.opentelemetry.javaagent.instrumentation.executors.ExecutorInstrumentationTest\$CustomThreadPoolExecutor,io.opentelemetry.javaagent.instrumentation.executors.ThreadPoolExecutorTest\$RunnableCheckingThreadPoolExecutor"`
`56`	`56`	`)`
`57`	`57`	`jvmArgs("-Djava.awt.headless=true")`
`58`		`- jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")`
`59`	`58`	`}`
`60`	`59`
`61`	`60`	`check {`
Original file line number	Diff line number	Diff line change
`@@ -85,8 +85,6 @@ tasks {`
`85`	`85`	`jvmArgs("--add-opens=java.base/java.lang.invoke=ALL-UNNAMED")`
`86`	`86`	`jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")`
`87`	`87`
`88`		`- jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")`
`89`		`-`
`90`	`88`	`systemProperty("collectMetadata", findProperty("collectMetadata"))`
`91`	`89`	`}`
`92`	`90`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,6 @@ tasks {`
`30`	`30`
`31`	`31`	`// TODO run tests both with and without experimental span attributes`
`32`	`32`	`jvmArgs("-Dotel.instrumentation.hibernate.experimental-span-attributes=true")`
`33`		`-`
`34`		`- jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")`
`35`	`33`	`}`
`36`	`34`
`37`	`35`	`val testStableSemconv by registering(Test::class) {`
Original file line number	Diff line number	Diff line change
`@@ -37,5 +37,4 @@ tasks.withType<Test>().configureEach {`
`37`	`37`	`jvmArgs("-Dotel.instrumentation.log4j-appender.experimental.capture-code-attributes=true")`
`38`	`38`	`jvmArgs("-Dotel.instrumentation.log4j-appender.experimental.capture-event-name=true")`
`39`	`39`	`jvmArgs("-Dotel.instrumentation.log4j-appender.experimental-log-attributes=true")`
`40`		`- jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")`
`41`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ dependencies {`
`21`	`21`	`tasks {`
`22`	`22`	`withType<Test>().configureEach {`
`23`	`23`	`systemProperty("testLatestDeps", findProperty("testLatestDeps"))`
`24`		`- jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")`
`25`	`24`	`}`
`26`	`25`
`27`	`26`	`val testAsyncLogger by registering(Test::class) {`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,3 @@ tasks {`
`192`	`192`	`dependsOn(testing.suites, testStableSemconv, testBothSemconv)`
`193`	`193`	`}`
`194`	`194`	`}`
`195`		`-`
`196`		`-tasks.withType<Test>().configureEach {`
`197`		`- jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")`
`198`		`-}`