Disable controller and view spans by default (#10042)

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2024-01-04 09:16:46 -08:00 · 2024-01-04 09:16:46 -08:00 · fdeb032b33
parent f35dddcf63
commit fdeb032b33
71 changed files with 167 additions and 5 deletions
--- a/instrumentation/camel-2.20/javaagent/build.gradle.kts
+++ b/instrumentation/camel-2.20/javaagent/build.gradle.kts
@ -76,6 +76,8 @@ tasks {
    // required on jdk17
    jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
    jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+
+    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
  }
 }

--- a/instrumentation/dropwizard/dropwizard-testing/build.gradle.kts
+++ b/instrumentation/dropwizard/dropwizard-testing/build.gradle.kts
@ -27,3 +27,7 @@ configurations.testRuntimeClasspath {
    force("com.fasterxml.jackson.module:jackson-module-afterburner:2.15.3")
  }
 }
+
+tasks.withType<Test>().configureEach {
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+}
--- a/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/build.gradle.kts
+++ b/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/build.gradle.kts
@ -16,3 +16,8 @@ dependencies {
  testImplementation("io.dropwizard:dropwizard-views-freemarker:0.7.0")
  testImplementation("io.dropwizard:dropwizard-views-mustache:0.7.0")
 }
+
+tasks.withType<Test>().configureEach {
+  jvmArgs("-Dotel.instrumentation.common.experimental.view-telemetry.enabled=true")
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+}
--- a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/build.gradle.kts
+++ b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/build.gradle.kts
@ -32,3 +32,7 @@ tasks {
    usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
  }
 }
+
+tasks.withType<Test>().configureEach {
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+}
--- a/instrumentation/executors/javaagent/build.gradle.kts
+++ b/instrumentation/executors/javaagent/build.gradle.kts
@ -48,6 +48,7 @@ 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 {
--- a/instrumentation/finatra-2.9/javaagent/build.gradle.kts
+++ b/instrumentation/finatra-2.9/javaagent/build.gradle.kts
@ -86,5 +86,6 @@ tasks {
    // required on jdk17
    jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
    jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
  }
 }
--- a/instrumentation/grails-3.0/javaagent/build.gradle.kts
+++ b/instrumentation/grails-3.0/javaagent/build.gradle.kts
@ -74,5 +74,6 @@ tasks {
    // required on jdk17
    jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
    jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
  }
 }
--- a/instrumentation/grpc-1.6/javaagent/build.gradle.kts
+++ b/instrumentation/grpc-1.6/javaagent/build.gradle.kts
@ -36,6 +36,7 @@ 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")

    // exclude our grpc library instrumentation, the ContextStorageOverride contained within it
    // breaks the tests
