Skip to content

Commit 86f138c

Browse files
thpiercethpierce
authored
Merge branch 'main' into dependabot/gradle/org.testcontainers-postgresql-1.21.3
2 parents eedf7b0 + 3f34807 commit 86f138c

17 files changed

+132
-56
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
steps:
2525
- name: Checkout repository
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@v5
2727

2828
# Initializes the CodeQL tools for scanning.
2929
- name: Initialize CodeQL

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
build-corretto:
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v5
2323
- uses: gradle/wrapper-validation-action@v1
2424
- name: Configure AWS Credentials
2525
uses: aws-actions/configure-aws-credentials@v4

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
build-docker:
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v5
2424
- uses: actions/setup-java@v4
2525
with:
2626
java-version: 17

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Checkout Java Instrumentation repository
28-
uses: actions/checkout@v4
28+
uses: actions/checkout@v5
2929
with:
3030
fetch-depth: 0
3131

@@ -71,15 +71,15 @@ jobs:
7171
env:
7272
COMMIT_HASH: ${{ inputs.image_tag }}
7373

74-
- uses: codecov/codecov-action@v3
74+
- uses: codecov/codecov-action@v5
7575

7676
test_Spring_App_With_Java_Agent:
7777
name: Test Spring App with AWS OTel Java agent
7878
needs: [ build_Images_For_Testing_Sample_App_With_Java_Agent ]
7979
runs-on: ubuntu-latest
8080

8181
steps:
82-
- uses: actions/checkout@v4
82+
- uses: actions/checkout@v5
8383

8484
- uses: actions/setup-java@v4
8585
with:
@@ -110,7 +110,7 @@ jobs:
110110
runs-on: ubuntu-latest
111111

112112
steps:
113-
- uses: actions/checkout@v4
113+
- uses: actions/checkout@v5
114114

115115
- uses: actions/setup-java@v4
116116
with:
@@ -141,7 +141,7 @@ jobs:
141141
runs-on: ubuntu-latest
142142

143143
steps:
144-
- uses: actions/checkout@v4
144+
- uses: actions/checkout@v5
145145

146146
- uses: actions/setup-java@v4
147147
with:

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
build-sample-app:
3535
runs-on: ubuntu-latest
3636
steps:
37-
- uses: actions/checkout@v4
37+
- uses: actions/checkout@v5
3838
with:
3939
fetch-depth: 0
4040

@@ -84,14 +84,14 @@ jobs:
8484
test-case-batch-value: ${{ steps.set-batches.outputs.batch-values }}
8585
steps:
8686
- name: Checkout Testing Framework repository
87-
uses: actions/checkout@v4
87+
uses: actions/checkout@v5
8888
with:
8989
repository: ${{ env.TESTING_FRAMEWORK_REPO }}
9090
path: testing-framework
9191
ref: ${{ inputs.test_ref }}
9292

9393
- name: Checkout Java Instrumentation repository
94-
uses: actions/checkout@v4
94+
uses: actions/checkout@v5
9595
with:
9696
fetch-depth: 0
9797
path: aws-otel-java-instrumentation
@@ -126,7 +126,7 @@ jobs:
126126
steps:
127127
# required for versioning
128128
- name: Checkout Java Instrumentation repository
129-
uses: actions/checkout@v4
129+
uses: actions/checkout@v5
130130
with:
131131
fetch-depth: 0
132132
path: aws-otel-java-instrumentation
@@ -151,7 +151,7 @@ jobs:
151151
role-duration-seconds: 14400
152152

153153
- name: Checkout Testing Framework repository
154-
uses: actions/checkout@v4
154+
uses: actions/checkout@v5
155155
with:
156156
repository: ${{ env.TESTING_FRAMEWORK_REPO }}
157157
path: testing-framework

‎.github/workflows/main-build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
name: Test patches applied to dependencies
2323
runs-on: aws-otel-java-instrumentation_ubuntu-latest_32-core
2424
steps:
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2626
- uses: actions/setup-java@v4
2727
with:
2828
java-version: 17
@@ -54,7 +54,7 @@ jobs:
5454
staging_registry: ${{ steps.imageOutput.outputs.stagingRegistry }}
5555
staging_repository: ${{ steps.imageOutput.outputs.stagingRepository }}
5656
steps:
57-
- uses: actions/checkout@v4
57+
- uses: actions/checkout@v5
5858
with:
5959
fetch-depth: 0
6060
- uses: actions/setup-java@v4
@@ -189,7 +189,7 @@ jobs:
189189
runs-on: ubuntu-latest
190190
needs: build
191191
steps:
192-
- uses: actions/checkout@v4
192+
- uses: actions/checkout@v5
193193
with:
194194
fetch-depth: 0
195195
- uses: actions/setup-java@v4
@@ -229,7 +229,7 @@ jobs:
229229
application-signals-lambda-layer-build:
230230
runs-on: ubuntu-latest
231231
steps:
232-
- uses: actions/checkout@v4
232+
- uses: actions/checkout@v5
233233
with:
234234
fetch-depth: 0
235235
- uses: actions/setup-java@v4

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
image_name: ${{ steps.imageOutput.outputs.imageName }}
2424

