Skip to content

Commit 21971fc

Browse files
tlhuntertlhunter
authored
Merge branch 'master' into chris.agocs/inject_trace_context_into_stepfunction_executions
2 parents c819350 + 29f09b1 commit 21971fc

File tree

74 files changed

+4901
-1102
lines changed

Some content is hidden

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

74 files changed

+4901
-1102
lines changed

‎.github/actions/node/21/action.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
name: Node 21
2+
runs:
3+
using: composite
4+
steps:
5+
- uses: actions/setup-node@v3
6+
with:
7+
node-version: '21'

‎.github/workflows/appsec.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- run: yarn test:appsec:ci
3232
- uses: ./.github/actions/node/20
3333
- run: yarn test:appsec:ci
34-
- uses: ./.github/actions/node/latest
34+
- uses: ./.github/actions/node/21
3535
- run: yarn test:appsec:ci
3636
- uses: codecov/codecov-action@v3
3737

@@ -65,7 +65,7 @@ jobs:
6565
- run: yarn install
6666
- uses: ./.github/actions/node/oldest
6767
- run: yarn test:appsec:plugins:ci
68-
- uses: ./.github/actions/node/latest
68+
- uses: ./.github/actions/node/21
6969
- run: yarn test:appsec:plugins:ci
7070
- uses: codecov/codecov-action@v3
7171

@@ -127,7 +127,7 @@ jobs:
127127
- run: yarn install
128128
- uses: ./.github/actions/node/oldest
129129
- run: yarn test:appsec:plugins:ci
130-
- uses: ./.github/actions/node/latest
130+
- uses: ./.github/actions/node/21
131131
- run: yarn test:appsec:plugins:ci
132132
- uses: codecov/codecov-action@v3
133133

@@ -141,7 +141,7 @@ jobs:
141141
- run: yarn install
142142
- uses: ./.github/actions/node/oldest
143143
- run: yarn test:appsec:plugins:ci
144-
- uses: ./.github/actions/node/latest
144+
- uses: ./.github/actions/node/21
145145
- run: yarn test:appsec:plugins:ci
146146
- uses: codecov/codecov-action@v3
147147

@@ -161,7 +161,7 @@ jobs:
161161
- run: yarn install
162162
- uses: ./.github/actions/node/oldest
163163
- run: yarn test:appsec:plugins:ci
164-
- uses: ./.github/actions/node/latest
164+
- uses: ./.github/actions/node/21
165165
- run: yarn test:appsec:plugins:ci
166166
- uses: codecov/codecov-action@v3
167167

@@ -181,7 +181,7 @@ jobs:
181181
- run: yarn install
182182
- uses: ./.github/actions/node/oldest
183183
- run: yarn test:appsec:plugins:ci
184-
- uses: ./.github/actions/node/latest
184+
- uses: ./.github/actions/node/21
185185
- run: yarn test:appsec:plugins:ci
186186
- uses: codecov/codecov-action@v3
187187

@@ -197,7 +197,7 @@ jobs:
197197
- run: yarn test:appsec:plugins:ci
198198
- uses: ./.github/actions/node/20
199199
- run: yarn test:appsec:plugins:ci
200-
- uses: ./.github/actions/node/latest
200+
- uses: ./.github/actions/node/21
201201
- run: yarn test:appsec:plugins:ci
202202
- uses: codecov/codecov-action@v3
203203

@@ -212,7 +212,7 @@ jobs:
212212
- run: yarn install
213213
- uses: ./.github/actions/node/oldest
214214
- run: yarn test:appsec:plugins:ci
215-
- uses: ./.github/actions/node/latest
215+
- uses: ./.github/actions/node/21
216216
- run: yarn test:appsec:plugins:ci
217217
- if: always()
218218
uses: ./.github/actions/testagent/logs

‎.github/workflows/profiling.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- uses: ./.github/actions/node/20
3535
- run: yarn test:profiler:ci
3636
- run: yarn test:integration:profiler
37-
- uses: ./.github/actions/node/latest
37+
- uses: ./.github/actions/node/21
3838
- run: yarn test:profiler:ci
3939
- run: yarn test:integration:profiler
4040
- uses: codecov/codecov-action@v3

‎.github/workflows/project.yml‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
strategy:
3535
matrix:
3636
version: [18, latest]
37-
framework: [cucumber, playwright]
37+
framework: [cucumber, playwright, selenium]
3838
runs-on: ubuntu-latest
3939
env:
4040
DD_SERVICE: dd-trace-js-integration-tests
@@ -45,6 +45,25 @@ jobs:
4545
- uses: actions/setup-node@v3
4646
with:
4747
node-version: ${{ matrix.version }}
48+
- name: Install Google Chrome
49+
run: |
50+
sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list'
51+
wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
52+
if [ $? -ne 0 ]; then echo "Failed to add Google key"; exit 1; fi
53+
sudo apt-get update
54+
sudo apt-get install -y google-chrome-stable
55+
if [ $? -ne 0 ]; then echo "Failed to install Google Chrome"; exit 1; fi
56+
if: ${{ matrix.framework == 'selenium' }}
57+
- name: Install ChromeDriver
58+
run: |
59+
export CHROME_VERSION=$(google-chrome --version)
60+
CHROME_DRIVER_DOWNLOAD_URL=$(node --experimental-fetch scripts/get-chrome-driver-download-url.js)
61+
wget -q "$CHROME_DRIVER_DOWNLOAD_URL"
62+
if [ $? -ne 0 ]; then echo "Failed to download ChromeDriver"; exit 1; fi
63+
unzip chromedriver-linux64.zip
64+
sudo mv chromedriver-linux64/chromedriver /usr/bin/chromedriver
65+
sudo chmod +x /usr/bin/chromedriver
66+
if: ${{ matrix.framework == 'selenium' }}
4867
- run: yarn install
4968
- run: yarn test:integration:${{ matrix.framework }}
5069
env:

‎.github/workflows/tracing.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- run: yarn test:trace:core:ci
3232
- uses: ./.github/actions/node/20
3333
- run: yarn test:trace:core:ci
34-
- uses: ./.github/actions/node/latest
34+
- uses: ./.github/actions/node/21
3535
- run: yarn test:trace:core:ci
3636
- uses: codecov/codecov-action@v3
3737

‎.gitlab-ci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ package:
2727
when: on_success
2828
script:
2929
- ../.gitlab/build-deb-rpm.sh
30+
- find . -iregex '.*\.\(deb\|rpm\)' -printf '%f\0' | xargs -0 dd-pkg lint
3031

3132
package-arm:
3233
extends: .package-arm
@@ -37,6 +38,7 @@ package-arm:
3738
when: on_success
3839
script:
3940
- ../.gitlab/build-deb-rpm.sh
41+
- find . -iregex '.*\.\(deb\|rpm\)' -printf '%f\0' | xargs -0 dd-pkg lint
4042

4143
.release-package:
4244
stage: deploy

‎.gitlab/benchmarks.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ benchmark-serverless-trigger:
8888
UPSTREAM_COMMIT_BRANCH: $CI_COMMIT_BRANCH
8989
UPSTREAM_COMMIT_AUTHOR: $CI_COMMIT_AUTHOR
9090
UPSTREAM_COMMIT_TITLE: $CI_COMMIT_TITLE
91+
UPSTREAM_COMMIT_TAG: $CI_COMMIT_TAG
9192
UPSTREAM_PROJECT_NAME: $CI_PROJECT_NAME
9293
UPSTREAM_GITLAB_USER_LOGIN: $GITLAB_USER_LOGIN
9394
UPSTREAM_GITLAB_USER_EMAIL: $GITLAB_USER_EMAIL

‎CODEOWNERS‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
/packages/dd-trace/src/lambda/ @DataDog/serverless
66
/packages/dd-trace/test/lambda/ @DataDog/serverless
77

8-
/packages/datadog-plugin-*/ @Datadog/dd-trace-js @Datadog/apm-framework-integrations-reviewers-js
9-
/packages/datadog-instrumentations/ @Datadog/dd-trace-js @Datadog/apm-framework-integrations-reviewers-js
10-
/packages/ddtrace/src/plugins/ @DataDog/dd-trace-js @Datadog/apm-framework-integrations-reviewers-js
11-
/packages/ddtrace/test/plugins/ @DataDog/dd-trace-js @Datadog/apm-framework-integrations-reviewers-js
8+
/packages/datadog-plugin-*/ @Datadog/dd-trace-js @Datadog/apm-idm-js
9+
/packages/datadog-instrumentations/ @Datadog/dd-trace-js @Datadog/apm-idm-js
10+
/packages/ddtrace/src/plugins/ @DataDog/dd-trace-js @Datadog/apm-idm-js
11+
/packages/ddtrace/test/plugins/ @DataDog/dd-trace-js @Datadog/apm-idm-js
1212

1313
/packages/dd-trace/src/ci-visibility/ @DataDog/ci-app-libraries
1414
/packages/datadog-plugin-jest/ @DataDog/ci-app-libraries
@@ -34,8 +34,8 @@
3434
/integration-tests/ci-visibility.spec.js @DataDog/ci-app-libraries
3535
/integration-tests/test-api-manual.spec.js @DataDog/ci-app-libraries
3636

37-
/packages/dd-trace/src/service-naming/ @Datadog/apm-framework-integrations-reviewers-js
38-
/packages/dd-trace/test/service-naming/ @Datadog/apm-framework-integrations-reviewers-js
37+
/packages/dd-trace/src/service-naming/ @Datadog/apm-idm-js
38+
/packages/dd-trace/test/service-naming/ @Datadog/apm-idm-js
3939

4040
# CI
4141
/.github/workflows/appsec.yml @DataDog/asm-js

‎docs/test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@ tracer.use('restify');
344344
tracer.use('restify', httpServerOptions);
345345
tracer.use('rhea');
346346
tracer.use('router');
347+
tracer.use('selenium');
347348
tracer.use('sharedb');
348349
tracer.use('sharedb', sharedbOptions);
349350
tracer.use('tedious');

‎index.d.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ interface Plugins {
187187
"restify": tracer.plugins.restify;
188188
"rhea": tracer.plugins.rhea;
189189
"router": tracer.plugins.router;
190+
"selenium": tracer.plugins.selenium;
190191
"sharedb": tracer.plugins.sharedb;
191192
"tedious": tracer.plugins.tedious;
192193
"winston": tracer.plugins.winston;
@@ -1736,6 +1737,12 @@ declare namespace tracer {
17361737
*/
17371738
interface router extends Integration {}
17381739

1740+
/**
1741+
* This plugin automatically instruments the
1742+
* [selenium-webdriver](https://www.npmjs.com/package/selenium-webdriver) module.
1743+
*/
1744+
interface selenium extends Integration {}
1745+
17391746
/**
17401747
* This plugin automatically instruments the
17411748
* [sharedb](https://github.com/share/sharedb) module.

0 commit comments

Comments
 (0)