dd-trace 3.13.0 → 3.13.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "3.13.0",
+  "version": "3.13.2",
   "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/datadog-plugin-jest/src/index.js

@@ -10,16 +10,13 @@ const {
   getTestSessionCommonTags,
   getTestModuleCommonTags,
   getTestSuiteCommonTags,
+  addIntelligentTestRunnerSpanTags,
   TEST_PARAMETERS,
   getCodeOwnersFileEntries,
   TEST_SESSION_ID,
   TEST_MODULE_ID,
   TEST_SUITE_ID,
   TEST_COMMAND,
-  TEST_ITR_TESTS_SKIPPED,
-  TEST_SESSION_CODE_COVERAGE_ENABLED,
-  TEST_SESSION_ITR_SKIPPING_ENABLED,
-  TEST_CODE_COVERAGE_LINES_TOTAL,
   TEST_BUNDLE
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
@@ -83,14 +80,14 @@ class JestPlugin extends CiPlugin {
       testCodeCoverageLinesTotal
     }) => {
       this.testSessionSpan.setTag(TEST_STATUS, status)
-      this.testSessionSpan.setTag(TEST_ITR_TESTS_SKIPPED, isSuitesSkipped ? 'true' : 'false')
-      this.testSessionSpan.setTag(TEST_SESSION_ITR_SKIPPING_ENABLED, isSuitesSkippingEnabled ? 'true' : 'false')
-      this.testSessionSpan.setTag(TEST_SESSION_CODE_COVERAGE_ENABLED, isCodeCoverageEnabled ? 'true' : 'false')
-
-      if (testCodeCoverageLinesTotal !== undefined) {
-        this.testSessionSpan.setTag(TEST_CODE_COVERAGE_LINES_TOTAL, testCodeCoverageLinesTotal)
-      }
       this.testModuleSpan.setTag(TEST_STATUS, status)
+
+      addIntelligentTestRunnerSpanTags(
+        this.testSessionSpan,
+        this.testModuleSpan,
+        { isSuitesSkipped, isSuitesSkippingEnabled, isCodeCoverageEnabled, testCodeCoverageLinesTotal }
+      )
+
       this.testModuleSpan.finish()
       this.testSessionSpan.finish()
       finishAllTraceSpans(this.testSessionSpan)

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

@@ -13,14 +13,12 @@ const {
   getTestSessionCommonTags,
   getTestModuleCommonTags,
   getTestSuiteCommonTags,
+  addIntelligentTestRunnerSpanTags,
   TEST_SUITE_ID,
   TEST_SESSION_ID,
   TEST_MODULE_ID,
   TEST_BUNDLE,
-  TEST_COMMAND,
-  TEST_ITR_TESTS_SKIPPED,
-  TEST_SESSION_CODE_COVERAGE_ENABLED,
-  TEST_SESSION_ITR_SKIPPING_ENABLED
+  TEST_COMMAND
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 
@@ -156,11 +154,14 @@ class MochaPlugin extends CiPlugin {
       if (this.testSessionSpan) {
         const { isSuitesSkippingEnabled, isCodeCoverageEnabled } = this.itrConfig || {}
         this.testSessionSpan.setTag(TEST_STATUS, status)
-        this.testSessionSpan.setTag(TEST_ITR_TESTS_SKIPPED, isSuitesSkipped ? 'true' : 'false')
-        this.testSessionSpan.setTag(TEST_SESSION_ITR_SKIPPING_ENABLED, isSuitesSkippingEnabled ? 'true' : 'false')
-        this.testSessionSpan.setTag(TEST_SESSION_CODE_COVERAGE_ENABLED, isCodeCoverageEnabled ? 'true' : 'false')
-
         this.testModuleSpan.setTag(TEST_STATUS, status)
+
+        addIntelligentTestRunnerSpanTags(
+          this.testSessionSpan,
+          this.testModuleSpan,
+          { isSuitesSkipped, isSuitesSkippingEnabled, isCodeCoverageEnabled }
+        )
+
         this.testModuleSpan.finish()
         this.testSessionSpan.finish()
         finishAllTraceSpans(this.testSessionSpan)

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}"`
         }

package/packages/dd-trace/src/log/writer.js

@@ -23,10 +23,18 @@ function withNoop (fn) {
 }
 
 function unsubscribeAll () {
-  debugChannel.unsubscribe(onDebug)
-  infoChannel.unsubscribe(onInfo)
-  warnChannel.unsubscribe(onWarn)
-  errorChannel.unsubscribe(onError)
+  if (debugChannel.hasSubscribers) {
+    debugChannel.unsubscribe(onDebug)
+  }
+  if (infoChannel.hasSubscribers) {
+    infoChannel.unsubscribe(onInfo)
+  }
+  if (warnChannel.hasSubscribers) {
+    warnChannel.unsubscribe(onWarn)
+  }
+  if (errorChannel.hasSubscribers) {
+    errorChannel.unsubscribe(onError)
+  }
 }
 
 function toggleSubscription (enable) {

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

@@ -50,6 +50,8 @@ const JEST_TEST_RUNNER = 'test.jest.test_runner'
 const TEST_ITR_TESTS_SKIPPED = '_dd.ci.itr.tests_skipped'
 const TEST_SESSION_ITR_SKIPPING_ENABLED = 'test_session.itr.tests_skipping.enabled'
 const TEST_SESSION_CODE_COVERAGE_ENABLED = 'test_session.code_coverage.enabled'
+const TEST_MODULE_ITR_SKIPPING_ENABLED = 'test_module.itr.tests_skipping.enabled'
+const TEST_MODULE_CODE_COVERAGE_ENABLED = 'test_module.code_coverage.enabled'
 
 const TEST_CODE_COVERAGE_LINES_TOTAL = 'test.codecov_lines_total'
 
@@ -84,9 +86,13 @@ module.exports = {
   TEST_MODULE_ID,
   TEST_SUITE_ID,
   TEST_ITR_TESTS_SKIPPED,
+  TEST_BUNDLE,
   TEST_SESSION_ITR_SKIPPING_ENABLED,
   TEST_SESSION_CODE_COVERAGE_ENABLED,
+  TEST_MODULE_ITR_SKIPPING_ENABLED,
+  TEST_MODULE_CODE_COVERAGE_ENABLED,
   TEST_CODE_COVERAGE_LINES_TOTAL,
+  addIntelligentTestRunnerSpanTags,
   getCoveredFilenamesFromCoverage,
   resetCoverage,
   mergeCoverage,
@@ -282,6 +288,26 @@ function getTestSuiteCommonTags (command, testFrameworkVersion, testSuite) {
   }
 }
 
+function addIntelligentTestRunnerSpanTags (
+  testSessionSpan,
+  testModuleSpan,
+  { isSuitesSkipped, isSuitesSkippingEnabled, isCodeCoverageEnabled, testCodeCoverageLinesTotal }
+) {
+  testSessionSpan.setTag(TEST_ITR_TESTS_SKIPPED, isSuitesSkipped ? 'true' : 'false')
+  testSessionSpan.setTag(TEST_SESSION_ITR_SKIPPING_ENABLED, isSuitesSkippingEnabled ? 'true' : 'false')
+  testSessionSpan.setTag(TEST_SESSION_CODE_COVERAGE_ENABLED, isCodeCoverageEnabled ? 'true' : 'false')
+
+  testModuleSpan.setTag(TEST_ITR_TESTS_SKIPPED, isSuitesSkipped ? 'true' : 'false')
+  testModuleSpan.setTag(TEST_MODULE_ITR_SKIPPING_ENABLED, isSuitesSkippingEnabled ? 'true' : 'false')
+  testModuleSpan.setTag(TEST_MODULE_CODE_COVERAGE_ENABLED, isCodeCoverageEnabled ? 'true' : 'false')
+
+  // If suites have been skipped we don't want to report the total coverage, as it will be wrong
+  if (testCodeCoverageLinesTotal !== undefined && !isSuitesSkipped) {
+    testSessionSpan.setTag(TEST_CODE_COVERAGE_LINES_TOTAL, testCodeCoverageLinesTotal)
+    testModuleSpan.setTag(TEST_CODE_COVERAGE_LINES_TOTAL, testCodeCoverageLinesTotal)
+  }
+}
+
 function getCoveredFilenamesFromCoverage (coverage) {
   const coverageMap = istanbul.createCoverageMap(coverage)
 

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

@@ -1,7 +1,6 @@
 'use strict'
 
 const tracerVersion = require('../../../../package.json').version
-const containerId = require('../exporters/common/docker').id()
 const os = require('os')
 const dependencies = require('./dependencies')
 const { sendData } = require('./send-data')
@@ -76,9 +75,31 @@ function createAppObject () {
 }
 
 function createHostObject () {
+  const osName = os.type()
+
+  if (osName === 'Linux' || osName === 'Darwin') {
+    return {
+      hostname: os.hostname(),
+      os: osName,
+      architecture: os.arch(),
+      kernel_version: os.version(),
+      kernel_release: os.release(),
+      kernel_name: osName
+    }
+  }
+
+  if (osName === 'Windows_NT') {
+    return {
+      hostname: os.hostname(),
+      os: osName,
+      architecture: os.arch(),
+      os_version: os.version()
+    }
+  }
+
   return {
     hostname: os.hostname(), // TODO is this enough?
-    container_id: containerId
+    os: osName
   }
 }