dd-trace 3.37.0 → 3.38.1

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

@@ -602,6 +602,23 @@ module.exports = {
       tags[refKey] = ref
     }
 
+    if (env.CODEBUILD_INITIATOR?.startsWith('codepipeline/')) {
+      const {
+        CODEBUILD_BUILD_ARN,
+        DD_ACTION_EXECUTION_ID,
+        DD_PIPELINE_EXECUTION_ID
+      } = env
+      tags = {
+        [CI_PROVIDER_NAME]: 'awscodepipeline',
+        [CI_PIPELINE_ID]: DD_PIPELINE_EXECUTION_ID,
+        [CI_ENV_VARS]: JSON.stringify({
+          CODEBUILD_BUILD_ARN,
+          DD_PIPELINE_EXECUTION_ID,
+          DD_ACTION_EXECUTION_ID
+        })
+      }
+    }
+
     normalizeTag(tags, CI_WORKSPACE_PATH, resolveTilde)
     normalizeTag(tags, GIT_REPOSITORY_URL, filterSensitiveInfoFromRepository)
     normalizeTag(tags, GIT_BRANCH, normalizeRef)

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

@@ -61,15 +61,37 @@ function unshallowRepository () {
   }
   const defaultRemoteName = sanitizedExec('git', ['config', '--default', 'origin', '--get', 'clone.defaultRemoteName'])
   const revParseHead = sanitizedExec('git', ['rev-parse', 'HEAD'])
