Skip to content

Commit 9c1ed62

Browse files
wconti27wconti27
committed
Merge branch 'master' into conti/remove-async-storage-graphql
2 parents 287508b + e8ac8bf commit 9c1ed62

File tree

702 files changed

+10045
-10412
lines changed

Some content is hidden

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

702 files changed

+10045
-10412
lines changed

‎.github/actions/install/action.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ runs:
1818
shell: bash
1919
if: inputs.cache == 'true' && steps.yarn-cache.outputs.cache-hit == 'true'
2020
# Retry in case of server error from registry.
21-
- run: yarn install --frozen-lockfile --ignore-engines || yarn install --frozen-lockfile --ignore-engines
21+
# Wait 60 seconds to give the registry server time to heal.
22+
- run: yarn install --frozen-lockfile --ignore-engines || sleep 60 && yarn install --frozen-lockfile --ignore-engines
2223
shell: bash
2324
- run: tar -cf node_modules.tar node_modules
2425
shell: bash

‎.github/actions/instrumentations/test/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ runs:
1010
- uses: ./.github/actions/node/active-lts
1111
- run: yarn test:instrumentations:ci
1212
shell: bash
13-
- uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
13+
- uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3

‎.github/dependabot.yml

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,54 @@ updates:
1111
- "/.github/actions/*"
1212
- "/.github/actions/*/*"
1313
schedule:
14-
interval: "monthly"
14+
interval: "weekly"
1515
groups:
1616
gh-actions-packages:
1717
patterns:
1818
- "*"
19+
- package-ecosystem: "npm"
20+
directories:
21+
- "/"
22+
schedule:
23+
interval: "weekly"
24+
ignore:
25+
- dependency-name: "@types/node"
26+
# Update the types manually with new Node.js version support
27+
update-types: ["version-update:semver-major"]
28+
- dependency-name: "eslint-plugin-mocha"
29+
# ESM only from v11.0.0 onwards
30+
update-types: ["version-update:semver-major"]
31+
- dependency-name: "jest-docblock"
32+
# 30.0.0 onwards only supports Node.js 18.14.x and above
33+
update-types: ["version-update:semver-major"]
34+
# The path-to-regexp version has to be the same as used in express v4.
35+
# Consider vendoring it instead.
36+
- dependency-name: "path-to-regexp"
37+
- dependency-name: "lru-cache"
38+
# 11.0.0 onwards only supports Node.js 20 and above
39+
update-types: ["version-update:semver-major"]
40+
groups:
41+
dev-minor-and-patch-dependencies:
42+
dependency-type: "development"
43+
patterns:
44+
- "*"
45+
update-types:
46+
- "minor"
47+
- "patch"
48+
runtime-minor-and-patch-dependencies:
49+
dependency-type: "production"
50+
patterns:
51+
- "*"
52+
update-types:
53+
- "minor"
54+
- "patch"
55+
exclude-patterns:
56+
# Add entries that we should update manually.
57+
- "@datadog/libdatadog"
58+
- "@datadog/native-appsec"
59+
- "@datadog/native-iast-taint-tracking"
60+
- "@datadog/native-metrics"
61+
- "@datadog/pprof"
62+
- "@datadog/sketches-js"
63+
- "@datadog/wasm-js-rewriter"
64+
- "@opentelemetry/api"

‎.github/scripts/yarn-dedupe.sh

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
#!/usr/bin/env bash
2+
3+
set -ex
4+
5+
if git diff --exit-code yarn.lock; then
6+
echo "✅ yarn.lock is already properly deduplicated"
7+
else
8+
echo "📝 yarn.lock was modified by dedupe command"
9+
10+
PR_AUTHOR="${PR_AUTHOR:-}"
11+
PR_USER_TYPE="${PR_USER_TYPE:-}"
12+
13+
if [[ "$PR_USER_TYPE" == "Bot" ]] && [[ "${GITHUB_EVENT_NAME:-}" == "pull_request" ]]; then
14+
echo "🤖 Bot-created PR detected. Auto-committing yarn.lock changes..."
15+
16+
git config --local user.email "action@github.com"
17+
git config --local user.name "GitHub Action"
18+
19+
git add yarn.lock
20+
git commit -m "Auto-dedupe yarn.lock dependencies"
21+
22+
git push origin HEAD:${GITHUB_HEAD_REF}
23+
24+
echo "✅ Successfully committed and pushed yarn.lock deduplication"
25+
else
26+
echo "❌ The yarn.lock file needs deduplication!"
27+
echo ""
28+
echo "The yarn dedupe command has modified your yarn.lock file."
29+
echo "This means there were duplicate dependencies that could be optimized."
30+
echo ""
31+
echo "To fix this issue:"
32+
echo "1. Run 'yarn dependencies:dedupe' locally"
33+
echo "2. Commit the updated yarn.lock file"
34+
echo "3. Push your changes"
35+
echo ""
36+
echo "This helps keep the dependency tree clean."
37+
exit 1
38+
fi
39+
fi

