Skip to content

Commit f625bb5

Browse files
committed
Merge remote-tracking branch 'origin/master' into native spans
# Conflicts: # packages/dd-trace/src/span_processor.js # packages/dd-trace/test/span_processor.spec.js
2 parents b1ba53c + fbd459a commit f625bb5

239 files changed

Lines changed: 7844 additions & 1956 deletions

File tree

Some content is hidden

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

.agents/skills/apm-integrations/references/new-integration-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ Add to `.github/workflows/apm-integrations.yml`:
269269
with:
270270
version: ${{ matrix.node-version }}
271271
- uses: ./.github/actions/install
272-
- run: yarn test:plugins:ci
272+
- run: npm run test:plugins:ci
273273
strategy:
274274
matrix:
275275
node-version: [18, 22]

.github/CODEOWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,7 @@
353353
/integration-tests/coverage-fixtures/ @DataDog/lang-platform-js
354354
/integration-tests/crashtracking/ @DataDog/lang-platform-js
355355
/integration-tests/helpers/ @DataDog/lang-platform-js
356+
/integration-tests/import-variants.spec.js @DataDog/lang-platform-js
356357
/integration-tests/init/ @DataDog/lang-platform-js
357358
/integration-tests/init.spec.js @DataDog/lang-platform-js
358359
/integration-tests/memory-leak/ @DataDog/lang-platform-js
@@ -375,6 +376,8 @@
375376
/packages/dd-trace/src/feature-registry.js @DataDog/lang-platform-js
376377
/packages/dd-trace/src/js_span_processor.js @DataDog/lang-platform-js
377378
/packages/dd-trace/src/exporters/common/ @DataDog/lang-platform-js
379+
/packages/dd-trace/src/exporters/common/client-library-headers.js @DataDog/lang-platform-js @DataDog/feature-flagging-and-experimentation-sdk
380+
/packages/dd-trace/src/proxy.js @DataDog/lang-platform-js
378381
/packages/dd-trace/test/agent/ @DataDog/lang-platform-js
379382
/packages/dd-trace/test/dd-trace.spec.js @DataDog/lang-platform-js
380383
/packages/dd-trace/test/dogstatsd.spec.js @DataDog/lang-platform-js

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ runs:
1717
- if: ${{ inputs.node-floor == 'newest-maintenance-lts' }}
1818
uses: ./.github/actions/node/newest-maintenance-lts
1919
- uses: ./.github/actions/install
20-
- run: yarn test:instrumentations:ci
20+
- run: npm run test:instrumentations:ci
2121
shell: bash
2222
- uses: ./.github/actions/node/latest
23-
- run: yarn test:instrumentations:ci
23+
- run: npm run test:instrumentations:ci
2424
shell: bash
2525
- uses: ./.github/actions/coverage
2626
with:

.github/actions/plugins/integration-test-newest-lts/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ runs:
1414
steps:
1515
- uses: ./.github/actions/node/newest-maintenance-lts
1616
- uses: ./.github/actions/install
17-
- run: yarn test:integration:plugins:coverage
17+
- run: npm run test:integration:plugins:coverage
1818
shell: bash
1919
- uses: ./.github/actions/coverage
2020
with:

.github/actions/plugins/integration-test/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ runs:
1111
- uses: ./.github/actions/testagent/start
1212
- uses: ./.github/actions/node/oldest-maintenance-lts
1313
- uses: ./.github/actions/install
14-
- run: yarn test:integration:plugins:coverage
14+
- run: npm run test:integration:plugins:coverage
1515
shell: bash
1616
- uses: ./.github/actions/node/latest
17-
- run: yarn test:integration:plugins:coverage
17+
- run: npm run test:integration:plugins:coverage
1818
shell: bash
1919
- uses: ./.github/actions/coverage
2020
with:

.github/actions/plugins/test-and-upstream/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ runs:
1717
- if: ${{ inputs.node-floor == 'newest-maintenance-lts' }}
1818
uses: ./.github/actions/node/newest-maintenance-lts
1919
- uses: ./.github/actions/install
20-
- run: yarn test:plugins:ci
20+
- run: npm run test:plugins:ci
2121
shell: bash
22-
- run: yarn test:plugins:upstream
22+
- run: npm run test:plugins:upstream
2323
shell: bash
2424
- uses: ./.github/actions/node/latest
25-
- run: yarn test:plugins:ci
25+
- run: npm run test:plugins:ci
2626
shell: bash
27-
- run: yarn test:plugins:upstream
27+
- run: npm run test:plugins:upstream
2828
shell: bash
2929
- uses: ./.github/actions/coverage
3030
with:

