Skip to content

Commit a0c6429

Browse files
jj22eejj22ee
authored
Merge branch 'main' into fix-udp-workflow
2 parents af54d70 + 7903dbf commit a0c6429

File tree

58 files changed

+3899
-825
lines changed

Some content is hidden

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

58 files changed

+3899
-825
lines changed

‎.github/patches/opentelemetry-java-contrib.patch‎

Lines changed: 3073 additions & 194 deletions
Large diffs are not rendered by default.

‎.github/patches/versions‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
OTEL_JAVA_INSTRUMENTATION_VERSION=v2.11.0
2-
OTEL_JAVA_CONTRIB_VERSION=v1.39.0
1+
OTEL_JAVA_INSTRUMENTATION_VERSION=v2.18.1
2+
OTEL_JAVA_CONTRIB_VERSION=v1.48.0

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 3 additions & 3 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
@@ -50,7 +50,7 @@ jobs:
5050
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
5151
gpg_password: ${{ secrets.GPG_PASSPHRASE }}
5252

53-
- uses: gradle/wrapper-validation-action@v1
53+
- uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
5454

5555
- name: Manually build to avoid autobuild failures
5656
uses: gradle/gradle-build-action@v3

‎.github/workflows/docker-build-corretto-slim.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- uses: actions/checkout@v5
23-
- uses: gradle/wrapper-validation-action@v1
23+
- uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
2424
- name: Configure AWS Credentials
2525
uses: aws-actions/configure-aws-credentials@v4
2626
with:

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

Lines changed: 3 additions & 3 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
@@ -38,7 +38,7 @@ jobs:
3838
with:
3939
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
4040
gpg_password: ${{ secrets.GPG_PASSPHRASE }}
41-
- uses: gradle/wrapper-validation-action@v1
41+
- uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
4242
- name: Configure AWS Credentials
4343
uses: aws-actions/configure-aws-credentials@v4
4444
with:

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

Lines changed: 9 additions & 9 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
@@ -51,7 +51,7 @@ jobs:
5151
gpg_password: ${{ secrets.GPG_PASSPHRASE }}
5252

5353
- name: Validate the checksums of Gradle Wrapper
54-
uses: gradle/wrapper-validation-action@v1
54+
uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
5555

5656
- name: Configure AWS Credentials
5757
uses: aws-actions/configure-aws-credentials@v4
@@ -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: 11 additions & 11 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
@@ -39,7 +39,7 @@ jobs:
3939
with:
4040
path: ~/.pnpm-store
4141
key: ${{ runner.os }}-test-cache-pnpm-modules
42-
- uses: gradle/wrapper-validation-action@v1
42+
- uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
4343
- uses: ./.github/actions/patch-dependencies
4444
with:
4545
run_tests: "true"
@@ -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
@@ -76,7 +76,7 @@ jobs:
7676
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
7777
gpg_password: ${{ secrets.GPG_PASSPHRASE }}
7878

79-
- uses: gradle/wrapper-validation-action@v1
79+
- uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
8080

8181
- name: Configure AWS Credentials
8282
uses: aws-actions/configure-aws-credentials@v4
@@ -192,11 +192,11 @@ 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'
199-
- uses: gradle/wrapper-validation-action@v1
199+
- uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
200200

201201
- name: Configure AWS Credentials
202202
uses: aws-actions/configure-aws-credentials@v4
@@ -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
@@ -256,7 +256,7 @@ jobs:
256256
aws s3 cp ./build/distributions/aws-opentelemetry-java-layer.zip s3://adot-main-build-staging-jar/adot-java-lambda-layer-${{ github.run_id }}.zip
257257
258258
application-signals-e2e-test:
259-
needs: [build]
259+
needs: [build, application-signals-lambda-layer-build]
260260
uses: ./.github/workflows/application-signals-e2e-test.yml
261261
secrets: inherit
262262
with:

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

Lines changed: 5 additions & 5 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
@@ -46,7 +46,7 @@ jobs:
4646
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
4747
gpg_password: ${{ secrets.GPG_PASSPHRASE }}
4848

49-
- uses: gradle/wrapper-validation-action@v1
49+
- uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
5050

5151
- name: Configure AWS Credentials
5252
uses: aws-actions/configure-aws-credentials@v4
@@ -132,11 +132,11 @@ 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'
139-
- uses: gradle/wrapper-validation-action@v1
139+
- uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
140140

141141
- name: Configure AWS Credentials
142142
uses: aws-actions/configure-aws-credentials@v4

‎.github/workflows/owasp.yml‎

Lines changed: 4 additions & 4 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
@@ -112,7 +112,7 @@ jobs:
112112
id: high_scan_v2
113113
uses: ./.github/actions/image_scan
114114
with:
115-
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v2.11.3"
115+
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v2.11.4"
116116
severity: 'CRITICAL,HIGH'
117117
logout: 'false'
118118

@@ -121,7 +121,7 @@ jobs:
121121
id: low_scan_v2
122122
uses: ./.github/actions/image_scan
123123
with:
124-
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v2.11.3"
124+
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v2.11.4"
125125
severity: 'MEDIUM,LOW,UNKNOWN'
126126
logout: 'false'
127127

0 commit comments

Comments
 (0)