Skip to content

Commit 197139c

Browse files
liustveliustve
authored
Merge branch 'main' into empty-commit
2 parents 4bd8492 + 8d92b0e commit 197139c

File tree

78 files changed

+10003
-901
lines changed

Some content is hidden

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

78 files changed

+10003
-901
lines changed

‎.github/actions/set_up/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ runs:
3131

3232
- name: Cache tox environment
3333
# Preserves .tox directory between runs for faster installs
34-
uses: actions/cache@v1
34+
uses: actions/cache@v3
3535
with:
3636
path: |
3737
.tox

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

Lines changed: 48 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
role-to-assume: arn:aws:iam::${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ACCOUNT_ID }}:role/${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ROLE_NAME }}
3535
aws-region: us-east-1
3636

37-
- uses: actions/download-artifact@v3
37+
- uses: actions/download-artifact@v4
3838
with:
3939
name: ${{ inputs.staging-wheel-name }}
4040

@@ -46,58 +46,58 @@ jobs:
4646
# DEFAULT SETTING: {Python Version}, EC2, AMD64, AL2
4747
#
4848

49-
default-v8-amd64:
49+
default-py39-amd64:
5050
needs: [ upload-main-build ]
5151
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-ec2-default-test.yml@main
5252
secrets: inherit
5353
with:
5454
aws-region: us-east-1
5555
caller-workflow-name: 'main-build'
56-
python-version: '3.8'
56+
python-version: '3.9'
5757
cpu-architecture: 'x86_64'
5858
staging-wheel-name: ${{ inputs.staging-wheel-name }}
5959

60-
default-v11-amd64:
60+
default-py310-amd64:
6161
needs: [ upload-main-build ]
6262
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-ec2-default-test.yml@main
6363
secrets: inherit
6464
with:
6565
aws-region: us-east-1
6666
caller-workflow-name: 'main-build'
67-
python-version: '3.9'
67+
python-version: '3.10'
6868
cpu-architecture: 'x86_64'
6969
staging-wheel-name: ${{ inputs.staging-wheel-name }}
7070

71-
default-v17-amd64:
71+
default-py311-amd64:
7272
needs: [ upload-main-build ]
7373
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-ec2-default-test.yml@main
7474
secrets: inherit
7575
with:
7676
aws-region: us-east-1
7777
caller-workflow-name: 'main-build'
78-
python-version: '3.10'
78+
python-version: '3.11'
7979
cpu-architecture: 'x86_64'
8080
staging-wheel-name: ${{ inputs.staging-wheel-name }}
8181

82-
default-v21-amd64:
82+
default-py312-amd64:
8383
needs: [ upload-main-build ]
8484
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-ec2-default-test.yml@main
8585
secrets: inherit
8686
with:
8787
aws-region: us-east-1
8888
caller-workflow-name: 'main-build'
89-
python-version: '3.11'
89+
python-version: '3.12'
9090
cpu-architecture: 'x86_64'
9191
staging-wheel-name: ${{ inputs.staging-wheel-name }}
9292

93-
default-v22-amd64:
93+
default-py313-amd64:
9494
needs: [ upload-main-build ]
9595
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-ec2-default-test.yml@main
9696
secrets: inherit
9797
with:
9898
aws-region: us-east-1
9999
caller-workflow-name: 'main-build'
100-
python-version: '3.12'
100+
python-version: '3.13'
101101
cpu-architecture: 'x86_64'
102102
staging-wheel-name: ${{ inputs.staging-wheel-name }}
103103

@@ -106,70 +106,71 @@ jobs:
106106
# DEFAULT SETTING: {Python Version}, EKS, AMD64, AL2
107107
#
108108