.github/actions/plugins/test/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ runs:
1717
- if: ${{ inputs.node-floor == 'newest-maintenance-lts' }}
1818
uses: ./.github/actions/node/newest-maintenance-lts
1919
- uses: ./.github/actions/install
20-
- run: yarn test:plugins:ci
20+
- run: npm run test:plugins:ci
2121
shell: bash
2222
- uses: ./.github/actions/node/latest
23-
- run: yarn test:plugins:ci
23+
- run: npm run test:plugins:ci
2424
shell: bash
2525
- uses: ./.github/actions/coverage
2626
with:

.github/actions/plugins/upstream/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ runs:
1717
- if: ${{ inputs.node-floor == 'newest-maintenance-lts' }}
1818
uses: ./.github/actions/node/newest-maintenance-lts
1919
- uses: ./.github/actions/install
20-
- run: yarn test:plugins:upstream
20+
- run: npm run test:plugins:upstream
2121
shell: bash
2222
- uses: ./.github/actions/node/latest
23-
- run: yarn test:plugins:upstream
23+
- run: npm run test:plugins:upstream
2424
shell: bash
2525
# `test:plugins:upstream` runs each plugin's upstream test suite (e.g., axios's own tests)
2626
# against the unit-test harness, which intentionally does not produce NYC coverage for

.github/workflows/aiguard.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2222
- uses: ./.github/actions/node/latest
2323
- uses: ./.github/actions/install
24-
- run: yarn test:aiguard:ci
24+
- run: npm run test:aiguard:ci
2525
- uses: ./.github/actions/coverage
2626
with:
2727
flags: aiguard-macos
@@ -39,13 +39,13 @@ jobs:
3939
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4040
- uses: ./.github/actions/node/oldest-maintenance-lts
4141
- uses: ./.github/actions/install
42-
- run: yarn test:aiguard:ci
42+
- run: npm run test:aiguard:ci
4343
- uses: ./.github/actions/node/newest-maintenance-lts
44-
- run: yarn test:aiguard:ci
44+
- run: npm run test:aiguard:ci
4545
- uses: ./.github/actions/node/active-lts
46-
- run: yarn test:aiguard:ci
46+
- run: npm run test:aiguard:ci
4747
- uses: ./.github/actions/node/latest
48-
- run: yarn test:aiguard:ci
48+
- run: npm run test:aiguard:ci
4949
- uses: ./.github/actions/coverage
5050
with:
5151
flags: aiguard-ubuntu
@@ -65,7 +65,7 @@ jobs:
6565
with:
6666
version: 24.14.1 # TODO: remove pin when https://github.com/nodejs/node/issues/62991 is fixed
6767
- uses: ./.github/actions/install
68-
- run: yarn test:aiguard:ci
68+
- run: npm run test:aiguard:ci
6969
- uses: ./.github/actions/node-crash-report
7070
if: failure()
7171
- uses: ./.github/actions/coverage
@@ -91,7 +91,7 @@ jobs:
9191
with:
9292
version: ${{ matrix.version }}
9393
- uses: ./.github/actions/install
94-
- run: yarn test:integration:aiguard:coverage
94+
- run: npm run test:integration:aiguard:coverage
9595
- uses: ./.github/actions/coverage
9696
with:
9797
flags: aiguard-integration-${{ matrix.version }}

.github/workflows/apm-capabilities.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3030
- uses: ./.github/actions/node/latest
3131
- uses: ./.github/actions/install
32-
- run: yarn test:trace:core:ci
32+
- run: npm run test:trace:core:ci
3333
- uses: ./.github/actions/coverage
3434
with:
3535
flags: apm-capabilities-tracing-macos
@@ -52,7 +52,7 @@ jobs:
5252
with:
5353
version: ${{ matrix.node-version }}
5454
- uses: ./.github/actions/install
55-
- run: yarn test:trace:core:ci
55+
- run: npm run test:trace:core:ci
5656
- uses: ./.github/actions/coverage
5757
with:
5858
flags: apm-capabilities-tracing-ubuntu-${{ matrix.node-version }}
@@ -71,7 +71,7 @@ jobs:
7171
with:
7272
version: 24.14.1 # TODO: remove pin when https://github.com/nodejs/node/issues/62991 is fixed
7373
- uses: ./.github/actions/install
74-
- run: yarn test:trace:core:ci
74+
- run: npm run test:trace:core:ci
7575
- uses: ./.github/actions/node-crash-report
7676
if: failure()
7777
- uses: ./.github/actions/coverage

0 commit comments

Comments
 (0)