Skip to content

Commit 648b7eb

Browse files
authored
Merge branch 'master' into appsec-57738-add-api-security-sampler
2 parents 8817183 + 748314c commit 648b7eb

File tree

87 files changed

+191
-169
lines changed

Some content is hidden

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

87 files changed

+191
-169
lines changed

.github/workflows/all-green.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
timeout-minutes: 60
2020
steps:
2121
- name: Run Ensure CI Success
22-
uses: DataDog/ensure-ci-success@727e7fe39ae2e1ce7ea336ec85a7369ab0731754 # v2.1.1
22+
uses: DataDog/ensure-ci-success@4a4b720e881d965254a9de2a4f14d1ec0c3d0d7c # v2.2.0
2323
with:
2424
# How long to wait before we start checking the job status
2525
# GitHub's API has a limit, so this helps avoid making too many calls

.github/workflows/build-gem.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3737
with:
3838
persist-credentials: false
39-
- uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0
39+
- uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
4040
with:
4141
ruby-version: '3.2'
4242
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
@@ -87,7 +87,7 @@ jobs:
8787
- name: List gem
8888
run: |
8989
find pkg
90-
- uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0
90+
- uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
9191
with:
9292
ruby-version: '3.2'
9393
- name: Install gem

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
# Initializes the CodeQL tools for scanning.
3636
- name: Initialize CodeQL
37-
uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
37+
uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
3838
with:
3939
languages: ${{ matrix.language }}
4040
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -45,10 +45,10 @@ jobs:
4545
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
4646
# If this step fails, then you should remove it and run the build manually
4747
- name: Autobuild
48-
uses: github/codeql-action/autobuild@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
48+
uses: github/codeql-action/autobuild@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
4949

5050
- name: Perform CodeQL Analysis
51-
uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
51+
uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
5252

5353
complete:
5454
name: CodeQL (complete)

.github/workflows/generate-supported-versions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
persist-credentials: false
2020

2121
- name: Set up Ruby
22-
uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0
22+
uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
2323
with:
2424
ruby-version: "3.3"
2525

.github/workflows/nix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5252
with:
5353
persist-credentials: false
54-
- uses: DeterminateSystems/nix-installer-action@4a562136e63e880cb5a5293b6bd1bd47e739028a # main
54+
- uses: DeterminateSystems/nix-installer-action@999d616271516551cacca0c8b34a02e94d4f79e8 # main
5555
- name: Print ruby version
5656
run: |
5757
nix develop --command which ruby

.github/workflows/parametric-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on: # yamllint disable-line rule:truthy
1515
permissions: {}
1616

1717
env:
18-
SYSTEM_TESTS_REF: e9fb2335c23a6e6d79ccaf4e993b3dca59649ad5 # Automated: This reference is automatically updated.
18+
SYSTEM_TESTS_REF: 76f6755f072c2f50f1c956c4eb31cad9bb0e534c # Automated: Can be updated by .github/workflows/update-system-tests.yml
1919

2020
jobs:
2121
changes:
@@ -24,7 +24,7 @@ jobs:
2424
outputs:
2525
changes: ${{ steps.changes.outputs.src }}
2626
FORCED_TESTS_LIST: ${{ steps.read_forced_tests_list.outputs.FORCED_TESTS_LIST }}
27-
ST_REF: ${{ steps.read_forced_tests_list.outputs.ST_REF }}
27+
ST_REF: ${{ steps.outputs_branch.outputs.ST_REF }}
2828
steps:
2929
- name: Checkout
3030
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2929
with:
3030
persist-credentials: false
31-
- uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0
31+
- uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
3232
with:
3333
ruby-version: "3.3.7"
3434

@@ -165,7 +165,7 @@ jobs:
165165
with:
166166
persist-credentials: false # `rubygems/release-gem` action handles credentials itself
167167
- name: Set up Ruby
168-
uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0
168+
uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
169169
with:
170170
ruby-version: "3.3.7"
171171
- run: bundle install
@@ -209,7 +209,7 @@ jobs:
209209
persist-credentials: false
210210
fetch-depth: 0
211211
- name: Set up Ruby
212-
uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0
212+
uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
213213
with:
214214
ruby-version: "3.3.7"
215215
- run: bundle install

.github/workflows/test-macos.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
# head rubies
4444
- if: ${{ matrix.ruby == 'head' }}
4545
run: sed -i~ -e '/spec\.required_ruby_version/d' datadog.gemspec
46-
- uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0
46+
- uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
4747
with:
4848
ruby-version: ${{ matrix.ruby }}
4949
rubygems: 3.3.26

