Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into semconv-stable-code

Author: SylvainJuge

.fossa.yml

@@ -958,9 +958,6 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:vertx:vertx-rx-java-3.5:javaagent'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:vertx:vertx-sql-client-4.0:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:vertx:vertx-web-3.0:javaagent'
@@ -1120,6 +1117,15 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:vertx:vertx-http-client:vertx-http-client-common:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:vertx:vertx-sql-client:vertx-sql-client-4.0:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:vertx:vertx-sql-client:vertx-sql-client-5.0:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:vertx:vertx-sql-client:vertx-sql-client-common:javaagent'
 
 experimental:
   gradle:

.github/workflows/auto-update-pull-request.yml

@@ -43,31 +43,10 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         if: steps.unzip-patch.outputs.exists == 'true'
         with:
+          repository: "${{ github.event.workflow_run.head_repository.full_name }}"
+          ref: "${{ github.event.workflow_run.head_branch }}"
           token: ${{ steps.otelbot-token.outputs.token }}
 
-      - id: get-pr
-        if: steps.unzip-patch.outputs.exists == 'true'
-        name: Get PR
-        env:
-          PR_BRANCH: |-
-            ${{
-              (github.event.workflow_run.head_repository.owner.login != github.event.workflow_run.repository.owner.login)
-                && format('{0}:{1}', github.event.workflow_run.head_repository.owner.login, github.event.workflow_run.head_branch)
-                || github.event.workflow_run.head_branch
-            }}
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          echo gh pr view "${PR_BRANCH}" --json number --jq .number
-          number=$(gh pr view "${PR_BRANCH}" --json number --jq .number)
-          echo $number
-          echo "number=$number" >> $GITHUB_OUTPUT
-
-      - name: Check out PR branch
-        if: steps.unzip-patch.outputs.exists == 'true'
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: gh pr checkout ${{ steps.get-pr.outputs.number }}
-
       - name: Use CLA approved github bot
         if: steps.unzip-patch.outputs.exists == 'true'
         # IMPORTANT do not call the .github/scripts/use-cla-approved-bot.sh
@@ -83,14 +62,34 @@ jobs:
           git commit -a -m "./gradlew spotlessApply"
           git push
 
+      - id: get-pr
+        if: steps.unzip-patch.outputs.exists == 'true'
+        name: Get PR
+        env:
+          GH_REPO: ${{ github.repository }}
+          GH_TOKEN: ${{ github.token }}
+          PR_BRANCH: |-
+            ${{
+              (github.event.workflow_run.head_repository.owner.login != github.event.workflow_run.repository.owner.login)
+                && format('{0}:{1}', github.event.workflow_run.head_repository.owner.login, github.event.workflow_run.head_branch)
+                || github.event.workflow_run.head_branch
+            }}
+        run: |
+          number=$(gh pr view "$PR_BRANCH" --json number --jq .number)
+          echo "number=$number" >> $GITHUB_OUTPUT
+
       - if: steps.unzip-patch.outputs.exists == 'true' && success()
         env:
+          GH_REPO: ${{ github.repository }}
           GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
+          PR_NUMBER: ${{ steps.get-pr.outputs.number }}
         run: |
-          gh pr comment ${{ steps.get-pr.outputs.number }} --body "🔧 The result from spotlessApply was committed to the PR branch."
+          gh pr comment $PR_NUMBER --body "🔧 The result from spotlessApply was committed to the PR branch."
 
       - if: steps.unzip-patch.outputs.exists == 'true' && failure()
         env:
+          GH_REPO: ${{ github.repository }}
           GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
+          PR_NUMBER: ${{ steps.get-pr.outputs.number }}
         run: |
-          gh pr comment ${{ steps.get-pr.outputs.number }} --body "❌ The result from spotlessApply could not be committed to the PR branch, see logs: $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID."
+          gh pr comment $PR_NUMBER --body "❌ The result from spotlessApply could not be committed to the PR branch, see logs: $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID."

.gitignore

@@ -57,6 +57,7 @@ derby.log
 hs_err_pid*
 replay_pid*
 .attach_pid*
