Skip to content

Commit 4a42134

Browse files
authored
fix(deps): Upgrade JDK from 17 to 21 (#1157)
The upstream OTel Java Agent upgraded its build toolchain from JDK 17 to 21 in May 2024. This PR aligns ADOT with that change. Without this upgrade, merges with recent upstream changes will result in build failures. Build with jdk21 #11219 open-telemetry/opentelemetry-java-instrumentation#11219 Tests performed: Local build with JDK 21 passes: ./gradlew build Unit tests pass: ./gradlew test Smoke/contract tests pass: ./gradlew appsignals-tests:contract-tests:contractTests By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 6d9b13a commit 4a42134

14 files changed

+47
-46
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ jobs:
3131
with:
3232
languages: java
3333

34-
- uses: actions/setup-java@v4
34+
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
3535
with:
36-
java-version: 17
36+
java-version-file: .java-version
3737
distribution: temurin
3838

3939
- name: Cache local Maven repository

.github/workflows/docker-build-smoke-tests-fake-backend.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- uses: actions/checkout@v5
24-
- uses: actions/setup-java@v4
24+
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
2525
with:
26-
java-version: 17
26+
java-version-file: .java-version
2727
distribution: 'temurin'
2828
# cache local patch outputs
2929
- name: Cache local Maven repository

.github/workflows/e2e-tests-app-with-java-agent.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ jobs:
2929
with:
3030
fetch-depth: 0
3131

32-
- uses: actions/setup-java@v4
32+
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
3333
with:
34-
java-version: 17
34+
java-version-file: .java-version
3535
distribution: temurin
3636

3737
# cache local patch outputs
@@ -81,9 +81,9 @@ jobs:
8181
steps:
8282
- uses: actions/checkout@v5
8383

84-
- uses: actions/setup-java@v4
84+
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
8585
with:
86-
java-version: 17
86+
java-version-file: .java-version
8787
distribution: 'temurin'
8888
- name: Configure AWS Credentials
8989
uses: aws-actions/configure-aws-credentials@v4
@@ -112,9 +112,9 @@ jobs:
112112
steps:
113113
- uses: actions/checkout@v5
114114

115-
- uses: actions/setup-java@v4
115+
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
116116
with:
117-
java-version: 17
117+
java-version-file: .java-version
118118
distribution: 'temurin'
119119
- name: Configure AWS Credentials
120120
uses: aws-actions/configure-aws-credentials@v4
@@ -143,9 +143,9 @@ jobs:
143143
steps:
144144
- uses: actions/checkout@v5
145145

146-
- uses: actions/setup-java@v4
146+
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
147147
with:
148-
java-version: 17
148+
java-version-file: .java-version
149149
distribution: 'temurin'
150150
- name: Configure AWS Credentials
151151
uses: aws-actions/configure-aws-credentials@v4

.github/workflows/e2e-tests-with-operator.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ jobs:
3838
with:
3939
fetch-depth: 0
4040

41-
- uses: actions/setup-java@v4
41+
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
4242
with:
43-
java-version: 17
43+
java-version-file: .java-version
4444
distribution: temurin
4545

4646
# cache local patch outputs
@@ -132,7 +132,7 @@ jobs:
132132
path: aws-otel-java-instrumentation
133133

134134
- name: Set up JDK 11
135-
uses: actions/setup-java@v4
135+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
136136
with:
137137
distribution: 'zulu'
138138
java-version: '11'

.github/workflows/main-build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ jobs:
2323
runs-on: aws-otel-java-instrumentation_ubuntu-latest_32-core
2424
steps:
2525
- uses: actions/checkout@v5
26-
- uses: actions/setup-java@v4
26+
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
2727
with:
28-
java-version: 17
28+
java-version-file: .java-version
2929
distribution: temurin
3030
# vaadin 14 tests fail with node 18
3131
- name: Set up Node
@@ -57,9 +57,9 @@ jobs:
5757
- uses: actions/checkout@v5
5858
with:
5959
fetch-depth: 0
60-
- uses: actions/setup-java@v4
60+
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
6161
with:
62-
java-version: 17
62+
java-version-file: .java-version
6363
distribution: temurin
6464

6565
# cache local patch outputs
@@ -192,7 +192,7 @@ jobs:
192192
- uses: actions/checkout@v5
193193
with:
194194
fetch-depth: 0
195-
- uses: actions/setup-java@v4
195+
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
196196
with:
197197
java-version: 23
198198
distribution: 'temurin'
@@ -232,9 +232,9 @@ jobs:
232232
- uses: actions/checkout@v5
233233
with:
234234
fetch-depth: 0
235-
- uses: actions/setup-java@v4
235+
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
236236
with:
237-
java-version: 17
237+
java-version-file: .java-version
238238
distribution: 'temurin'
239239
- name: Build Application Signals Lambda Layer
240240
working-directory: lambda-layer

.github/workflows/nightly-upstream-snapshot-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ jobs:
2727
with:
2828
fetch-depth: 0
2929

30-
- uses: actions/setup-java@v4
30+
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
3131
with:
32-
java-version: 17
32+
java-version-file: .java-version
3333
distribution: 'temurin'
3434

3535
# cache local patch outputs
@@ -132,7 +132,7 @@ jobs:
132132
- uses: actions/checkout@v5
133133
with:
134134
fetch-depth: 0
135-
- uses: actions/setup-java@v4
135+
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
136136
with:
137137
java-version: 23
138138
distribution: 'temurin'

.github/workflows/owasp.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ jobs:
3131
fetch-depth: 0
3232

3333
- name: Set up Java for dependency scan
34-
uses: actions/setup-java@v4
34+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
3535
with:
36-
java-version: 17
36+
java-version-file: .java-version
3737
distribution: 'temurin'
3838

3939
- name: Configure AWS credentials for dependency scan

.github/workflows/patch-release-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ jobs:
6161
with:
6262
ref: ${{ needs.prepare-release-branch.outputs.release-branch-name }}
6363

64-
- uses: actions/setup-java@v4
64+
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
6565
with:
66-
java-version: 17
66+
java-version-file: .java-version
6767
distribution: 'temurin'
6868
- name: Configure AWS Credentials
6969
uses: aws-actions/configure-aws-credentials@v4

.github/workflows/pr-build.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v5
1616

17-
- uses: actions/setup-java@v4
17+
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
1818
with:
19-
java-version: 17
19+
java-version-file: .java-version
2020
distribution: temurin
2121
# vaadin 14 tests fail with node 18
2222
- name: Set up Node
@@ -56,9 +56,9 @@ jobs:
5656
steps:
5757
- uses: actions/checkout@v5
5858

59-
- uses: actions/setup-java@v4
59+
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
6060
with:
61-
java-version: 17
61+
java-version-file: .java-version
6262
distribution: temurin
6363

6464
- uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
@@ -93,7 +93,7 @@ jobs:
9393
./gradlew build -p exporters/aws-distro-opentelemetry-xray-udp-span-exporter
9494
9595
- name: Set up Java version for tests
96-
uses: actions/setup-java@v4
96+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
9797
with:
9898
java-version: 23
9999
distribution: temurin
@@ -109,9 +109,9 @@ jobs:
109109
arguments: contractTests -PlocalDocker=true -i
110110

111111
- name: Set up Java version for image build
112-
uses: actions/setup-java@v4
112+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
113113
with:
114-
java-version: 17
114+
java-version-file: .java-version
115115
distribution: temurin
116116

117117
- name: Get current version
@@ -168,9 +168,9 @@ jobs:
168168
uses: actions/checkout@v5
169169

170170
- name: Setup Java
171-
uses: actions/setup-java@v4
171+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
172172
with:
173-
java-version: 17
173+
java-version-file: .java-version
174174
distribution: temurin
175175

176176
- name: Build layer

.github/workflows/release-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- uses: actions/checkout@v5
28-
- uses: actions/setup-java@v4
28+
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
2929
with:
30-
java-version: 17
30+
java-version-file: .java-version
3131
distribution: 'temurin'
3232
- uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
3333

0 commit comments

Comments
 (0)