dd-trace 5.54.0 → 5.56.0

package/packages/datadog-instrumentations/src/helpers/register.js

@@ -9,11 +9,14 @@ const log = require('../../../dd-trace/src/log')
 const checkRequireCache = require('./check-require-cache')
 const telemetry = require('../../../dd-trace/src/guardrails/telemetry')
 const { isInServerlessEnvironment } = require('../../../dd-trace/src/serverless')
+const { getEnvironmentVariables } = require('../../../dd-trace/src/config-helper')
+
+const envs = getEnvironmentVariables()
 
 const {
   DD_TRACE_DISABLED_INSTRUMENTATIONS = '',
   DD_TRACE_DEBUG = ''
-} = process.env
+} = envs
 
 const hooks = require('./hooks')
 const instrumentations = require('./instrumentations')
@@ -24,7 +27,7 @@ const disabledInstrumentations = new Set(
 )
 
 // Check for DD_TRACE_<INTEGRATION>_ENABLED environment variables
-for (const [key, value] of Object.entries(process.env)) {
+for (const [key, value] of Object.entries(envs)) {
   const match = key.match(/^DD_TRACE_(.+)_ENABLED$/)
   if (match && (value?.toLowerCase() === 'false' || value === '0')) {
     const integration = match[1].toLowerCase()
@@ -96,9 +99,7 @@ for (const packageName of names) {
       // That way it would also not be duplicated. The actual name being used has to be identified else wise.
       // Maybe it is also not important to know what name was actually used?
       hook[HOOK_SYMBOL] ??= new WeakSet()
-      let matchesFile = false
-
-      matchesFile = moduleName === fullFilename
+      let matchesFile = moduleName === fullFilename
 
       if (fullFilePattern) {
         // Some libraries include a hash in their filenames when installed,