Merge branch 'main' into declarative-config-thread-details-provider2

Author: zeitlinger

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

@@ -37,6 +37,7 @@ jobs:
       - id: create-patch
         name: Create patch file
         run: |
+          git add -N --ignore-removal licenses
           git diff > patch
           if [ -s patch ]; then
             echo "exists=true" >> "$GITHUB_OUTPUT"

.github/workflows/build-common.yml

@@ -286,13 +286,13 @@ jobs:
 
       # vaadin 14 tests fail with node 18
       - name: Set up Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
         with:
           node-version: 16
 
       # vaadin tests use pnpm
       - name: Cache pnpm modules
-        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
+        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
         with:
           path: ~/.pnpm-store
           key: ${{ runner.os }}-test-cache-pnpm-modules

.github/workflows/codeql.yml

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

.github/workflows/copilot-setup-steps.yml

@@ -0,0 +1,27 @@
+name: "Copilot Setup Steps"
+
+on:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  copilot-setup-steps:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+
+      - name: Free disk space
+        run: .github/scripts/gha-free-disk-space.sh
+
+      - name: Set up JDK for running Gradle
+        uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
+        with:
+          distribution: temurin
+          java-version-file: .java-version
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
+        with:
+          cache-read-only: true

.github/workflows/ossf-scorecard.yml

@@ -43,6 +43,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
+        uses: github/codeql-action/upload-sarif@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
         with:
           sarif_file: results.sarif

.github/workflows/reusable-link-check.yml

@@ -14,7 +14,7 @@ jobs:
         with:
           fetch-depth: 0 # needed for merge-base used in lint:links-in-modified-files
 
-      - uses: jdx/mise-action@146a28175021df8ca24f8ee1828cc2a60f980bd5 # v3.5.1
+      - uses: jdx/mise-action@c53b9236f0b3370f31520f8b142f141256d839c6 # v3.6.0
 
       - name: Link check for pull requests
         if: github.event_name == 'pull_request'

.github/workflows/reusable-markdown-lint-check.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
-      - uses: jdx/mise-action@146a28175021df8ca24f8ee1828cc2a60f980bd5 # v3.5.1
+      - uses: jdx/mise-action@c53b9236f0b3370f31520f8b142f141256d839c6 # v3.6.0
 
       - name: Run markdownlint
         run: |

.github/workflows/reusable-test-latest-deps.yml

@@ -48,7 +48,7 @@ jobs:
 
       # vaadin tests use pnpm
       - name: Cache pnpm modules
-        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
+        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
         with:
           path: ~/.pnpm-store
           key: ${{ runner.os }}-test-latest-cache-pnpm-modules

CHANGELOG.md

@@ -2,6 +2,105 @@
 
 ## Unreleased
 
