more modules

Author: jaydeluca

docs/instrumentation-list.yaml

@@ -712,6 +712,12 @@ libraries:
     target_versions:
       javaagent:
       - org.elasticsearch.client:elasticsearch-rest-client:[6.4,7.0)
+    configurations:
+    - name: otel.instrumentation.elasticsearch.capture-search-query
+      description: |
+        Enable the capture of search query bodies. It is important to note that Elasticsearch queries may contain personal or sensitive information.
+      type: boolean
+      default: false
   - name: elasticsearch-api-client-7.16
     source_path: instrumentation/elasticsearch/elasticsearch-api-client-7.16
     scope:
@@ -728,6 +734,13 @@ libraries:
       javaagent:
       - org.elasticsearch.client:rest:[5.0,6.4)
       - org.elasticsearch.client:elasticsearch-rest-client:[5.0,6.4)
+    configurations:
+    - name: otel.instrumentation.elasticsearch.capture-search-query
+      description: |
+        Enable the capture of search query bodies. It is important to note that Elasticsearch queries
+        may contain personal or sensitive information.
+      type: boolean
+      default: false
   - name: elasticsearch-rest-7.0
     source_path: instrumentation/elasticsearch/elasticsearch-rest-7.0
     scope:
@@ -737,6 +750,12 @@ libraries:
       - org.elasticsearch.client:elasticsearch-rest-client:[7.0,)
       library:
       - org.elasticsearch.client:elasticsearch-rest-client:7.0.0
+    configurations:
+    - name: otel.instrumentation.elasticsearch.capture-search-query
+      description: |
+        Enable the capture of search query bodies. It is important to note that Elasticsearch queries may contain personal or sensitive information.
+      type: boolean
+      default: false
   - name: elasticsearch-transport-6.0
     source_path: instrumentation/elasticsearch/elasticsearch-transport-6.0
     scope:

instrumentation-docs/collect.sh

@@ -14,25 +14,39 @@ fi
 
 readonly INSTRUMENTATIONS=(
   # <module path (colon-separated)> : <javaagent|library> : [ gradle-task-suffix ]
-  "alibaba-druid-1.0:javaagent:test"
-  "alibaba-druid-1.0:javaagent:testStableSemconv"
-  "apache-dbcp-2.0:javaagent:test"
-  "apache-dbcp-2.0:javaagent:testStableSemconv"
-  "apache-httpclient:apache-httpclient-5.0:javaagent:test"
-  "c3p0-0.9:javaagent:test"
-  "c3p0-0.9:javaagent:testStableSemconv"
-  "clickhouse-client-0.5:javaagent:test"
-  "clickhouse-client-0.5:javaagent:testStableSemconv"
-  "hikaricp-3.0:javaagent:test"
-  "hikaricp-3.0:javaagent:testStableSemconv"
-  "tomcat:tomcat-jdbc:javaagent:test"
-  "tomcat:tomcat-jdbc:javaagent:testStableSemconv"
-  "oracle-ucp-11.2:javaagent:test"
-  "oracle-ucp-11.2:javaagent:testStableSemconv"
-  "oshi:javaagent:test"
-  "oshi:javaagent:testExperimental"
-  "vibur-dbcp-11.0:javaagent:test"
-  "vibur-dbcp-11.0:javaagent:testStableSemconv"
+#  "akka:akka-http-10.0:javaagent:test"
+#  "apache-httpasyncclient-4.1:javaagent:test"
+#  "alibaba-druid-1.0:javaagent:test"
+#  "alibaba-druid-1.0:javaagent:testStableSemconv"
+#  "apache-dbcp-2.0:javaagent:test"
+#  "apache-dbcp-2.0:javaagent:testStableSemconv"
+#  "apache-httpclient:apache-httpclient-5.0:javaagent:test"
+#  "c3p0-0.9:javaagent:test"
+#  "c3p0-0.9:javaagent:testStableSemconv"
+#  "clickhouse-client-0.5:javaagent:test"
+#  "clickhouse-client-0.5:javaagent:testStableSemconv"
+#  "aws-sdk:aws-sdk-1.11:javaagent:test"
+#  "google-http-client-1.19:javaagent:test"
+#  "http-url-connection:javaagent:test"
+#  "java-http-client:javaagent:test"
+#  "jetty-httpclient:jetty-httpclient-9.2:javaagent:test"
+#  "jetty-httpclient:jetty-httpclient-12.0:javaagent:test"
+#  "jodd-http-4.2:javaagent:test"
+  "netty:netty-3.8:javaagent:test"
+#  "aws-sdk:aws-sdk-1.11:javaagent:testStableSemconv"
+#  "aws-sdk:aws-sdk-2.2:javaagent:test"
+#  "aws-sdk:aws-sdk-2.2:javaagent:testStableSemconv"
+#  "aws-sdk:aws-sdk-2.2:javaagent:testBedrockRuntime"
+#  "hikaricp-3.0:javaagent:test"
+#  "hikaricp-3.0:javaagent:testStableSemconv"
+#  "tomcat:tomcat-jdbc:javaagent:test"
+#  "tomcat:tomcat-jdbc:javaagent:testStableSemconv"
+#  "oracle-ucp-11.2:javaagent:test"
+#  "oracle-ucp-11.2:javaagent:testStableSemconv"
+#  "oshi:javaagent:test"
+#  "oshi:javaagent:testExperimental"
+#  "vibur-dbcp-11.0:javaagent:test"
+#  "vibur-dbcp-11.0:javaagent:testStableSemconv"
 )
 
 readonly TELEMETRY_DIR_NAME=".telemetry"

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