109-
eks-v3-8-amd64:
109+
eks-py39-amd64:
110+
if: ${{ always() }}
110111
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-eks-test.yml@main
111112
secrets: inherit
112113
with:
113114
aws-region: us-east-1
114115
test-cluster-name: 'e2e-python-adot-test'
115116
adot-image-name: ${{ inputs.adot-image-name }}
116117
caller-workflow-name: 'main-build'
117-
python-version: '3.8'
118+
python-version: '3.9'
118119

119-
eks-v3-9-amd64:
120+
eks-py310-amd64:
120121
if: ${{ always() }}
121-
needs: eks-v3-8-amd64
122+
needs: eks-py39-amd64
122123
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-eks-test.yml@main
123124
secrets: inherit
124125
with:
125126
aws-region: us-east-1
126127
test-cluster-name: 'e2e-python-adot-test'
127128
adot-image-name: ${{ inputs.adot-image-name }}
128129
caller-workflow-name: 'main-build'
129-
python-version: '3.9'
130+
python-version: '3.10'
130131

131-
eks-v3-10-amd64:
132+
eks-py311-amd64:
132133
if: ${{ always() }}
133-
needs: eks-v3-9-amd64
134+
needs: eks-py310-amd64
134135
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-eks-test.yml@main
135136
secrets: inherit
136137
with:
137138
aws-region: us-east-1
138139
test-cluster-name: 'e2e-python-adot-test'
139140
adot-image-name: ${{ inputs.adot-image-name }}
140141
caller-workflow-name: 'main-build'
141-
python-version: '3.10'
142+
python-version: '3.11'
142143

143-
eks-v3-11-amd64:
144+
eks-py312-amd64:
144145
if: ${{ always() }}
145-
needs: eks-v3-10-amd64
146+
needs: eks-py311-amd64
146147
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-eks-test.yml@main
147148
secrets: inherit
148149
with:
149150
aws-region: us-east-1
150151
test-cluster-name: 'e2e-python-adot-test'
151152
adot-image-name: ${{ inputs.adot-image-name }}
152153
caller-workflow-name: 'main-build'
153-
python-version: '3.11'
154+
python-version: '3.12'
154155

155-
eks-v3-12-amd64:
156+
eks-py313-amd64:
156157
if: ${{ always() }}
157-
needs: eks-v3-11-amd64
158+
needs: eks-py312-amd64
158159
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-eks-test.yml@main
159160
secrets: inherit
160161
with:
161162
aws-region: us-east-1
162163
test-cluster-name: 'e2e-python-adot-test'
163164
adot-image-name: ${{ inputs.adot-image-name }}
164165
caller-workflow-name: 'main-build'
165-
python-version: '3.12'
166+
python-version: '3.13'
166167

167168
#
168169
# PACKAGED DISTRIBUTION PLATFORM COVERAGE
169170
# DEFAULT SETTING: Python 3.9, {Platform}, AMD64, AL2
170171
#
171172

172-
asg-v11-amd64:
173+
asg-py39-amd64:
173174
needs: [ upload-main-build ]
174175
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-ec2-asg-test.yml@main
175176
secrets: inherit
@@ -184,7 +185,7 @@ jobs:
184185
# DEFAULT SETTING: Python 3.10, {Platform}, AMD64, AL2
185186
#
186187

187-
k8s-v11-amd64:
188+
k8s-py310-amd64:
188189
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-k8s-test.yml@main
189190
secrets: inherit
190191
with:
@@ -194,7 +195,7 @@ jobs:
194195
python-version: '3.10'
195196

196197

197-
ecs-v11-amd64:
198+
ecs-py310-amd64:
198199
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-ecs-test.yml@main
199200
secrets: inherit
200201
with:
@@ -208,7 +209,7 @@ jobs:
208209
# DEFAULT SETTING: Python 3.9, EC2, {CPU Architecture}, AL2
209210
#
210211

