From 87f49679a1bc6233d02e697cd547b8ea2ff4c634 Mon Sep 17 00:00:00 2001 From: CarlesDD Date: Tue, 15 Jul 2025 21:46:19 +0200 Subject: [PATCH 1/6] Include RC test in test:trace:core --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ec7ec34895a..9941dd6b677 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "test:debugger": "mocha -r 'packages/dd-trace/test/setup/mocha.js' 'packages/dd-trace/test/debugger/**/*.spec.js'", "test:debugger:ci": "nyc --no-clean --include 'packages/dd-trace/src/debugger/**/*.js' -- npm run test:debugger", "test:eslint-rules": "node eslint-rules/*.test.mjs", - "test:trace:core": "tap packages/dd-trace/test/*.spec.js \"packages/dd-trace/test/{ci-visibility,datastreams,encode,exporters,opentelemetry,opentracing,plugins,service-naming,standalone,telemetry}/**/*.spec.js\"", + "test:trace:core": "tap packages/dd-trace/test/*.spec.js \"packages/dd-trace/test/{ci-visibility,datastreams,encode,exporters,opentelemetry,opentracing,plugins,remote_config,service-naming,standalone,telemetry}/**/*.spec.js\"", "test:trace:core:ci": "npm run test:trace:core -- --coverage --nyc-arg=--include=\"packages/dd-trace/src/**/*.js\"", "test:trace:guardrails": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/dd-trace/test/guardrails/**/*.spec.js\"", "test:trace:guardrails:ci": "nyc --no-clean --include \"packages/dd-trace/src/guardrails/**/*.js\" -- npm run test:trace:guardrails", From fc34def3fdcbd4574e6a7eb25e315f8e1d223951 Mon Sep 17 00:00:00 2001 From: CarlesDD Date: Tue, 15 Jul 2025 21:51:26 +0200 Subject: [PATCH 2/6] Rename RC test folder + fix tests --- package.json | 2 +- .../{remote_config => remote-config}/index.spec.js | 12 +++--------- .../{remote_config => remote-config}/manager.spec.js | 8 ++++---- .../rc-client_id.spec.js | 0 .../resources/index.js | 0 .../scheduler.spec.js | 0 6 files changed, 8 insertions(+), 14 deletions(-) rename packages/dd-trace/test/{remote_config => remote-config}/index.spec.js (98%) rename packages/dd-trace/test/{remote_config => remote-config}/manager.spec.js (99%) rename packages/dd-trace/test/{remote_config => remote-config}/rc-client_id.spec.js (100%) rename packages/dd-trace/test/{remote_config => remote-config}/resources/index.js (100%) rename packages/dd-trace/test/{remote_config => remote-config}/scheduler.spec.js (100%) diff --git a/package.json b/package.json index 9941dd6b677..6f252e4d03c 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "test:debugger": "mocha -r 'packages/dd-trace/test/setup/mocha.js' 'packages/dd-trace/test/debugger/**/*.spec.js'", "test:debugger:ci": "nyc --no-clean --include 'packages/dd-trace/src/debugger/**/*.js' -- npm run test:debugger", "test:eslint-rules": "node eslint-rules/*.test.mjs", - "test:trace:core": "tap packages/dd-trace/test/*.spec.js \"packages/dd-trace/test/{ci-visibility,datastreams,encode,exporters,opentelemetry,opentracing,plugins,remote_config,service-naming,standalone,telemetry}/**/*.spec.js\"", + "test:trace:core": "tap packages/dd-trace/test/*.spec.js \"packages/dd-trace/test/{ci-visibility,datastreams,encode,exporters,opentelemetry,opentracing,plugins,remote-config,service-naming,standalone,telemetry}/**/*.spec.js\"", "test:trace:core:ci": "npm run test:trace:core -- --coverage --nyc-arg=--include=\"packages/dd-trace/src/**/*.js\"", "test:trace:guardrails": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/dd-trace/test/guardrails/**/*.spec.js\"", "test:trace:guardrails:ci": "nyc --no-clean --include \"packages/dd-trace/src/guardrails/**/*.js\" -- npm run test:trace:guardrails", diff --git a/packages/dd-trace/test/remote_config/index.spec.js b/packages/dd-trace/test/remote-config/index.spec.js similarity index 98% rename from packages/dd-trace/test/remote_config/index.spec.js rename to packages/dd-trace/test/remote-config/index.spec.js index 0dd14f0a845..bd103c54935 100644 --- a/packages/dd-trace/test/remote_config/index.spec.js +++ b/packages/dd-trace/test/remote-config/index.spec.js @@ -1,12 +1,12 @@ 'use strict' +const RuleManager = require('../../src/appsec/rule_manager') const RemoteConfigCapabilities = require('../../src/remote_config/capabilities') const { kPreUpdate } = require('../../src/remote_config/manager') let config let rc let RemoteConfigManager -let RuleManager let UserTracking let log let appsec @@ -33,10 +33,6 @@ describe('Remote Config index', () => { RemoteConfigManager = sinon.stub().returns(rc) - RuleManager = { - updateWafFromRC: sinon.stub() - } - UserTracking = { setCollectionMode: sinon.stub() } @@ -52,10 +48,8 @@ describe('Remote Config index', () => { remoteConfig = proxyquire('../src/remote_config', { './manager': RemoteConfigManager, - '../rule_manager': RuleManager, - '../user_tracking': UserTracking, - '../../log': log, - '..': appsec + '../appsec/user_tracking': UserTracking, + '../log': log, }) }) diff --git a/packages/dd-trace/test/remote_config/manager.spec.js b/packages/dd-trace/test/remote-config/manager.spec.js similarity index 99% rename from packages/dd-trace/test/remote_config/manager.spec.js rename to packages/dd-trace/test/remote-config/manager.spec.js index 8b85f6a7ce6..805f66dfece 100644 --- a/packages/dd-trace/test/remote_config/manager.spec.js +++ b/packages/dd-trace/test/remote-config/manager.spec.js @@ -42,11 +42,11 @@ describe('RemoteConfigManager', () => { RemoteConfigManager = proxyquire('../src/remote_config/manager', { 'crypto-randomuuid': uuid, './scheduler': Scheduler, - '../../../../../package.json': { version: '3.0.0' }, - '../../exporters/common/request': request, - '../../log': log, + '../../../../package.json': { version: '3.0.0' }, + '../exporters/common/request': request, + '../log': log, '../tagger': tagger, - '../../service-naming/extra-services': { + '../service-naming/extra-services': { getExtraServices: () => extraServices } }) diff --git a/packages/dd-trace/test/remote_config/rc-client_id.spec.js b/packages/dd-trace/test/remote-config/rc-client_id.spec.js similarity index 100% rename from packages/dd-trace/test/remote_config/rc-client_id.spec.js rename to packages/dd-trace/test/remote-config/rc-client_id.spec.js diff --git a/packages/dd-trace/test/remote_config/resources/index.js b/packages/dd-trace/test/remote-config/resources/index.js similarity index 100% rename from packages/dd-trace/test/remote_config/resources/index.js rename to packages/dd-trace/test/remote-config/resources/index.js diff --git a/packages/dd-trace/test/remote_config/scheduler.spec.js b/packages/dd-trace/test/remote-config/scheduler.spec.js similarity index 100% rename from packages/dd-trace/test/remote_config/scheduler.spec.js rename to packages/dd-trace/test/remote-config/scheduler.spec.js From 550282318680414fcb956e343c722622aed10f40 Mon Sep 17 00:00:00 2001 From: CarlesDD Date: Tue, 15 Jul 2025 22:19:34 +0200 Subject: [PATCH 3/6] Switch to tap --- packages/dd-trace/test/remote-config/index.spec.js | 2 ++ packages/dd-trace/test/remote-config/manager.spec.js | 2 ++ packages/dd-trace/test/remote-config/rc-client_id.spec.js | 2 ++ packages/dd-trace/test/remote-config/scheduler.spec.js | 2 ++ 4 files changed, 8 insertions(+) diff --git a/packages/dd-trace/test/remote-config/index.spec.js b/packages/dd-trace/test/remote-config/index.spec.js index bd103c54935..bd96904de37 100644 --- a/packages/dd-trace/test/remote-config/index.spec.js +++ b/packages/dd-trace/test/remote-config/index.spec.js @@ -1,5 +1,7 @@ 'use strict' +require('../setup/tap') + const RuleManager = require('../../src/appsec/rule_manager') const RemoteConfigCapabilities = require('../../src/remote_config/capabilities') const { kPreUpdate } = require('../../src/remote_config/manager') diff --git a/packages/dd-trace/test/remote-config/manager.spec.js b/packages/dd-trace/test/remote-config/manager.spec.js index 805f66dfece..6454020b22e 100644 --- a/packages/dd-trace/test/remote-config/manager.spec.js +++ b/packages/dd-trace/test/remote-config/manager.spec.js @@ -1,5 +1,7 @@ 'use strict' +require('../setup/tap') + const Capabilities = require('../../src/remote_config/capabilities') const { UNACKNOWLEDGED, ACKNOWLEDGED, ERROR } = require('../../src/remote_config/apply_states') diff --git a/packages/dd-trace/test/remote-config/rc-client_id.spec.js b/packages/dd-trace/test/remote-config/rc-client_id.spec.js index aef7c1dc1fa..1d49532bb4a 100644 --- a/packages/dd-trace/test/remote-config/rc-client_id.spec.js +++ b/packages/dd-trace/test/remote-config/rc-client_id.spec.js @@ -1,5 +1,7 @@ 'use strict' +require('../setup/tap') + const { createSandbox, FakeAgent, spawnProc } = require('../../../../integration-tests/helpers') const path = require('path') const Axios = require('axios') diff --git a/packages/dd-trace/test/remote-config/scheduler.spec.js b/packages/dd-trace/test/remote-config/scheduler.spec.js index db3b4db3fe6..e116dd591d4 100644 --- a/packages/dd-trace/test/remote-config/scheduler.spec.js +++ b/packages/dd-trace/test/remote-config/scheduler.spec.js @@ -1,5 +1,7 @@ 'use strict' +require('../setup/tap') + const Scheduler = require('../../src/remote_config/scheduler') const INTERVAL = 5e3 From 2adaee6490ed196036d4ae9ffdb98a2f1f4df3c3 Mon Sep 17 00:00:00 2001 From: CarlesDD Date: Tue, 15 Jul 2025 22:47:55 +0200 Subject: [PATCH 4/6] Remove timeout from RC client Id test --- packages/dd-trace/test/remote-config/rc-client_id.spec.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/dd-trace/test/remote-config/rc-client_id.spec.js b/packages/dd-trace/test/remote-config/rc-client_id.spec.js index 1d49532bb4a..41ab43dc291 100644 --- a/packages/dd-trace/test/remote-config/rc-client_id.spec.js +++ b/packages/dd-trace/test/remote-config/rc-client_id.spec.js @@ -11,8 +11,6 @@ describe('Remote config client id', () => { let axios, sandbox, cwd, appFile before(async function () { - this.timeout(process.platform === 'win32' ? 90000 : 30000) - sandbox = await createSandbox( ['express'], false, @@ -24,7 +22,6 @@ describe('Remote config client id', () => { }) after(async function () { - this.timeout(60000) await sandbox.remove() }) From d1603150eeb568e20000a3f9946cbffdcd84b584 Mon Sep 17 00:00:00 2001 From: CarlesDD Date: Wed, 16 Jul 2025 07:51:42 +0200 Subject: [PATCH 5/6] Move integration test to correct folder --- .../remote-config.spec.js | 11 ++++++----- .../remote-config}/index.js | 0 2 files changed, 6 insertions(+), 5 deletions(-) rename packages/dd-trace/test/remote-config/rc-client_id.spec.js => integration-tests/remote-config.spec.js (86%) rename {packages/dd-trace/test/remote-config/resources => integration-tests/remote-config}/index.js (100%) diff --git a/packages/dd-trace/test/remote-config/rc-client_id.spec.js b/integration-tests/remote-config.spec.js similarity index 86% rename from packages/dd-trace/test/remote-config/rc-client_id.spec.js rename to integration-tests/remote-config.spec.js index 41ab43dc291..dffd0323858 100644 --- a/packages/dd-trace/test/remote-config/rc-client_id.spec.js +++ b/integration-tests/remote-config.spec.js @@ -1,8 +1,6 @@ 'use strict' -require('../setup/tap') - -const { createSandbox, FakeAgent, spawnProc } = require('../../../../integration-tests/helpers') +const { createSandbox, FakeAgent, spawnProc } = require('./helpers') const path = require('path') const Axios = require('axios') const { assert } = require('chai') @@ -11,17 +9,20 @@ describe('Remote config client id', () => { let axios, sandbox, cwd, appFile before(async function () { + this.timeout(process.platform === 'win32' ? 90000 : 30000) + sandbox = await createSandbox( ['express'], false, - [path.join(__dirname, 'resources')] + [path.join(__dirname, 'remote-config')] ) cwd = sandbox.folder - appFile = path.join(cwd, 'resources', 'index.js') + appFile = path.join(cwd, 'remote-config', 'index.js') }) after(async function () { + this.timeout(60000) await sandbox.remove() }) diff --git a/packages/dd-trace/test/remote-config/resources/index.js b/integration-tests/remote-config/index.js similarity index 100% rename from packages/dd-trace/test/remote-config/resources/index.js rename to integration-tests/remote-config/index.js From 9d911a5226b5078f4280f86266b6255a5bbfdb53 Mon Sep 17 00:00:00 2001 From: CarlesDD Date: Wed, 16 Jul 2025 08:04:57 +0200 Subject: [PATCH 6/6] Rename remote-config to remote_config to match the original name in the code --- .../{remote-config.spec.js => remote_config.spec.js} | 4 ++-- integration-tests/{remote-config => remote_config}/index.js | 0 package.json | 2 +- .../test/{remote-config => remote_config}/index.spec.js | 0 .../test/{remote-config => remote_config}/manager.spec.js | 0 .../test/{remote-config => remote_config}/scheduler.spec.js | 0 6 files changed, 3 insertions(+), 3 deletions(-) rename integration-tests/{remote-config.spec.js => remote_config.spec.js} (94%) rename integration-tests/{remote-config => remote_config}/index.js (100%) rename packages/dd-trace/test/{remote-config => remote_config}/index.spec.js (100%) rename packages/dd-trace/test/{remote-config => remote_config}/manager.spec.js (100%) rename packages/dd-trace/test/{remote-config => remote_config}/scheduler.spec.js (100%) diff --git a/integration-tests/remote-config.spec.js b/integration-tests/remote_config.spec.js similarity index 94% rename from integration-tests/remote-config.spec.js rename to integration-tests/remote_config.spec.js index dffd0323858..5d1a0e3f6e7 100644 --- a/integration-tests/remote-config.spec.js +++ b/integration-tests/remote_config.spec.js @@ -14,11 +14,11 @@ describe('Remote config client id', () => { sandbox = await createSandbox( ['express'], false, - [path.join(__dirname, 'remote-config')] + [path.join(__dirname, 'remote_config')] ) cwd = sandbox.folder - appFile = path.join(cwd, 'remote-config', 'index.js') + appFile = path.join(cwd, 'remote_config', 'index.js') }) after(async function () { diff --git a/integration-tests/remote-config/index.js b/integration-tests/remote_config/index.js similarity index 100% rename from integration-tests/remote-config/index.js rename to integration-tests/remote_config/index.js diff --git a/package.json b/package.json index 6f252e4d03c..9941dd6b677 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "test:debugger": "mocha -r 'packages/dd-trace/test/setup/mocha.js' 'packages/dd-trace/test/debugger/**/*.spec.js'", "test:debugger:ci": "nyc --no-clean --include 'packages/dd-trace/src/debugger/**/*.js' -- npm run test:debugger", "test:eslint-rules": "node eslint-rules/*.test.mjs", - "test:trace:core": "tap packages/dd-trace/test/*.spec.js \"packages/dd-trace/test/{ci-visibility,datastreams,encode,exporters,opentelemetry,opentracing,plugins,remote-config,service-naming,standalone,telemetry}/**/*.spec.js\"", + "test:trace:core": "tap packages/dd-trace/test/*.spec.js \"packages/dd-trace/test/{ci-visibility,datastreams,encode,exporters,opentelemetry,opentracing,plugins,remote_config,service-naming,standalone,telemetry}/**/*.spec.js\"", "test:trace:core:ci": "npm run test:trace:core -- --coverage --nyc-arg=--include=\"packages/dd-trace/src/**/*.js\"", "test:trace:guardrails": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/dd-trace/test/guardrails/**/*.spec.js\"", "test:trace:guardrails:ci": "nyc --no-clean --include \"packages/dd-trace/src/guardrails/**/*.js\" -- npm run test:trace:guardrails", diff --git a/packages/dd-trace/test/remote-config/index.spec.js b/packages/dd-trace/test/remote_config/index.spec.js similarity index 100% rename from packages/dd-trace/test/remote-config/index.spec.js rename to packages/dd-trace/test/remote_config/index.spec.js diff --git a/packages/dd-trace/test/remote-config/manager.spec.js b/packages/dd-trace/test/remote_config/manager.spec.js similarity index 100% rename from packages/dd-trace/test/remote-config/manager.spec.js rename to packages/dd-trace/test/remote_config/manager.spec.js diff --git a/packages/dd-trace/test/remote-config/scheduler.spec.js b/packages/dd-trace/test/remote_config/scheduler.spec.js similarity index 100% rename from packages/dd-trace/test/remote-config/scheduler.spec.js rename to packages/dd-trace/test/remote_config/scheduler.spec.js