dd-trace 3.17.0 → 3.17.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "3.17.0",
+  "version": "3.17.1",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -91,7 +91,7 @@
     "path-to-regexp": "^0.1.2",
     "protobufjs": "^7.1.2",
     "retry": "^0.10.1",
-    "semver": "^5.5.0"
+    "semver": "^7.3.8"
   },
   "devDependencies": {
     "@types/node": ">=14",

package/packages/datadog-plugin-next/src/index.js

@@ -68,6 +68,12 @@ class NextPlugin extends Plugin {
       const span = store.span
       const req = this._requests.get(span)
 
+      // Only use error page names if there's not already a name
+      const current = span.context()._tags['next.page']
+      if (current && (page === '/404' || page === '/500' || page === '/_error')) {
+        return
+      }
+
       span.addTags({
         [COMPONENT]: this.constructor.id,
         'resource.name': `${req.method} ${page}`.trim(),

package/packages/dd-trace/src/lambda/handler.js

@@ -50,7 +50,7 @@ function crashFlush () {
       [ERROR_TYPE]: error.name
     })
   } else {
-    log.warn('An impending timeout was reached, but no root span was found. No error will be tagged.')
+    log.debug('An impending timeout was reached, but no root span was found. No error will be tagged.')
   }
 
   tracer._processor.killAll()
@@ -59,6 +59,23 @@ function crashFlush () {
   }
 }
 
+/**
+ * Extracts the context from the given Lambda handler arguments.
+ *
+ * @param {*} args any amount of arguments
+ * @returns the context, if extraction was succesful.
+ */
+function extractContext (args) {
+  let context = args.length > 1 ? args[1] : undefined
+  if (context === undefined || context.getRemainingTimeInMillis === undefined) {
+    context = args.length > 2 ? args[2] : undefined
+    if (context === undefined || context.getRemainingTimeInMillis === undefined) {
+      throw Error('Could not extract context')
+    }
+  }
+  return context
+}
+
 /**
  * Patches your AWS Lambda handler function to add some tracing support.
  *
@@ -66,14 +83,21 @@ function crashFlush () {
  */
 exports.datadog = function datadog (lambdaHandler) {
   return (...args) => {
-    const context = args[1]
     const patched = lambdaHandler.apply(this, args)
-    checkTimeout(context)
 
-    if (patched) {
-      // clear the timeout as soon as a result is returned
-      patched.then(_ => clearTimeout(__lambdaTimeout))
+    try {
+      const context = extractContext(args)
+
+      checkTimeout(context)
+
+      if (patched) {
+        // clear the timeout as soon as a result is returned
+        patched.then(_ => clearTimeout(__lambdaTimeout))
+      }
+    } catch (e) {
+      log.debug('Error patching AWS Lambda handler. Timeout spans will not be generated.')
     }
+
     return patched
   }
 }

package/scripts/install_plugin_modules.js

@@ -89,6 +89,8 @@ async function assertInstrumentation (instrumentation, external) {
 }
 
 async function assertModules (name, version, external) {
+  const range = process.env.RANGE
+  if (range && !semver.subset(version, range)) return
   addFolder(name)
   addFolder(name, version)
   assertFolder(name)