dd-trace 3.13.0 → 4.0.0-pre-e22d438

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "3.13.0",
+  "version": "4.0.0-pre-e22d438",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",

package/packages/datadog-instrumentations/src/fs.js

@@ -85,36 +85,37 @@ const paramsByFileHandleMethods = {
   writeFile: ['data', 'options'],
   writev: ['buffers', 'position']
 }
+const names = ['fs', 'node:fs']
+names.forEach(name => {
+  addHook({ name }, fs => {
+    const asyncMethods = Object.keys(paramsByMethod)
+    const syncMethods = asyncMethods.map(name => `${name}Sync`)
+
+    massWrap(fs, asyncMethods, createWrapFunction())
+    massWrap(fs, syncMethods, createWrapFunction())
+    massWrap(fs.promises, asyncMethods, createWrapFunction('promises.'))
+
+    wrap(fs.realpath, 'native', createWrapFunction('', 'realpath.native'))
+    wrap(fs.realpathSync, 'native', createWrapFunction('', 'realpath.native'))
+    wrap(fs.promises.realpath, 'native', createWrapFunction('', 'realpath.native'))
+
+    wrap(fs, 'createReadStream', wrapCreateStream)
+    wrap(fs, 'createWriteStream', wrapCreateStream)
+    if (fs.Dir) {
+      wrap(fs.Dir.prototype, 'close', createWrapFunction('dir.'))
+      wrap(fs.Dir.prototype, 'closeSync', createWrapFunction('dir.'))
+      wrap(fs.Dir.prototype, 'read', createWrapFunction('dir.'))
+      wrap(fs.Dir.prototype, 'readSync', createWrapFunction('dir.'))
+      wrap(fs.Dir.prototype, Symbol.asyncIterator, createWrapDirAsyncIterator())
+    }
 
-addHook({ name: 'fs' }, fs => {
-  const asyncMethods = Object.keys(paramsByMethod)
-  const syncMethods = asyncMethods.map(name => `${name}Sync`)
-
-  massWrap(fs, asyncMethods, createWrapFunction())
-  massWrap(fs, syncMethods, createWrapFunction())
-  massWrap(fs.promises, asyncMethods, createWrapFunction('promises.'))
-
-  wrap(fs.realpath, 'native', createWrapFunction('', 'realpath.native'))
-  wrap(fs.realpathSync, 'native', createWrapFunction('', 'realpath.native'))
-  wrap(fs.promises.realpath, 'native', createWrapFunction('', 'realpath.native'))
-
-  wrap(fs, 'createReadStream', wrapCreateStream)
-  wrap(fs, 'createWriteStream', wrapCreateStream)
-  if (fs.Dir) {
-    wrap(fs.Dir.prototype, 'close', createWrapFunction('dir.'))
-    wrap(fs.Dir.prototype, 'closeSync', createWrapFunction('dir.'))
-    wrap(fs.Dir.prototype, 'read', createWrapFunction('dir.'))
-    wrap(fs.Dir.prototype, 'readSync', createWrapFunction('dir.'))
-    wrap(fs.Dir.prototype, Symbol.asyncIterator, createWrapDirAsyncIterator())
-  }
-
-  wrap(fs, 'unwatchFile', createWatchWrapFunction())
-  wrap(fs, 'watch', createWatchWrapFunction())
-  wrap(fs, 'watchFile', createWatchWrapFunction())
+    wrap(fs, 'unwatchFile', createWatchWrapFunction())
+    wrap(fs, 'watch', createWatchWrapFunction())
+    wrap(fs, 'watchFile', createWatchWrapFunction())
 
-  return fs
+    return fs
+  })
 })
-
 function isFirstMethodReturningFileHandle (original) {
   return !kHandle && original.name === 'open'
 }

package/packages/datadog-instrumentations/src/mocha.js

@@ -418,8 +418,13 @@ addHook({
 
         // we store the original function, not to lose it
         originalFns.set(newFn, this.fn)
-
         this.fn = newFn
+
+        // Temporarily keep functionality when .asyncResource is removed from node
+        // in https://github.com/nodejs/node/pull/46432
+        if (!this.fn.asyncResource) {
+          this.fn.asyncResource = asyncResource
+        }
       }
     }
 

package/packages/dd-trace/src/exporters/common/request.js

@@ -98,9 +98,16 @@ function request (data, options, callback) {
       if (res.statusCode >= 200 && res.statusCode <= 299) {
         callback(null, responseData, res.statusCode)
       } else {
-        const fullUrl = `${options.url || options.hostname || `localhost:${options.port}`}${options.path}`
-        // eslint-disable-next-line
-        let errorMessage = `Error from ${fullUrl}: ${res.statusCode} ${http.STATUS_CODES[res.statusCode]}.`
+        let errorMessage = ''
+        try {
+          const fullUrl = new URL(
+            options.path,
+            options.url || options.hostname || `http://localhost:${options.port}`
+          ).href
+          errorMessage = `Error from ${fullUrl}: ${res.statusCode} ${http.STATUS_CODES[res.statusCode]}.`
+        } catch (e) {
+          // ignore error
+        }
         if (responseData) {
           errorMessage += ` Response from the endpoint: "${responseData}"`
         }