dd-trace 2.33.0 → 2.34.0

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

@@ -20,7 +20,9 @@ const {
   CI_STAGE_NAME,
   CI_ENV_VARS,
   GIT_COMMIT_COMMITTER_NAME,
-  GIT_COMMIT_COMMITTER_EMAIL
+  GIT_COMMIT_COMMITTER_EMAIL,
+  CI_NODE_LABELS,
+  CI_NODE_NAME
 } = require('./tags')
 
 // Receives a string with the form 'John Doe <john.doe@gmail.com>'
@@ -108,7 +110,9 @@ module.exports = {
         GIT_COMMIT: JENKINS_GIT_COMMIT,
         GIT_URL: JENKINS_GIT_REPOSITORY_URL,
         GIT_URL_1: JENKINS_GIT_REPOSITORY_URL_1,
-        DD_CUSTOM_TRACE_ID
+        DD_CUSTOM_TRACE_ID,
+        NODE_NAME,
+        NODE_LABELS
       } = env
 
       tags = {
@@ -119,7 +123,18 @@ module.exports = {
         [GIT_COMMIT_SHA]: JENKINS_GIT_COMMIT,
         [GIT_REPOSITORY_URL]: JENKINS_GIT_REPOSITORY_URL || JENKINS_GIT_REPOSITORY_URL_1,
         [CI_WORKSPACE_PATH]: WORKSPACE,
-        [CI_ENV_VARS]: JSON.stringify({ DD_CUSTOM_TRACE_ID })
+        [CI_ENV_VARS]: JSON.stringify({ DD_CUSTOM_TRACE_ID }),
+        [CI_NODE_NAME]: NODE_NAME
+      }
+
+      if (NODE_LABELS) {
+        let nodeLabels
+        try {
+          nodeLabels = JSON.stringify(NODE_LABELS.split(' '))
+          tags[CI_NODE_LABELS] = nodeLabels
+        } catch (e) {
+          // ignore errors
+        }
       }
 
       const isTag = JENKINS_GIT_BRANCH && JENKINS_GIT_BRANCH.includes('tags/')
@@ -159,7 +174,9 @@ module.exports = {
         CI_COMMIT_TIMESTAMP,
         CI_COMMIT_AUTHOR,
         CI_PROJECT_URL: GITLAB_PROJECT_URL,
-        CI_JOB_ID: GITLAB_CI_JOB_ID
+        CI_JOB_ID: GITLAB_CI_JOB_ID,
+        CI_RUNNER_ID,
+        CI_RUNNER_TAGS
       } = env
 
       const { name, email } = parseEmailAndName(CI_COMMIT_AUTHOR)
@@ -186,7 +203,9 @@ module.exports = {
           CI_PROJECT_URL: GITLAB_PROJECT_URL,
           CI_PIPELINE_ID: GITLAB_PIPELINE_ID,
           CI_JOB_ID: GITLAB_CI_JOB_ID
-        })
+        }),
+        [CI_NODE_LABELS]: CI_RUNNER_TAGS,
+        [CI_NODE_NAME]: CI_RUNNER_ID
       }
     }
 
@@ -448,9 +467,17 @@ module.exports = {
         BUILDKITE_BUILD_CHECKOUT_PATH,
         BUILDKITE_BUILD_AUTHOR,
         BUILDKITE_BUILD_AUTHOR_EMAIL,
-        BUILDKITE_MESSAGE
+        BUILDKITE_MESSAGE,
+        BUILDKITE_AGENT_ID
       } = env
 
+      const extraTags = Object.keys(env).filter(envVar =>
+        envVar.startsWith('BUILDKITE_AGENT_META_DATA_')
+      ).map((metadataKey) => {
+        const key = metadataKey.replace('BUILDKITE_AGENT_META_DATA_', '').toLowerCase()
+        return `${key}:${env[metadataKey]}`
+      })
+
       tags = {
         [CI_PROVIDER_NAME]: 'buildkite',
         [CI_PIPELINE_ID]: BUILDKITE_BUILD_ID,
@@ -469,7 +496,9 @@ module.exports = {
         [CI_ENV_VARS]: JSON.stringify({
           BUILDKITE_BUILD_ID,
           BUILDKITE_JOB_ID
-        })
+        }),
+        [CI_NODE_NAME]: BUILDKITE_AGENT_ID,
+        [CI_NODE_LABELS]: JSON.stringify(extraTags)
       }
     }
 
@@ -546,6 +575,32 @@ module.exports = {
       }
     }
 
+    if (env.CF_BUILD_ID) {
+      const {
+        CF_BUILD_ID,
+        CF_PIPELINE_NAME,
+        CF_BUILD_URL,
+        CF_STEP_NAME,
+        CF_BRANCH
+      } = env
+      tags = {
+        [CI_PROVIDER_NAME]: 'codefresh',
+        [CI_PIPELINE_ID]: CF_BUILD_ID,
+        [CI_PIPELINE_NAME]: CF_PIPELINE_NAME,
+        [CI_PIPELINE_URL]: CF_BUILD_URL,
+        [CI_JOB_NAME]: CF_STEP_NAME,
+        [CI_ENV_VARS]: JSON.stringify({
+          CF_BUILD_ID
+        })
+      }
+
+      const isTag = CF_BRANCH && CF_BRANCH.includes('tags/')
+      const refKey = isTag ? GIT_TAG : GIT_BRANCH
+      const ref = normalizeRef(CF_BRANCH)
+
+      tags[refKey] = ref
+    }
+
     normalizeTag(tags, CI_WORKSPACE_PATH, resolveTilde)
     normalizeTag(tags, GIT_REPOSITORY_URL, filterSensitiveInfoFromRepository)
     normalizeTag(tags, GIT_BRANCH, normalizeRef)

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