-  sanitizedExec('git', [
+
+  const baseGitOptions = [
     'fetch',
     '--shallow-since="1 month ago"',
     '--update-shallow',
     '--filter=blob:none',
     '--recurse-submodules=no',
-    defaultRemoteName,
-    revParseHead
-  ])
+    defaultRemoteName
+  ]
+
+  try {
+    execFileSync('git', [
+      ...baseGitOptions,
+      revParseHead
+    ], { stdio: 'pipe' })
+  } catch (e) {
+    // If the local HEAD is a commit that has not been pushed to the remote, the above command will fail.
+    log.error(e)
+    const upstreamRemote = sanitizedExec('git', ['rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{upstream}'])
+    try {
+      execFileSync('git', [
+        ...baseGitOptions,
+        upstreamRemote
+      ], { stdio: 'pipe' })
+    } catch (e) {
+      // If the CI is working on a detached HEAD or branch tracking hasn’t been set up, the above command will fail.
+      log.error(e)
+      // We use sanitizedExec here because if this last option fails, we'll give up.
+      sanitizedExec('git', baseGitOptions)
+    }
+  }
 }
 
 function getRepositoryUrl () {

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

@@ -58,6 +58,8 @@ const TEST_ITR_SKIPPING_ENABLED = 'test.itr.tests_skipping.enabled'
 const TEST_ITR_SKIPPING_TYPE = 'test.itr.tests_skipping.type'
 const TEST_ITR_SKIPPING_COUNT = 'test.itr.tests_skipping.count'
 const TEST_CODE_COVERAGE_ENABLED = 'test.code_coverage.enabled'
+const TEST_ITR_UNSKIPPABLE = 'test.itr.unskippable'
+const TEST_ITR_FORCED_RUN = 'test.itr.forced_run'
 
 const TEST_CODE_COVERAGE_LINES_PCT = 'test.code_coverage.lines_pct'
 
@@ -107,6 +109,8 @@ module.exports = {
   TEST_ITR_SKIPPING_COUNT,
   TEST_CODE_COVERAGE_ENABLED,
   TEST_CODE_COVERAGE_LINES_PCT,
+  TEST_ITR_UNSKIPPABLE,
+  TEST_ITR_FORCED_RUN,
   addIntelligentTestRunnerSpanTags,
   getCoveredFilenamesFromCoverage,
   resetCoverage,
@@ -366,7 +370,9 @@ function addIntelligentTestRunnerSpanTags (
     isCodeCoverageEnabled,
     testCodeCoverageLinesTotal,
     skippingCount,
-    skippingType = 'suite'
+    skippingType = 'suite',
+    hasUnskippableSuites,
+    hasForcedToRunSuites
   }
 ) {
   testSessionSpan.setTag(TEST_ITR_TESTS_SKIPPED, isSuitesSkipped ? 'true' : 'false')
@@ -381,6 +387,15 @@ function addIntelligentTestRunnerSpanTags (
   testModuleSpan.setTag(TEST_ITR_SKIPPING_COUNT, skippingCount)
   testModuleSpan.setTag(TEST_CODE_COVERAGE_ENABLED, isCodeCoverageEnabled ? 'true' : 'false')
 
+  if (hasUnskippableSuites) {
+    testSessionSpan.setTag(TEST_ITR_UNSKIPPABLE, 'true')
+    testModuleSpan.setTag(TEST_ITR_UNSKIPPABLE, 'true')
+  }
+  if (hasForcedToRunSuites) {
+    testSessionSpan.setTag(TEST_ITR_FORCED_RUN, 'true')
+    testModuleSpan.setTag(TEST_ITR_FORCED_RUN, 'true')
+  }
+
   // 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_PCT, testCodeCoverageLinesTotal)

package/packages/dd-trace/src/profiling/config.js

@@ -37,6 +37,8 @@ class Config {
       DD_PROFILING_EXPERIMENTAL_OOM_HEAP_LIMIT_EXTENSION_SIZE,
       DD_PROFILING_EXPERIMENTAL_OOM_MAX_HEAP_EXTENSION_COUNT,
       DD_PROFILING_EXPERIMENTAL_OOM_EXPORT_STRATEGIES,
+      DD_PROFILING_CODEHOTSPOTS_ENABLED,
+      DD_PROFILING_ENDPOINT_COLLECTION_ENABLED,
       DD_PROFILING_EXPERIMENTAL_CODEHOTSPOTS_ENABLED,
       DD_PROFILING_EXPERIMENTAL_ENDPOINT_COLLECTION_ENABLED
     } = process.env
@@ -53,8 +55,6 @@ class Config {
       Number(DD_PROFILING_UPLOAD_TIMEOUT), 60 * 1000)
     const sourceMap = coalesce(options.sourceMap,
       DD_PROFILING_SOURCE_MAP, true)
-    const endpointCollectionEnabled = coalesce(options.endpointCollection,
-      DD_PROFILING_EXPERIMENTAL_ENDPOINT_COLLECTION_ENABLED, false)
     const pprofPrefix = coalesce(options.pprofPrefix,
       DD_PROFILING_PPROF_PREFIX, '')
 
@@ -71,11 +71,25 @@ class Config {
       tagger.parse({ env, host, service, version, functionname })
     )
     this.logger = ensureLogger(options.logger)
+    const logger = this.logger
+    function logExperimentalVarDeprecation (shortVarName) {
+      const deprecatedEnvVarName = `DD_PROFILING_EXPERIMENTAL_${shortVarName}`
+      const v = process.env[deprecatedEnvVarName]
+      // not null, undefined, or NaN -- same logic as koalas.hasValue
+      // eslint-disable-next-line no-self-compare
+      if (v != null && v === v) {
+        logger.warn(`${deprecatedEnvVarName} is deprecated. Use DD_PROFILING_${shortVarName} instead.`)
+      }
+    }
     this.flushInterval = flushInterval
     this.uploadTimeout = uploadTimeout
     this.sourceMap = sourceMap
     this.debugSourceMaps = isTrue(coalesce(options.debugSourceMaps, DD_PROFILING_DEBUG_SOURCE_MAPS, false))
-    this.endpointCollectionEnabled = endpointCollectionEnabled
+    this.endpointCollectionEnabled = isTrue(coalesce(options.endpointCollection,
+      DD_PROFILING_ENDPOINT_COLLECTION_ENABLED,
+      DD_PROFILING_EXPERIMENTAL_ENDPOINT_COLLECTION_ENABLED, false))
+    logExperimentalVarDeprecation('ENDPOINT_COLLECTION_ENABLED')
+
     this.pprofPrefix = pprofPrefix
     this.v8ProfilerBugWorkaroundEnabled = isTrue(coalesce(options.v8ProfilerBugWorkaround,
       DD_PROFILING_V8_PROFILER_BUG_WORKAROUND, true))
@@ -113,8 +127,25 @@ class Config {
     const profilers = options.profilers
       ? options.profilers
       : getProfilers({ DD_PROFILING_HEAP_ENABLED, DD_PROFILING_WALLTIME_ENABLED, DD_PROFILING_PROFILERS })
-    this.codeHotspotsEnabled = isTrue(coalesce(options.codeHotspotsEnabled,
-      DD_PROFILING_EXPERIMENTAL_CODEHOTSPOTS_ENABLED, false))
+
+    function getCodeHotspotsOptionsOr (defvalue) {
+      return coalesce(options.codeHotspotsEnabled,
+        DD_PROFILING_CODEHOTSPOTS_ENABLED,
+        DD_PROFILING_EXPERIMENTAL_CODEHOTSPOTS_ENABLED, defvalue)
+    }
+    this.codeHotspotsEnabled = isTrue(getCodeHotspotsOptionsOr(false))
+    logExperimentalVarDeprecation('CODEHOTSPOTS_ENABLED')
+    if (this.endpointCollectionEnabled && !this.codeHotspotsEnabled) {
+      if (getCodeHotspotsOptionsOr(undefined) !== undefined) {
+        this.logger.warn(
+          'Endpoint collection is enabled, but Code Hotspots are disabled. ' +
+          'Enable Code Hotspots too for endpoint collection to work.')
+        this.endpointCollectionEnabled = false
+      } else {
+        this.logger.info('Code Hotspots are implicitly enabled by endpoint collection.')
+        this.codeHotspotsEnabled = true
+      }
+    }
 
     this.profilers = ensureProfilers(profilers, this)
   }

package/packages/dd-trace/src/profiling/profilers/wall.js

@@ -23,7 +23,7 @@ function getStartedSpans (context) {
   return context._trace.started
 }
 
-function generateLabels ({ spanId, rootSpanId, webTags, endpoint }) {
+function generateLabels ({ context: { spanId, rootSpanId, webTags, endpoint }, timestamp }) {
   const labels = {}
   if (spanId) {
     labels['span id'] = spanId
@@ -37,6 +37,8 @@ function generateLabels ({ spanId, rootSpanId, webTags, endpoint }) {
     // fallback to endpoint computed when sample was taken
     labels['trace endpoint'] = endpoint
   }
+  // Incoming timestamps are in microseconds, we emit nanos.
+  labels['end_timestamp_ns'] = timestamp * 1000n
 
   return labels
 }
@@ -100,6 +102,10 @@ class NativeWallProfiler {
     return this._codeHotspotsEnabled
   }
 
+  endpointCollectionEnabled () {
+    return this._endpointCollectionEnabled
+  }
+
   start ({ mapper } = {}) {
     if (this._started) return
 

package/packages/dd-trace/src/service-naming/extra-services.js

@@ -0,0 +1,24 @@
+'use strict'
+
+const maxExtraServices = 64
+const extraServices = new Set()
+
+function getExtraServices () {
+  return [...extraServices]
+}
+
+function registerExtraService (serviceName) {
+  if (serviceName && extraServices.size < maxExtraServices) {
+    extraServices.add(serviceName)
+  }
+}
+
+function clear () {
+  extraServices.clear()
+}
+
+module.exports = {
+  registerExtraService,
+  getExtraServices,
+  clear
+}

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

@@ -1,7 +1,5 @@
 'use strict'
 
-const { version } = require('../../../../package.json')
-
 const { sendData } = require('./send-data')
 
 function getId (type, namespace, name, tags) {
@@ -35,10 +33,7 @@ class Metric {
     this.metric = common ? metric : `nodejs.${metric}`
     this.tags = tagArray(tags)
     if (common) {
-      this.tags.push('lib_language:nodejs')
       this.tags.push(`version:${process.version}`)
-    } else {
-      this.tags.push(`lib_version:${version}`)
     }
     this.common = common