Skip to content

Commit

Permalink
Revert "ci(workflow): enable datadog traces for the tests" (#50815)
Browse files Browse the repository at this point in the history
Reverts #50619

Seeing some weird failure supposed to not occur since we never enabled this 

https://github.com/vercel/next.js/actions/runs/5181685987/jobs/9337538270?pr=50600

Investigating after reverting.
  • Loading branch information
kwonoj committed Jun 5, 2023
1 parent 2b1f0d9 commit 38f7c3b
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 22 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ env:
# we build a dev binary for use in CI so skip downloading
# canary next-swc binaries in the monorepo
NEXT_SKIP_NATIVE_POSTINSTALL: 1
DATADOG_API_KEY: ${{ secrets.DATA_DOG_API_KEY }}
DATADOG_TRACE_NEXTJS_TEST: 'true'
TEST_TIMINGS_TOKEN: ${{ secrets.TEST_TIMINGS_TOKEN }}
NEXT_TEST_JOB: 1

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build_reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ env:
# we build a dev binary for use in CI so skip downloading
# canary next-swc binaries in the monorepo
NEXT_SKIP_NATIVE_POSTINSTALL: 1
DATADOG_API_KEY: ${{ secrets.DATA_DOG_API_KEY }}
DATADOG_TRACE_NEXTJS_TEST: 'true'
TEST_TIMINGS_TOKEN: ${{ secrets.TEST_TIMINGS_TOKEN }}
NEXT_TEST_JOB: 1

Expand Down
18 changes: 0 additions & 18 deletions run-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -322,23 +322,6 @@ async function main() {

const shouldRecordTestWithReplay = process.env.RECORD_REPLAY && isRetry

const traceEnv =
process.env.DATADOG_API_KEY && process.env.DATADOG_TRACE_NEXTJS_TEST
? {
DD_API_KEY: process.env.DATADOG_API_KEY,
DD_CIVISIBILITY_AGENTLESS_ENABLED: 'true',
DD_ENV: 'ci',
DD_SERVICE: 'nextjs',
NODE_OPTIONS: !!process.env.DATADOG_API_KEY
? '-r dd-trace/ci/init'
: undefined,
}
: {}

if (traceEnv.DD_API_KEY) {
console.log(`Running test with Datadog tracing enabled`)
}

const child = spawn(
jestPath,
[
Expand All @@ -358,7 +341,6 @@ async function main() {
stdio: ['ignore', 'pipe', 'pipe'],
env: {
...process.env,
...traceEnv,
RECORD_REPLAY: shouldRecordTestWithReplay,
// run tests in headless mode by default
HEADLESS: 'true',
Expand Down

0 comments on commit 38f7c3b

Please sign in to comment.