Skip to content

Commit ea8493e

Browse files
yiyuan-heyiyuan-he
committed
merge main branch commits into v1.32.x release branch
1 parent 68f08cb commit ea8493e

File tree

56 files changed

+3385
-77
lines changed

Some content is hidden

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

56 files changed

+3385
-77
lines changed

‎.github/CODEOWNERS‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
# https://help.github.com/articles/about-codeowners/
1+
# Learn about CODEOWNERS file format:
2+
# https://help.github.com/en/articles/about-code-owners
23

3-
* @aws-observability/adot-sdk-maintainers
4+
# Default owners for the entire repo
5+
* @aws-observability/aws-application-signals-maintainers

‎.github/actions/cpUtility-testing/action.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ runs:
2929

3030
- name: Set up Docker Buildx
3131
uses: docker/setup-buildx-action@v3
32+
with:
33+
driver-opts: image=moby/buildkit:v0.15.1
3234

3335
- name: Configure AWS Credentials
3436
uses: aws-actions/configure-aws-credentials@v4
@@ -64,4 +66,4 @@ runs:
6466
build-args: "ADOT_JAVA_VERSION=${{ inputs.adot-java-version }}"
6567
context: .
6668
platforms: linux/amd64,linux/arm64
67-
tags: ${{ inputs.image_uri_with_tag }}
69+
tags: ${{ inputs.image_uri_with_tag }}

‎.github/actions/image_scan/action.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
## SPDX-License-Identifier: Apache-2.0
3+
name: image-scan
4+
description: |
5+
This action performs a scan of a provided (local or public ECR remote) image, using Trivy.
6+
7+
inputs:
8+
image-ref:
9+
required: true
10+
description: "Reference for the image to be scanned"
11+
severity:
12+
required: true
13+
description: "List of severities that will cause a failure"
14+
15+
runs:
16+
using: "composite"
17+
steps:
18+
19+
# Per https://docs.aws.amazon.com/AmazonECR/latest/public/docker-pull-ecr-image.html, it is possible to
20+
# make unauthorized calls to get public ECR images (needed to build the ADOT Java docker image), but
21+
# it can fail if you previously authenticated to a public repo. Adding this step to log out, so we
22+
# ensure we can make unauthenticated call. This is important for making the pr_build workflow run on
23+
# PRs created from forked repos.
24+
- name: Logout of public AWS ECR
25+
shell: bash
26+
run: docker logout public.ecr.aws
27+
28+
- name: Run Trivy vulnerability scanner on image
29+
uses: aquasecurity/trivy-action@master
30+
with:
31+
image-ref: ${{ inputs.image-ref }}
32+
severity: ${{ inputs.severity }}
33+
exit-code: '1'

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

Lines changed: 162 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,42 +41,199 @@ jobs:
4141
java-ec2-default-e2e-test:
4242
needs: [ upload-main-build ]
4343
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-e2e-test.yml@consolidate-release
44+
45+
java-ec2-asg-e2e-test:
46+
needs: [ upload-main-build ]
47+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-asg-e2e-test.yml@consolidate-release
48+
49+
java-eks-e2e-test:
50+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-e2e-test.yml@consolidate-release
51+
52+
#
53+
# PACKAGED DISTRIBUTION LANGUAGE VERSION COVERAGE
54+
# DEFAULT SETTING: {Java Version}, EC2, AMD64, AL2
55+
#
56+
57+
default-v8-amd64:
58+
needs: [ upload-main-build ]
59+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
4460
secrets: inherit
4561
with:
4662
aws-region: us-east-1
4763
caller-workflow-name: 'main-build'
64+
java-version: '8'
65+
cpu-architecture: 'x86_64'
4866

49-
java-ec2-asg-e2e-test:
67+
default-v11-amd64:
5068
needs: [ upload-main-build ]
51-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-asg-e2e-test.yml@consolidate-release
69+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
5270
secrets: inherit
5371
with:
5472
aws-region: us-east-1
5573
caller-workflow-name: 'main-build'
74+
java-version: '11'
75+
cpu-architecture: 'x86_64'
5676