211-
default-v11-arm64:
212+
default-py39-arm64:
212213
needs: [ upload-main-build ]
213214
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-ec2-default-test.yml@main
214215
secrets: inherit
@@ -228,3 +229,21 @@ jobs:
228229
aws-region: us-east-1
229230
python-version: '3.12'
230231
caller-workflow-name: 'main-build'
232+
#
233+
# Stand-Alone ADOT/ADOT SigV4 test on EC2
234+
adot-sigv4:
235+
needs: [ upload-main-build ]
236+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-ec2-adot-sigv4-test.yml@main
237+
secrets: inherit
238+
with:
239+
caller-workflow-name: 'main-build'
240+
staging-wheel-name: ${{ inputs.staging-wheel-name }}
241+
242+
# Stand-Alone ADOT/ADOT Genesis test on EC2
243+
adot-genesis:
244+
needs: [ upload-main-build ]
245+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-ec2-genesis-test.yml@main
246+
secrets: inherit
247+
with:
248+
caller-workflow-name: 'main-build'
249+
staging-wheel-name: ${{ inputs.staging-wheel-name }}

‎.github/workflows/daily_scan.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ jobs:
6666
if: always()
6767
run: |
6868
gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 259A55407DD6C00299E6607EFFDE55BE73A2D1ED
69-
VERSION=$(curl -s https://jeremylong.github.io/DependencyCheck/current.txt)
70-
curl -Ls "https://github.com/jeremylong/DependencyCheck/releases/download/v$VERSION/dependency-check-$VERSION-release.zip" --output dependency-check.zip
71-
curl -Ls "https://github.com/jeremylong/DependencyCheck/releases/download/v$VERSION/dependency-check-$VERSION-release.zip.asc" --output dependency-check.zip.asc
69+
VERSION=$(curl -s https://jeremylong.github.io/DependencyCheck/current.txt | head -n1 | cut -d' ' -f1)
70+
curl -Ls "https://github.com/dependency-check/DependencyCheck/releases/download/v$VERSION/dependency-check-$VERSION-release.zip" --output dependency-check.zip
71+
curl -Ls "https://github.com/dependency-check/DependencyCheck/releases/download/v$VERSION/dependency-check-$VERSION-release.zip.asc" --output dependency-check.zip.asc
7272
gpg --verify dependency-check.zip.asc
7373
unzip dependency-check.zip
7474
./dependency-check/bin/dependency-check.sh --enableExperimental --suppression .github/dependency-check-suppressions.xml --failOnCVSS 0 --nvdApiKey ${{ env.NVD_API_KEY_NVD_API_KEY }} -s aws-opentelemetry-distro/
@@ -82,15 +82,15 @@ jobs:
8282
id: high_scan
8383
uses: ./.github/actions/image_scan
8484
with:
85-
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-python:v0.8.0"
85+
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-python:v0.9.0"
8686
severity: 'CRITICAL,HIGH'
8787

8888
- name: Perform low image scan
8989
if: always()
9090
id: low_scan
9191
uses: ./.github/actions/image_scan
9292
with:
93-
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-python:v0.8.0"
93+
image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-python:v0.9.0"
9494
severity: 'MEDIUM,LOW,UNKNOWN'
9595

9696
- name: Configure AWS Credentials for emitting metrics

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
aws s3 cp dist/${{ steps.staging_wheel_output.outputs.STAGING_WHEEL}} s3://${{ env.STAGING_S3_BUCKET }}
8888
8989
- name: Upload Wheel to GitHub Actions
90-
uses: actions/upload-artifact@v3
90+
uses: actions/upload-artifact@v4
9191
with:
9292
name: ${{ steps.staging_wheel_output.outputs.STAGING_WHEEL}}
9393
path: dist/${{ steps.staging_wheel_output.outputs.STAGING_WHEEL}}

‎.github/workflows/pr_build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
1717
matrix:
18-
python-version: ["3.8", "3.9", "3.10", "3.11"]
18+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
1919
steps:
2020
- name: Checkout Repo @ SHA - ${{ github.sha }}
2121
uses: actions/checkout@v4

0 commit comments

Comments
 (0)