Skip to content

Commit c2bf53a

Browse files
Miqueasherjj22ee
Miqueasher
authored and
jj22ee
committed
Reverting previous revert for 3p actions update (#1198)
This pr reverts the previous revert for 3p action updates for non release files. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 612f602 commit c2bf53a

8 files changed

+113
-95
lines changed

‎.github/workflows/application-signals-e2e-test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- name: Configure AWS Credentials
29-
uses: aws-actions/configure-aws-credentials@v4
29+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
3030
with:
3131
role-to-assume: arn:aws:iam::${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ACCOUNT_ID }}:role/${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ROLE_NAME }}
3232
aws-region: us-east-1
3333

34-
- uses: actions/download-artifact@v4
34+
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 #5.0.0
3535
with:
3636
name: aws-opentelemetry-agent.jar
3737

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323

2424
steps:
2525
- name: Checkout repository
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0
2727

2828
# Initializes the CodeQL tools for scanning.
2929
- name: Initialize CodeQL
30-
uses: github/codeql-action/init@v3
30+
uses: github/codeql-action/init@16df4fbc19aea13d921737861d6c622bf3cefe23 #v3.30.3
3131
with:
3232
languages: java
3333

@@ -37,7 +37,7 @@ jobs:
3737
distribution: temurin
3838

3939
- name: Cache local Maven repository
40-
uses: actions/cache@v3
40+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 #v4.2.4
4141
with:
4242
path: |
4343
~/.m2/repository/io/opentelemetry/
@@ -52,10 +52,11 @@ jobs:
5252

5353
- uses: gradle/wrapper-validation-action@v1
5454

55+
- name: Setup Gradle
56+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a #4.4.3
57+
5558
- name: Manually build to avoid autobuild failures
56-
uses: gradle/gradle-build-action@v3
57-
with:
58-
arguments: build
59+
run: ./gradlew build
5960

6061
- name: Perform CodeQL Analysis
61-
uses: github/codeql-action/analyze@v3
62+
uses: github/codeql-action/analyze@16df4fbc19aea13d921737861d6c622bf3cefe23 #v3.30.3

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,24 @@ jobs:
1919
build-corretto:
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v4
23-
- uses: gradle/wrapper-validation-action@v1
22+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0
23+
- uses: gradle/actions/wrapper-validation@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
2424
- name: Configure AWS Credentials
25-
uses: aws-actions/configure-aws-credentials@v4
25+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
2626
with:
2727
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
2828
aws-region: ${{ env.AWS_DEFAULT_REGION }}
2929
- name: Log in to AWS ECR
30-
uses: docker/login-action@v3
30+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 #v3.5.0
3131
with:
3232
registry: public.ecr.aws
3333

3434
- name: Set up QEMU
35-
uses: docker/setup-qemu-action@v3
35+
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 #3.6.0
3636
- name: Set up Docker Buildx
37-
uses: docker/setup-buildx-action@v3
37+
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 #v3.11.1
3838
- name: Build docker image
39-
uses: docker/build-push-action@v5
39+
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 #6.18.0
4040
with:
4141
push: true
4242
context: scripts/docker/corretto-slim

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
build-docker:
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/checkout@v4
24-
- uses: actions/setup-java@v4
23+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0
24+
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2525
with:
2626
java-version: 17
2727
distribution: 'temurin'
2828
# cache local patch outputs
2929
- name: Cache local Maven repository
30-
uses: actions/cache@v3
30+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 #v4.2.4
3131
with:
3232
path: |
3333
~/.m2/repository/io/opentelemetry/
@@ -40,16 +40,17 @@ jobs:
4040
gpg_password: ${{ secrets.GPG_PASSPHRASE }}
4141
- uses: gradle/wrapper-validation-action@v1
4242
- name: Configure AWS Credentials
43-
uses: aws-actions/configure-aws-credentials@v4
43+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
4444
with:
4545
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
4646
aws-region: ${{ env.AWS_DEFAULT_REGION }}
4747
- name: Log in to AWS ECR
48-
uses: docker/login-action@v3
48+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 #v3.5.0
4949
with:
5050
registry: public.ecr.aws
5151

