Skip to content

Commit 2ea449e

Browse files
committed
Merge remote-tracking branch 'origin/master' into bengl/native-spans-attempt-3
# Conflicts: # packages/dd-trace/src/exporter.js # packages/dd-trace/src/span_processor.js # packages/dd-trace/test/span_processor.spec.js
2 parents 5cb4811 + b78cd37 commit 2ea449e

325 files changed

Lines changed: 19844 additions & 19740 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.

.github/actions/datadog-ci/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Install @datadog/datadog-ci from npm and add it to PATH.
44
runs:
55
using: composite
66
steps:
7-
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
7+
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
88
with:
99
node-version: '20'
1010

.github/actions/node/action.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ inputs:
55
description: "Version identifier of the version to use."
66
required: false
77
default: 'latest'
8+
registry-url:
9+
description: "npm registry URL to configure for publishing. Leave unset for jobs that don't publish."
10+
required: false
11+
default: ''
812
runs:
913
using: composite
1014
steps:
@@ -15,6 +19,7 @@ runs:
1519
continue-on-error: true
1620
with:
1721
version: ${{ inputs.version }}
22+
registry-url: ${{ inputs.registry-url }}
1823
- if: steps.attempt.outcome == 'failure'
1924
shell: bash
2025
run: sleep 60
@@ -23,3 +28,4 @@ runs:
2328
uses: ./.github/actions/node/setup
2429
with:
2530
version: ${{ inputs.version }}
31+
registry-url: ${{ inputs.registry-url }}

.github/actions/node/setup/action.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ inputs:
55
description: "Version identifier of the version to use."
66
required: false
77
default: 'latest'
8+
registry-url:
9+
description: "npm registry URL to configure for publishing. Leave unset for jobs that don't publish."
10+
required: false
11+
default: ''
812
runs:
913
using: composite
1014
steps:
@@ -41,10 +45,14 @@ runs:
4145
esac
4246
echo "version=$version" >> "$GITHUB_OUTPUT"
4347
44-
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
48+
# registry-url is left empty for jobs that don't publish: setup-node only writes an
49+
# .npmrc auth placeholder when it's set, and since v7.0.0 no longer backstops that
50+
# placeholder with a dummy NODE_AUTH_TOKEN, so an always-on registry-url broke Yarn
51+
# Classic (it hard-errors on an unresolved ${NODE_AUTH_TOKEN} env reference in .npmrc).
52+
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
4553
with:
4654
node-version: ${{ steps.node-version.outputs.version }}
47-
registry-url: ${{ inputs.registry-url || 'https://registry.npmjs.org' }}
55+
registry-url: ${{ inputs.registry-url }}
4856

4957
# The shipped package.json pins engines.node to the supported runtime range, but CI keeps
5058
# running the full suite on Node 18/20. Widen the field to >=18 for this checkout so the

.github/actions/testagent/logs/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ inputs:
1010
runs:
1111
using: composite
1212
steps:
13-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
13+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
1414
with:
1515
# Preserve untracked artifacts (coverage/, .nyc_output/, node_modules/) produced by earlier
1616
# test steps. Without this, the default `git clean -ffdx` wipes them before subsequent

.github/actions/testagent/start/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: "Starts the APM Test Agent image with environment."
33
runs:
44
using: composite
55
steps:
6-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
6+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
77
- run: docker compose up -d testagent || docker compose up -d testagent
88
shell: bash
99
- name: Wait for test agent to be ready

.github/workflows/aiguard.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
permissions:
1919
id-token: write
2020
steps:
21-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
21+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2222
- uses: ./.github/actions/node/latest
2323
- uses: ./.github/actions/install
2424
- run: npm run test:aiguard:ci
@@ -36,7 +36,7 @@ jobs:
3636
permissions:
3737
id-token: write
3838
steps:
39-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
39+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4040
- uses: ./.github/actions/node/oldest-maintenance-lts
4141
- uses: ./.github/actions/install
4242
- run: npm run test:aiguard:ci
@@ -60,7 +60,7 @@ jobs:
6060
permissions:
6161
id-token: write
6262
steps:
63-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
63+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
6464
- uses: ./.github/actions/node
6565
with:
6666
version: 24.14.1 # TODO: remove pin when https://github.com/nodejs/node/issues/62991 is fixed
@@ -86,7 +86,7 @@ jobs:
8686
permissions:
8787
id-token: write
8888
steps:
89-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
89+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
9090
- uses: ./.github/actions/node
9191
with:
9292
version: ${{ matrix.version }}

.github/workflows/all-green.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
with:
2323
scope: DataDog/dd-trace-js
2424
policy: all-green
25-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
25+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2626
with:
2727
sparse-checkout-cone-mode: false
2828
sparse-checkout: |

.github/workflows/apm-capabilities.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
permissions:
2727
id-token: write
2828
steps:
29-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
29+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3030
- uses: ./.github/actions/node/latest
3131
- uses: ./.github/actions/install
3232
- run: npm run test:trace:core:ci
@@ -47,7 +47,7 @@ jobs:
4747
matrix:
4848
node-version: [oldest, maintenance, active, latest]
4949
steps:
50-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
50+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
5151
- uses: ./.github/actions/node
5252
with:
5353
version: ${{ matrix.node-version }}
@@ -66,7 +66,7 @@ jobs:
6666
permissions:
6767
id-token: write
6868
steps:
69-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
69+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
7070
- uses: ./.github/actions/node
7171
with:
7272
version: 24.14.1 # TODO: remove pin when https://github.com/nodejs/node/issues/62991 is fixed

0 commit comments

Comments
 (0)