2525
steps:
26-
- uses: actions/checkout@v4
26+
- uses: actions/checkout@v5
2727
with:
2828
fetch-depth: 0
2929

@@ -129,7 +129,7 @@ jobs:
129129
runs-on: ubuntu-latest
130130
needs: build
131131
steps:
132-
- uses: actions/checkout@v4
132+
- uses: actions/checkout@v5
133133
with:
134134
fetch-depth: 0
135135
- uses: actions/setup-java@v4

‎.github/workflows/owasp.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88
name: Daily scan
99

1010
on:
11-
schedule:
12-
- cron: '0 18 * * *' # scheduled to run at 18:00 UTC every day
11+
schedule: # scheduled to run at 14:00, 20:00, 02:00 UTC every day
12+
- cron: '0 14 * * *' # 6:00/7:00 PST/PDT (14:00 UTC)
13+
- cron: '0 20 * * *' # 12:00/13:00 PST/PDT (20:00 UTC)
14+
- cron: '0 02 * * *' # 18:00/19:00 PST/PDT (02:00 UTC)
1315
workflow_dispatch: # be able to run the workflow on demand
1416

1517
env:
@@ -24,7 +26,7 @@ jobs:
2426
runs-on: ubuntu-latest
2527
steps:
2628
- name: Checkout repo for dependency scan
27-
uses: actions/checkout@v4
29+
uses: actions/checkout@v5
2830
with:
2931
fetch-depth: 0
3032

@@ -41,7 +43,7 @@ jobs:
4143
aws-region: ${{ env.AWS_DEFAULT_REGION }}
4244

4345
- name: Get NVD API key for dependency scan
44-
uses: aws-actions/aws-secretsmanager-get-secrets@v1
46+
uses: aws-actions/aws-secretsmanager-get-secrets@v2
4547
id: nvd_api_key
4648
with:
4749
secret-ids: ${{ secrets.NVD_API_KEY_SECRET_ARN }}
@@ -97,15 +99,15 @@ jobs:
9799
id: high_scan_v2
98100
uses: ./.github/actions/image_scan
99101
with:
100-
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v2.11.1"
102+
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v2.11.2"
101103
severity: 'CRITICAL,HIGH'
102104

103105
- name: Perform low image scan on v2
104106
if: always()
105107
id: low_scan_v2
106108
uses: ./.github/actions/image_scan
107109
with:
108-
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v2.11.1"
110+
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v2.11.2"
109111
severity: 'MEDIUM,LOW,UNKNOWN'
110112

111113
- name: Configure AWS Credentials for emitting metrics

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ jobs:
3737
name: Check out release branch
3838
# Will fail if there is no release branch yet or succeed otherwise
3939
continue-on-error: true
40-
uses: actions/checkout@v4
40+
uses: actions/checkout@v5
4141
with:
4242
ref: ${{ steps.parse-release-branch.outputs.release-branch-name }}
4343
- id: checkout-release-tag
4444
name: Check out release tag
4545
# If there is already a release branch, the previous step succeeds and we don't run this or the next one.
4646
if: ${{ steps.checkout-release-branch.outcome == 'failure' }}
47-
uses: actions/checkout@v4
47+
uses: actions/checkout@v5
4848
with:
4949
ref: ${{ steps.parse-release-branch.outputs.release-tag-name }}
5050
- name: Create release branch
@@ -57,7 +57,7 @@ jobs:
5757
needs: prepare-release-branch
5858
steps:
5959
- name: Checkout release branch
60-
uses: actions/checkout@v4
60+
uses: actions/checkout@v5
6161
with:
6262
ref: ${{ needs.prepare-release-branch.outputs.release-branch-name }}
6363

‎.github/workflows/pr-build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: Test patches applied to dependencies
1313
runs-on: aws-otel-java-instrumentation_ubuntu-latest_32-core
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616

1717
- uses: actions/setup-java@v4
1818
with:
@@ -54,7 +54,7 @@ jobs:
5454
# https://github.com/open-telemetry/opentelemetry-java/issues/4560
5555
- os: ${{ startsWith(github.event.pull_request.base.ref, 'release/v') && 'windows-latest' || '' }}
5656
steps:
57-
- uses: actions/checkout@v4
57+
- uses: actions/checkout@v5
5858

5959
- uses: actions/setup-java@v4
6060
with:
@@ -158,13 +158,13 @@ jobs:
158158
if: ${{ matrix.os != 'ubuntu-latest' && (hashFiles('.github/patches/opentelemetry-java*.patch') == '' || matrix.os != 'windows-latest' ) }} # build on windows as well unless a patch exists
159159
with:
160160
arguments: build --stacktrace -PenableCoverage=true
161-
- uses: codecov/codecov-action@v3
161+
- uses: codecov/codecov-action@v5
162162

163163
build-lambda:
164164
runs-on: ubuntu-latest
165165
steps:
166166
- name: Checkout Repo @ SHA - ${{ github.sha }}
167-
uses: actions/checkout@v4
167+
uses: actions/checkout@v5
168168

169169
- name: Setup Java
170170
uses: actions/setup-java@v4

0 commit comments

Comments
 (0)