Merge remote-tracking branch 'upstream/main' into cp-bridge-for-contrib

# Conflicts:
#	CHANGELOG.md
#	instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java

Author: trask

.fossa.yml

@@ -139,9 +139,6 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:gwt-2.0:javaagent'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:hbase-client-2.0:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:helidon-4.3:javaagent'
@@ -514,6 +511,15 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:graphql-java:graphql-java-common-12.0:library'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:hbase:hbase-client-1.4:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:hbase:hbase-client-2.0:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:hbase:hbase-client-common-1.4:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:hibernate:hibernate-3.3:javaagent'

.github/agents/knowledge/api-deprecation-policy.md

@@ -21,6 +21,11 @@
 
 A rename of any of these surfaces is a breaking change even if no Java symbol moved.
 
+### Replacement stability
+
+A replacement must be at least as stable as the contract being deprecated. Do not direct users of
+a stable API to an incubating or experimental API.
+
 ## When Are Breaking Changes Allowed?
 
 Only in **non-stable (alpha) modules** — i.e. artifacts whose version has the `-alpha` suffix.

.github/config/.rumdl.toml

@@ -3,6 +3,8 @@
 [global]
 # disable link text should be descriptive check
 disable = ["MD059", "line-length", "no-inline-html", "MD041", "MD022", "ul-style", "fenced-code-language"]
+# MD060 (table-cell-alignment)
+extend-enable = ["MD060"]
 
 [per-file-ignores]
 ".github/workflows/*.md" = ["MD046"]

.github/config/latest-dep-versions.json

@@ -61,13 +61,13 @@
     "com.ning:async-http-client#1.8.+": "1.8.17",
     "com.ning:async-http-client#1.9.+": "1.9.40",
     "com.noelios.restlet:com.noelios.restlet#+": "1.1.10",
-    "com.openai:openai-java#+": "4.42.0",
+    "com.openai:openai-java#+": "4.43.0",
     "com.oracle.database.jdbc:ojdbc8#+": "23.26.2.0.0",
     "com.oracle.database.jdbc:ucp#+": "23.26.2.0.0",
     "com.rabbitmq:amqp-client#+": "5.34.0",
-    "com.softwaremill.sttp.tapir:tapir-pekko-http-server_2.12#+": "1.13.27",
-    "com.softwaremill.sttp.tapir:tapir-pekko-http-server_2.13#+": "1.13.27",
-    "com.softwaremill.sttp.tapir:tapir-pekko-http-server_3#+": "1.13.27",
+    "com.softwaremill.sttp.tapir:tapir-pekko-http-server_2.12#+": "1.13.28",
+    "com.softwaremill.sttp.tapir:tapir-pekko-http-server_2.13#+": "1.13.28",
+    "com.softwaremill.sttp.tapir:tapir-pekko-http-server_3#+": "1.13.28",
     "com.sparkjava:spark-core#+": "2.9.4",
     "com.squareup.okhttp3:okhttp#+": "5.4.0",
     "com.squareup.okhttp:okhttp#+": "2.7.5",
@@ -120,7 +120,7 @@
     "com.typesafe.play:play_2.11#2.7.+": "2.7.9",
     "com.typesafe.play:play_2.12#+": "2.8.22",
     "com.typesafe.play:play_2.13#+": "2.9.11",
-    "com.vaadin:flow-server#+": "25.2.2",
+    "com.vaadin:flow-server#+": "25.2.4",
     "com.vaadin:vaadin-spring-boot-starter#14.11.+": "14.11.14",
     "com.xuxueli:xxl-job-core#+": "3.4.2",
     "com.xuxueli:xxl-job-core#2.2.+": "2.2.0",
@@ -194,7 +194,7 @@
     "io.projectreactor:reactor-test#+": "3.8.6",
     "io.quarkus.platform:quarkus-bom#3.5.+": "3.5.3",
     "io.quarkus.platform:quarkus-bom#3.9.+": "3.9.5",