+## Version 2.24.0 (2026-01-17)
+
+### ⚠️ Breaking Changes
+
+- Remove support for previously deprecated property
+  `otel.instrumentation.logback-appender.experimental.capture-logstash-attributes`
+  ([#15722](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15722))
+- Remove deprecated methods from HTTP library instrumentations
+  ([#15802](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15802))
+
+### 🚫 Deprecations
+
+- JMX Metrics: Deprecated `addClassPathRules` and `addCustomRules` methods in
+  `JmxTelemetryBuilder`, and moved non-public classes to an internal package
+  ([#15658](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15658))
+- Deprecated `setMessagingReceiveInstrumentationEnabled` in favor of
+  `setMessagingReceiveTelemetryEnabled` to match config property name
+  ([#15668](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15668))
+- Deprecated database client attribute getter methods `getDbSystem()` and `getResponseStatus()`
+  in favor of `getDbSystemName()` and `getResponseStatusCode()` to align with stable semantic
+  conventions
+  ([#15696](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15696))
+- Deprecated `setCapturedRequestParameters()` in Servlet library instrumentation in favor of
+  `Experimental.setCapturedRequestParameters()` as request parameter capture is experimental
+  ([#15826](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15826))
+- Deprecated `getHttpClient()`, `setHttpClientTransport()`, and `setSslContextFactory()` in Jetty
+  client instrumentation in favor of new builder-style methods `newHttpClient()`,
+  `newHttpClient(SslContextFactory)`, and `newHttpClient(HttpClientTransport, SslContextFactory)`
+  ([#15827](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15827))
+- Deprecate Netty experimental method that is still in public API
+  ([#15828](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15828))
+- Deprecated `newHttpClient()` in favor of `wrap()` in Java HTTP Client instrumentation for
+  consistency with naming conventions across library instrumentations
+  ([#15829](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15829))
+- Deprecated `new*` methods in favor of `create*` methods across multiple instrumentation libraries
+  for consistency (e.g., `newHttpClient()` → `createHttpClient()`, `newInterceptor()` →
+  `createInterceptor()`)
+  ([#15832](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15832))
+- Deprecated methods in `SqlStatementInfo` and `MultiQuery` in favor of methods using stable
+  semantic convention terminology: `getFullStatement()` → `getQueryText()`, `getOperation()` →
+  `getOperationName()`, and `getStatements()` → `getQueryTexts()`
+  ([#15833](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15833))
+- Deprecated database getter methods in favor of methods using stable semantic convention
+  terminology: `getResponseStatusCode()` → `getDbResponseStatusCode()`, `getBatchSize()` →
+  `getDbOperationBatchSize()`, and `getQueryParameters()` → `getDbQueryParameters()`
+  ([#15859](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15859))
+
+### 📈 Enhancements
+
+- Spring Boot starter: add support for
+  `otel.instrumentation.logback-appender.experimental.capture-template`
+  ([#15649](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15649))
+- Spring Boot Starter: Support Spring Boot 4 RestClient
+  ([#15684](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15684))
+- Improve support for experimental declarative configuration
+  ([#15656](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15656),
+   [#15688](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15688),
+   [#15697](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15697),
+   [#15698](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15698),
+   [#15704](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15704),
+   [#15707](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15707),
+   [#15713](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15713),
+   [#15714](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15714),
+   [#15722](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15722),
+   [#15727](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15727),
+   [#15732](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15732),
+   [#15733](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15733),
+   [#15734](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15734),
+   [#15735](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15735),
+   [#15740](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15740),
+   [#15741](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15741),
+   [#15742](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15742),
+   [#15752](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15752),
+   [#15756](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15756),
+   [#15787](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15787),
+   [#15791](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15791),
+   [#15792](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15792),
+   [#15841](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15841),
+   [#15856](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15856))
+- AWS Bedrock: support model IDs with regional prefixes (e.g., `us.`, `global.`) for
+  inference profiles
+  ([#15751](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15751))
+- Redis: Improve sanitization for ACL command
+  ([#15797](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15797))
+- Ktor and Netty library instrumentations: Add `setSpanNameExtractorCustomizer`
+  ([#15825](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15825))
+- Support more of stable database semconv under opt-in flag
+  ([#15836](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15836),
+   [#15854](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15854))
+- Move `SpanStatusExtractor.extract()` before `OperationListener.onEnd()` in `Instrumenter`
+  ([#15844](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15844))
+
+### 🛠️ Bug fixes
+
+- Servlet library instrumentation: fix capturing `enduser.id`
+  ([#15858](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15858))
+- Fix agent startup failing on read-only filesystem
+  ([#15682](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/15682))
+
 ## Version 2.23.0 (2025-12-13)
 
 ### ⚠️ Breaking Changes

VERSIONING.md

@@ -9,9 +9,6 @@ Artifacts in this repository follow the same compatibility requirements describe
 EXCEPT for the following incompatible changes which are allowed in stable artifacts in this
 repository:
 
-- Changes to the telemetry produced by instrumentation
-  (there will be some guarantees about telemetry stability in the future, see discussions
-  in <https://github.com/open-telemetry/opentelemetry-specification/issues/1301>)
 - Changes to configuration properties that contain the word `experimental`
 - Changes to configuration properties under the namespace `otel.javaagent.testing`