remove old implementation

Author: rochdev

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

@@ -9,7 +9,7 @@ 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 { isFalse, isTrue, normalizePluginEnvName } = require('../../../dd-trace/src/util')
+const { isFalse } = require('../../../dd-trace/src/util')
 const { getEnvironmentVariables } = require('../../../dd-trace/src/config-helper')
 
 const envs = getEnvironmentVariables()
@@ -25,20 +25,15 @@ const names = Object.keys(hooks)
 const pathSepExpr = new RegExp(`\\${path.sep}`, 'g')
 
 const disabledInstrumentations = new Set(
-  DD_TRACE_DISABLED_INSTRUMENTATIONS?.split(',').map(name => normalizePluginEnvName(name, true)) ?? []
+  DD_TRACE_DISABLED_INSTRUMENTATIONS?.split(',') ?? []
 )
-const reenabledInstrumentations = new Set()
 
 // Check for DD_TRACE_<INTEGRATION>_ENABLED environment variables
 for (const [key, value] of Object.entries(envs)) {
   const match = key.match(/^DD_TRACE_(.+)_ENABLED$/)
-  if (match && value) {
-    const integration = normalizePluginEnvName(match[1], true)
-    if (isFalse(value)) {
-      disabledInstrumentations.add(integration)
-    } else if (isTrue(value)) {
-      reenabledInstrumentations.add(integration)
-    }
+  if (match && isFalse(value)) {
+    const integration = match[1].toLowerCase()
+    disabledInstrumentations.add(integration)
   }
 }
 
@@ -65,8 +60,7 @@ const allInstrumentations = {}
 
 // TODO: make this more efficient
 for (const packageName of names) {
-  const normalizedPackageName = normalizePluginEnvName(packageName, true)
-  if (disabledInstrumentations.has(normalizedPackageName)) continue
+  if (disabledInstrumentations.has(packageName)) continue
 
   const hookOptions = {}
 
@@ -75,10 +69,6 @@ for (const packageName of names) {
   if (hook !== null && typeof hook === 'object') {
     if (hook.serverless === false && isInServerlessEnvironment()) continue
 
-    // some integrations are disabled by default, but can be enabled by setting
-    // the DD_TRACE_<INTEGRATION>_ENABLED environment variable to true
-    if (hook.disabled && !reenabledInstrumentations.has(normalizedPackageName)) continue
-
     hookOptions.internals = hook.esmFirst
     hook = hook.fn
   }

packages/datadog-instrumentations/test/helpers/register.spec.js

@@ -20,7 +20,6 @@ describe('register', () => {
 
     hooksMock = {
       '@confluentinc/kafka-javascript': {
-        disabled: true,
         fn: sinon.stub().returns('hooked')
       },
       'mongodb-core': {
@@ -72,54 +71,6 @@ describe('register', () => {
     }
   }
 
-  it('should skip hooks that are disabled by default and process enabled hooks', () => {
-    loadRegisterWithEnv()
-
-    expect(HookMock.callCount).to.equal(1)
-    expect(HookMock.args[0]).to.deep.include(['mongodb-core'], { internals: undefined })
-
-    runHookCallbacks(HookMock)
-
-    expect(hooksMock['@confluentinc/kafka-javascript'].fn).to.not.have.been.called
-    expect(hooksMock['mongodb-core'].fn).to.have.been.called
-  })
-
-  it('should enable disabled hooks when DD_TRACE_[pkg]_ENABLED is true', () => {
-    loadRegisterWithEnv({ DD_TRACE_CONFLUENTINC_KAFKA_JAVASCRIPT_ENABLED: 'true' })
-
-    expect(HookMock.callCount).to.equal(2)
-    expect(HookMock.args[0]).to.deep.include(['@confluentinc/kafka-javascript'], { internals: undefined })
-    expect(HookMock.args[1]).to.deep.include(['mongodb-core'], { internals: undefined })
-
-    runHookCallbacks(HookMock)
-
-    expect(hooksMock['@confluentinc/kafka-javascript'].fn).to.have.been.called
-    expect(hooksMock['mongodb-core'].fn).to.have.been.called
-  })
-
-  it('should not enable disabled hooks when DD_TRACE_[pkg]_ENABLED is false', () => {
-    loadRegisterWithEnv({ DD_TRACE_CONFLUENTINC_KAFKA_JAVASCRIPT_ENABLED: 'false' })
-
-    expect(HookMock.callCount).to.equal(1)
-    expect(HookMock.args[0]).to.deep.include(['mongodb-core'], { internals: undefined })
-
-    runHookCallbacks(HookMock)
-
-    expect(hooksMock['@confluentinc/kafka-javascript'].fn).to.not.have.been.called
-    expect(hooksMock['mongodb-core'].fn).to.have.been.called
-  })
-
-  it('should disable hooks that are disabled by DD_TRACE_[pkg]_ENABLED=false', () => {
-    loadRegisterWithEnv({ DD_TRACE_MONGODB_CORE_ENABLED: 'false' })
-
-    expect(HookMock.callCount).to.equal(0)
-
-    runHookCallbacks(HookMock)
-
-    expect(hooksMock['@confluentinc/kafka-javascript'].fn).to.not.have.been.called
-    expect(hooksMock['mongodb-core'].fn).to.not.have.been.called
-  })
-
   it('should disable hooks that are disabled by DD_TRACE_DISABLED_INSTRUMENTATIONS', () => {
     loadRegisterWithEnv({ DD_TRACE_DISABLED_INSTRUMENTATIONS: 'mongodb-core,@confluentinc/kafka-javascript' })