-    "io.quarkus:quarkus-rest#+": "3.37.2",
+    "io.quarkus:quarkus-rest#+": "3.37.3",
     "io.quarkus:quarkus-resteasy-reactive#+": "3.15.7",
     "io.r2dbc:r2dbc-spi#+": "1.0.0.RELEASE",
     "io.ratpack:ratpack-core#+": "1.9.0",
@@ -207,42 +207,42 @@
     "io.reactivex:rxjava#+": "1.3.8",
     "io.undertow:undertow-core#+": "2.4.2.Final",
     "io.undertow:undertow-servlet-jakarta#+": "2.2.20.Final",
-    "io.vertx:vertx-circuit-breaker#+": "5.1.4",
+    "io.vertx:vertx-circuit-breaker#+": "5.1.5",
     "io.vertx:vertx-circuit-breaker#3.+": "3.9.16",
-    "io.vertx:vertx-circuit-breaker#4.+": "4.5.29",
-    "io.vertx:vertx-codegen#+": "5.1.4",
+    "io.vertx:vertx-circuit-breaker#4.+": "4.5.30",
+    "io.vertx:vertx-codegen#+": "5.1.5",
     "io.vertx:vertx-codegen#3.+": "3.9.16",
-    "io.vertx:vertx-codegen#4.+": "4.5.29",
+    "io.vertx:vertx-codegen#4.+": "4.5.30",
     "io.vertx:vertx-codegen#5.0.+": "5.0.12",
-    "io.vertx:vertx-core#+": "5.1.4",
+    "io.vertx:vertx-core#+": "5.1.5",
     "io.vertx:vertx-core#3.+": "3.9.16",
-    "io.vertx:vertx-core#4.+": "4.5.29",
+    "io.vertx:vertx-core#4.+": "4.5.30",
     "io.vertx:vertx-docgen#+": "3.5.1",
     "io.vertx:vertx-docgen#3.+": "3.5.1",
-    "io.vertx:vertx-jdbc-client#+": "5.1.4",
+    "io.vertx:vertx-jdbc-client#+": "5.1.5",
     "io.vertx:vertx-jdbc-client#3.+": "3.9.16",
-    "io.vertx:vertx-jdbc-client#4.+": "4.5.29",
+    "io.vertx:vertx-jdbc-client#4.+": "4.5.30",
     "io.vertx:vertx-jdbc-client#5.0.+": "5.0.12",
-    "io.vertx:vertx-kafka-client#+": "5.1.4",
+    "io.vertx:vertx-kafka-client#+": "5.1.5",
     "io.vertx:vertx-kafka-client#3.+": "3.9.16",
-    "io.vertx:vertx-kafka-client#4.+": "4.5.29",
-    "io.vertx:vertx-lang-kotlin-coroutines#+": "5.1.4",
-    "io.vertx:vertx-pg-client#+": "5.1.4",
-    "io.vertx:vertx-pg-client#4.+": "4.5.29",
+    "io.vertx:vertx-kafka-client#4.+": "4.5.30",
+    "io.vertx:vertx-lang-kotlin-coroutines#+": "5.1.5",
+    "io.vertx:vertx-pg-client#+": "5.1.5",
+    "io.vertx:vertx-pg-client#4.+": "4.5.30",
     "io.vertx:vertx-pg-client#5.0.+": "5.0.12",
-    "io.vertx:vertx-redis-client#+": "5.1.4",
-    "io.vertx:vertx-rx-java2#+": "5.1.4",
+    "io.vertx:vertx-redis-client#+": "5.1.5",
+    "io.vertx:vertx-rx-java2#+": "5.1.5",
     "io.vertx:vertx-rx-java2#3.+": "3.9.16",
-    "io.vertx:vertx-rx-java2#4.+": "4.5.29",
-    "io.vertx:vertx-sql-client#+": "5.1.4",
-    "io.vertx:vertx-sql-client#4.+": "4.5.29",
+    "io.vertx:vertx-rx-java2#4.+": "4.5.30",
+    "io.vertx:vertx-sql-client#+": "5.1.5",
+    "io.vertx:vertx-sql-client#4.+": "4.5.30",
     "io.vertx:vertx-sql-client#5.0.+": "5.0.12",
