Skip to content

Force node21 in test suites with native modules #4267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
uurien merged 3 commits into from
Apr 29, 2024
Merged

Force node21 in test suites with native modules #4267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dcd744c
Force node21 in test suites with native modules
uurien Apr 26, 2024
ddcdef1
Force execution of ubuntu tests in node21 because profiling is requir…
uurien Apr 26, 2024
ab18e80
Fix pino test
uurien Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/actions/node/21/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
name: Node 21
runs:
using: composite
steps:
- uses: actions/setup-node@v3
with:
node-version: '21'
16 changes: 8 additions & 8 deletions .github/workflows/appsec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- run: yarn test:appsec:ci
- uses: ./.github/actions/node/20
- run: yarn test:appsec:ci
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/21
- run: yarn test:appsec:ci
- uses: codecov/codecov-action@v3

Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
- run: yarn install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/21
- run: yarn test:appsec:plugins:ci
- uses: codecov/codecov-action@v3

Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
- run: yarn install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/21
- run: yarn test:appsec:plugins:ci
- uses: codecov/codecov-action@v3

Expand All @@ -141,7 +141,7 @@ jobs:
- run: yarn install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/21
- run: yarn test:appsec:plugins:ci
- uses: codecov/codecov-action@v3

Expand All @@ -161,7 +161,7 @@ jobs:
- run: yarn install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/21
- run: yarn test:appsec:plugins:ci
- uses: codecov/codecov-action@v3

Expand All @@ -181,7 +181,7 @@ jobs:
- run: yarn install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/21
- run: yarn test:appsec:plugins:ci
- uses: codecov/codecov-action@v3

Expand All @@ -197,7 +197,7 @@ jobs:
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/20
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/21
- run: yarn test:appsec:plugins:ci
- uses: codecov/codecov-action@v3

Expand All @@ -212,7 +212,7 @@ jobs:
- run: yarn install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/21
- run: yarn test:appsec:plugins:ci
- if: always()
uses: ./.github/actions/testagent/logs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/profiling.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- uses: ./.github/actions/node/20
- run: yarn test:profiler:ci
- run: yarn test:integration:profiler
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/21
- run: yarn test:profiler:ci
- run: yarn test:integration:profiler
- uses: codecov/codecov-action@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tracing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- run: yarn test:trace:core:ci
- uses: ./.github/actions/node/20
- run: yarn test:trace:core:ci
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/21
- run: yarn test:trace:core:ci
- uses: codecov/codecov-action@v3

Expand Down
2 changes: 1 addition & 1 deletion packages/datadog-plugin-pino/test/index.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ describe('Plugin', () => {
} else { // pino <7
expect(record).to.have.property('msg', error.message)
// ** TODO ** add this back once we fix it
if (NODE_MAJOR !== 21) {
if (NODE_MAJOR < 21) {
expect(record).to.have.property('type', 'Error')
expect(record).to.have.property('stack', error.stack)
}
Expand Down