dd-trace 4.0.0-pre-1b1c414 → 4.0.0-pre-e7fe5c1

package/index.d.ts

@@ -77,9 +77,6 @@ export declare interface Tracer extends opentracing.Tracer {
    * span will finish when that callback is called.
    * * The function doesn't accept a callback and doesn't return a promise, in
    * which case the span will finish at the end of the function execution.
-   *
-   * If the `orphanable` option is set to false, the function will not be traced
-   * unless there is already an active span or `childOf` option.
    */
   trace<T> (name: string, fn: (span?: Span, fn?: (error?: Error) => any) => T): T;
   trace<T> (name: string, options: TraceOptions & SpanOptions, fn: (span?: Span, done?: (error?: Error) => string) => T): T;
@@ -488,12 +485,6 @@ export declare interface TracerOptions {
    */
   logLevel?: 'error' | 'debug'
 
-  /**
-   * If false, require a parent in order to trace.
-   * @default true
-   */
-  orphanable?: boolean
-
   /**
    * Enables DBM to APM link using tag injection.
    * @default 'disabled'

package/package.json

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

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

@@ -22,6 +22,10 @@ for (const packageName of names) {
 
     hooks[packageName]()
 
+    if (!instrumentations[packageName]) {
+      return moduleExports
+    }
+
     for (const { name, file, versions, hook } of instrumentations[packageName]) {
       const fullFilename = filename(name, file)
 

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

@@ -1,7 +1,10 @@
 'use strict'
+const semver = require('semver')
+
 const { addHook, channel, AsyncResource } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 const log = require('../../dd-trace/src/log')
+const { version: ddTraceVersion } = require('../../../package.json')
 const {
   getCoveredFilenamesFromCoverage,
   JEST_WORKER_TRACE_PAYLOAD_CODE,
@@ -480,11 +483,13 @@ function jasmineAsyncInstallWraper (jasmineAsyncInstallExport, jestVersion) {
   }
 }
 
-addHook({
-  name: 'jest-jasmine2',
-  versions: ['>=24.8.0'],
-  file: 'build/jasmineAsyncInstall.js'
-}, jasmineAsyncInstallWraper)
+if (semver.lt(ddTraceVersion, '4.0.0')) {
+  addHook({
+    name: 'jest-jasmine2',
+    versions: ['>=24.8.0'],
+    file: 'build/jasmineAsyncInstall.js'
+  }, jasmineAsyncInstallWraper)
+}
 
 addHook({
   name: 'jest-worker',

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

@@ -10,7 +10,7 @@ const {
   mergeCoverage,
   getTestSuitePath,
   fromCoverageMapToCoverage,
-  getTestLineStart
+  getCallSites
 } = require('../../dd-trace/src/plugins/util/test')
 
 const testStartCh = channel('ci:mocha:test:start')
@@ -393,9 +393,13 @@ addHook({
   file: 'lib/suite.js'
 }, (Suite) => {
   shimmer.wrap(Suite.prototype, 'addTest', addTest => function (test) {
-    // In here, the test definition is in the stack, so we search for it.
-    const startLine = getTestLineStart(new Error(), test.file)
-    testToStartLine.set(test, startLine)
+    const callSites = getCallSites()
+    let startLine
+    const testCallSite = callSites.find(site => site.getFileName() === test.file)
+    if (testCallSite) {
+      startLine = testCallSite.getLineNumber()
+      testToStartLine.set(test, startLine)
+    }
     return addTest.apply(this, arguments)
   })
   return Suite

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

@@ -103,7 +103,8 @@ module.exports = {
   resetCoverage,
   mergeCoverage,
   fromCoverageMapToCoverage,
-  getTestLineStart
+  getTestLineStart,
+  getCallSites
 }
 
 // Returns pkg manager and its version, separated by '-', e.g. npm-8.15.0 or yarn-1.22.19
@@ -395,3 +396,23 @@ function getTestLineStart (err, testSuitePath) {
     return null
   }
 }
+
+// From https://github.com/felixge/node-stack-trace/blob/ba06dcdb50d465cd440d84a563836e293b360427/index.js#L1
+function getCallSites () {
+  const oldLimit = Error.stackTraceLimit
+  Error.stackTraceLimit = Infinity
+
+  const dummy = {}
+
+  const v8Handler = Error.prepareStackTrace
+  Error.prepareStackTrace = function (_, v8StackTrace) {
+    return v8StackTrace
+  }
+  Error.captureStackTrace(dummy)
+
+  const v8StackTrace = dummy.stack
+  Error.prepareStackTrace = v8Handler
+  Error.stackTraceLimit = oldLimit
+
+  return v8StackTrace
+}

package/packages/dd-trace/src/telemetry/send-data.js

@@ -1,5 +1,17 @@
 const request = require('../exporters/common/request')
 let seqId = 0
+
+function getPayload (payload) {
+  // Some telemetry endpoints payloads accept collections of elements such as the 'logs' endpoint.
+  // 'logs' request type payload is meant to send library logs to Datadog’s backend.
+  if (Array.isArray(payload)) {
+    return payload
+  } else {
+    const { logger, tags, serviceMapping, ...trimmedPayload } = payload
+    return trimmedPayload
+  }
+}
+
 function sendData (config, application, host, reqType, payload = {}) {
   const {
     hostname,
@@ -7,8 +19,6 @@ function sendData (config, application, host, reqType, payload = {}) {
     url
   } = config
 
-  const { logger, tags, serviceMapping, ...trimmedPayload } = payload
-
   const options = {
     url,
     hostname,
@@ -27,7 +37,7 @@ function sendData (config, application, host, reqType, payload = {}) {
     tracer_time: Math.floor(Date.now() / 1000),
     runtime_id: config.tags['runtime-id'],
     seq_id: ++seqId,
-    payload: trimmedPayload,
+    payload: getPayload(payload),
     application,
     host
   })

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

@@ -26,10 +26,6 @@ class DatadogTracer extends Tracer {
       childOf: this.scope().active()
     }, options)
 
-    if (!options.childOf && options.orphanable === false) {
-      return fn(null, () => {})
-    }
-
     const span = this.startSpan(name, options)
 
     addTags(span, options)
@@ -81,10 +77,6 @@ class DatadogTracer extends Tracer {
         optionsObj = optionsObj.apply(this, arguments)
       }
 
-      if (optionsObj && optionsObj.orphanable === false && !tracer.scope().active()) {
-        return fn.apply(this, arguments)
-      }
-
       const lastArgId = arguments.length - 1
       const cb = arguments[lastArgId]