dd-trace 3.9.1 → 3.9.3

package/package.json

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

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

@@ -176,6 +176,9 @@ function cliWrapper (cli) {
     const configurationPromise = new Promise((resolve) => {
       onDone = resolve
     })
+    if (!jestConfigurationCh.hasSubscribers) {
+      return runCLI.apply(this, arguments)
+    }
 
     sessionAsyncResource.runInAsyncScope(() => {
       jestConfigurationCh.publish({ onDone })

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

@@ -317,6 +317,9 @@ addHook({
    * If ITR is disabled, `onDone` is called immediately on the subscriber
    */
   shimmer.wrap(Mocha.prototype, 'run', run => function () {
+    if (!configurationCh.hasSubscribers) {
+      return run.apply(this, arguments)
+    }
     const onReceivedSkippableSuites = ({ err, skippableSuites }) => {
       if (err) {
         log.error(err)
@@ -332,6 +335,9 @@ addHook({
         log.error(err)
         return run.apply(this, arguments)
       }
+      if (!skippableSuitesCh.hasSubscribers) {
+        return run.apply(this, arguments)
+      }
 
       skippableSuitesCh.publish({
         onDone: mochaRunAsyncResource.bind(onReceivedSkippableSuites)

package/packages/dd-trace/src/plugins/util/web.js

@@ -265,11 +265,7 @@ const web = {
 
   // Extract the parent span from the headers and start a new span as its child
   startChildSpan (tracer, name, headers) {
-    const activeSpan = tracer.scope().active()
-    const spanContext = activeSpan && activeSpan.context()
-    const isLambda = spanContext && spanContext._name === 'aws.lambda'
-
-    const childOf = (isLambda && activeSpan) || tracer.extract(FORMAT_HTTP_HEADERS, headers)
+    const childOf = tracer.scope().active() || tracer.extract(FORMAT_HTTP_HEADERS, headers)
 
     const span = tracer.startSpan(name, { childOf })