From e970623b0ee410b8cf8f86bcd5f110a4a14ef706 Mon Sep 17 00:00:00 2001 From: Bryan English Date: Tue, 13 Aug 2024 13:40:33 -0400 Subject: [PATCH] more correct package guardrails (#4600) While _functioning_ correctly, the logging and telemetry was broken for packages that met one range, but didn't meet a subsequent range. This is now fixed. --- integration-tests/package-guardrails.spec.js | 4 +++- packages/datadog-instrumentations/src/helpers/register.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/integration-tests/package-guardrails.spec.js b/integration-tests/package-guardrails.spec.js index f560a4ab2a3..4ee05c033cb 100644 --- a/integration-tests/package-guardrails.spec.js +++ b/integration-tests/package-guardrails.spec.js @@ -64,7 +64,9 @@ false }) context('when fastify is latest and logging enabled', () => { useSandbox(['fastify']) - it('should instrument the package', () => runTest('true\n')) + useEnv({ DD_TRACE_DEBUG }) + it('should instrument the package', () => + runTest('Application instrumentation bootstrapping complete\ntrue\n')) }) }) diff --git a/packages/datadog-instrumentations/src/helpers/register.js b/packages/datadog-instrumentations/src/helpers/register.js index c593961be71..2ef9d199f99 100644 --- a/packages/datadog-instrumentations/src/helpers/register.js +++ b/packages/datadog-instrumentations/src/helpers/register.js @@ -98,7 +98,7 @@ for (const packageName of names) { log.error(e) continue } - if (!Object.hasOwnProperty(namesAndSuccesses, name)) { + if (typeof namesAndSuccesses[`${name}@${version}`] === 'undefined') { namesAndSuccesses[`${name}@${version}`] = false }