@@ -65,6 +65,7 @@ tasks {
     jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
 
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
+    systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
   }
 
   check {

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

@@ -16,3 +16,9 @@ muzzle {
 dependencies {
   library("org.apache.httpcomponents:httpasyncclient:4.1")
 }
+
+tasks {
+  test {
+    systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
+  }
+}

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts

@@ -130,6 +130,8 @@ testing {
   }
 }
 
+val collectMetadata = findProperty("collectMetadata")?.toString() ?: "false"
+
 tasks {
   if (!(findProperty("testLatestDeps") as Boolean)) {
     check {
@@ -143,6 +145,9 @@ tasks {
 
   val testStableSemconv by registering(Test::class) {
     jvmArgs("-Dotel.semconv-stability.opt-in=database")
+
+    systemProperty("collectMetadata", collectMetadata)
+    systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database")
   }
 
   check {
@@ -151,6 +156,7 @@ tasks {
 
   test {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
+    systemProperty("collectMetadata", collectMetadata)
   }
 
   withType<Test>().configureEach {

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts

@@ -161,13 +161,16 @@ testing {
           testTask.configure {
             // TODO run tests both with and without genai message capture
             systemProperty("otel.instrumentation.genai.capture-message-content", "true")
+            systemProperty("collectMetadata", collectMetadata)
           }
         }
       }
     }
   }
 }
 
+val collectMetadata = findProperty("collectMetadata")?.toString() ?: "false"
+
 tasks {
   val testExperimentalSqs by registering(Test::class) {
     filter {
@@ -202,6 +205,7 @@ tasks {
     systemProperty("otel.instrumentation.aws-sdk.experimental-span-attributes", "true")
     systemProperty("otel.instrumentation.aws-sdk.experimental-record-individual-http-error", "true")
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
+    systemProperty("collectMetadata", collectMetadata)
   }
 
   withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>().configureEach {
@@ -216,6 +220,9 @@ tasks {
     }
     systemProperty("otel.instrumentation.messaging.experimental.receive-telemetry.enabled", "true")
     jvmArgs("-Dotel.semconv-stability.opt-in=database")
+
+    systemProperty("collectMetadata", collectMetadata)
+    systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database")
   }
 
   check {

instrumentation/elasticsearch/elasticsearch-rest-5.0/metadata.yaml

@@ -1,5 +1,7 @@
 configurations:
   - name: otel.instrumentation.elasticsearch.capture-search-query
-    description: Enable the capture of search query bodies. Attention: Elasticsearch queries may contain personal or sensitive information.
+    description: |
+      Enable the capture of search query bodies. It is important to note that Elasticsearch queries
+      may contain personal or sensitive information.
     type: boolean
     default: false

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

@@ -15,3 +15,9 @@ muzzle {
 dependencies {
   library("com.google.http-client:google-http-client:1.19.0")
 }
+
+tasks {
+  test {
+    systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
+  }
+}

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

@@ -7,3 +7,9 @@ muzzle {
     coreJdk()
   }
 }
+
+tasks {
+  test {
+    systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
+  }
+}

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

@@ -16,3 +16,9 @@ dependencies {
   implementation(project(":instrumentation:java-http-client:library"))
   testImplementation(project(":instrumentation:java-http-client:testing"))
 }
+
+tasks {
+  test {
+    systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
+  }
+}