‎.github/workflows/apm-integrations.yml

Lines changed: 68 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,52 @@ jobs:
187187

188188
azure-functions:
189189
runs-on: ubuntu-latest
190+
services:
191+
azureservicebusemulator:
192+
image: mcr.microsoft.com/azure-messaging/servicebus-emulator:1.1.2
193+
ports:
194+
- "127.0.0.1:5672:5672"
195+
- "127.0.0.1:5300:5300"
196+
env:
197+
ACCEPT_EULA: "Y"
198+
MSSQL_SA_PASSWORD: "Localtestpass1!"
199+
SQL_SERVER: azuresqledge
200+
azuresqledge:
201+
image: mcr.microsoft.com/azure-sql-edge:1.0.7
202+
ports:
203+
- "127.0.0.1:1433:1433"
204+
env:
205+
ACCEPT_EULA: "Y"
206+
MSSQL_SA_PASSWORD: "Localtestpass1!"
190207
env:
191208
PLUGINS: azure-functions
209+
SERVICES: azureservicebusemulator,azuresqledge
210+
steps:
211+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
212+
- uses: ./.github/actions/plugins/test
213+
214+
azure-service-bus:
215+
runs-on: ubuntu-latest
216+
services:
217+
azureservicebusemulator:
218+
image: mcr.microsoft.com/azure-messaging/servicebus-emulator:1.1.2
219+
ports:
220+
- "127.0.0.1:5672:5672"
221+
- "127.0.0.1:5300:5300"
222+
env:
223+
ACCEPT_EULA: "Y"
224+
MSSQL_SA_PASSWORD: "Localtestpass1!"
225+
SQL_SERVER: azuresqledge
226+
azuresqledge:
227+
image: mcr.microsoft.com/azure-sql-edge:1.0.7
228+
ports:
229+
- "127.0.0.1:1433:1433"
230+
env:
231+
ACCEPT_EULA: "Y"
232+
MSSQL_SA_PASSWORD: "Localtestpass1!"
233+
env:
234+
PLUGINS: azure-service-bus
235+
SERVICES: azureservicebusemulator,azuresqledge
192236
steps:
193237
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
194238
- uses: ./.github/actions/plugins/test
@@ -438,6 +482,14 @@ jobs:
438482
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
439483
- uses: ./.github/actions/plugins/test
440484

485+
hono:
486+
runs-on: ubuntu-latest
487+
env:
488+
PLUGINS: hono
489+
steps:
490+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
491+
- uses: ./.github/actions/plugins/test
492+
441493
http:
442494
strategy:
443495
matrix:
@@ -482,6 +534,9 @@ jobs:
482534
- uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
483535

484536
kafkajs:
537+
strategy:
538+
matrix:
539+
node-version: ['oldest', 'latest']
485540
runs-on: ubuntu-latest
486541
services:
487542
kafka:
@@ -506,7 +561,17 @@ jobs:
506561
SERVICES: kafka
507562
steps:
508563
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
509-
- uses: ./.github/actions/plugins/test
564+
- uses: ./.github/actions/testagent/start
565+
- uses: ./.github/actions/node
566+
with:
567+
version: ${{ matrix.node-version }}
568+
- uses: ./.github/actions/install
569+
- run: yarn test:plugins:ci
570+
- if: always()
571+
uses: ./.github/actions/testagent/logs
572+
with:
573+
suffix: plugins-${{ github.job }}-${{ matrix.node-version }}
574+
- uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
510575

511576
koa:
512577
runs-on: ubuntu-latest
@@ -771,14 +836,12 @@ jobs:
771836
SERVICES: oracledb
772837
DD_TEST_AGENT_URL: http://testagent:9126
773838
DD_INJECT_FORCE: 'true'
774-
# Needed to fix issue with `actions/checkout@v3: https://github.com/actions/checkout/issues/1590
775-
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
776839
steps:
777840
# https://github.com/actions/runner/issues/2906#issuecomment-2109514798
778841
- name: Install Node for runner (with glibc 2.17 compatibility)
779842
run: |
780-
curl -LO https://unofficial-builds.nodejs.org/download/release/v20.9.0/node-v20.9.0-linux-x64-glibc-217.tar.xz
781-
tar -xf node-v20.9.0-linux-x64-glibc-217.tar.xz --strip-components 1 -C /node20217
843+
curl -LO https://unofficial-builds.nodejs.org/download/release/v20.19.3/node-v20.19.3-linux-x64-glibc-217.tar.xz
844+
tar -xf node-v20.19.3-linux-x64-glibc-217.tar.xz --strip-components 1 -C /node20217
782845
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
783846
- uses: ./.github/actions/node
784847
with:

‎.github/workflows/codeql-analysis.yml

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