@@ -19,6 +19,8 @@ const CI_WORKSPACE_PATH = 'ci.workspace_path'
 const CI_JOB_URL = 'ci.job.url'
 const CI_JOB_NAME = 'ci.job.name'
 const CI_STAGE_NAME = 'ci.stage.name'
+const CI_NODE_NAME = 'ci.node.name'
+const CI_NODE_LABELS = 'ci.node.labels'
 
 const CI_ENV_VARS = '_dd.ci.env_vars'
 
@@ -43,5 +45,7 @@ module.exports = {
   CI_JOB_URL,
   CI_JOB_NAME,
   CI_STAGE_NAME,
-  CI_ENV_VARS
+  CI_ENV_VARS,
+  CI_NODE_NAME,
+  CI_NODE_LABELS
 }

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

@@ -9,7 +9,6 @@ const snapshotKinds = Object.freeze({
 const oomExportStrategies = Object.freeze({
   PROCESS: 'process',
   ASYNC_CALLBACK: 'async',
-  INTERRUPT_CALLBACK: 'interrupt',
   LOGS: 'logs'
 })
 

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

@@ -3,9 +3,7 @@
 const { oomExportStrategies } = require('../constants')
 
 function strategiesToCallbackMode (strategies, callbackMode) {
-  const hasInterrupt = strategies.includes(oomExportStrategies.INTERRUPT_CALLBACK) ? callbackMode.Interrupt : 0
-  const hasCallback = strategies.includes(oomExportStrategies.ASYNC_CALLBACK) ? callbackMode.Async : 0
-  return hasInterrupt | hasCallback
+  return strategies.includes(oomExportStrategies.ASYNC_CALLBACK) ? callbackMode.Async : 0
 }
 
 class NativeSpaceProfiler {

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

@@ -30,6 +30,10 @@ class Tracer extends NoopProxy {
         remoteConfig.enable(config)
       }
 
+      if (config.isGCPFunction) {
+        require('./serverless').maybeStartServerlessMiniAgent()
+      }
+
       if (config.profiling.enabled) {
         // do not stop tracer initialization if the profiler fails to be imported
         try {

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

@@ -0,0 +1,25 @@
+'use strict'
+
+function maybeStartServerlessMiniAgent () {
+  let rustBinaryPath =
+    '/workspace/node_modules/@datadog/sma/datadog-serverless-agent-linux-amd64/datadog-serverless-trace-mini-agent'
+  if (process.env.DD_MINI_AGENT_PATH !== undefined) {
+    rustBinaryPath = process.env.DD_MINI_AGENT_PATH
+  }
+  const log = require('./log')
+  const fs = require('fs')
+
+  // trying to spawn with an invalid path will return a non-descriptive error, so we want to catch
+  // invalid paths and log our own error.
+  if (!fs.existsSync(rustBinaryPath)) {
+    log.error('Serverless Mini Agent did not start. Could not find mini agent binary.')
+    return
+  }
+  try {
+    require('child_process').spawn(rustBinaryPath, { stdio: 'inherit' })
+  } catch (err) {
+    log.error(`Error spawning mini agent process: ${err}`)
+  }
+}
+
+module.exports = { maybeStartServerlessMiniAgent }

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

@@ -3,6 +3,7 @@
 const log = require('./log')
 const format = require('./format')
 const SpanSampler = require('./span_sampler')
+const GitMetadataTagger = require('./git_metadata_tagger')
 
 const { SpanStatsProcessor } = require('./span_stats')
 
@@ -18,6 +19,7 @@ class SpanProcessor {
 
     this._stats = new SpanStatsProcessor(config)
     this._spanSampler = new SpanSampler(config.sampler)
+    this._gitMetadataTagger = new GitMetadataTagger(config)
   }
 
   process (span) {
@@ -32,6 +34,7 @@ class SpanProcessor {
     if (started.length === finished.length || finished.length >= flushMinSpans) {
       this._prioritySampler.sample(spanContext)
       this._spanSampler.sample(spanContext)
+      this._gitMetadataTagger.tagGitMetadata(spanContext)
 
       for (const span of started) {
         if (span._duration !== undefined) {

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

@@ -7,6 +7,7 @@ const { storage } = require('../../datadog-core')
 const { isError } = require('./util')
 const { setStartupLogConfig } = require('./startup-log')
 const { ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK } = require('../../dd-trace/src/constants')
+const { MAJOR } = require('../../../version')
 
 const SPAN_TYPE = tags.SPAN_TYPE
 const RESOURCE_NAME = tags.RESOURCE_NAME
@@ -26,7 +27,7 @@ class DatadogTracer extends Tracer {
       childOf: this.scope().active()
     }, options)
 
-    if (!options.childOf && options.orphanable === false) {
+    if (!options.childOf && options.orphanable === false && MAJOR < 4) {
       return fn(null, () => {})
     }
 
@@ -81,7 +82,7 @@ class DatadogTracer extends Tracer {
         optionsObj = optionsObj.apply(this, arguments)
       }
 
-      if (optionsObj && optionsObj.orphanable === false && !tracer.scope().active()) {
+      if (optionsObj && optionsObj.orphanable === false && !tracer.scope().active() && MAJOR < 4) {
         return fn.apply(this, arguments)
       }
 

package/version.js

@@ -0,0 +1,9 @@
+'use strict'
+
+const matches = require('./package.json').version.match(/^(\d+)\.(\d+)\.(\d+)/)
+
+module.exports = {
+  MAJOR: parseInt(matches[1]),
+  MINOR: parseInt(matches[2]),
+  PATCH: parseInt(matches[3])
+}