--- a/instrumentation/grpc-1.6/library/build.gradle.kts
+++ b/instrumentation/grpc-1.6/library/build.gradle.kts
@ -19,6 +19,7 @@ dependencies {
 tasks {
  test {
    systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
+    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
  }
 }

--- a/instrumentation/hibernate/hibernate-4.0/javaagent/build.gradle.kts
+++ b/instrumentation/hibernate/hibernate-4.0/javaagent/build.gradle.kts
@ -79,6 +79,8 @@ tasks.withType<Test>().configureEach {

  // 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")
 }

 tasks {
--- a/instrumentation/hibernate/hibernate-6.0/spring-testing/build.gradle.kts
+++ b/instrumentation/hibernate/hibernate-6.0/spring-testing/build.gradle.kts
@ -31,4 +31,6 @@ tasks.withType<Test>().configureEach {

  // 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")
 }
--- a/instrumentation/jaxrs/jaxrs-1.0/javaagent/build.gradle.kts
+++ b/instrumentation/jaxrs/jaxrs-1.0/javaagent/build.gradle.kts
@ -25,3 +25,6 @@ dependencies {
  testImplementation("io.dropwizard:dropwizard-testing:0.7.1")
  testImplementation("javax.xml.bind:jaxb-api:2.2.3")
 }
+tasks.withType<Test>().configureEach {
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+}
--- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/build.gradle.kts
+++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/build.gradle.kts
@ -24,3 +24,9 @@ dependencies {

  testImplementation("javax.ws.rs:javax.ws.rs-api:2.0")
 }
+
+tasks {
+  withType<Test>().configureEach {
+    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+  }
+}
--- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/build.gradle.kts
+++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/build.gradle.kts
@ -57,4 +57,5 @@ tasks.withType<Test>().configureEach {

  // TODO run tests both with and without experimental span attributes
  jvmArgs("-Dotel.instrumentation.jaxrs.experimental-span-attributes=true")
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
 }
--- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/build.gradle.kts
+++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/build.gradle.kts
@ -72,5 +72,6 @@ tasks {
    // required on jdk17
    jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
    jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
  }
 }
--- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-payara-testing/build.gradle.kts
+++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-payara-testing/build.gradle.kts
@ -16,3 +16,9 @@ dependencies {
  testInstrumentation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-annotations:javaagent"))
  testInstrumentation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-jersey-2.0:javaagent"))
 }
+
+tasks {
+  withType<Test>().configureEach {
+    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+  }
+}
--- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts
+++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts
@ -78,5 +78,6 @@ tasks {
  withType<Test>().configureEach {
    // TODO run tests both with and without experimental span attributes
    jvmArgs("-Dotel.instrumentation.jaxrs.experimental-span-attributes=true")
+    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
  }
 }
--- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/build.gradle.kts
+++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/build.gradle.kts
@ -75,6 +75,7 @@ tasks {
  withType<Test>().configureEach {
    // TODO run tests both with and without experimental span attributes
    jvmArgs("-Dotel.instrumentation.jaxrs.experimental-span-attributes=true")
+    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
  }
 }

--- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-tomee-testing/build.gradle.kts
+++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-tomee-testing/build.gradle.kts
@ -19,4 +19,5 @@ tasks.withType<Test>().configureEach {
  jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
  jvmArgs("--add-exports=java.base/sun.misc=ALL-UNNAMED")
  jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
 }
--- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/build.gradle.kts
+++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/build.gradle.kts
@ -73,4 +73,5 @@ tasks.withType<Test>().configureEach {
  // required on jdk17
  jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
  jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
 }
--- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/build.gradle.kts
+++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/build.gradle.kts
@ -20,3 +20,9 @@ dependencies {

  testImplementation("jakarta.ws.rs:jakarta.ws.rs-api:3.0.0")
 }
+
+tasks {
+  withType<Test>().configureEach {
+    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+  }
+}
--- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-jersey-3.0/javaagent/build.gradle.kts
+++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-jersey-3.0/javaagent/build.gradle.kts
@ -42,5 +42,6 @@ tasks {
  withType<Test>().configureEach {
    // TODO run tests both with and without experimental span attributes
    jvmArgs("-Dotel.instrumentation.jaxrs.experimental-span-attributes=true")
+    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
  }
 }
--- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-resteasy-6.0/javaagent/build.gradle.kts
+++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-resteasy-6.0/javaagent/build.gradle.kts
@ -45,5 +45,6 @@ tasks {
  withType<Test>().configureEach {
    // TODO run tests both with and without experimental span attributes
    jvmArgs("-Dotel.instrumentation.jaxrs.experimental-span-attributes=true")
+    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
  }
 }
--- a/instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/build.gradle.kts
+++ b/instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/build.gradle.kts
@ -52,4 +52,5 @@ tasks.withType<Test>().configureEach {
  // required on jdk17
  jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
  jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
 }
--- a/instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/build.gradle.kts
+++ b/instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/build.gradle.kts
@ -45,4 +45,5 @@ tasks.withType<Test>().configureEach {
  // required on jdk17
  jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
  jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
 }
--- a/instrumentation/jaxws/jaxws-2.0-metro-2.2-testing/build.gradle.kts
+++ b/instrumentation/jaxws/jaxws-2.0-metro-2.2-testing/build.gradle.kts
@ -28,4 +28,5 @@ tasks.withType<Test>().configureEach {
  jvmArgs("--add-exports=java.xml/com.sun.org.apache.xerces.internal.jaxp=ALL-UNNAMED")
  jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
  jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
 }
--- a/instrumentation/jaxws/jaxws-2.0-tomee-testing/build.gradle.kts
+++ b/instrumentation/jaxws/jaxws-2.0-tomee-testing/build.gradle.kts
@ -20,4 +20,5 @@ tasks.withType<Test>().configureEach {
  jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
  jvmArgs("--add-exports=java.base/sun.misc=ALL-UNNAMED")
  jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
 }
--- a/instrumentation/jaxws/jaxws-2.0-wildfly-testing/build.gradle.kts
+++ b/instrumentation/jaxws/jaxws-2.0-wildfly-testing/build.gradle.kts
@ -74,4 +74,5 @@ tasks.withType<Test>().configureEach {
  // required on jdk17
  jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
  jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
 }
--- a/instrumentation/jaxws/jaxws-2.0/javaagent/build.gradle.kts
+++ b/instrumentation/jaxws/jaxws-2.0/javaagent/build.gradle.kts
@ -14,3 +14,7 @@ dependencies {
  library("javax.xml.ws:jaxws-api:2.0")
  implementation(project(":instrumentation:jaxws:jaxws-common:javaagent"))
 }
+
+tasks.withType<Test>().configureEach {
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+}
--- a/instrumentation/jaxws/jaxws-3.0-metro-2.2-testing/build.gradle.kts
+++ b/instrumentation/jaxws/jaxws-3.0-metro-2.2-testing/build.gradle.kts
@ -24,4 +24,5 @@ tasks.withType<Test>().configureEach {
  jvmArgs("--add-exports=java.xml/com.sun.org.apache.xerces.internal.jaxp=ALL-UNNAMED")
  jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
  jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
 }
--- a/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/build.gradle.kts
+++ b/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/build.gradle.kts
@ -14,3 +14,6 @@ dependencies {
  library("javax.jws:javax.jws-api:1.1")
  implementation(project(":instrumentation:jaxws:jaxws-common:javaagent"))
 }
+tasks.withType<Test>().configureEach {
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+}
--- a/instrumentation/jsf/jsf-mojarra-1.2/javaagent/build.gradle.kts
+++ b/instrumentation/jsf/jsf-mojarra-1.2/javaagent/build.gradle.kts
@ -90,3 +90,6 @@ tasks {
    dependsOn(testing.suites)
  }
 }