52+
- name: Setup Gradle
53+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a #4.4.3
54+
5255
- name: Build and push docker image
53-
uses: gradle/gradle-build-action@v3
54-
with:
55-
arguments: :smoke-tests:fakebackend:jib
56+
run: ./gradlew :smoke-tests:fakebackend:jib

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

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

32-
- uses: actions/setup-java@v4
32+
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 #v5.0.0
3333
with:
3434
java-version: 17
3535
distribution: temurin
3636

3737
# cache local patch outputs
3838
- name: Cache local Maven repository
3939
id: cache-local-maven-repo
40-
uses: actions/cache@v3
40+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 #v4.2.4
4141
with:
4242
path: |
4343
~/.m2/repository/io/opentelemetry/
@@ -51,47 +51,48 @@ 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@ed408507eac070d1f99cc633dbcf757c94c7933a #v4.4.3
5555

5656
- name: Configure AWS Credentials
57-
uses: aws-actions/configure-aws-credentials@v4
57+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
5858
with:
5959
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
6060
aws-region: ${{ env.AWS_DEFAULT_REGION }}
6161

6262
- name: Log in to AWS ECR
63-
uses: docker/login-action@v3
63+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 #v3.5.0
6464
with:
6565
registry: public.ecr.aws
6666

67+
- name: Setup Gradle
68+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a #4.4.3
69+
6770
- name: Build and push agent and testing docker images with Gradle
68-
uses: gradle/gradle-build-action@v3
69-
with:
70-
arguments: jib
71+
run: ./gradlew jib
7172
env:
7273
COMMIT_HASH: ${{ inputs.image_tag }}
7374

74-
- uses: codecov/codecov-action@v3
75+
- uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 #v5.5.1
7576

7677
test_Spring_App_With_Java_Agent:
7778
name: Test Spring App with AWS OTel Java agent
7879
needs: [ build_Images_For_Testing_Sample_App_With_Java_Agent ]
7980
runs-on: ubuntu-latest
8081

8182
steps:
82-
- uses: actions/checkout@v4
83+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
8384

8485
- uses: actions/setup-java@v4
8586
with:
8687
java-version: 17
8788
distribution: 'temurin'
8889
- name: Configure AWS Credentials
89-
uses: aws-actions/configure-aws-credentials@v4
90+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
9091
with:
9192
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
9293
aws-region: ${{ env.AWS_DEFAULT_REGION }}
9394
- name: Log in to AWS ECR
94-
uses: docker/login-action@v3
95+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 #v3.5.0
9596
with:
9697
registry: public.ecr.aws
9798

@@ -110,19 +111,19 @@ jobs:
110111
runs-on: ubuntu-latest
111112

112113
steps:
113-
- uses: actions/checkout@v4
114+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
114115

115116
- uses: actions/setup-java@v4
116117
with:
117118
java-version: 17
118119
distribution: 'temurin'
119120
- name: Configure AWS Credentials
120-
uses: aws-actions/configure-aws-credentials@v4
121+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
121122
with:
122123
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
123124
aws-region: ${{ env.AWS_DEFAULT_REGION }}
124125
- name: Log in to AWS ECR
125-
uses: docker/login-action@v3
126+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 #v3.5.0
126127
with:
127128
registry: public.ecr.aws
128129

@@ -141,19 +142,19 @@ jobs:
141142
runs-on: ubuntu-latest
142143

143144
steps:
144-
- uses: actions/checkout@v4
145+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
145146