57-
java-eks-e2e-test:
58-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-e2e-test.yml@consolidate-release
77+
default-v17-amd64:
78+
needs: [ upload-main-build ]
79+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
80+
secrets: inherit
81+
with:
82+
aws-region: us-east-1
83+
caller-workflow-name: 'main-build'
84+
java-version: '17'
85+
cpu-architecture: 'x86_64'
86+
87+
default-v21-amd64:
88+
needs: [ upload-main-build ]
89+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
90+
secrets: inherit
91+
with:
92+
aws-region: us-east-1
93+
caller-workflow-name: 'main-build'
94+
java-version: '21'
95+
cpu-architecture: 'x86_64'
96+
97+
default-v22-amd64:
98+
needs: [ upload-main-build ]
99+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
100+
secrets: inherit
101+
with:
102+
aws-region: us-east-1
103+
caller-workflow-name: 'main-build'
104+
java-version: '22'
105+
cpu-architecture: 'x86_64'
106+
107+
#
108+
# DOCKER DISTRIBUTION LANGUAGE VERSION COVERAGE
109+
# DEFAULT SETTING: {Java Version}, EKS, AMD64, AL2
110+
#
111+
112+
eks-v8-amd64:
113+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@main
59114
secrets: inherit
60115
with:
61116
aws-region: us-east-1
62117
test-cluster-name: 'e2e-adot-test'
63118
adot-image-name: ${{ inputs.adot-image-name }}
64119
caller-workflow-name: 'main-build'
120+
java-version: '8'
65121

66122
java-metric-limiter-e2e-test:
67123
needs: [ java-eks-e2e-test ]
68124
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-e2e-test.yml@consolidate-release
125+
126+
eks-v11-amd64:
127+
needs: eks-v8-amd64
128+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@main
69129
secrets: inherit
70130
with:
71131
aws-region: us-east-1
72132
test-cluster-name: 'e2e-adot-test'
73133
adot-image-name: ${{ inputs.adot-image-name }}
74134
caller-workflow-name: 'main-build'
135+
java-version: '11'
75136

76137
java-k8s-e2e-test:
77138
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-k8s-e2e-test.yml@consolidate-release
139+
140+
eks-v17-amd64:
141+
needs: eks-v11-amd64
142+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@main
78143
secrets: inherit
79144
with:
80145
aws-region: us-east-1
146+
test-cluster-name: 'e2e-adot-test'
81147
adot-image-name: ${{ inputs.adot-image-name }}
82-
caller-workflow-name: 'main-build'
148+
caller-workflow-name: 'main-build'
149+
java-version: '17'
150+
151+
eks-v21-amd64:
152+
needs: eks-v17-amd64
153+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@main
154+
secrets: inherit
155+
with:
156+
aws-region: us-east-1
157+
test-cluster-name: 'e2e-adot-test'
158+
adot-image-name: ${{ inputs.adot-image-name }}
159+
caller-workflow-name: 'main-build'
160+
java-version: '21'
161+
162+
eks-v22-amd64:
163+
needs: eks-v21-amd64
164+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@main
165+
secrets: inherit
166+
with:
167+
aws-region: us-east-1
168+
test-cluster-name: 'e2e-adot-test'
169+
adot-image-name: ${{ inputs.adot-image-name }}
170+
caller-workflow-name: 'main-build'
171+
java-version: '22'
172+
173+
#
174+
# PACKAGED DISTRIBUTION PLATFORM COVERAGE
175+
# DEFAULT SETTING: Java 11, {Platform}, AMD64, AL2
176+
#
177+
178+
asg-v11-amd64:
179+
needs: [ upload-main-build ]
180+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-asg-test.yml@main
181+
secrets: inherit
182+
with:
183+
aws-region: us-east-1
184+
caller-workflow-name: 'main-build'
185+
java-version: '11'
186+
187+
#
188+
# DOCKER DISTRIBUTION PLATFORM COVERAGE
189+
# DEFAULT SETTING: Java 11, {Platform}, AMD64, AL2
190+
#
191+
192+
k8s-v11-amd64:
193+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-k8s-test.yml@main
194+
secrets: inherit
195+
with:
196+
aws-region: us-east-1
197+
adot-image-name: ${{ inputs.adot-image-name }}
198+
caller-workflow-name: 'main-build'
199+
java-version: '11'
200+
201+
202+
ecs-v11-amd64:
203+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ecs-test.yml@main
204+
secrets: inherit
205+
with:
206+
aws-region: us-east-1
207+
adot-image-name: ${{ inputs.adot-image-name }}
208+
caller-workflow-name: 'main-build'
209+
java-version: '11'
210+
211+
#
212+
# CPU ARCHITECTURE COVERAGE
213+
# DEFAULT SETTING: Java 11, EC2, {CPU Architecture}, AL2
214+
#
215+
216+
default-v11-arm64:
217+
needs: [ upload-main-build ]
218+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
219+
secrets: inherit
220+
with:
221+
aws-region: us-east-1
222+
caller-workflow-name: 'main-build'
223+
java-version: '11'
224+
cpu-architecture: 'arm64'
225+
226+
#
227+
# Other Functional Test Case
228+
#
229+
230+
metric-limiter-v11-amd64:
231+
needs: [ eks-v22-amd64 ]
232+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/metric-limiter-test.yml@main
233+
secrets: inherit
234+
with:
235+
aws-region: us-east-1
236+
test-cluster-name: 'e2e-adot-test'
237+
adot-image-name: ${{ inputs.adot-image-name }}
238+
caller-workflow-name: 'main-build'
239+
java-version: '11'

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
registry: public.ecr.aws
9797

9898
- name: Run test containers
99-
run: docker-compose up --abort-on-container-exit
99+
run: docker compose up --abort-on-container-exit
100100
working-directory: .github/collector
101101
env:
102102
INSTANCE_ID: ${{ github.run_id }}-${{ github.run_number }}
@@ -127,7 +127,7 @@ jobs:
127127
registry: public.ecr.aws
128128

129129
- name: Run test containers
130-
run: docker-compose up --abort-on-container-exit
130+
run: docker compose up --abort-on-container-exit
131131
working-directory: .github/collector
132132
env:
133133
INSTANCE_ID: ${{ github.run_id }}-${{ github.run_number }}
@@ -158,7 +158,7 @@ jobs:
158158
registry: public.ecr.aws
159159

160160
- name: Run test containers
161-
run: docker-compose up --abort-on-container-exit
161+
run: docker compose up --abort-on-container-exit
162162
working-directory: .github/collector
163163
env:
164164
INSTANCE_ID: ${{ github.run_id }}-${{ github.run_number }}
@@ -179,6 +179,6 @@ jobs:
179179
success: ${{ needs.test_Spring_App_With_Java_Agent.result == 'success' &&
180180
needs.test_Spark_App_With_Java_Agent.result == 'success' &&
181181
needs.test_Spark_AWS_SDK_V1_App_With_Java_Agent.result == 'success' }}
182-
region: us-west-2
182+
region: us-east-1
183183
secrets:
184184
roleArn: ${{ secrets.METRICS_ROLE_ARN }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ jobs:
189189
# file locks are being held from SIGTERMS dispatched in previous
190190
# steps.
191191
- name: Destroy resources
192-
if: ${{ cancelled() }}
192+
if: ${{ cancelled() || failure() }}
193193
shell: bash {0}
194194
working-directory: testing-framework/terraform
195195
run: |
@@ -207,6 +207,6 @@ jobs:
207207
branch: ${{ github.ref_name }}
208208
workflow: ${{ inputs.caller-workflow-name }}
209209
success: ${{ needs.run-batch-job.result == 'success' }}
210-
region: us-west-2
210+
region: us-east-1
211211
secrets:
212-
roleArn: ${{ secrets.METRICS_ROLE_ARN }}
212+
roleArn: ${{ secrets.METRICS_ROLE_ARN }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,6 @@ jobs:
241241
workflow: main-build
242242
success: ${{ needs.build.result == 'success' &&
243243
needs.contract-tests.result == 'success' }}
244-
region: us-west-2
244+
region: us-east-1
245245
secrets:
246246
roleArn: ${{ secrets.METRICS_ROLE_ARN }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,6 @@ jobs:
168168
workflow: nightly-upstream-snapshot-build
169169
success: ${{ needs.build.result == 'success' &&
170170
needs.contract-tests.result == 'success' }}
171-
region: us-west-2
171+
region: us-east-1
172172
secrets:
173173
roleArn: ${{ secrets.METRICS_ROLE_ARN }}

0 commit comments

Comments
 (0)