+tasks.withType<Test>().configureEach {
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+}
--- a/instrumentation/jsf/jsf-mojarra-3.0/javaagent/build.gradle.kts
+++ b/instrumentation/jsf/jsf-mojarra-3.0/javaagent/build.gradle.kts
@ -33,3 +33,9 @@ dependencies {
  // JSF 4+ requires CDI instead of BeanManager, the test should be upgraded first
  // latestDepTestLibrary("org.glassfish:jakarta.faces:4.+")
 }
+
+tasks {
+  withType<Test>().configureEach {
+    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+  }
+}
--- a/instrumentation/jsf/jsf-myfaces-1.2/javaagent/build.gradle.kts
+++ b/instrumentation/jsf/jsf-myfaces-1.2/javaagent/build.gradle.kts
@ -60,3 +60,7 @@ tasks {
    dependsOn(testing.suites)
  }
 }
+tasks.withType<Test>().configureEach {
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+  jvmArgs("-Dotel.instrumentation.common.experimental.view-telemetry.enabled=true")
+}
--- a/instrumentation/jsf/jsf-myfaces-3.0/javaagent/build.gradle.kts
+++ b/instrumentation/jsf/jsf-myfaces-3.0/javaagent/build.gradle.kts
@ -33,3 +33,9 @@ dependencies {
  // JSF 4+ requires CDI instead of BeanManager, the test should be upgraded first
  // latestDepTestLibrary("org.apache.myfaces.core:myfaces-impl:4.+")
 }