+**/.telemetry*
 
 !java-agent/benchmark/releases/*.jar
 

benchmark-overhead/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
   id("java")
-  id("com.diffplug.spotless") version "7.0.3"
+  id("com.diffplug.spotless") version "7.0.4"
 }
 
 spotless {
@@ -18,8 +18,8 @@ repositories {
 dependencies {
   implementation(enforcedPlatform("org.junit:junit-bom:5.12.2"))
 
-  testImplementation("org.testcontainers:testcontainers:1.21.0")
-  testImplementation("org.testcontainers:postgresql:1.21.0")
+  testImplementation("org.testcontainers:testcontainers:1.21.1")
+  testImplementation("org.testcontainers:postgresql:1.21.1")
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testImplementation("org.junit.jupiter:junit-jupiter-params")
   testImplementation("com.squareup.okhttp3:okhttp:4.12.0")

conventions/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
   `kotlin-dsl`
   // When updating, update below in dependencies too
-  id("com.diffplug.spotless") version "7.0.3"
+  id("com.diffplug.spotless") version "7.0.4"
 }
 
 spotless {
@@ -54,12 +54,12 @@ dependencies {
   implementation("org.apache.maven:maven-aether-provider:3.3.9")
 
   // When updating, update above in plugins too
-  implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.3")
+  implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.4")
   implementation("com.google.guava:guava:33.4.8-jre")
   implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
   implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.6")
   implementation("org.apache.httpcomponents:httpclient:4.5.14")
-  implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.0.1")
+  implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.0.2")
   implementation("org.owasp:dependency-check-gradle:12.1.1")
   implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1")
   implementation("org.spdx:spdx-gradle-plugin:0.9.0")

conventions/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -161,7 +161,7 @@ dependencies {
   compileOnly("com.google.errorprone:error_prone_annotations")
 
   codenarc("org.codenarc:CodeNarc:3.6.0")
-  codenarc(platform("org.codehaus.groovy:groovy-bom:3.0.24"))
+  codenarc(platform("org.codehaus.groovy:groovy-bom:3.0.25"))
 
   modules {
     // checkstyle uses the very old google-collections which causes Java 9 module conflict with

dependencyManagement/build.gradle.kts

@@ -10,7 +10,7 @@ val otelContribVersion = "1.46.0-alpha"
 val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
 
 // Need both BOM and groovy jars
-val groovyVersion = "4.0.26"
+val groovyVersion = "4.0.27"
 
 // We don't force libraries we instrument to new versions since we compile and test against specific
 // old baseline versions but we do try to force those libraries' transitive dependencies to new
@@ -28,12 +28,12 @@ val DEPENDENCY_BOMS = listOf(
   // even if they are only used by test dependencies, so not using junit bom since it is LGPL
 
   "com.fasterxml.jackson:jackson-bom:2.19.0",
-  "com.squareup.okio:okio-bom:3.11.0", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637
+  "com.squareup.okio:okio-bom:3.12.0", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637
   "com.google.guava:guava-bom:33.4.8-jre",
   "org.apache.groovy:groovy-bom:${groovyVersion}",
   "io.opentelemetry:opentelemetry-bom:${otelSdkVersion}",
   "io.opentelemetry:opentelemetry-bom-alpha:${otelSdkAlphaVersion}",
-  "org.testcontainers:testcontainers-bom:1.21.0"
+  "org.testcontainers:testcontainers-bom:1.21.1"
 )
 
 val autoServiceVersion = "1.1.1"
@@ -91,7 +91,7 @@ val DEPENDENCIES = listOf(
   "com.github.stefanbirkner:system-rules:1.19.0",
   "uk.org.webcompere:system-stubs-jupiter:2.0.3",
   "com.uber.nullaway:nullaway:0.12.7",
-  "commons-beanutils:commons-beanutils:1.10.1",
+  "commons-beanutils:commons-beanutils:1.11.0",
   "commons-cli:commons-cli:1.9.0",
   "commons-codec:commons-codec:1.18.0",
   "commons-collections:commons-collections:3.2.2",

docs/instrumentation-list.yaml

@@ -54,6 +54,46 @@ libraries:
       - com.alibaba:druid:(,)
       library:
       - com.alibaba:druid:1.0.0
+    metrics:
+    - name: db.client.connections.usage
+      description: The number of connections that are currently in state described
+        by the state attribute.
+      type: LONG_SUM
+      unit: connections
+      attributes:
+      - name: pool.name
+        type: STRING
+      - name: state
+        type: STRING
+    - name: db.client.connections.pending_requests
+      description: The number of pending requests for an open connection, cumulative
+        for the entire pool.
+      type: LONG_SUM
+      unit: requests
+      attributes:
+      - name: pool.name
+        type: STRING
+    - name: db.client.connections.max
+      description: The maximum number of open connections allowed.
+      type: LONG_SUM
+      unit: connections
+      attributes:
+      - name: pool.name
+        type: STRING
+    - name: db.client.connections.idle.min
+      description: The minimum number of idle open connections allowed.
+      type: LONG_SUM
+      unit: connections
+      attributes:
+      - name: pool.name
+        type: STRING
+    - name: db.client.connections.idle.max
+      description: The maximum number of idle open connections allowed.
+      type: LONG_SUM
+      unit: connections
+      attributes:
+      - name: pool.name
+        type: STRING
   apache:
   - name: apache-shenyu-2.4
     source_path: instrumentation/apache-shenyu-2.4
@@ -831,7 +871,7 @@ libraries:
         services.
       type: map
       default: ''
-    - name: otel.instrumentation.jdbc.capture-query-parameters
+    - name: otel.instrumentation.jdbc.experimental.capture-query-parameters
       description: |
         Sets whether the query parameters should be captured as span attributes named <code>db.query.parameter.&lt;key&gt;</code>. Enabling this option disables the statement sanitization.<p>WARNING: captured query parameters may contain sensitive information such as passwords, personally identifiable information or protected health info.
       type: boolean
@@ -1910,6 +1950,22 @@ libraries:
     target_versions:
       javaagent:
       - io.vertx:vertx-redis-client:[4.0.0,)
+  - name: vertx-sql-client-5.0
+    source_path: instrumentation/vertx/vertx-sql-client/vertx-sql-client-5.0
+    minimum_java_version: 11
+    scope:
+      name: io.opentelemetry.vertx-sql-client-5.0
+    target_versions:
+      javaagent:
+      - io.vertx:vertx-sql-client:[5.0.0,)
+  - name: vertx-http-client-5.0
+    source_path: instrumentation/vertx/vertx-http-client/vertx-http-client-5.0
+    minimum_java_version: 11
+    scope:
+      name: io.opentelemetry.vertx-http-client-5.0
+    target_versions:
+      javaagent:
+      - io.vertx:vertx-core:[5.0.0,)
   - name: vertx-web-3.0
     source_path: instrumentation/vertx/vertx-web-3.0
     scope:
@@ -1918,19 +1974,19 @@ libraries:
       javaagent:
       - io.vertx:vertx-web:[3.0.0,)
   - name: vertx-sql-client-4.0
-    source_path: instrumentation/vertx/vertx-sql-client-4.0
+    source_path: instrumentation/vertx/vertx-sql-client/vertx-sql-client-4.0
     scope:
       name: io.opentelemetry.vertx-sql-client-4.0
     target_versions:
       javaagent:
-      - io.vertx:vertx-sql-client:[4.0.0,)
+      - io.vertx:vertx-sql-client:[4.0.0,5)
   - name: vertx-http-client-4.0
     source_path: instrumentation/vertx/vertx-http-client/vertx-http-client-4.0
     scope:
       name: io.opentelemetry.vertx-http-client-4.0
     target_versions:
       javaagent:
-      - io.vertx:vertx-core:[4.0.0,)
+      - io.vertx:vertx-core:[4.0.0,5)
   - name: vertx-rx-java-3.5
     source_path: instrumentation/vertx/vertx-rx-java-3.5
     scope:
@@ -2051,6 +2107,10 @@ internal:
   source_path: instrumentation/opentelemetry-api/opentelemetry-api-1.32
   scope:
     name: io.opentelemetry.opentelemetry-api-1.32
+- name: opentelemetry-api-1.50
+  source_path: instrumentation/opentelemetry-api/opentelemetry-api-1.50
+  scope:
+    name: io.opentelemetry.opentelemetry-api-1.50
 - name: opentelemetry-api-1.42
   source_path: instrumentation/opentelemetry-api/opentelemetry-api-1.42
   scope:

examples/distro/build.gradle

@@ -12,7 +12,7 @@ buildscript {
     }
   }
   dependencies {
-    classpath "com.diffplug.spotless:spotless-plugin-gradle:7.0.3"
+    classpath "com.diffplug.spotless:spotless-plugin-gradle:7.0.4"
     classpath "com.gradleup.shadow:shadow-gradle-plugin:8.3.6"
     classpath "io.opentelemetry.instrumentation:gradle-plugins:2.17.0-alpha-SNAPSHOT"
   }

examples/distro/smoke-tests/build.gradle

@@ -3,9 +3,9 @@ plugins {
 }
 
 dependencies {
-  testImplementation("org.testcontainers:testcontainers:1.21.0")
+  testImplementation("org.testcontainers:testcontainers:1.21.1")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.19.0")
-  testImplementation("com.google.protobuf:protobuf-java-util:4.31.0")
+  testImplementation("com.google.protobuf:protobuf-java-util:4.31.1")
   testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha")
   testImplementation("io.opentelemetry:opentelemetry-api")