3939
# Initializes the CodeQL tools for scanning.
4040
- name: Initialize CodeQL
41-
uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
41+
uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
4242
with:
4343
languages: ${{ matrix.language }}
4444
config-file: .github/codeql_config.yml
@@ -48,7 +48,7 @@ jobs:
4848
# queries: ./path/to/local/query, your-org/your-repo/queries@main
4949

5050
- name: Autobuild
51-
uses: github/codeql-action/autobuild@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
51+
uses: github/codeql-action/autobuild@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
5252

5353
- name: Perform CodeQL Analysis
54-
uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
54+
uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2

‎.github/workflows/eslint-rules.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: ESLint Rules
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- 'eslint-rules/**'
7+
push:
8+
branches: [master]
9+
paths:
10+
- 'eslint-rules/**'
11+
12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
14+
cancel-in-progress: true
15+
16+
jobs:
17+
eslint-rules:
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
21+
- uses: ./.github/actions/node/active-lts
22+
- uses: ./.github/actions/install
23+
- run: yarn test:eslint-rules

‎.github/workflows/platform.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,15 @@ jobs:
283283
- run: yarn test:integration
284284
- run: yarn test:integration:esbuild
285285

286+
unit-guardrails:
287+
runs-on: ubuntu-latest
288+
steps:
289+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
290+
- uses: ./.github/actions/node/active-lts
291+
- uses: ./.github/actions/install
292+
- run: yarn test:trace:guardrails:ci
293+
- uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
294+
286295
# We'll run these separately for earlier (i.e. unsupported) versions
287296
integration-guardrails:
288297
strategy:
@@ -296,13 +305,16 @@ jobs:
296305
version: ${{ matrix.version }}
297306
- uses: ./.github/actions/install
298307
- run: yarn add --ignore-scripts mocha@10 # Use older mocha to support old Node.js versions
308+
- run: yarn add --ignore-scripts express@4 # Use older express to support old Node.js versions
299309
- run: node node_modules/.bin/mocha --colors --timeout 30000 integration-tests/init.spec.js
300310

301311
integration-guardrails-unsupported:
302312
strategy:
303313
matrix:
304314
version: ['0.8', '0.10', '0.12', '4', '6', '8', '10', '12']
305315
runs-on: ubuntu-latest
316+
env:
317+
DD_TRACE_DEBUG: 'true' # This exercises more of the guardrails code
306318
steps:
307319
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
308320
- uses: ./.github/actions/node

‎.github/workflows/pr-labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
label:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: mheap/github-action-required-labels@388fd6af37b34cdfe5a23b37060e763217e58b03 # v5.5.0
11+
- uses: mheap/github-action-required-labels@8afbe8ae6ab7647d0c9f0cfa7c2f939650d22509 # v5.5.1
1212
with:
1313
mode: exactly
1414
count: 1

‎.github/workflows/project.yml

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ jobs:
6767
static-analysis:
6868
runs-on: ubuntu-latest
6969
name: Datadog Static Analyzer
70+
if: github.actor != 'dependabot[bot]'
7071
steps:
7172
- name: Checkout
7273
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -98,9 +99,15 @@ jobs:
9899

99100
yarn-dedupe:
100101
runs-on: ubuntu-latest
102+
permissions:
103+
contents: write
104+
pull-requests: read
101105
steps:
102106
- name: Checkout code
103107
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
108+
with:
109+
token: ${{ secrets.GITHUB_TOKEN }}
110+
fetch-depth: 0
104111

105112
- name: Setup Node.js
106113
uses: ./.github/actions/node/active-lts
@@ -111,21 +118,9 @@ jobs:
111118
- name: Run yarn dependencies:dedupe
112119
run: yarn dependencies:dedupe
113120

114-
- name: Check if yarn.lock was modified
115-
run: |
116-
if git diff --exit-code yarn.lock; then
117-
echo "✅ yarn.lock is already properly deduplicated"
118-
else
119-
echo "❌ The yarn.lock file needs deduplication!"
120-
echo ""
121-
echo "The yarn dedupe command has modified your yarn.lock file."
122-
echo "This means there were duplicate dependencies that could be optimized."
123-
echo ""
124-
echo "To fix this issue:"
125-
echo "1. Run 'yarn dependencies:dedupe' locally"
126-
echo "2. Commit the updated yarn.lock file"
127-
echo "3. Push your changes"
128-
echo ""
129-
echo "This helps keep the dependency tree clean."
130-
exit 1
131-
fi
121+
- name: Run yarn dedupe check
122+
run: ./.github/scripts/yarn-dedupe.sh
123+
env:
124+
PR_AUTHOR: ${{ github.event.pull_request.user.login }}
125+
PR_USER_TYPE: ${{ github.event.pull_request.user.type }}
126+
GITHUB_EVENT_NAME: ${{ github.event_name }}

0 commit comments

Comments
 (0)