Skip to content

Commit 38edb2b

Browse files
authored
Merge branch 'develop-hybrid-core-tracing' into hybrid-agent-wsgi-traces
2 parents c16c775 + 0c05c66 commit 38edb2b

File tree

8 files changed

+109
-103
lines changed

8 files changed

+109
-103
lines changed

.github/.trivyignore

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1+
# =============================
2+
# Accepted Risk Vulnerabilities
3+
# =============================
4+
5+
# Accepting risk due to Python 3.8 support.
6+
CVE-2025-50181 # Requires misconfiguration of urllib3, which agent does not do without intervention
7+
CVE-2025-66418 # Malicious servers could cause high resource consumption
8+
CVE-2025-66471 # Malicious servers could cause high resource consumption
9+
110
# =======================
211
# Ignored Vulnerabilities
312
# =======================
413

5-
# Accepting risk due to Python 3.8 support.
6-
CVE-2025-50181
7-
814
# Not relevant, only affects Pyodide
915
CVE-2025-50182

.github/workflows/addlicense.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
permissions:
4040
contents: read
4141
steps:
42-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
42+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
4343

4444
- name: Fetch git tags
4545
run: |

.github/workflows/benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
BASE_SHA: ${{ github.event.pull_request.base.sha }}
3939

4040
steps:
41-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
41+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
4242
with:
4343
fetch-depth: 0
4444

.github/workflows/build-ci-image.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ jobs:
4343
name: Docker Build ${{ matrix.platform }}
4444

4545
steps:
46-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
46+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
4747
with:
4848
persist-credentials: false
4949
fetch-depth: 0
5050

5151
- name: Set up Docker Buildx
5252
id: buildx
53-
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # 3.11.1
53+
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # 3.12.0
5454

5555
# Lowercase image name and append -ci
5656
- name: Generate Image Name
@@ -97,7 +97,7 @@ jobs:
9797
touch "${{ runner.temp }}/digests/${digest#sha256:}"
9898
9999
- name: Upload Digest
100-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # 5.0.0
100+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # 6.0.0
101101
with:
102102
name: digests-${{ matrix.cache_tag }}
103103
path: ${{ runner.temp }}/digests/*
@@ -114,7 +114,7 @@ jobs:
114114

115115
steps:
116116
- name: Download Digests
117-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # 6.0.0
117+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # 7.0.0
118118
with:
119119
path: ${{ runner.temp }}/digests
120120
pattern: digests-*
@@ -129,7 +129,7 @@ jobs:
129129
password: ${{ secrets.GITHUB_TOKEN }}
130130

131131
- name: Set up Docker Buildx
132-
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # 3.11.1
132+
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # 3.12.0
133133

134134
# Lowercase image name and append -ci
135135
- name: Generate Image Name

.github/workflows/deploy.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
runs-on: ${{ matrix.os }}
7070

7171
steps:
72-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
72+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
7373
with:
7474
persist-credentials: false
7575
fetch-depth: 0
@@ -97,7 +97,7 @@ jobs:
9797
CIBW_TEST_SKIP: "*-win_arm64"
9898

9999
- name: Upload Artifacts
100-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # 5.0.0
100+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # 6.0.0
101101
with:
102102
name: ${{ github.job }}-${{ matrix.wheel }}
103103
path: ./wheelhouse/*.whl
@@ -109,7 +109,7 @@ jobs:
109109
runs-on: ubuntu-24.04
110110

111111
steps:
112-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
112+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
113113
with:
114114
persist-credentials: false
115115
fetch-depth: 0
@@ -134,7 +134,7 @@ jobs:
134134
openssl md5 -binary "dist/${tarball}" | xxd -p | tr -d '\n' > "dist/${md5_file}"
135135
136136
- name: Upload Artifacts
137-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # 5.0.0
137+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # 6.0.0
138138
with:
139139
name: ${{ github.job }}-sdist
140140
path: |
@@ -166,7 +166,7 @@ jobs:
166166
environment: ${{ matrix.pypi-instance }}
167167

168168
steps:
169-
- uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # 6.0.0
169+
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # 7.0.0
170170
with:
171171
path: ./dist/
172172
merge-multiple: true
@@ -196,7 +196,7 @@ jobs:
196196
repository-url: https://test.pypi.org/legacy/
197197

198198
- name: Attest
199-
uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # 3.0.0
199+
uses: actions/attest-build-provenance@00014ed6ed5efc5b1ab7f7f34a39eb55d41aa4f8 # 3.1.0
200200
id: attest
201201
with:
202202
subject-path: |

.github/workflows/mega-linter.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
steps:
4646
# Git Checkout
4747
- name: Checkout Code
48-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
48+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
4949
with:
5050
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
5151
fetch-depth: 0 # Required for pushing commits to PRs
@@ -68,7 +68,7 @@ jobs:
6868
# Upload MegaLinter artifacts
6969
- name: Archive production artifacts
7070
if: success() || failure()
71-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # 5.0.0
71+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # 6.0.0
7272
with:
7373
name: MegaLinter reports
7474
include-hidden-files: "true"
@@ -109,7 +109,7 @@ jobs:
109109
run: sudo chown -Rc $UID .git/
110110

111111
- name: Commit and push applied linter fixes
112-
uses: stefanzweifel/git-auto-commit-action@28e16e81777b558cc906c8750092100bbb34c5e3 # 7.0.0
112+
uses: stefanzweifel/git-auto-commit-action@04702edda442b2e678b25b537cec683a1493fcb9 # 7.1.0
113113
if: env.APPLY_FIXES_IF_COMMIT == 'true'
114114
with:
115115
branch: >-

0 commit comments

Comments
 (0)