Simplify metadata configuration flags

instrumentation-docs/instrumentations.sh

@@ -120,6 +120,7 @@ readonly INSTRUMENTATIONS=(
 #  container.
 # shellcheck disable=SC2034
 readonly COLIMA_INSTRUMENTATIONS=(
+  "spring:spring-jms:spring-jms-6.0:javaagent:test"
   "elasticsearch:elasticsearch-rest-6.4:javaagent:test"
   "elasticsearch:elasticsearch-rest-5.0:javaagent:test"
   "oracle-ucp-11.2:javaagent:test"

instrumentation-docs/readme.md

@@ -12,7 +12,7 @@ Run the analysis to update the instrumentation-list.yaml:
 
 Until this process is ready for all instrumentations, each module will be modified to include a
 system property feature flag configured for when the tests run. By enabling the following flag you
-will enable metric collection:
+will enable metric and span collection:
 
 ```kotlin
 tasks {
@@ -23,17 +23,6 @@ tasks {
 }
 ```
 
-In order to collect spans, add the `collectSpans` property (along with `collectMetadata`):
-
-```kotlin
-tasks {
-  test {
-    systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
-  }
-}
-```
-
 Sometimes instrumentation will behave differently based on configuration options, and we can
 differentiate between these configurations by using the `metaDataConfig` system property. When the
 telemetry is written to a file, the value of this property will be included, or it will default to

instrumentation/activej-http-6.0/javaagent/build.gradle.kts

@@ -23,6 +23,5 @@ otelJava {
 tasks {
   test {
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 }

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

@@ -66,7 +66,6 @@ tasks {
 
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 
   check {

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

@@ -27,12 +27,10 @@ tasks {
 
     systemProperty("collectMetadata", collectMetadata)
     systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database")
-    systemProperty("collectSpans", true)
   }
 
   test {
     systemProperty("collectMetadata", collectMetadata)
-    systemProperty("collectSpans", true)
   }
 
   check {

instrumentation/apache-dubbo-2.7/javaagent/build.gradle.kts

@@ -47,7 +47,6 @@ tasks.withType<Test>().configureEach {
   jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
 
   systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-  systemProperty("collectSpans", true)
 }
 
 tasks {

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

@@ -20,6 +20,5 @@ dependencies {
 tasks {
   test {
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 }

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

@@ -20,6 +20,5 @@ tasks {
   withType<Test>().configureEach {
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 }

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

@@ -33,6 +33,5 @@ dependencies {
 tasks {
   test {
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 }

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

@@ -15,6 +15,5 @@ dependencies {
 tasks {
   test {
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 }

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

@@ -23,6 +23,5 @@ tasks {
 
   test {
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 }

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

@@ -11,6 +11,5 @@ dependencies {
 tasks {
   test {
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 }

instrumentation/apache-shenyu-2.4/javaagent/build.gradle.kts

@@ -46,7 +46,6 @@ tasks.withType<Test>().configureEach {
 
   systemProperty("metaDataConfig", "otel.instrumentation.apache-shenyu.experimental-span-attributes=true")
   systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-  systemProperty("collectSpans", true)
 
   // required on jdk17
   jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")

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

@@ -28,6 +28,5 @@ tasks {
   withType<Test>().configureEach {
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 }

instrumentation/armeria/armeria-grpc-1.14/javaagent/build.gradle.kts

@@ -56,5 +56,4 @@ afterEvaluate {
 
 tasks.test {
   systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-  systemProperty("collectSpans", true)
 }

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

@@ -29,6 +29,5 @@ tasks {
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
 
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 }

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

@@ -41,7 +41,6 @@ tasks.withType<Test>().configureEach {
   }
 
   systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-  systemProperty("collectSpans", true)
 }
 
 // async-http-client 2.0.0 does not work with Netty versions newer than this due to referencing an

instrumentation/clickhouse-client-0.5/javaagent/build.gradle.kts

@@ -28,15 +28,13 @@ tasks {
   test {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
     systemProperty("collectMetadata", collectMetadata)
-    systemProperty("collectSpans", true)
   }
 
   val testStableSemconv by registering(Test::class) {
     jvmArgs("-Dotel.semconv-stability.opt-in=database")
 
     systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database")
     systemProperty("collectMetadata", collectMetadata)
-    systemProperty("collectSpans", true)
   }
 
   check {

instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/build.gradle.kts

@@ -79,7 +79,6 @@ tasks {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
 
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 
   val testStableSemconv by registering(Test::class) {

instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/build.gradle.kts

@@ -41,6 +41,5 @@ tasks {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
 
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 }

instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/build.gradle.kts

@@ -40,6 +40,5 @@ tasks {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
 
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 }

instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/build.gradle.kts

@@ -43,6 +43,5 @@ tasks {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
 
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 }

instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts

@@ -55,7 +55,6 @@ tasks {
     jvmArgs("--add-opens=java.base/java.nio=ALL-UNNAMED")
     jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 
   val testStableSemconv by registering(Test::class) {

instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts

@@ -74,7 +74,6 @@ tasks {
     jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
 
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 
   val testStableSemconv by registering(Test::class) {

instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/build.gradle.kts

@@ -99,7 +99,6 @@ tasks {
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
 
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 
   val testSuites = testing.suites.withType(JvmTestSuite::class)

instrumentation/finagle-http-23.11/javaagent/build.gradle.kts

@@ -45,7 +45,7 @@ tasks {
     jvmArgs("-Dotel.instrumentation.http.client.emit-experimental-telemetry=true")
     jvmArgs("-Dotel.instrumentation.http.server.emit-experimental-telemetry=true")
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
+
     systemProperty("metaDataConfig", "otel.instrumentation.http.client.emit-experimental-telemetry=true,otel.instrumentation.http.server.emit-experimental-telemetry=true")
   }
 }

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

@@ -87,6 +87,5 @@ tasks {
     jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
 
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 }

instrumentation/openai/openai-java-1.1/javaagent/build.gradle.kts

@@ -28,6 +28,5 @@ tasks {
 
     systemProperty("otel.instrumentation.genai.capture-message-content", "true")
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 }

instrumentation/spring/spring-batch-3.0/javaagent/build.gradle.kts

@@ -50,7 +50,6 @@ tasks {
     }
 
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
     systemProperty("metaDataConfig", "otel.instrumentation.spring-batch.experimental-span-attributes=true")
   }
 

instrumentation/spring/spring-core-2.0/javaagent/build.gradle.kts

@@ -30,6 +30,5 @@ if (findProperty("testLatestDeps") as Boolean) {
 tasks {
   test {
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 }

instrumentation/spring/spring-data/spring-data-1.8/javaagent/build.gradle.kts

@@ -53,7 +53,6 @@ tasks {
     jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
 
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 
   val testStableSemconv by registering(Test::class) {

instrumentation/spring/spring-integration-4.1/javaagent/build.gradle.kts

@@ -81,7 +81,6 @@ tasks {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
 
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 }
 

instrumentation/spring/spring-jms/spring-jms-2.0/javaagent/build.gradle.kts

@@ -62,7 +62,6 @@ tasks {
   withType<Test>().configureEach {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
   // this does not apply to testReceiveSpansDisabled
   test {

instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/build.gradle.kts

@@ -38,7 +38,6 @@ tasks {
   withType<Test>().configureEach {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 
   val testReceiveSpansDisabled by registering(Test::class) {

instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts

@@ -57,7 +57,6 @@ testing {
             jvmArgs("-Dotel.instrumentation.messaging.experimental.receive-telemetry.enabled=false")
 
             systemProperty("collectMetadata", collectMetadata)
-            systemProperty("collectSpans", true)
           }
         }
       }
@@ -75,7 +74,6 @@ tasks {
 
     systemProperty("metaDataConfig", "otel.instrumentation.kafka.experimental-span-attributes=true")
     systemProperty("collectMetadata", collectMetadata)
-    systemProperty("collectSpans", true)
   }
 
   check {

instrumentation/spring/spring-pulsar-1.0/javaagent/build.gradle.kts

@@ -66,7 +66,6 @@ tasks {
     jvmArgs("-Dotel.instrumentation.messaging.experimental.receive-telemetry.enabled=true")
 
     systemProperty("collectMetadata", collectMetadata)
-    systemProperty("collectSpans", true)
   }
 
   check {

instrumentation/spring/spring-rabbit-1.0/javaagent/build.gradle.kts

@@ -27,7 +27,6 @@ tasks {
   test {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 }
 

instrumentation/spring/spring-rmi-4.0/javaagent/build.gradle.kts

@@ -36,7 +36,6 @@ otelJava {
 tasks.withType<Test>().configureEach {
   jvmArgs("-Djava.rmi.server.hostname=127.0.0.1")
   systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-  systemProperty("collectSpans", true)
 }
 
 configurations.testRuntimeClasspath {

instrumentation/spring/spring-scheduling-3.1/javaagent/build.gradle.kts

@@ -27,7 +27,6 @@ tasks {
     jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
 
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 
   val testExperimental by registering(Test::class) {

instrumentation/spring/spring-security-config-6.0/library/build.gradle.kts

@@ -22,5 +22,4 @@ otelJava {
 tasks.test {
   systemProperty("metaDataConfig", "otel.instrumentation.common.enduser.id.enabled=true,otel.instrumentation.common.enduser.role.enabled=true,otel.instrumentation.common.enduser.scope.enabled=true")
   systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-  systemProperty("collectSpans", true)
 }

instrumentation/spring/spring-web/spring-web-3.1/library/build.gradle.kts

@@ -23,6 +23,5 @@ if (latestDepTest) {
 tasks {
   test {
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 }

instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/build.gradle.kts

@@ -72,7 +72,6 @@ tasks.withType<Test>().configureEach {
   systemProperty("metaDataConfig", "otel.instrumentation.common.experimental.controller-telemetry.enabled")
   systemProperty("testLatestDeps", latestDepTest)
   systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-  systemProperty("collectSpans", true)
 }
 
 if (latestDepTest) {

instrumentation/spring/spring-webflux/spring-webflux-5.3/library/build.gradle.kts

@@ -37,6 +37,5 @@ if (!latestDepTest) {
 tasks {
   test {
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 }

instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/build.gradle.kts

@@ -52,8 +52,6 @@ tasks {
     jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
 
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
-
     jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
     jvmArgs("-Dotel.instrumentation.common.experimental.view-telemetry.enabled=true")
   }

instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/build.gradle.kts

@@ -26,6 +26,5 @@ configurations.testRuntimeClasspath {
 tasks {
   test {
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
   }
 }

instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/build.gradle.kts

@@ -53,8 +53,6 @@ tasks {
     jvmArgs("-Dotel.instrumentation.common.experimental.view-telemetry.enabled=true")
 
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("collectSpans", true)
-
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
   }
 

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/InstrumentationTestRunner.java

@@ -153,7 +153,7 @@ private <T extends Consumer<TraceAssert>> void doAssertTraces(
     }
     TracesAssert.assertThat(traces).hasTracesSatisfyingExactly(assertionsList);
 
-    if (Boolean.getBoolean("collectMetadata") && Boolean.getBoolean("collectSpans")) {
+    if (Boolean.getBoolean("collectMetadata")) {
       collectEmittedSpans(traces);
     }
   }