dd-trace 3.9.3 → 3.10.0

package/packages/dd-trace/src/ritm.js

@@ -16,6 +16,8 @@ let cache = Object.create(null)
 let patching = Object.create(null)
 let patchedRequire = null
 const moduleLoadStartChannel = dc.channel('dd-trace:moduleLoadStart')
+const moduleLoadEndChannel = dc.channel('dd-trace:moduleLoadEnd')
+
 function Hook (modules, options, onrequire) {
   if (!(this instanceof Hook)) return new Hook(modules, options, onrequire)
   if (typeof modules === 'function') {
@@ -52,7 +54,6 @@ function Hook (modules, options, onrequire) {
     const filename = Module._resolveFilename(request, this)
     const core = filename.indexOf(path.sep) === -1
     let name, basedir, hooks
-
     // return known patched modules immediately
     if (cache[filename]) {
       // require.cache was potentially altered externally
@@ -66,27 +67,31 @@ function Hook (modules, options, onrequire) {
     // Check if this module has a patcher in-progress already.
     // Otherwise, mark this module as patching in-progress.
     const patched = patching[filename]
-    if (!patched) {
+    if (patched) {
+      // If it's already patched, just return it as-is.
+      return origRequire.apply(this, arguments)
+    } else {
       patching[filename] = true
     }
 
-    const exports = origRequire.apply(this, arguments)
+    const payload = {
+      filename,
+      request
+    }
 
-    // If it's already patched, just return it as-is.
-    if (patched) return exports
+    if (moduleLoadStartChannel.hasSubscribers) {
+      moduleLoadStartChannel.publish(payload)
+    }
+    const exports = origRequire.apply(this, arguments)
+    payload.module = exports
+    if (moduleLoadEndChannel.hasSubscribers) {
+      moduleLoadEndChannel.publish(payload)
+    }
 
     // The module has already been loaded,
     // so the patching mark can be cleaned up.
     delete patching[filename]
 
-    if (moduleLoadStartChannel.hasSubscribers) {
-      moduleLoadStartChannel.publish({
-        filename,
-        module: exports,
-        request
-      })
-    }
-
     if (core) {
       hooks = moduleHooks[filename]
       if (!hooks) return exports // abort if module name isn't on whitelist

package/packages/dd-trace/src/telemetry/dependencies.js

@@ -71,7 +71,17 @@ function start (_config, _application, _host) {
 }
 
 function isDependency (filename, request) {
-  return request.indexOf(`.${path.sep}`) !== 0 && request.indexOf(path.sep) !== 0
+  const isDependencyWithSlash = isDependencyWithSeparator(filename, request, '/')
+  if (isDependencyWithSlash && process.platform === 'win32') {
+    return isDependencyWithSeparator(filename, request, path.sep)
+  }
+  return isDependencyWithSlash
+}
+function isDependencyWithSeparator (filename, request, sep) {
+  return request.indexOf(`..${sep}`) !== 0 &&
+    request.indexOf(`.${sep}`) !== 0 &&
+    request.indexOf(sep) !== 0 &&
+    request.indexOf(`:${sep}`) !== 1
 }
 
 function stop () {