Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions benchmark/sirun/startup/startup-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ if (Number(process.env.EVERYTHING)) {
'axios',
'benchmark',
'body-parser',
'chai',
'crypto-randomuuid',
'dc-polyfill',
'eslint-plugin-cypress',
Expand Down Expand Up @@ -67,7 +66,6 @@ if (Number(process.env.EVERYTHING)) {
'semifies',
'semver',
'shell-quote',
'sinon-chai',
'sinon',
'source-map',
'tap',
Expand Down
1 change: 0 additions & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,6 @@ export default [
allowModules: [
...Object.keys(dependencies),
'mocha',
'chai'
]
}],
'n/no-missing-require': 'off',
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/appsec/data-collection.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ describe('ASM Data collection', () => {

const env = {
DD_TRACE_AGENT_PORT: agent.port,
DD_APPSEC_ENABLED: true,
DD_APPSEC_ENABLED: 'true',
DD_APPSEC_RULES: path.join(cwd, 'appsec', 'data-collection', 'data-collection-rules.json')
}

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/appsec/response-headers.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ describe('Headers collection - Fastify', () => {

const env = {
DD_TRACE_AGENT_PORT: agent.port,
DD_APPSEC_ENABLED: true,
DD_APPSEC_ENABLED: 'true',
DD_APPSEC_RULES: path.join(cwd, 'appsec/data-collection/data-collection-rules.json')
}
proc = await spawnProc(appFile, { cwd, env, execArgv: [] })
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/appsec/trace-tagging.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe('ASM Trace Tagging rules', () => {

const env = {
DD_TRACE_AGENT_PORT: agent.port,
DD_APPSEC_ENABLED: true,
DD_APPSEC_ENABLED: 'true',
DD_APPSEC_RULES: path.join(cwd, 'appsec', 'data-collection', 'data-collection-rules.json')
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ describe('test optimization automatic log submission', () => {
'@cucumber/cucumber',
'jest',
'winston',
'chai@4',
'@playwright/test'
], true)

Expand Down Expand Up @@ -73,7 +72,7 @@ describe('test optimization automatic log submission', () => {
getExtraEnvVars: () => ({
PW_BASE_URL: `http://localhost:${webAppPort}`,
TEST_DIR: 'ci-visibility/automatic-log-submission-playwright',
DD_TRACE_DEBUG: 1
DD_TRACE_DEBUG: '1'
})
}
]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/cucumber/cucumber.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -1838,7 +1838,7 @@ describe(`cucumber@${version} commonJS`, () => {
cwd,
env: {
...envVars,
DD_CIVISIBILITY_FLAKY_RETRY_COUNT: 1
DD_CIVISIBILITY_FLAKY_RETRY_COUNT: '1'
},
stdio: 'pipe'
}
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/cypress/cypress.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2012,7 +2012,7 @@ moduleTypes.forEach(({
env: {
...restEnvVars,
CYPRESS_BASE_URL: `http://localhost:${webAppPort}`,
DD_CIVISIBILITY_FLAKY_RETRY_COUNT: 1,
DD_CIVISIBILITY_FLAKY_RETRY_COUNT: '1',
SPEC_PATTERN: specToRun
},
stdio: 'pipe'
Expand Down Expand Up @@ -2302,7 +2302,7 @@ moduleTypes.forEach(({
CYPRESS_BASE_URL: `http://localhost:${webAppPort}`,
CYPRESS_BASE_URL_SECOND: `http://localhost:${secondWebAppPort}`,
SPEC_PATTERN: specToRun,
DD_TRACE_DEBUG: true
DD_TRACE_DEBUG: 'true'
},
stdio: 'pipe'
}
Expand Down
6 changes: 3 additions & 3 deletions integration-tests/debugger/basic.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ describe('Dynamic Instrumentation', function () {

describe('DD_TRACING_ENABLED=true, DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED=true', function () {
const t = setup({
env: { DD_TRACING_ENABLED: true, DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED: true },
env: { DD_TRACING_ENABLED: 'true', DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED: true },
dependencies: ['fastify']
})

Expand All @@ -778,7 +778,7 @@ describe('Dynamic Instrumentation', function () {

describe('DD_TRACING_ENABLED=true, DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED=false', function () {
const t = setup({
env: { DD_TRACING_ENABLED: true, DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED: false },
env: { DD_TRACING_ENABLED: 'true', DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED: false },
dependencies: ['fastify']
})

Expand All @@ -789,7 +789,7 @@ describe('Dynamic Instrumentation', function () {

describe('DD_TRACING_ENABLED=false', function () {
const t = setup({
env: { DD_TRACING_ENABLED: false },
env: { DD_TRACING_ENABLED: 'false' },
dependencies: ['fastify']
})

Expand Down
7 changes: 3 additions & 4 deletions integration-tests/jest/jest.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ describe(`jest@${JEST_VERSION} commonJS`, () => {

useSandbox([
`jest@${JEST_VERSION}`,
'chai@v4',
`jest-jasmine2@${JEST_VERSION}`,
// jest-environment-jsdom is included in older versions of jest
JEST_VERSION === 'latest' && `jest-environment-jsdom@${JEST_VERSION}`,
Expand Down Expand Up @@ -2792,7 +2791,7 @@ describe(`jest@${JEST_VERSION} commonJS`, () => {
...getCiVisAgentlessConfig(receiver.port), // use agentless for this test, just for variety
TESTS_TO_RUN: 'test/ci-visibility-test',
ENABLE_JSDOM: true,
DD_TRACE_DEBUG: 1,
DD_TRACE_DEBUG: '1',
DD_TRACE_LOG_LEVEL: 'warn'
},
stdio: 'inherit'
Expand Down Expand Up @@ -3386,7 +3385,7 @@ describe(`jest@${JEST_VERSION} commonJS`, () => {
env: {
...getCiVisEvpProxyConfig(receiver.port),
TESTS_TO_RUN: 'jest-flaky/flaky-',
DD_CIVISIBILITY_FLAKY_RETRY_COUNT: 1
DD_CIVISIBILITY_FLAKY_RETRY_COUNT: '1'
},
stdio: 'inherit'
}
Expand Down Expand Up @@ -4801,7 +4800,7 @@ describe(`jest@${JEST_VERSION} commonJS`, () => {

fs.writeFileSync(
path.join(cwd, 'ci-visibility/test-impacted-test/test-impacted-1.js'),
`const { expect } = require('chai')
`const assert = require('assert')

describe('impacted tests', () => {
it('can pass normally', () => {
Expand Down
11 changes: 5 additions & 6 deletions integration-tests/mocha/mocha.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ describe(`mocha@${MOCHA_VERSION}`, function () {
useSandbox(
[
`mocha@${MOCHA_VERSION}`,
'chai@v4',
'nyc',
'mocha-each',
'workerpool'
Expand Down Expand Up @@ -1206,7 +1205,7 @@ describe(`mocha@${MOCHA_VERSION}`, function () {
cwd,
env: {
...restEnvVars,
DD_TRACE_DEBUG: 1,
DD_TRACE_DEBUG: '1',
DD_TRACE_LOG_LEVEL: 'error',
DD_SITE: '= invalid = url'
},
Expand Down Expand Up @@ -1283,7 +1282,7 @@ describe(`mocha@${MOCHA_VERSION}`, function () {
env: {
...getCiVisAgentlessConfig(receiver.port),
RUN_IN_PARALLEL: true,
DD_TRACE_DEBUG: 1,
DD_TRACE_DEBUG: '1',
DD_TRACE_LOG_LEVEL: 'warn',
DD_TEST_SESSION_NAME: 'my-test-session'
},
Expand Down Expand Up @@ -1393,7 +1392,7 @@ describe(`mocha@${MOCHA_VERSION}`, function () {
childProcess = fork(startupTestFile, {
cwd,
env: {
DD_CIVISIBILITY_AGENTLESS_ENABLED: 1,
DD_CIVISIBILITY_AGENTLESS_ENABLED: '1',
NODE_OPTIONS: '-r dd-trace/ci/init'
},
stdio: 'pipe'
Expand Down Expand Up @@ -3070,7 +3069,7 @@ describe(`mocha@${MOCHA_VERSION}`, function () {
TESTS_TO_RUN: JSON.stringify([
'./test-flaky-test-retries/eventually-passing-test.js'
]),
DD_CIVISIBILITY_FLAKY_RETRY_COUNT: 1
DD_CIVISIBILITY_FLAKY_RETRY_COUNT: '1'
},
stdio: 'inherit'
}
Expand Down Expand Up @@ -4231,7 +4230,7 @@ describe(`mocha@${MOCHA_VERSION}`, function () {
execSync('git checkout -b feature-branch', { cwd, stdio: 'ignore' })
fs.writeFileSync(
path.join(cwd, 'ci-visibility/test-impacted-test/test-impacted-1.js'),
`const { expect } = require('chai')
`const assert = require('assert')
describe('impacted tests', () => {
it('can pass normally', () => {
assert.strictEqual(2 + 2, 3)
Expand Down
30 changes: 15 additions & 15 deletions integration-tests/opentelemetry.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ describe('opentelemetry', () => {
cwd,
env: {
DD_TRACE_AGENT_PORT: agent.port,
DD_TRACE_OTEL_ENABLED: 1,
DD_TELEMETRY_HEARTBEAT_INTERVAL: 1,
TIMEOUT: 1500,
DD_TRACE_OTEL_ENABLED: '1',
DD_TELEMETRY_HEARTBEAT_INTERVAL: '1',
TIMEOUT: '1500',
DD_SERVICE: 'service',
DD_TRACE_LOG_LEVEL: 'error',
DD_TRACE_SAMPLE_RATE: '0.5',
Expand Down Expand Up @@ -115,9 +115,9 @@ describe('opentelemetry', () => {
cwd,
env: {
DD_TRACE_AGENT_PORT: agent.port,
DD_TRACE_OTEL_ENABLED: 1,
DD_TELEMETRY_HEARTBEAT_INTERVAL: 1,
TIMEOUT: 1500,
DD_TRACE_OTEL_ENABLED: '1',
DD_TELEMETRY_HEARTBEAT_INTERVAL: '1',
TIMEOUT: '1500',
DD_SERVICE: 'service',
OTEL_SERVICE_NAME: 'otel_service',
DD_TRACE_LOG_LEVEL: 'error',
Expand Down Expand Up @@ -195,9 +195,9 @@ describe('opentelemetry', () => {
cwd,
env: {
DD_TRACE_AGENT_PORT: agent.port,
DD_TRACE_OTEL_ENABLED: 1,
DD_TELEMETRY_HEARTBEAT_INTERVAL: 1,
TIMEOUT: 1500,
DD_TRACE_OTEL_ENABLED: '1',
DD_TELEMETRY_HEARTBEAT_INTERVAL: '1',
TIMEOUT: '1500',
OTEL_SERVICE_NAME: 'otel_service',
OTEL_LOG_LEVEL: 'foo',
OTEL_TRACES_SAMPLER: 'foo',
Expand Down Expand Up @@ -293,9 +293,9 @@ describe('opentelemetry', () => {
cwd,
env: {
DD_TRACE_AGENT_PORT: agent.port,
DD_TRACE_OTEL_ENABLED: 1,
DD_TELEMETRY_HEARTBEAT_INTERVAL: 1,
TIMEOUT: 1500
DD_TRACE_OTEL_ENABLED: '1',
DD_TELEMETRY_HEARTBEAT_INTERVAL: '1',
TIMEOUT: '1500'
}
})

Expand Down Expand Up @@ -335,10 +335,10 @@ describe('opentelemetry', () => {
cwd,
env: {
DD_TRACE_AGENT_PORT: agent.port,
DD_TRACE_OTEL_ENABLED: 1,
DD_TRACE_OTEL_ENABLED: '1',
SERVER_PORT,
DD_TRACE_DISABLED_INSTRUMENTATIONS: 'http,dns,express,net',
DD_TELEMETRY_HEARTBEAT_INTERVAL: 1
DD_TELEMETRY_HEARTBEAT_INTERVAL: '1'
}
})
await new Promise(resolve => setTimeout(resolve, 1000)) // Adjust the delay as necessary
Expand Down Expand Up @@ -408,7 +408,7 @@ describe('opentelemetry', () => {
cwd,
env: {
DD_TRACE_AGENT_PORT: agent.port,
DD_TRACE_OTEL_ENABLED: 1,
DD_TRACE_OTEL_ENABLED: '1',
SERVER_PORT,
DD_TRACE_DISABLED_INSTRUMENTATIONS: 'http,dns,express,net'
}
Expand Down
38 changes: 19 additions & 19 deletions integration-tests/profiler/profiler.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,8 @@ async function gatherTimelineEvents (cwd, scriptFilePath, agentPort, eventType,
cwd,
env: {
DD_PROFILING_EXPORTERS: 'file',
DD_PROFILING_ENABLED: 1,
DD_INTERNAL_PROFILING_TIMELINE_SAMPLING_ENABLED: 0, // capture all events
DD_PROFILING_ENABLED: '1',
DD_INTERNAL_PROFILING_TIMELINE_SAMPLING_ENABLED: '0', // capture all events
DD_TRACE_AGENT_PORT: agentPort
}
})
Expand Down Expand Up @@ -352,7 +352,7 @@ describe('profiler', () => {
const procStart = BigInt(Date.now() * 1000000)
const env = {
DD_PROFILING_EXPORTERS: 'file',
DD_PROFILING_ENABLED: 1,
DD_PROFILING_ENABLED: '1',
BUSY_CYCLE_TIME: (busyCycleTimeNs | 0).toString(),
DD_TRACE_AGENT_PORT: agent.port
}
Expand Down Expand Up @@ -558,8 +558,8 @@ describe('profiler', () => {
beforeEach(() => {
oomEnv = {
DD_TRACE_AGENT_PORT: agent.port,
DD_PROFILING_ENABLED: 1,
DD_TRACE_DEBUG: 1,
DD_PROFILING_ENABLED: '1',
DD_TRACE_DEBUG: '1',
DD_TRACE_LOG_LEVEL: 'warn'
}
})
Expand All @@ -573,7 +573,7 @@ describe('profiler', () => {
cwd,
env: {
DD_TRACE_AGENT_PORT: agent.port,
DD_PROFILING_ENABLED: 1
DD_PROFILING_ENABLED: '1'
}
})
const checkTelemetry = agent.assertTelemetryReceived('generate-metrics', 1000)
Expand Down Expand Up @@ -601,7 +601,7 @@ describe('profiler', () => {
it('sends a heap profile on OOM in worker thread and exits successfully', () => {
proc = fork(oomTestFile, [1, 50], {
cwd,
env: { ...oomEnv, DD_PROFILING_WALLTIME_ENABLED: 0 }
env: { ...oomEnv, DD_PROFILING_WALLTIME_ENABLED: '0' }
})
return checkProfiles(agent, proc, timeout, ['space'], false)
})
Expand All @@ -615,8 +615,8 @@ describe('profiler', () => {
execArgv: oomExecArgv,
env: {
...oomEnv,
DD_PROFILING_EXPERIMENTAL_OOM_HEAP_LIMIT_EXTENSION_SIZE: 15000000,
DD_PROFILING_EXPERIMENTAL_OOM_MAX_HEAP_EXTENSION_COUNT: 3
DD_PROFILING_EXPERIMENTAL_OOM_HEAP_LIMIT_EXTENSION_SIZE: '15000000',
DD_PROFILING_EXPERIMENTAL_OOM_MAX_HEAP_EXTENSION_COUNT: '3'
}
})
return checkProfiles(agent, proc, timeout, ['space'], false, false)
Expand All @@ -628,8 +628,8 @@ describe('profiler', () => {
execArgv: oomExecArgv,
env: {
...oomEnv,
DD_PROFILING_EXPERIMENTAL_OOM_HEAP_LIMIT_EXTENSION_SIZE: 10000000,
DD_PROFILING_EXPERIMENTAL_OOM_MAX_HEAP_EXTENSION_COUNT: 1,
DD_PROFILING_EXPERIMENTAL_OOM_HEAP_LIMIT_EXTENSION_SIZE: '10000000',
DD_PROFILING_EXPERIMENTAL_OOM_MAX_HEAP_EXTENSION_COUNT: '1',
DD_PROFILING_EXPERIMENTAL_OOM_EXPORT_STRATEGIES: 'async'
}
})
Expand All @@ -642,8 +642,8 @@ describe('profiler', () => {
execArgv: oomExecArgv,
env: {
...oomEnv,
DD_PROFILING_EXPERIMENTAL_OOM_HEAP_LIMIT_EXTENSION_SIZE: 10000000,
DD_PROFILING_EXPERIMENTAL_OOM_MAX_HEAP_EXTENSION_COUNT: 1,
DD_PROFILING_EXPERIMENTAL_OOM_HEAP_LIMIT_EXTENSION_SIZE: '10000000',
DD_PROFILING_EXPERIMENTAL_OOM_MAX_HEAP_EXTENSION_COUNT: '1',
DD_PROFILING_EXPERIMENTAL_OOM_EXPORT_STRATEGIES: 'async,process'
}
})
Expand Down Expand Up @@ -691,8 +691,8 @@ describe('profiler', () => {
cwd,
env: {
DD_TRACE_AGENT_PORT: agent.port,
DD_PROFILING_ENABLED: 1,
DD_PROFILING_UPLOAD_PERIOD: 1,
DD_PROFILING_ENABLED: '1',
DD_PROFILING_UPLOAD_PERIOD: '1',
TEST_DURATION_MS: 2500
}
})
Expand Down Expand Up @@ -753,10 +753,10 @@ describe('profiler', () => {
cwd,
env: {
DD_TRACE_AGENT_PORT: agent.port,
DD_PROFILING_ENABLED: 1,
DD_PROFILING_UPLOAD_PERIOD: 1,
DD_PROFILING_ASYNC_CONTEXT_FRAME_ENABLED: 1,
DD_TELEMETRY_HEARTBEAT_INTERVAL: 1, // every second
DD_PROFILING_ENABLED: '1',
DD_PROFILING_UPLOAD_PERIOD: '1',
DD_PROFILING_ASYNC_CONTEXT_FRAME_ENABLED: '1',
DD_TELEMETRY_HEARTBEAT_INTERVAL: '1', // every second
TEST_DURATION_MS: 1500
}
})
Expand Down
Loading
Loading