.github/workflows/test-memory-leaks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1919
with:
2020
persist-credentials: false
21-
- uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0
21+
- uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
2222
with:
2323
ruby-version: 3.4.1
2424
bundler-cache: true # runs 'bundle install' and caches installed gems automatically

.github/workflows/test-yjit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
# head rubies
5050
- if: ${{ matrix.ruby == 'head' }}
5151
run: sed -i~ -e '/spec\.required_ruby_version/d' datadog.gemspec
52-
- uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0
52+
- uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
5353
with:
5454
ruby-version: ${{ matrix.ruby }}
5555
bundler-cache: true # runs 'bundle install' and caches installed gems automatically

.github/workflows/update-system-tests.yml

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
name: Update System Tests
22

3+
# To run this workflow manually, use the following command:
4+
# `gh workflow run "Update System Tests"`
5+
#
6+
# with additional arguments:
7+
# `gh workflow run "Update System Tests" -f ref=<your-ref>`
8+
39
on: # yamllint disable-line rule:truthy
410
schedule:
511
- cron: '0 0 * * 0' # Every Sunday at midnight
12+
repository_dispatch:
13+
types: [update-system-tests]
614
workflow_dispatch:
715
inputs:
816
ref:
@@ -29,7 +37,7 @@ jobs:
2937
steps:
3038
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3139
with:
32-
persist-credentials: true
40+
persist-credentials: false
3341

3442
- name: Checkout System Test
3543
id: system-test-ref
@@ -38,7 +46,8 @@ jobs:
3846
repository: "DataDog/system-tests"
3947
path: system-tests
4048
persist-credentials: false
41-
ref: ${{ github.event.inputs.ref || '' }}
49+
# Use ref from repository_dispatch payload if available, otherwise from workflow_dispatch
50+
ref: ${{ github.event.client_payload.ref || github.event.inputs.ref || '' }}
4251

4352
- run: .github/scripts/update_reference.sh
4453
env:
@@ -62,7 +71,8 @@ jobs:
6271
private-key: ${{ secrets.APP_PRIVATE_KEY }}
6372

6473
- name: Create Pull Request
65-
if: ${{ github.event.inputs.dry-run != true }}
74+
# Skip PR creation if dry-run is true (from either trigger type)
75+
if: ${{ github.event.inputs.dry-run != 'true' && github.event.client_payload.dry-run != 'true' }}
6676
id: cpr
6777
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
6878
with:
@@ -79,4 +89,11 @@ jobs:
7989
body: |
8090
_This is an auto-generated PR from [here](${{github.server_url}}/${{ github.repository }}/blob/master/.github/workflows/update-system-tests.yml)_
8191
The PR updates the system tests (Updated to commit: ${{ steps.system-test-ref.outputs.commit }})
92+
93+
**Trigger Information:**
94+
- Event: ${{ github.event_name }}
95+
- Triggered by: ${{ github.event.client_payload.triggered_by || 'Manual/Scheduled' }}
96+
- Source repo: ${{ github.event.client_payload.source_repo || 'N/A' }}
97+
- Source commit: ${{ github.event.client_payload.source_commit || 'N/A' }}
98+
8299
Please review the changes and merge when ready

gemfiles/jruby_9.2_elasticsearch_7.gemfile.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gemfiles/jruby_9.2_elasticsearch_latest.gemfile.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gemfiles/jruby_9.2_faraday_latest.gemfile.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gemfiles/jruby_9.2_opensearch_2.gemfile.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gemfiles/jruby_9.2_opensearch_latest.gemfile.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gemfiles/jruby_9.2_rest_client_latest.gemfile.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gemfiles/jruby_9.3_mongo_latest.gemfile.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gemfiles/jruby_9.3_redis_latest.gemfile.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gemfiles/jruby_9.3_rest_client_latest.gemfile.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gemfiles/jruby_9.4_elasticsearch_7.gemfile.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gemfiles/jruby_9.4_elasticsearch_latest.gemfile.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gemfiles/jruby_9.4_faraday_latest.gemfile.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gemfiles/jruby_9.4_karafka_latest.gemfile.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gemfiles/jruby_9.4_mongo_latest.gemfile.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gemfiles/jruby_9.4_opensearch_2.gemfile.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gemfiles/jruby_9.4_opensearch_latest.gemfile.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gemfiles/jruby_9.4_redis_latest.gemfile.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gemfiles/jruby_9.4_rest_client_latest.gemfile.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)