switch to internal diagnostics channel with node bug patch (#3002)

Author: rochdev

.eslintrc.json

@@ -6,6 +6,10 @@
     "eslint:recommended",
     "standard"
   ],
+  "plugins": [
+    "mocha",
+    "n"
+  ],
   "env": {
     "node": true,
     "es2020": true
@@ -18,6 +22,7 @@
     "object-curly-spacing": [2, "always"],
     "import/no-extraneous-dependencies": 2,
     "standard/no-callback-literal": 0,
-    "no-prototype-builtins": 0
+    "no-prototype-builtins": 0,
+    "n/no-restricted-require": [2, ["diagnostics_channel"]]
   }
 }

LICENSE-3rdparty.csv

@@ -40,6 +40,7 @@ dev,esbuild,MIT,Copyright (c) 2020 Evan Wallace
 dev,eslint,MIT,Copyright JS Foundation and other contributors https://js.foundation
 dev,eslint-config-standard,MIT,Copyright Feross Aboukhadijeh
 dev,eslint-plugin-import,MIT,Copyright 2015 Ben Mosher
+dev,eslint-plugin-n,MIT,Copyright 2015 Toru Nagashima
 dev,eslint-plugin-node,MIT,Copyright 2015 Toru Nagashima
 dev,eslint-plugin-promise,ISC,jden and other contributors
 dev,eslint-plugin-standard,MIT,Copyright 2015 Jamund Ferguson

package.json

@@ -108,6 +108,7 @@
     "eslint": "^8.23.0",
     "eslint-config-standard": "^11.0.0-beta.0",
     "eslint-plugin-import": "^2.8.0",
+    "eslint-plugin-n": "^15.7.0",
     "eslint-plugin-node": "^5.2.1",
     "eslint-plugin-promise": "^3.6.0",
     "eslint-plugin-standard": "^3.0.1",

packages/datadog-core/src/storage/async_resource.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { createHook, executionAsyncResource } = require('async_hooks')
-const { channel } = require('diagnostics_channel')
+const { channel } = require('../../../diagnostics_channel')
 
 const beforeCh = channel('dd-trace:storage:before')
 const afterCh = channel('dd-trace:storage:after')

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

@@ -1,6 +1,6 @@
 'use strict'
 
-const dc = require('diagnostics_channel')
+const dc = require('../../../diagnostics_channel')
 const semver = require('semver')
 const instrumentations = require('./instrumentations')
 const { AsyncResource } = require('async_hooks')

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

@@ -1,6 +1,6 @@
 'use strict'
 
-const { channel } = require('diagnostics_channel')
+const { channel } = require('../../../diagnostics_channel')
 const path = require('path')
 const semver = require('semver')
 const Hook = require('./hook')

packages/dd-trace/src/appsec/gateway/channels.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const dc = require('diagnostics_channel')
+const dc = require('../../../../diagnostics_channel')
 
 // TODO: use TBD naming convention
 //       or directly use http plugin's channels

packages/dd-trace/src/appsec/iast/index.js

@@ -3,7 +3,7 @@ const { enableAllAnalyzers, disableAllAnalyzers } = require('./analyzers')
 const web = require('../../plugins/util/web')
 const { storage } = require('../../../../datadog-core')
 const overheadController = require('./overhead-controller')
-const dc = require('diagnostics_channel')
+const dc = require('../../../../diagnostics_channel')
 const iastContextFunctions = require('./iast-context')
 const { enableTaintTracking, disableTaintTracking, createTransaction, removeTransaction } = require('./taint-tracking')
 

packages/dd-trace/src/appsec/iast/telemetry/logs.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const dc = require('diagnostics_channel')
+const dc = require('../../../../../diagnostics_channel')
 const logCollector = require('./log_collector')
 const { sendData } = require('../../../telemetry/send-data')
 const log = require('../../../log')

packages/dd-trace/src/dcitm.js

@@ -1,5 +1,7 @@
 'use strict'
 
+// TODO: Figure out why we can't use the internal version.
+// eslint-disable-next-line n/no-restricted-require
 const dc = require('diagnostics_channel')
 
 const CHANNEL_PREFIX = 'dd-trace:bundledModuleLoadStart'