146-
- uses: actions/setup-java@v4
147+
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 #v5.0.0
147148
with:
148149
java-version: 17
149150
distribution: 'temurin'
150151
- name: Configure AWS Credentials
151-
uses: aws-actions/configure-aws-credentials@v4
152+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
152153
with:
153154
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
154155
aws-region: ${{ env.AWS_DEFAULT_REGION }}
155156
- name: Log in to AWS ECR
156-
uses: docker/login-action@v3
157+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 #v3.5.0
157158
with:
158159
registry: public.ecr.aws
159160

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

Lines changed: 16 additions & 15 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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
3838
with:
3939
fetch-depth: 0
4040

@@ -46,7 +46,7 @@ jobs:
4646
# cache local patch outputs
4747
- name: Cache local Maven repository
4848
id: cache-local-maven-repo
49-
uses: actions/cache@v3
49+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 #v4.2.4
5050
with:
5151
path: |
5252
~/.m2/repository/io/opentelemetry/
@@ -60,20 +60,21 @@ jobs:
6060
gpg_password: ${{ secrets.GPG_PASSPHRASE }}
6161

6262
- name: Configure AWS Credentials
63-
uses: aws-actions/configure-aws-credentials@v4
63+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
6464
with:
6565
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
6666
aws-region: ${{ env.AWS_DEFAULT_REGION }}
6767

6868
- name: Log in to AWS ECR
69-
uses: docker/login-action@v3
69+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 #v3.5.0
7070
with:
7171
registry: public.ecr.aws
7272

7373
- name: Build and push Sample-Apps without Auto-Instrumentation Agent
74-
uses: gradle/gradle-build-action@v3
75-
with:
76-
arguments: jibBuildWithoutAgent
74+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a #v4.4.3
75+
76+
- name: Build and push Sample-Apps with Auto-Instrumentation Agent
77+
run: jibBuildWithoutAgent
7778
env:
7879
COMMIT_HASH: ${{ inputs.image_tag }}
7980

@@ -84,20 +85,20 @@ jobs:
8485
test-case-batch-value: ${{ steps.set-batches.outputs.batch-values }}
8586
steps:
8687
- name: Checkout Testing Framework repository
87-
uses: actions/checkout@v4
88+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
8889
with:
8990
repository: ${{ env.TESTING_FRAMEWORK_REPO }}
9091
path: testing-framework
9192
ref: ${{ inputs.test_ref }}
9293

9394
- name: Checkout Java Instrumentation repository
94-
uses: actions/checkout@v4
95+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
9596
with:
9697
fetch-depth: 0
9798
path: aws-otel-java-instrumentation
9899

99100
- name: Set up Go 1.x
100-
uses: actions/setup-go@v5
101+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 #v6.0.0
101102
with:
102103
go-version: '~1.18.9'
103104

@@ -126,32 +127,32 @@ jobs:
126127
steps:
127128
# required for versioning
128129
- name: Checkout Java Instrumentation repository
129-
uses: actions/checkout@v4
130+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
130131
with:
131132
fetch-depth: 0
132133
path: aws-otel-java-instrumentation
133134

134135
- name: Set up JDK 11
135-
uses: actions/setup-java@v4
136+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 #v5.0.0
136137
with:
137138
distribution: 'zulu'
138139
java-version: '11'
139140

140141
- name: Set up terraform
141-
uses: hashicorp/setup-terraform@v3
142+
uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd #v3.1.2
142143
with:
143144
terraform_version: "~1.5"
144145

145146
- name: Configure AWS Credentials
146-
uses: aws-actions/configure-aws-credentials@v4
147+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
147148
with:
148149
role-to-assume: ${{ secrets.JAVA_INSTRUMENTATION_INTEG_TEST_ARN}}
149150
aws-region: us-west-2
150151
# 4 hours
151152
role-duration-seconds: 14400
152153

153154
- name: Checkout Testing Framework repository
154-
uses: actions/checkout@v4
155+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
155156
with:
156157
repository: ${{ env.TESTING_FRAMEWORK_REPO }}
157158
path: testing-framework

0 commit comments

Comments
 (0)