+
+tasks {
+  withType<Test>().configureEach {
+    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+  }
+}
--- a/instrumentation/ktor/ktor-1.0/library/build.gradle.kts
+++ b/instrumentation/ktor/ktor-1.0/library/build.gradle.kts
@ -35,3 +35,6 @@ tasks {
    }
  }
 }
+tasks.withType<Test>().configureEach {
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+}
--- a/instrumentation/log4j/log4j-appender-1.2/javaagent/build.gradle.kts
+++ b/instrumentation/log4j/log4j-appender-1.2/javaagent/build.gradle.kts
@ -34,4 +34,6 @@ tasks.withType<Test>().configureEach {
  // TODO run tests both with and without experimental log attributes
  jvmArgs("-Dotel.instrumentation.log4j-appender.experimental.capture-mdc-attributes=*")
  jvmArgs("-Dotel.instrumentation.log4j-appender.experimental-log-attributes=true")
+  jvmArgs("-Dotel.instrumentation.log4j-appender.experimental-log-attributes=true")
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
 }
--- a/instrumentation/log4j/log4j-appender-2.17/library/build.gradle.kts
+++ b/instrumentation/log4j/log4j-appender-2.17/library/build.gradle.kts
@ -11,3 +11,7 @@ dependencies {
    testCompileOnly("biz.aQute.bnd:biz.aQute.bnd.annotation:7.0.0")
  }
 }
+
+tasks.withType<Test>().configureEach {
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+}
--- a/instrumentation/logback/logback-appender-1.0/library/build.gradle.kts
+++ b/instrumentation/logback/logback-appender-1.0/library/build.gradle.kts
@ -91,3 +91,7 @@ tasks {
    dependsOn(testing.suites)
  }
 }
+
+tasks.withType<Test>().configureEach {
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+}
--- a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/build.gradle.kts
+++ b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/build.gradle.kts
@ -85,3 +85,6 @@ if (!(findProperty("testLatestDeps") as Boolean)) {
    }
  }
 }
+tasks.withType<Test>().configureEach {
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+}
--- a/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/build.gradle.kts
+++ b/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/build.gradle.kts
@ -80,3 +80,6 @@ tasks {
 configurations.configureEach {
  exclude("org.eclipse.jetty.websocket", "websocket-client")
 }
+tasks.withType<Test>().configureEach {
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+}
--- a/instrumentation/ratpack/ratpack-1.4/javaagent/build.gradle.kts
+++ b/instrumentation/ratpack/ratpack-1.4/javaagent/build.gradle.kts
@ -51,3 +51,7 @@ tasks {
    systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
  }
 }
+
+tasks.withType<Test>().configureEach {
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+}
--- 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
@ -38,6 +38,7 @@ tasks {
    }
    include("**/ReactorNettyConnectionSpanTest.*")
    jvmArgs("-Dotel.instrumentation.netty.connection-telemetry.enabled=true")
+    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
  }

  test {
--- 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,6 +54,7 @@ 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 {
--- a/instrumentation/restlet/restlet-1.1/javaagent/build.gradle.kts
+++ b/instrumentation/restlet/restlet-1.1/javaagent/build.gradle.kts
@ -31,3 +31,7 @@ dependencies {
  testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
  testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
 }
+
+tasks.withType<Test>().configureEach {
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+}
--- a/instrumentation/restlet/restlet-1.1/library/build.gradle.kts
+++ b/instrumentation/restlet/restlet-1.1/library/build.gradle.kts
@ -15,3 +15,7 @@ dependencies {

  testImplementation(project(":instrumentation:restlet:restlet-1.1:testing"))
 }
+
+tasks.withType<Test>().configureEach {
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+}
--- a/instrumentation/restlet/restlet-2.0/javaagent/build.gradle.kts
+++ b/instrumentation/restlet/restlet-2.0/javaagent/build.gradle.kts
@ -41,3 +41,7 @@ if (findProperty("testLatestDeps") as Boolean) {
    }
  }
 }
