dd-trace 2.24.0 → 2.25.0

package/packages/dd-trace/src/plugins/database.js

@@ -25,8 +25,8 @@ class DatabasePlugin extends StoragePlugin {
     }
   }
 
-  createDBMPropagationCommentService () {
-    this.encodingServiceTags('dddbs', 'encodedDddbs', this.config.service)
+  createDBMPropagationCommentService (serviceName) {
+    this.encodingServiceTags('dddbs', 'encodedDddbs', serviceName)
     this.encodingServiceTags('dde', 'encodedDde', this.tracer._env)
     this.encodingServiceTags('ddps', 'encodedDdps', this.tracer._service)
     this.encodingServiceTags('ddpv', 'encodedDdpv', this.tracer._version)
@@ -37,11 +37,11 @@ class DatabasePlugin extends StoragePlugin {
     `ddps='${encodedDdps}',ddpv='${encodedDdpv}'`
   }
 
-  injectDbmQuery (query) {
+  injectDbmQuery (query, serviceName) {
     if (this.config.dbmPropagationMode === 'disabled') {
       return query
     }
-    const servicePropagation = this.createDBMPropagationCommentService()
+    const servicePropagation = this.createDBMPropagationCommentService(serviceName)
     if (this.config.dbmPropagationMode === 'service') {
       return `/*${servicePropagation}*/ ${query}`
     } else if (this.config.dbmPropagationMode === 'full') {

package/packages/dd-trace/src/plugins/log_plugin.js

@@ -43,8 +43,8 @@ module.exports = class LogPlugin extends Plugin {
       const store = storage.getStore()
       const span = store && store.span
 
-      if (!span) return
-
+      // NOTE: This needs to run whether or not there is a span
+      // so service, version, and env will always get injected.
       const holder = {}
       this.tracer.inject(span, LOG, holder)
       arg.message = messageProxy(arg.message, holder)

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

@@ -235,7 +235,8 @@ module.exports = {
         GITHUB_SHA,
         GITHUB_REPOSITORY,
         GITHUB_SERVER_URL,
-        GITHUB_RUN_ATTEMPT
+        GITHUB_RUN_ATTEMPT,
+        GITHUB_JOB
       } = env
 
       const repositoryURL = `${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git`
@@ -259,6 +260,7 @@ module.exports = {
         [GIT_COMMIT_SHA]: GITHUB_SHA,
         [GIT_REPOSITORY_URL]: repositoryURL,
         [CI_JOB_URL]: jobUrl,
+        [CI_JOB_NAME]: GITHUB_JOB,
         [CI_WORKSPACE_PATH]: GITHUB_WORKSPACE,
         [refKey]: ref,
         [CI_ENV_VARS]: JSON.stringify({
@@ -353,7 +355,8 @@ module.exports = {
         [GIT_COMMIT_AUTHOR_EMAIL]: BUILD_REQUESTEDFOREMAIL,
         [GIT_COMMIT_MESSAGE]: BUILD_SOURCEVERSIONMESSAGE,
         [CI_STAGE_NAME]: SYSTEM_STAGEDISPLAYNAME,
-        [CI_JOB_NAME]: SYSTEM_JOBDISPLAYNAME
+        [CI_JOB_NAME]: SYSTEM_JOBDISPLAYNAME,
+        [CI_ENV_VARS]: JSON.stringify({ SYSTEM_TEAMPROJECTID, BUILD_BUILDID, SYSTEM_JOBID })
       }
 
       if (SYSTEM_TEAMFOUNDATIONSERVERURI && SYSTEM_TEAMPROJECTID && BUILD_BUILDID) {

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

@@ -47,7 +47,7 @@ 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_ITR_CODE_COVERAGE_ENABLED = 'test_session.itr.code_coverage.enabled'
+const TEST_SESSION_CODE_COVERAGE_ENABLED = 'test_session.code_coverage.enabled'
 
 const TEST_CODE_COVERAGE_LINES_TOTAL = 'test.codecov_lines_total'
 
@@ -81,7 +81,7 @@ module.exports = {
   TEST_SUITE_ID,
   TEST_ITR_TESTS_SKIPPED,
   TEST_SESSION_ITR_SKIPPING_ENABLED,
-  TEST_SESSION_ITR_CODE_COVERAGE_ENABLED,
+  TEST_SESSION_CODE_COVERAGE_ENABLED,
   TEST_CODE_COVERAGE_LINES_TOTAL,
   getCoveredFilenamesFromCoverage,
   resetCoverage,

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

@@ -26,6 +26,19 @@ function removeEmptyValues (tags) {
   }, {})
 }
 
+function filterSensitiveInfoFromRepository (repositoryUrl) {
+  try {
+    if (repositoryUrl.startsWith('git@')) {
+      return repositoryUrl
+    }
+    const { protocol, hostname, pathname } = new URL(repositoryUrl)
+
+    return `${protocol}//${hostname}${pathname}`
+  } catch (e) {
+    return repositoryUrl
+  }
+}
+
 function getUserProviderGitMetadata () {
   const {
     DD_GIT_COMMIT_SHA,
@@ -57,7 +70,7 @@ function getUserProviderGitMetadata () {
   return removeEmptyValues({
     [GIT_COMMIT_SHA]: DD_GIT_COMMIT_SHA,
     [GIT_BRANCH]: branch,
-    [GIT_REPOSITORY_URL]: DD_GIT_REPOSITORY_URL,
+    [GIT_REPOSITORY_URL]: filterSensitiveInfoFromRepository(DD_GIT_REPOSITORY_URL),
     [GIT_TAG]: tag,
     [GIT_COMMIT_MESSAGE]: DD_GIT_COMMIT_MESSAGE,
     [GIT_COMMIT_COMMITTER_NAME]: DD_GIT_COMMIT_COMMITTER_NAME,

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

@@ -109,9 +109,9 @@ class PrioritySampler {
   }
 
   _getPriorityFromTags (tags) {
-    if (tags.hasOwnProperty(MANUAL_KEEP) && tags[MANUAL_KEEP] !== false) {
+    if (hasOwn(tags, MANUAL_KEEP) && tags[MANUAL_KEEP] !== false) {
       return USER_KEEP
-    } else if (tags.hasOwnProperty(MANUAL_DROP) && tags[MANUAL_DROP] !== false) {
+    } else if (hasOwn(tags, MANUAL_DROP) && tags[MANUAL_DROP] !== false) {
       return USER_REJECT
     } else {
       const priority = parseInt(tags[SAMPLING_PRIORITY], 10)
@@ -198,4 +198,8 @@ class PrioritySampler {
   }
 }
 
+function hasOwn (object, prop) {
+  return Object.prototype.hasOwnProperty.call(object, prop)
+}
+
 module.exports = PrioritySampler

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

@@ -25,7 +25,7 @@ class Tracer extends NoopProxy {
     try {
       const config = new Config(options) // TODO: support dynamic config
 
-      if (!config.isCiVisibility) {
+      if (config.remoteConfig.enabled && !config.isCiVisibility) {
         remoteConfig.enable(config)
       }
 
@@ -49,11 +49,12 @@ class Tracer extends NoopProxy {
           require('./appsec').enable(config)
         }
 
+        this._tracer = new DatadogTracer(config)
+
         if (config.iast.enabled) {
-          require('./appsec/iast').enable(config)
+          require('./appsec/iast').enable(config, this._tracer)
         }
 
-        this._tracer = new DatadogTracer(config)
         this._pluginManager.configure(config)
         setStartupLogPluginManager(this._pluginManager)
         telemetry.start(config, this._pluginManager)

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

@@ -97,7 +97,13 @@ function Hook (modules, options, onrequire) {
       if (!hooks) return exports // abort if module name isn't on whitelist
       name = filename
     } else {
-      const stat = parse(filename)
+      const inAWSLambda = process.env.AWS_LAMBDA_FUNCTION_NAME !== undefined
+      const hasLambdaHandler = process.env.DD_LAMBDA_HANDLER !== undefined
+      const segments = filename.split(path.sep)
+      const filenameFromNodeModule = segments.lastIndexOf('node_modules') !== -1
+      // decide how to assign the stat
+      // first case will only happen when patching an AWS Lambda Handler
+      const stat = inAWSLambda && hasLambdaHandler && !filenameFromNodeModule ? { name: filename } : parse(filename)
       if (!stat) return exports // abort if filename could not be parsed
       name = stat.name
       basedir = stat.basedir

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

@@ -14,6 +14,7 @@ class SpanProcessor {
     this._exporter = exporter
     this._prioritySampler = prioritySampler
     this._config = config
+    this._killAll = false
 
     this._stats = new SpanStatsProcessor(config)
     this._spanSampler = new SpanSampler(config)
@@ -48,6 +49,18 @@ class SpanProcessor {
 
       this._erase(trace, active)
     }
+
+    if (this._killAll) {
+      started.map(startedSpan => {
+        if (!startedSpan._finished) {
+          startedSpan.finish()
+        }
+      })
+    }
+  }
+
+  killAll () {
+    this._killAll = true
   }
 
   _erase (trace, active) {

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

@@ -1,9 +1,6 @@
 'use strict'
 const { globMatch } = require('../src/util')
-const {
-  USER_KEEP,
-  AUTO_KEEP
-} = require('../../../ext').priority
+const { USER_KEEP, AUTO_KEEP } = require('../../../ext').priority
 const RateLimiter = require('./rate_limiter')
 
 class SpanSampler {