merge

Author: jaydeluca

benchmark-overhead/build.gradle.kts

@@ -23,9 +23,9 @@ dependencies {
   testImplementation("org.testcontainers:testcontainers-postgresql")
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testImplementation("org.junit.jupiter:junit-jupiter-params")
-  testImplementation("com.squareup.okhttp3:okhttp:5.2.1")
+  testImplementation("com.squareup.okhttp3:okhttp:5.3.0")
   testImplementation("org.jooq:joox:2.0.1")
-  testImplementation("com.jayway.jsonpath:json-path:2.9.0")
+  testImplementation("com.jayway.jsonpath:json-path:2.10.0")
   testImplementation("org.slf4j:slf4j-simple:2.0.17")
 
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")

build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 
 buildscript {
   dependencies {
-    classpath("com.squareup.okhttp3:okhttp:5.2.1")
+    classpath("com.squareup.okhttp3:okhttp:5.3.0")
   }
 }
 

docs/instrumentation-list.yaml

@@ -5755,12 +5755,24 @@ libraries:
         - name: code.namespace
           type: STRING
   - name: jaxws-metro-2.2
+    display_name: Metro JAX-WS
+    description: |
+      This instrumentation enriches HTTP server spans with route information, and enables controller spans for Metro JAX-WS web services (controller spans are disabled by default).
+    library_link: https://javaee.github.io/metro/
+    features:
+    - HTTP_ROUTE
+    - CONTROLLER_SPANS
     source_path: instrumentation/jaxws/jaxws-metro-2.2
     scope:
       name: io.opentelemetry.jaxws-metro-2.2
     target_versions:
       javaagent:
       - com.sun.xml.ws:jaxws-rt:[2.2.0.1,)
+    configurations:
+    - name: otel.instrumentation.common.experimental.controller-telemetry.enabled
+      description: Enables the creation of experimental controller spans.
+      type: boolean
+      default: false
     telemetry:
     - when: otel.instrumentation.common.experimental.controller-telemetry.enabled=true
       spans:

examples/distro/instrumentation/servlet-3/build.gradle

@@ -27,7 +27,7 @@ dependencies {
     exclude group: 'org.eclipse.jetty', module: 'jetty-server'
   }
 
-  testImplementation "com.squareup.okhttp3:okhttp:5.2.1"
+  testImplementation "com.squareup.okhttp3:okhttp:5.3.0"
   testImplementation "javax.servlet:javax.servlet-api:3.0.1"
   testImplementation "org.eclipse.jetty:jetty-server:8.2.0.v20160908"
   testImplementation "org.eclipse.jetty:jetty-servlet:8.2.0.v20160908"

examples/distro/smoke-tests/build.gradle

@@ -6,7 +6,7 @@ dependencies {
   testImplementation("org.testcontainers:testcontainers:2.0.1")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.20.0")
   testImplementation("com.google.protobuf:protobuf-java-util:4.33.0")
-  testImplementation("com.squareup.okhttp3:okhttp:5.2.1")
+  testImplementation("com.squareup.okhttp3:okhttp:5.3.0")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.8.0-alpha")
   testImplementation("io.opentelemetry:opentelemetry-api")
 

examples/extension/build.gradle

@@ -101,7 +101,7 @@ dependencies {
   testImplementation("org.testcontainers:testcontainers:2.0.1")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.20.0")
   testImplementation("com.google.protobuf:protobuf-java-util:4.33.0")
-  testImplementation("com.squareup.okhttp3:okhttp:5.2.1")
+  testImplementation("com.squareup.okhttp3:okhttp:5.3.0")
   testImplementation("io.opentelemetry:opentelemetry-api")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.8.0-alpha")
 

instrumentation-docs/build.gradle.kts

@@ -9,11 +9,10 @@ otelJava {
 
 dependencies {
   implementation("org.yaml:snakeyaml:2.5")
-  implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.20.0")
+  implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
   implementation("io.opentelemetry:opentelemetry-sdk-common")
 
-  testImplementation(enforcedPlatform("org.junit:junit-bom:5.14.0"))
-  testImplementation("org.assertj:assertj-core:3.27.6")
+  testImplementation("org.assertj:assertj-core")
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }

instrumentation-docs/collect.sh

@@ -154,17 +154,17 @@ main() {
   run_gradle_tasks "${gradle_tasks[@]}"
 
   # Setup colima if needed
-#  setup_colima
-#
-#  # Process colima-specific instrumentations
-#  echo "Processing colima instrumentations..."
-#  gradle_tasks=()
-#  while IFS= read -r line; do
-#    gradle_tasks+=("$line")
-#  done < <(process_descriptors "${COLIMA_INSTRUMENTATIONS[@]}")
-#  run_gradle_tasks "${gradle_tasks[@]}"
-#
-#  colima stop
+  setup_colima
+
+  # Process colima-specific instrumentations
+  echo "Processing colima instrumentations..."
+  gradle_tasks=()
+  while IFS= read -r line; do
+    gradle_tasks+=("$line")
+  done < <(process_descriptors "${COLIMA_INSTRUMENTATIONS[@]}")
+  run_gradle_tasks "${gradle_tasks[@]}"
+
+  colima stop
 
   # uncomment the next line to remove all .telemetry directories
   #find_and_remove_all_telemetry

instrumentation-docs/instrumentations.sh

@@ -127,6 +127,7 @@ readonly INSTRUMENTATIONS=(
   "jaxws:jaxws-2.0-axis2-1.6:javaagent:test"
   "jaxws:jaxws-cxf-3.0:javaagent:test"
   "jaxws:jaxws-jws-api-1.1:javaagent:test"
+  "jaxws:jaxws-metro-2.2:javaagent:test"
   "jedis:jedis-1.4:javaagent:test"
   "jedis:jedis-1.4:javaagent:testStableSemconv"
   "jedis:jedis-3.0:javaagent:test"

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

@@ -29,8 +29,8 @@ dependencies {
 
   // used to record LLM responses in bedrock tests
   implementation("com.github.tomakehurst:wiremock-jre8:2.35.2")
-  implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2")
-  implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.2")
+  implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
+  implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
 
   implementation("io.opentelemetry:opentelemetry-api")
 }