Skip to content

Commit 099926d

Browse files
authored
Merge branch 'master' into james.eastham/support-eventbridge-dsm
2 parents 1eb7ee4 + 600610b commit 099926d

521 files changed

Lines changed: 11217 additions & 5141 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.

.codecov.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@ coverage:
33
round: down
44
precision: 2
55
status:
6+
# The coverage action only attaches `master-coverage` on PRs targeting
7+
# master; other PRs auto-pass codecov/patch via the rule below.
8+
default_rules:
9+
flag_coverage_not_uploaded_behavior: pass
610
project: off
711
patch:
812
default:
913
target: 95%
1014
if_not_found: success
1115
if_ci_failed: success
12-
# PRs against `vN.x` release branches are typically backports / cherry-picks
13-
# where the patch coverage is decided in the source PR; only enforce on master.
14-
branches:
15-
- master
16+
only_pulls: true
17+
flags:
18+
- master-coverage

.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@
258258
/.github/workflows/electron.yml @DataDog/apm-idm-js
259259
/.github/workflows/serverless.yml @DataDog/serverless-aws @DataDog/apm-serverless
260260
/.github/workflows/llmobs.yml @DataDog/ml-observability
261+
/.github/workflows/openfeature.yml @DataDog/feature-flagging-and-experimentation-sdk
261262
/.github/workflows/profiling.yml @DataDog/profiling-js
262263
/.github/workflows/system-tests.yml @DataDog/asm-js
263264
/.github/workflows/test-optimization.yml @DataDog/ci-app-libraries
@@ -294,6 +295,7 @@
294295
/integration-tests/coverage-fixtures/parent.js @DataDog/lang-platform-js
295296
/integration-tests/coverage-fixtures/worker.js @DataDog/lang-platform-js
296297
/integration-tests/coverage-manual-process.spec.js @DataDog/lang-platform-js
298+
/integration-tests/crashtracking/ @DataDog/lang-platform-js
297299
/integration-tests/init.spec.js @DataDog/lang-platform-js
298300
/integration-tests/mocha-parallel-files-fixtures/ @DataDog/lang-platform-js
299301
/integration-tests/mocha-parallel-files.spec.js @DataDog/lang-platform-js

.github/actions/coverage/action.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,26 @@ runs:
2020
shell: bash
2121
run: node scripts/verify-coverage.js --flags "${{ inputs.flags }}"
2222

23+
# `master-coverage` is the flag .codecov.yml gates codecov/patch on. Attach
24+
# it only on PRs targeting master so release-branch PRs auto-pass.
25+
- name: Compute Codecov flags
26+
id: codecov-flags
27+
shell: bash
28+
env:
29+
JOB_FLAGS: ${{ inputs.flags }}
30+
EVENT_NAME: ${{ github.event_name }}
31+
BASE_REF: ${{ github.base_ref }}
32+
run: |
33+
flags="$JOB_FLAGS"
34+
if [ "$EVENT_NAME" = "pull_request" ] && [ "$BASE_REF" = "master" ]; then
35+
flags="${flags:+$flags,}master-coverage"
36+
fi
37+
echo "value=$flags" >> "$GITHUB_OUTPUT"
38+
2339
- name: Upload coverage to Codecov
2440
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
2541
with:
26-
flags: ${{ inputs.flags }}
42+
flags: ${{ steps.codecov-flags.outputs.value }}
2743

2844
- name: Install datadog-ci
2945
if: always()

.github/actions/datadog-ci/.yarnrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
registry "https://registry.npmjs.org"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ runs:
66
steps:
77
- uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
88
with:
9-
path: ${{ github.action_path }}/node_modules
10-
key: datadog-ci-${{ hashFiles('.github/actions/datadog-ci/package.json') }}
9+
path: ${{ github.workspace }}/.github/actions/datadog-ci/node_modules
10+
key: datadog-ci-${{ hashFiles('.github/actions/datadog-ci/yarn.lock') }}
1111

1212
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
1313
with:
1414
node-version: '20'
1515

1616
- shell: bash
1717
run: |
18-
yarn install --no-lockfile
18+
yarn install --frozen-lockfile || (sleep 30 && yarn install --frozen-lockfile)
1919
echo "$(pwd)/node_modules/.bin" >> $GITHUB_PATH
20-
working-directory: ${{ github.action_path }}
20+
working-directory: ${{ github.workspace }}/.github/actions/datadog-ci
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
2+
# yarn lockfile v1
3+
4+
5+
"@datadog/datadog-ci@5.16.0":
6+
version "5.16.0"
7+
resolved "https://registry.npmjs.org/@datadog/datadog-ci/-/datadog-ci-5.16.0.tgz#54c40e97ff0ba14d661beaec4f8efec1808b8bbe"
8+
integrity sha512-0ykDASeq6cM9LAZibf/n8VxyVYLFGSCGmepuY0tLzcFHZuob2hszN++C8R91afW3cOTy/fKWHdDADFKv4qD1RQ==