-    "io.vertx:vertx-web#+": "5.1.4",
+    "io.vertx:vertx-web#+": "5.1.5",
     "io.vertx:vertx-web#3.+": "3.9.16",
-    "io.vertx:vertx-web#4.+": "4.5.29",
-    "io.vertx:vertx-web-client#+": "5.1.4",
+    "io.vertx:vertx-web#4.+": "4.5.30",
+    "io.vertx:vertx-web-client#+": "5.1.5",
     "io.vertx:vertx-web-client#3.+": "3.9.16",
-    "io.vertx:vertx-web-client#4.+": "4.5.29",
+    "io.vertx:vertx-web-client#4.+": "4.5.30",
     "jakarta.el:jakarta.el-api#4.+": "4.0.0",
     "jakarta.faces:jakarta.faces-api#+": "3.0.0",
     "jakarta.faces:jakarta.faces-api#3.+": "3.0.0",
@@ -298,8 +298,10 @@
     "org.apache.dubbo:dubbo-config-api#+": "3.3.6",
     "org.apache.geode:geode-core#+": "2.0.2",
     "org.apache.hbase:hbase-client#+": "2.6.6",
+    "org.apache.hbase:hbase-client#1.+": "1.7.2",
     "org.apache.hbase:hbase-client#2.4.+": "2.4.18",
     "org.apache.hbase:hbase-shaded-client#+": "2.4.18",
+    "org.apache.hbase:hbase-shaded-client#1.+": "1.7.2",
     "org.apache.hbase:hbase-shaded-client#2.4.+": "2.4.18",
     "org.apache.httpcomponents.client5:httpclient5#+": "5.6.2",
     "org.apache.httpcomponents:httpasyncclient#+": "4.1.5",
@@ -393,7 +395,7 @@
     "org.glassfish.jersey.core:jersey-server#2.+": "2.48",
     "org.glassfish.jersey.inject:jersey-hk2#+": "4.0.2",
     "org.glassfish.jersey.inject:jersey-hk2#2.+": "2.48",
-    "org.glassfish:jakarta.faces#+": "4.1.9",
+    "org.glassfish:jakarta.faces#+": "4.1.10",
     "org.glassfish:jakarta.faces#3.+": "3.0.5",
     "org.glassfish:javax.faces#+": "2.4.0",
     "org.glassfish:javax.faces#2.+": "2.4.0",
@@ -559,20 +561,20 @@
     "redis.clients:jedis#2.+": "2.10.2",
     "redis.clients:jedis#3.+": "3.10.0",
     "software.amazon.awssdk.crt:aws-crt#+": "0.47.3",
-    "software.amazon.awssdk:aws-core#+": "2.47.5",
-    "software.amazon.awssdk:aws-json-protocol#+": "2.47.5",
-    "software.amazon.awssdk:bedrockruntime#+": "2.47.5",
-    "software.amazon.awssdk:dynamodb#+": "2.47.5",
-    "software.amazon.awssdk:ec2#+": "2.47.5",
-    "software.amazon.awssdk:kinesis#+": "2.47.5",
-    "software.amazon.awssdk:lambda#+": "2.47.5",
-    "software.amazon.awssdk:rds#+": "2.47.5",
-    "software.amazon.awssdk:s3#+": "2.47.5",
-    "software.amazon.awssdk:secretsmanager#+": "2.47.5",
-    "software.amazon.awssdk:ses#+": "2.47.5",
-    "software.amazon.awssdk:sfn#+": "2.47.5",
-    "software.amazon.awssdk:sns#+": "2.47.5",
-    "software.amazon.awssdk:sqs#+": "2.47.5",
+    "software.amazon.awssdk:aws-core#+": "2.48.1",
+    "software.amazon.awssdk:aws-json-protocol#+": "2.48.1",
+    "software.amazon.awssdk:bedrockruntime#+": "2.48.1",
+    "software.amazon.awssdk:dynamodb#+": "2.48.1",
+    "software.amazon.awssdk:ec2#+": "2.48.1",
+    "software.amazon.awssdk:kinesis#+": "2.48.1",
+    "software.amazon.awssdk:lambda#+": "2.48.1",
+    "software.amazon.awssdk:rds#+": "2.48.1",
+    "software.amazon.awssdk:s3#+": "2.48.1",
+    "software.amazon.awssdk:secretsmanager#+": "2.48.1",
+    "software.amazon.awssdk:ses#+": "2.48.1",
+    "software.amazon.awssdk:sfn#+": "2.48.1",
+    "software.amazon.awssdk:sns#+": "2.48.1",
+    "software.amazon.awssdk:sqs#+": "2.48.1",
     "tech.powerjob:powerjob-official-processors#+": "5.1.2",
     "tech.powerjob:powerjob-worker#+": "5.1.2"
 }

.github/renovate.json5

@@ -36,6 +36,13 @@
       ],
       groupName: 'weekly update',
     },
+    {
+      // gh-aw updates need a dedicated branch so CI can regenerate their workflow lockfiles
+      matchPackageNames: [
+        'github/gh-aw',
+      ],
+      groupName: 'gh-aw',
+    },
     {
       // do not update these workflow lockfiles
       matchManagers: [
@@ -397,6 +404,18 @@
     },
   ],
   customManagers: [
+    {
+      customType: 'regex',
+      datasourceTemplate: 'github-releases',
+      depNameTemplate: 'github/gh-aw',
+      versioningTemplate: 'semver-coerced',
+      managerFilePatterns: [
+        '.github/workflows/build-common.yml',
+      ],
+      matchStrings: [
+        'gh extension install github/gh-aw --pin (?<currentValue>v\\d+\\.\\d+\\.\\d+)',
+      ],
+    },
 // commented out to see whether weekly update passes without this block
 //    {
 //      customType: 'regex',

.github/scripts/instrumentations.sh

@@ -114,8 +114,10 @@ readonly INSTRUMENTATIONS=(
   "grpc-1.6:javaagent:testStableSemconv"
   "grpc-1.6:javaagent:testExperimental"
   "gwt-2.0:javaagent:test"
-  "hbase-client-2.0:javaagent:test"
-  "hbase-client-2.0:javaagent:testStableSemconv"
+  "hbase:hbase-client-1.4:javaagent:test"
+  "hbase:hbase-client-1.4:javaagent:testStableSemconv"
+  "hbase:hbase-client-2.0:javaagent:test"
+  "hbase:hbase-client-2.0:javaagent:testStableSemconv"
   "helidon-4.3:javaagent:test"
   "hibernate:hibernate-3.3:javaagent:test"
   "hibernate:hibernate-3.3:javaagent:testExperimental"
@@ -197,9 +199,13 @@ readonly INSTRUMENTATIONS=(
   "lettuce:lettuce-4.0:javaagent:test"
   "lettuce:lettuce-4.0:javaagent:testExperimental"
   "lettuce:lettuce-4.0:javaagent:testStableSemconv"
+  "lettuce:lettuce-4.0:javaagent:testConnectionTelemetryEnabled"
+  "lettuce:lettuce-4.0:javaagent:testConnectionTelemetryEnabledStableSemconv"
   "lettuce:lettuce-5.0:javaagent:test"
   "lettuce:lettuce-5.0:javaagent:testExperimental"
   "lettuce:lettuce-5.0:javaagent:testStableSemconv"
+  "lettuce:lettuce-5.0:javaagent:testConnectionTelemetryEnabled"
+  "lettuce:lettuce-5.0:javaagent:testConnectionTelemetryEnabledStableSemconv"
   "lettuce:lettuce-5.0:javaagent:testV3Preview"
   "lettuce:lettuce-5.1:javaagent:test"
   "mongo:mongo-3.1:javaagent:test"

.github/workflows/auto-license-report.yml

@@ -74,6 +74,7 @@ jobs:
         with:
           client-id: ${{ vars.OTELBOT_JAVA_INSTRUMENTATION_CLIENT_ID }}
           private-key: ${{ secrets.OTELBOT_JAVA_INSTRUMENTATION_PRIVATE_KEY }}
+          permission-contents: write
 
       - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         if: steps.check-patch.outputs.exists == 'true'

.github/workflows/auto-update-gh-aw-lockfiles.yml

@@ -0,0 +1,106 @@
+name: Auto-update gh-aw lockfiles
+
+on:
+  push:
+    branches:
+      - 'renovate/**'
+    paths:
+      - '.github/workflows/build-common.yml'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  generate:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        with:
+          persist-credentials: false
+
+      - name: Regenerate agentic workflow lockfiles
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          version=$(sed -nE 's/.*gh extension install github\/gh-aw --pin (v[0-9]+\.[0-9]+\.[0-9]+).*/\1/p' \
+            .github/workflows/build-common.yml)
+          if [[ ! $version =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            echo "Unable to read a single pinned gh-aw version: $version" >&2
+            exit 1
+          fi
+          gh extension install github/gh-aw --pin "$version"
+          gh aw compile --action-tag "$version" --approve --no-check-update
+
+      - name: Create generated-files patch
+        run: |
+          files=(
+            .github/aw/actions-lock.json
+            .github/workflows/*.lock.yml
+          )
+          git add -N -- "${files[@]}"
+          git diff --binary -- "${files[@]}" > gh-aw-lockfiles.patch
+
+      - name: Upload generated-files patch
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: gh-aw-lockfiles
+          path: gh-aw-lockfiles.patch
+
+  apply:
+    runs-on: ubuntu-latest
+    needs: generate
+    steps:
+      - name: Download generated-files patch
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          name: gh-aw-lockfiles
+          path: ${{ runner.temp }}
+
+      - name: Check patch
+        id: patch
+        working-directory: ${{ runner.temp }}
+        run: |
+          if [ ! -s gh-aw-lockfiles.patch ]; then
+            exit 0
+          fi
+          while IFS= read -r path; do
+            case "$path" in
+              .github/aw/actions-lock.json |
+              .github/workflows/*.lock.yml) ;;
+              *)
+                echo "Unexpected path in generated patch: $path" >&2
+                exit 1
+                ;;
+            esac
+          done < <(git apply --numstat gh-aw-lockfiles.patch | cut -f3)
+          echo "exists=true" >> "$GITHUB_OUTPUT"
+
+      - name: Create otelbot token
+        if: steps.patch.outputs.exists == 'true'
+        id: otelbot-token
+        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
+        with:
+          client-id: ${{ vars.OTELBOT_JAVA_INSTRUMENTATION_CLIENT_ID }}
+          private-key: ${{ secrets.OTELBOT_JAVA_INSTRUMENTATION_PRIVATE_KEY }}
+          permission-contents: write
+          permission-workflows: write
+
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        if: steps.patch.outputs.exists == 'true'
+        with:
+          persist-credentials: false
+
+      - name: Apply patch and push
+        if: steps.patch.outputs.exists == 'true'
+        env:
+          GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
+        run: |
+          gh auth setup-git
+          git apply --index "${{ runner.temp }}/gh-aw-lockfiles.patch"
+          .github/scripts/use-cla-approved-bot.sh
+          git commit -m "Update gh-aw lockfiles"
+          git push

.github/workflows/auto-update-otel-sdk.yml

@@ -90,6 +90,7 @@ jobs:
         with:
           client-id: ${{ vars.OTELBOT_CLIENT_ID }}
           private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
+          permission-pull-requests: write
 
       - name: Create pull request against main
         if: success() || failure()

.github/workflows/backport.yml

@@ -34,6 +34,7 @@ jobs:
         with:
           client-id: ${{ vars.OTELBOT_CLIENT_ID }}
           private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
+          permission-pull-requests: write
 
       - name: Create pull request
         env: