Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into module-group

Author: SylvainJuge

.fossa.yml

@@ -606,7 +606,7 @@ targets:
       target: ':instrumentation:jetty:jetty-8.0:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:jetty:jetty-common:javaagent'
+      target: ':instrumentation:jetty:jetty-common-8.0:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:jetty-httpclient:jetty-httpclient-12.0:javaagent'
@@ -798,7 +798,7 @@ targets:
       target: ':instrumentation:opensearch:opensearch-rest-3.0:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:opensearch:opensearch-rest-common:javaagent'
+      target: ':instrumentation:opensearch:opensearch-rest-common-1.0:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent'
@@ -1029,7 +1029,7 @@ targets:
       target: ':instrumentation:tomcat:tomcat-7.0:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:tomcat:tomcat-common:javaagent'
+      target: ':instrumentation:tomcat:tomcat-common-7.0:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:tomcat:tomcat-jdbc:javaagent'

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

@@ -11,6 +11,7 @@
 
 - Java symbols in published artifacts (classes, methods, fields in `:library`, `:testing`,
   `instrumentation-api*`).
+- Non-private `Experimental*` helpers in published artifacts, even under `.internal` packages.
 - User-facing configuration keys — `otel.instrumentation.<name>.enabled`, any
   `otel.instrumentation.*` property, and the equivalent declarative YAML keys.
 - Outgoing telemetry identity — anything users can match on in their backend, including

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

@@ -176,7 +176,7 @@
     "io.netty:netty-codec-http#4.0.+": "4.0.56.Final",
     "io.netty:netty-handler#+": "4.2.13.Final",
     "io.netty:netty-transport-native-epoll#+": "4.2.13.Final",
-    "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api#+": "2.27.0",
+    "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api#+": "2.28.0",
     "io.opentelemetry:opentelemetry-api#+": "1.62.0",
     "io.opentelemetry:opentelemetry-extension-annotations#+": "1.18.0",
     "io.opentelemetry:opentelemetry-extension-kotlin#+": "1.62.0",
@@ -204,7 +204,7 @@
     "io.reactivex.rxjava2:rxjava#+": "2.2.21",
     "io.reactivex.rxjava3:rxjava#+": "3.1.12",
     "io.reactivex:rxjava#+": "1.3.8",
-    "io.undertow:undertow-core#+": "2.4.0.Final",
+    "io.undertow:undertow-core#+": "2.4.1.Final",
     "io.undertow:undertow-servlet-jakarta#+": "2.2.20.Final",
     "io.vertx:vertx-circuit-breaker#+": "5.0.12",
     "io.vertx:vertx-circuit-breaker#3.+": "3.9.16",
@@ -296,7 +296,7 @@
     "org.apache.httpcomponents:httpasyncclient#+": "4.1.5",
     "org.apache.httpcomponents:httpclient#+": "4.5.14",
     "org.apache.httpcomponents:httpclient#4.+": "4.5.14",
-    "org.apache.iceberg:iceberg-core#+": "1.10.1",
+    "org.apache.iceberg:iceberg-core#+": "1.11.0",
     "org.apache.kafka:connect-api#+": "4.2.0",
     "org.apache.kafka:kafka-clients#+": "4.2.0",
     "org.apache.kafka:kafka-streams#+": "4.2.0",
@@ -545,20 +545,20 @@
     "redis.clients:jedis#2.+": "2.10.2",
     "redis.clients:jedis#3.+": "3.10.0",
     "software.amazon.awssdk.crt:aws-crt#+": "0.45.4",
-    "software.amazon.awssdk:aws-core#+": "2.44.7",
-    "software.amazon.awssdk:aws-json-protocol#+": "2.44.7",
-    "software.amazon.awssdk:bedrockruntime#+": "2.44.7",
-    "software.amazon.awssdk:dynamodb#+": "2.44.7",
-    "software.amazon.awssdk:ec2#+": "2.44.7",
-    "software.amazon.awssdk:kinesis#+": "2.44.7",
-    "software.amazon.awssdk:lambda#+": "2.44.7",
-    "software.amazon.awssdk:rds#+": "2.44.7",
-    "software.amazon.awssdk:s3#+": "2.44.7",
-    "software.amazon.awssdk:secretsmanager#+": "2.44.7",
-    "software.amazon.awssdk:ses#+": "2.44.7",
-    "software.amazon.awssdk:sfn#+": "2.44.7",
-    "software.amazon.awssdk:sns#+": "2.44.7",
-    "software.amazon.awssdk:sqs#+": "2.44.7",
+    "software.amazon.awssdk:aws-core#+": "2.44.9",
+    "software.amazon.awssdk:aws-json-protocol#+": "2.44.9",
+    "software.amazon.awssdk:bedrockruntime#+": "2.44.9",
+    "software.amazon.awssdk:dynamodb#+": "2.44.9",
+    "software.amazon.awssdk:ec2#+": "2.44.9",
+    "software.amazon.awssdk:kinesis#+": "2.44.9",
+    "software.amazon.awssdk:lambda#+": "2.44.9",
+    "software.amazon.awssdk:rds#+": "2.44.9",
+    "software.amazon.awssdk:s3#+": "2.44.9",
+    "software.amazon.awssdk:secretsmanager#+": "2.44.9",
+    "software.amazon.awssdk:ses#+": "2.44.9",
+    "software.amazon.awssdk:sfn#+": "2.44.9",
+    "software.amazon.awssdk:sns#+": "2.44.9",
+    "software.amazon.awssdk:sqs#+": "2.44.9",
     "tech.powerjob:powerjob-official-processors#+": "5.1.2",
     "tech.powerjob:powerjob-worker#+": "5.1.2"
 }

.github/scripts/copilot-cli/package-lock.json

@@ -1,6 +1,6 @@
 {
   "private": true,
   "dependencies": {
-    "@github/copilot": "1.0.44"
+    "@github/copilot": "1.0.48"
   }
 }

.github/scripts/copilot-cli/package.json

@@ -38,6 +38,11 @@ interface in a non-stable (`-alpha`) module or in `javaagent-extension-api`
 - removal of a `default` method from an internal interface,
 - signature change even when the method never carried `@Deprecated`.
 
+Treat non-private `Experimental*` helpers in published `:library`
+artifacts as incubating public API even when their package name
+contains `.internal`; removals or binary-incompatible reshaping belong
+under Breaking.
+
 Emitted-attribute, attribute-value, or span-name changes are Breaking
 **only** when they ship unconditionally. If the change is gated behind
 `otel.instrumentation.common.v3-preview`,
@@ -111,6 +116,10 @@ to one or more of:
 - new package-private, `internal`-package, or test-only methods,
 - `metadata.yaml` documentation (see section above).
 
+Do not use the internal-helper omit rule for non-private `Experimental*`
+classes in published artifacts; classify their
+removal or binary-incompatible reshaping under Breaking.
+
 Trivial omits (renovate bumps, all-test/docs/build paths, post-release
 version bumps) are handled by `classify.py --preclassify-only`.
 Everything else must be decided from the diff on a per-PR basis.

.github/scripts/draft-release-notes/rules.md

@@ -68,7 +68,7 @@ jobs:
             echo "exists=true" >> $GITHUB_OUTPUT
           fi
 
-      - uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
+      - uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
         if: steps.check-patch.outputs.exists == 'true'
         id: otelbot-token
         with:

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

@@ -85,7 +85,7 @@ jobs:
       - name: Use CLA approved bot
         run: .github/scripts/use-cla-approved-bot.sh
 
-      - uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
+      - uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
         id: otelbot-token
         with:
           app-id: ${{ vars.OTELBOT_APP_ID }}

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

@@ -29,7 +29,7 @@ jobs:
       - name: Use CLA approved bot
         run: .github/scripts/use-cla-approved-bot.sh
 
-      - uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
+      - uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
         id: otelbot-token
         with:
           app-id: ${{ vars.OTELBOT_APP_ID }}

.github/workflows/backport.yml

@@ -63,7 +63,7 @@ jobs:
           cache-read-only: ${{ github.event_name == 'pull_request' }}
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
+        uses: github/codeql-action/init@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
         with:
           languages: ${{ matrix.language }}
           # using "linked" helps to keep up with the linked Kotlin support
@@ -80,6 +80,6 @@ jobs:
           --no-build-cache --no-daemon
 
       - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
+        uses: github/codeql-action/analyze@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
         with:
           category: "/language:${{matrix.language}}"