Skip to content

Commit efd749f

Browse files
lauritlaurit
committed
merge
2 parents 4f4abeb + fdcf0d2 commit efd749f

File tree

195 files changed

+3219
-255
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

195 files changed

+3219
-255
lines changed

‎.fossa.yml

+3
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ targets:
4949
- type: gradle
5050
path: ./
5151
target: ':testing:agent-for-testing'
52+
- type: gradle
53+
path: ./
54+
target: ':instrumentation:activej-http-6.0:javaagent'
5255
- type: gradle
5356
path: ./
5457
target: ':instrumentation:alibaba-druid-1.0:javaagent'

‎.github/renovate.json5

+6
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,12 @@
7878
'com.gradleup.shadow{/,}**',
7979
],
8080
},
81+
{
82+
groupName: 'jackson packages',
83+
matchPackageNames: [
84+
'com.fasterxml.jackson{/,}**',
85+
],
86+
},
8187
{
8288
// prevent update to 2.4-groovy-4.0-SNAPSHOT
8389
allowedVersions: '!/\\-SNAPSHOT$/',

‎.github/scripts/check-latest-dep-test-overrides.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# all missing version coverage should be documented in supported-libraries.md
44

55
if grep -r --include build.gradle.kts latestDepTestLibrary instrumentation \
6-
| grep -v :+\" \
6+
| grep -v -e :+\" -e :latest.release\" \
77
| grep -v "// see .* module" \
88
| grep -v "// see test suite below" \
99
| grep -v "// no longer applicable" \

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
- name: Use CLA approved bot
8585
run: .github/scripts/use-cla-approved-bot.sh
8686

87-
- uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3
87+
- uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
8888
id: otelbot-token
8989
with:
9090
app-id: ${{ vars.OTELBOT_APP_ID }}

‎.github/workflows/backport.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Use CLA approved bot
3030
run: .github/scripts/use-cla-approved-bot.sh
3131

32-
- uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3
32+
- uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
3333
id: otelbot-token
3434
with:
3535
app-id: ${{ vars.OTELBOT_APP_ID }}
@@ -48,7 +48,14 @@ jobs:
4848
4949
git checkout -b $branch
5050
git cherry-pick $commit
51+
52+
# note this push will fail if the backport contains any workflow files
53+
# because secrets.GITHUB_TOKEN doesn't have this permission
54+
# supporting this would require another access token with content write
55+
# and workflow write permissions
56+
# so for now at least PRs that update workflow files need to be backported manually
5157
git push --set-upstream origin $branch
58+
5259
gh pr create --title "[$GITHUB_REF_NAME] $title" \
5360
--body "Clean cherry-pick of #$NUMBER to the \`$GITHUB_REF_NAME\` branch." \
5461
--base $GITHUB_REF_NAME

‎.github/workflows/build-common.yml

+13-9
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ jobs:
205205
fi
206206
207207
- name: Upload agent jar
208-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
208+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
209209
with:
210210
name: opentelemetry-javaagent.jar
211211
path: javaagent/build/libs/opentelemetry-javaagent-*-SNAPSHOT.jar
@@ -216,7 +216,7 @@ jobs:
216216
mkdir sboms
217217
cp javaagent/build/spdx/*.spdx.json sboms
218218
219-
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
219+
- uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
220220
name: Upload SBOMs
221221
with:
222222
name: opentelemetry-java-instrumentation-SBOM.zip
@@ -275,7 +275,7 @@ jobs:
275275

276276
# vaadin tests use pnpm
277277
- name: Cache pnpm modules
278-
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
278+
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
279279
with:
280280
path: ~/.pnpm-store
281281
key: ${{ runner.os }}-test-cache-pnpm-modules
@@ -358,15 +358,15 @@ jobs:
358358
359359
- name: Upload deadlock detector artifacts if any
360360
if: failure()
361-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
361+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
362362
with:
363363
name: deadlock-detector-test-${{ matrix.test-java-version }}-${{ matrix.vm }}-${{ matrix.test-partition }}-indy-${{ matrix.test-indy }}
364364
path: /tmp/deadlock-detector-*
365365
if-no-files-found: ignore
366366

367367
- name: Upload jvm crash dump files if any
368368
if: failure()
369-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
369+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
370370
with:
371371
name: javacore-test-${{ matrix.test-java-version }}-${{ matrix.test-partition }}
372372
path: |
@@ -426,11 +426,11 @@ jobs:
426426
run: ./gradlew :smoke-tests:test -PsmokeTestSuite=none --no-daemon ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
427427

428428
- name: Test
429-
run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.smoke-test-suite }}${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
429+
run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.smoke-test-suite }} ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
430430

431431
- name: Upload jvm crash dump files if any
432432
if: failure()
433-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
433+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
434434
with:
435435
name: javacore-smoke-test-${{ matrix.smoke-test-suite }}-${{ matrix.os }}
436436
# we expect crash dumps either in root director or in smoke-tests
@@ -500,13 +500,17 @@ jobs:
500500
working-directory: gradle-plugins
501501

502502
- name: Build distro
503-
run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
503+
run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
504504
working-directory: examples/distro
505505

506506
- name: Build extension
507-
run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
507+
run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
508508
working-directory: examples/extension
509509

510+
- name: Build benchmark-overhead
511+
run: ./gradlew assemble ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
512+
working-directory: benchmark-overhead
513+
510514
- name: Run muzzle check against extension
511515
run: ./gradlew muzzle --init-script ../../.github/scripts/local.init.gradle.kts
512516
working-directory: examples/extension

‎.github/workflows/codeql.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
cache-read-only: ${{ github.event_name == 'pull_request' }}
5151

5252
- name: Initialize CodeQL
53-
uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
53+
uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
5454
with:
5555
languages: java, actions
5656
# using "latest" helps to keep up with the latest Kotlin support
@@ -65,4 +65,4 @@ jobs:
6565
run: ./gradlew assemble -x javadoc -x :instrumentation:quarkus-resteasy-reactive:quarkus3-testing:quarkusGenerateCodeDev -x :instrumentation:quarkus-resteasy-reactive:quarkus2-testing:quarkusGenerateCodeDev --no-build-cache --no-daemon
6666

6767
- name: Perform CodeQL analysis
68-
uses: github/codeql-action/analyze@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
68+
uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10

‎.github/workflows/ossf-scorecard.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
with:
2424
persist-credentials: false
2525

26-
- uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
26+
- uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
2727
with:
2828
results_file: results.sarif
2929
results_format: sarif
@@ -33,7 +33,7 @@ jobs:
3333
# uploads of run results in SARIF format to the repository Actions tab.
3434
# https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
3535
- name: "Upload artifact"
36-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
36+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
3737
with:
3838
name: SARIF file
3939
path: results.sarif
@@ -42,6 +42,6 @@ jobs:
4242
# Upload the results to GitHub's code scanning dashboard (optional).
4343
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4444
- name: "Upload to code-scanning"
45-
uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
45+
uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
4646
with:
4747
sarif_file: results.sarif

‎.github/workflows/owasp-dependency-check-daily.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
- name: Upload report
4040
if: always()
41-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
41+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
4242
with:
4343
path: javaagent/build/reports
4444

‎.github/workflows/prepare-patch-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- name: Use CLA approved bot
5252
run: .github/scripts/use-cla-approved-bot.sh
5353

54-
- uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3
54+
- uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
5555
id: otelbot-token
5656
with:
5757
app-id: ${{ vars.OTELBOT_APP_ID }}

‎.github/workflows/prepare-release-branch.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
- name: Use CLA approved bot
6464
run: .github/scripts/use-cla-approved-bot.sh
6565

66-
- uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3
66+
- uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
6767
id: otelbot-token
6868
with:
6969
app-id: ${{ vars.OTELBOT_APP_ID }}
@@ -120,7 +120,7 @@ jobs:
120120
- name: Use CLA approved bot
121121
run: .github/scripts/use-cla-approved-bot.sh
122122

123-
- uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3
123+
- uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
124124
id: otelbot-token
125125
with:
126126
app-id: ${{ vars.OTELBOT_APP_ID }}

‎.github/workflows/publish-petclinic-benchmark-image.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2121

22-
- uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
22+
- uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
2323

2424
- name: Login to GitHub container registry
2525
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
@@ -32,7 +32,7 @@ jobs:
3232
run: echo "TS=$(date +'%Y%m%d%H%M%S')" >> $GITHUB_ENV
3333

3434
- name: Push to GitHub packages
35-
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
35+
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
3636
with:
3737
push: true
3838
file: benchmark-overhead/Dockerfile.petclinic

‎.github/workflows/release-update-cloudfoundry-index.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: display changes
4545
run: git diff
4646

47-
- uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3
47+
- uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
4848
id: otelbot-token
4949
with:
5050
app-id: ${{ vars.OTELBOT_APP_ID }}

‎.github/workflows/release.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ jobs:
120120
cp javaagent/build/spdx/*.spdx.json sboms
121121
zip opentelemetry-java-instrumentation-SBOM.zip sboms/*
122122
123-
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
123+
- uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
124124
name: Upload SBOMs
125125
with:
126126
name: opentelemetry-java-instrumentation-SBOM
@@ -219,7 +219,7 @@ jobs:
219219
- name: Use CLA approved bot
220220
run: .github/scripts/use-cla-approved-bot.sh
221221

222-
- uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3
222+
- uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
223223
id: otelbot-token
224224
with:
225225
app-id: ${{ vars.OTELBOT_APP_ID }}
@@ -288,7 +288,7 @@ jobs:
288288
- name: Use CLA approved bot
289289
run: .github/scripts/use-cla-approved-bot.sh
290290

291-
- uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3
291+
- uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
292292
id: otelbot-token
293293
with:
294294
app-id: ${{ vars.OTELBOT_APP_ID }}
@@ -301,7 +301,7 @@ jobs:
301301
GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
302302
run: |
303303
message="Update apidiff baseline to released version $VERSION"
304-
body="Update apidiff baseline to released version \`$version\`."
304+
body="Update apidiff baseline to released version \`$VERSION\`."
305305
branch="otelbot/update-apidiff-baseline-to-released-version-${VERSION}"
306306
307307
git checkout -b $branch

‎.github/workflows/reusable-native-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2222
- id: read-java
2323
run: echo "version=$(cat .java-version)" >> "$GITHUB_OUTPUT"
24-
- uses: graalvm/setup-graalvm@aafbedb8d382ed0ca6167d3a051415f20c859274 # v1.2.8.1
24+
- uses: graalvm/setup-graalvm@b0cb26a8da53cb3e97cdc0c827d8e3071240e730 # v1.3.1.1
2525
with:
2626
version: "latest"
2727
java-version: "${{ steps.read-java.outputs.version }}"

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
4747
# vaadin tests use pnpm
4848
- name: Cache pnpm modules
49-
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
49+
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
5050
with:
5151
path: ~/.pnpm-store
5252
key: ${{ runner.os }}-test-latest-cache-pnpm-modules
@@ -114,15 +114,15 @@ jobs:
114114
115115
- name: Upload deadlock detector artifacts if any
116116
if: failure()
117-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
117+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
118118
with:
119119
name: deadlock-detector-test-latest-${{ matrix.test-java-version }}-${{ matrix.vm }}-${{ matrix.test-partition }}
120120
path: /tmp/deadlock-detector-*
121121
if-no-files-found: ignore
122122

123123
- name: Upload jvm crash dump files if any
124124
if: failure()
125-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
125+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
126126
with:
127127
name: javacore-test-latest-${{ matrix.test-java-version }}-${{ matrix.test-partition }}
128128
path: |

‎CHANGELOG.md

+27
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,33 @@
22

33
## Unreleased
44

5+
### Migration notes
6+
7+
- The `java.net.http.HttpClient` instrumentation package
8+
`io.opentelemetry.instrumentation.httpclient` was deprecated in favor of the new package name
9+
`io.opentelemetry.instrumentation.javahttpclient`
10+
11+
## Version 2.13.3 (2025-02-28)
12+
13+
### 🛠️ Bug fixes
14+
15+
- Backport: Fix failure to start when AWS Resource Provider is enabled
16+
([#13420](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13420))
17+
18+
## Version 2.13.2 (2025-02-27)
19+
20+
### 🛠️ Bug fixes
21+
22+
- Backport: Fix Spring boot starter dependency resolution failure with Gradle and Java 11
23+
([#13402](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13402))
24+
25+
## Version 2.13.1 (2025-02-18)
26+
27+
### 🛠️ Bug fixes
28+
29+
- Backport: Fix double instrumentation of Java runtime metrics
30+
([#13339](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13339))
31+
532
## Version 2.13.0 (2025-02-17)
633

734
### Migration notes

‎benchmark-overhead-jmh/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ otelJava {
1313
}
1414

1515
dependencies {
16-
jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.4.2")
16+
jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.4.3")
1717
}
1818

1919
tasks {

‎benchmark-overhead/Dockerfile.petclinic

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eclipse-temurin:11.0.26_4-jdk@sha256:88ffb69a9a26d1b6c56897cb2e34aecf31d67f575d50620a00b54c543eae271e as app-build
1+
FROM eclipse-temurin:11.0.26_4-jdk@sha256:be923b4c9abb99b97b8aa18169bf4598ab570e9b6dc3ca0ecaef433bd2011dcc as app-build
22

33
# This is the base image that will contain a built version of the spring-petclinic-rest
44
# application. Installing the dependencies and maven compiling the application is time
@@ -13,7 +13,7 @@ RUN git checkout 8aa4d49
1313
RUN ./mvnw package -Dmaven.test.skip=true
1414
RUN cp target/spring-petclinic-rest*.jar /app/spring-petclinic-rest.jar
1515

16-
FROM bellsoft/liberica-openjdk-alpine:21.0.6@sha256:fab34f9e4ff5676582c2ed7d23f9a3a63cf7da0b2f9b5285885b849a88862aaf
16+
FROM bellsoft/liberica-openjdk-alpine:21.0.6@sha256:5f23f8082baea518a1657b420dbe19c181483255209b70af836543d6068fed8c
1717
COPY --from=app-build /app/spring-petclinic-rest.jar /app/spring-petclinic-rest.jar
1818
WORKDIR /app
1919
EXPOSE 9966

0 commit comments

Comments
 (0)