.github/actions/dd-sts-api-key/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ runs:
1111
steps:
1212
- name: Get Datadog API key
1313
id: dd-sts
14-
uses: DataDog/dd-sts-action@2e8187910199bd93129520183c093e19aa585c75 # v1.0.0
14+
uses: DataDog/dd-sts-action@cf22dd37b6a6355fd2dcd4b7a1634ef5f837e6fc # v1.0.1
1515
with:
1616
policy: dd-trace-js-api-key

.github/actions/dd-sts-app-key/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ runs:
1111
steps:
1212
- name: Get Datadog App key
1313
id: dd-sts
14-
uses: DataDog/dd-sts-action@2e8187910199bd93129520183c093e19aa585c75 # v1.0.0
14+
uses: DataDog/dd-sts-action@cf22dd37b6a6355fd2dcd4b7a1634ef5f837e6fc # v1.0.1
1515
with:
1616
policy: dd-trace-js

.github/actions/install/action.yml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,11 @@
11
name: Install dependencies
22
description: Install dependencies
3-
inputs:
4-
cache:
5-
description: "Whether to enable caching of node_modules."
6-
required: false
7-
default: 'false'
83
runs:
94
using: composite
105
steps:
11-
- id: yarn-cache
12-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
13-
with:
14-
key: yarn-cache-${{ github.workflow }}-${{ github.job }}-${{ hashFiles('yarn.lock') }}-v2
15-
path: node_modules.tar
16-
if: inputs.cache == 'true'
17-
- run: tar -xf node_modules.tar
18-
shell: bash
19-
if: inputs.cache == 'true' && steps.yarn-cache.outputs.cache-hit == 'true'
206
# Retry in case of server error from registry.
217
# Wait 60 seconds to give the registry server time to heal.
22-
- run: bun install --linker=hoisted --trust || sleep 60 && bun install --linker=hoisted --trust
8+
- run: bun install --linker=hoisted --trust --network-concurrency 8 || (sleep 60 && bun install --linker=hoisted --trust --network-concurrency 8)
239
shell: bash
2410
env:
2511
_DD_IGNORE_ENGINES: 'true'
26-
- run: tar -cf node_modules.tar node_modules
27-
shell: bash
28-
if: inputs.cache == 'true' && steps.yarn-cache.outputs.cache-hit != 'true'

.github/actions/node/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ runs:
3333
- uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
3434
id: node-version-cache
3535
with:
36-
path: /tmp/.node-resolved-version-${{ steps.node-version.outputs.version }}
36+
path: ${{ runner.temp }}/.node-resolved-version-${{ steps.node-version.outputs.version }}
3737
key: node-resolved-${{ runner.os }}-${{ runner.arch }}-v${{ steps.node-version.outputs.version }}-${{ steps.cache-key.outputs.block }}
3838
- name: Read cached version
3939
id: cached
4040
shell: bash
4141
run: |
42-
if [ -f /tmp/.node-resolved-version-${{ steps.node-version.outputs.version }} ]; then
43-
echo "version=$(cat /tmp/.node-resolved-version-${{ steps.node-version.outputs.version }})" >> "$GITHUB_OUTPUT"
42+
if [ -f "$RUNNER_TEMP/.node-resolved-version-${{ steps.node-version.outputs.version }}" ]; then
43+
echo "version=$(cat "$RUNNER_TEMP/.node-resolved-version-${{ steps.node-version.outputs.version }}")" >> "$GITHUB_OUTPUT"
4444
fi
4545
4646
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
@@ -55,7 +55,7 @@ runs:
5555
- name: Save resolved version
5656
if: steps.node-version-cache.outputs.cache-hit != 'true'
5757
shell: bash
58-
run: node -v | tr -d 'v' > /tmp/.node-resolved-version-${{ steps.node-version.outputs.version }}
58+
run: node -v | tr -d 'v' > "$RUNNER_TEMP/.node-resolved-version-${{ steps.node-version.outputs.version }}"
5959
- uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
6060
with:
6161
bun-version: 1.3.1

0 commit comments

Comments
 (0)