+
+tasks.withType<Test>().configureEach {
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+}
--- a/instrumentation/restlet/restlet-2.0/library/build.gradle.kts
+++ b/instrumentation/restlet/restlet-2.0/library/build.gradle.kts
@ -27,3 +27,7 @@ if (findProperty("testLatestDeps") as Boolean) {
    }
  }
 }
+
+tasks.withType<Test>().configureEach {
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+}
--- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/javaagent/build.gradle.kts
+++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/javaagent/build.gradle.kts
@ -29,4 +29,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")
 }
--- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/build.gradle.kts
+++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/build.gradle.kts
@ -18,4 +18,5 @@ 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")
 }
--- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/build.gradle.kts
+++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/build.gradle.kts
@ -30,6 +30,7 @@ tasks {
      excludeTestsMatching("RocketMqClientSuppressReceiveSpanTest")
    }
    jvmArgs("-Dotel.instrumentation.messaging.experimental.receive-telemetry.enabled=true")
+    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
  }

  check {
--- a/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-2.0/javaagent/build.gradle.kts
+++ b/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-2.0/javaagent/build.gradle.kts
@ -33,6 +33,8 @@ tasks.withType<Test>().configureEach {
  jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
  jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")

+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+
  systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
 }

--- a/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-2.2/testing/build.gradle.kts
+++ b/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-2.2/testing/build.gradle.kts
@ -22,6 +22,8 @@ tasks.withType<Test>().configureEach {
  jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
  jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")

+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+
  systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
 }

--- 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
@ -50,5 +50,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")
  }
 }
--- 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,6 +46,7 @@ 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")
  }

  check {
--- a/instrumentation/spring/spring-integration-4.1/library/build.gradle.kts
+++ b/instrumentation/spring/spring-integration-4.1/library/build.gradle.kts
@ -36,3 +36,7 @@ configurations.testRuntimeClasspath {
    force("org.slf4j:slf4j-api:1.7.36")
  }
 }
+
+tasks.withType<Test>().configureEach {
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+}
--- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/build.gradle.kts
+++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/build.gradle.kts
@ -68,6 +68,7 @@ tasks.withType<Test>().configureEach {
  // required on jdk17
  jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
  jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")

  systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
 }
--- a/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/build.gradle.kts
+++ b/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/build.gradle.kts
@ -50,6 +50,8 @@ tasks.withType<Test>().configureEach {
  // required on jdk17
  jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
  jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+  jvmArgs("-Dotel.instrumentation.common.experimental.view-telemetry.enabled=true")
 }

 configurations.testRuntimeClasspath {
--- a/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/wildfly-testing/build.gradle.kts
+++ b/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/wildfly-testing/build.gradle.kts
@ -74,6 +74,7 @@ tasks {
      jvmArgs("--add-modules=java.se")
      // add offset to default port values
      jvmArgs("-Djboss.socket.binding.port-offset=300")
+      jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")

      // remove logback-classic from classpath
      classpath = classpath.filter {
--- a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/build.gradle.kts
+++ b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/build.gradle.kts
@ -50,6 +50,8 @@ tasks.withType<Test>().configureEach {
  // required on jdk17
  jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
  jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+  jvmArgs("-Dotel.instrumentation.common.experimental.view-telemetry.enabled=true")

  systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
 }
--- a/instrumentation/spring/spring-ws-2.0/javaagent/build.gradle.kts
+++ b/instrumentation/spring/spring-ws-2.0/javaagent/build.gradle.kts
@ -54,6 +54,7 @@ tasks.withType<Test>().configureEach {
  // required on jdk17
  jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
  jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
 }

 configurations.testRuntimeClasspath {
--- a/instrumentation/struts-2.3/javaagent/build.gradle.kts
+++ b/instrumentation/struts-2.3/javaagent/build.gradle.kts
@ -27,3 +27,7 @@ dependencies {

  latestDepTestLibrary("org.apache.struts:struts2-core:6.0.+")
 }
+
+tasks.withType<Test>().configureEach {
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+}
--- a/instrumentation/tapestry-5.4/javaagent/build.gradle.kts
+++ b/instrumentation/tapestry-5.4/javaagent/build.gradle.kts
@ -28,3 +28,7 @@ dependencies {
  testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
  testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
 }
+
+tasks.withType<Test>().configureEach {
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+}
--- a/instrumentation/tomcat/tomcat-10.0/javaagent/build.gradle.kts
+++ b/instrumentation/tomcat/tomcat-10.0/javaagent/build.gradle.kts
@ -26,5 +26,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")
  }
 }
--- a/instrumentation/tomcat/tomcat-7.0/javaagent/build.gradle.kts
+++ b/instrumentation/tomcat/tomcat-7.0/javaagent/build.gradle.kts
@ -36,5 +36,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")
  }
 }
--- a/instrumentation/undertow-1.4/javaagent/build.gradle.kts
+++ b/instrumentation/undertow-1.4/javaagent/build.gradle.kts
@ -20,3 +20,7 @@ dependencies {
  bootstrap(project(":instrumentation:servlet:servlet-common:bootstrap"))
  bootstrap(project(":instrumentation:undertow-1.4:bootstrap"))
 }
+
+tasks.withType<Test>().configureEach {
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+}
--- a/instrumentation/vaadin-14.2/javaagent/build.gradle.kts
+++ b/instrumentation/vaadin-14.2/javaagent/build.gradle.kts
@ -95,3 +95,7 @@ configurations.configureEach {
    }
  }
 }
+tasks.withType<Test>().configureEach {
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+  jvmArgs("-Dotel.instrumentation.common.experimental.view-telemetry.enabled=true")
+}
--- a/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/ExperimentalConfig.java
+++ b/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/ExperimentalConfig.java
@ -34,12 +34,12 @@ public final class ExperimentalConfig {

  public boolean controllerTelemetryEnabled() {
    return config.getBoolean(
-        "otel.instrumentation.common.experimental.controller-telemetry.enabled", true);
+        "otel.instrumentation.common.experimental.controller-telemetry.enabled", false);
  }

  public boolean viewTelemetryEnabled() {
    return config.getBoolean(
-        "otel.instrumentation.common.experimental.view-telemetry.enabled", true);
+        "otel.instrumentation.common.experimental.view-telemetry.enabled", false);
  }

  public boolean messagingReceiveInstrumentationEnabled() {
--- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/QuarkusSmokeTest.groovy
+++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/QuarkusSmokeTest.groovy
@ -41,7 +41,6 @@ class QuarkusSmokeTest extends SmokeTest {

    then:
    countSpansByName(traces, 'GET /hello') == 1
-    countSpansByName(traces, 'HelloResource.hello') == 1

      [currentAgentVersion] as Set == findResourceAttribute(traces, "telemetry.distro.version")
      .map { it.stringValue }
--- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy
+++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy
@ -52,7 +52,6 @@ class SpringBootSmokeTest extends SmokeTest {
    then: "spans are exported"
    response.contentUtf8() == "Hi!"
    countSpansByName(traces, 'GET /greeting') == 1
-    countSpansByName(traces, 'WebController.greeting') == 1
    countSpansByName(traces, 'WebController.withSpan') == 1

    then: "thread details are recorded"
--- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy
+++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy
@ -47,7 +47,6 @@ class SpringBootWithSamplingSmokeTest extends SmokeTest {

    then:
    // since sampling is enabled, not really expecting to receive NUM_TRIES spans
-    Math.abs(countSpansByName(traces, 'WebController.greeting') - (SAMPLER_PROBABILITY * NUM_TRIES)) <= ALLOWED_DEVIATION
    Math.abs(countSpansByName(traces, 'GET /greeting') - (SAMPLER_PROBABILITY * NUM_TRIES)) <= ALLOWED_DEVIATION

    cleanup: