dd-trace 2.12.2 → 2.15.0

package/packages/dd-trace/src/opentracing/propagation/text_map.js

@@ -11,6 +11,7 @@ const traceKey = 'x-datadog-trace-id'
 const spanKey = 'x-datadog-parent-id'
 const originKey = 'x-datadog-origin'
 const samplingKey = 'x-datadog-sampling-priority'
+const tagsKey = 'x-datadog-tags'
 const baggagePrefix = 'ot-baggage-'
 const b3TraceKey = 'x-b3-traceid'
 const b3TraceExpr = /^([0-9a-f]{16}){1,2}$/i
@@ -23,6 +24,8 @@ const b3HeaderKey = 'b3'
 const sqsdHeaderHey = 'x-aws-sqsd-attr-_datadog'
 const b3HeaderExpr = /^(([0-9a-f]{16}){1,2}-[0-9a-f]{16}(-[01d](-[0-9a-f]{16})?)?|[01d])$/i
 const baggageExpr = new RegExp(`^${baggagePrefix}(.+)$`)
+const tagKeyExpr = /^_dd\.p\.[\x21-\x2b\x2d-\x7e]+$/ // ASCII minus spaces and commas
+const tagValueExpr = /^[\x20-\x2b\x2d-\x7e]*$/ // ASCII minus commas
 const ddKeys = [traceKey, spanKey, samplingKey, originKey]
 const b3Keys = [b3TraceKey, b3SpanKey, b3ParentKey, b3SampledKey, b3FlagsKey, b3HeaderKey]
 const logKeys = ddKeys.concat(b3Keys)
@@ -43,6 +46,7 @@ class TextMapPropagator {
     this._injectBaggageItems(spanContext, carrier)
     this._injectB3(spanContext, carrier)
     this._injectTraceparent(spanContext, carrier)
+    this._injectTags(spanContext, carrier)
 
     log.debug(() => `Inject into carrier: ${JSON.stringify(pick(carrier, logKeys))}.`)
   }
@@ -79,11 +83,40 @@ class TextMapPropagator {
     })
   }
 
+  _injectTags (spanContext, carrier) {
+    const trace = spanContext._trace
+
+    if (this._config.tagsHeaderMaxLength === 0) {
+      log.debug('Trace tag propagation is disabled, skipping injection.')
+      return
+    }
+
+    const tags = []
+
+    for (const key in trace.tags) {
+      if (!trace.tags[key] || !key.startsWith('_dd.p.')) continue
+      if (!this._validateTagKey(key) || !this._validateTagValue(trace.tags[key])) {
+        log.error('Trace tags from span are invalid, skipping injection.')
+        return
+      }
+
+      tags.push(`${key}=${trace.tags[key]}`)
+    }
+
+    const header = tags.join(',')
+
+    if (header.length > this._config.tagsHeaderMaxLength) {
+      log.error('Trace tags from span are too large, skipping injection.')
+    } else if (header) {
+      carrier[tagsKey] = header
+    }
+  }
+
   _injectB3 (spanContext, carrier) {
     if (!this._config.experimental.b3) return
 
-    carrier[b3TraceKey] = spanContext._traceId.toString('hex')
-    carrier[b3SpanKey] = spanContext._spanId.toString('hex')
+    carrier[b3TraceKey] = spanContext._traceId.toString(16)
+    carrier[b3SpanKey] = spanContext._spanId.toString(16)
     carrier[b3SampledKey] = spanContext._sampling.priority >= AUTO_KEEP ? '1' : '0'
 
     if (spanContext._sampling.priority > AUTO_KEEP) {
@@ -91,7 +124,7 @@ class TextMapPropagator {
     }
 
     if (spanContext._parentId) {
-      carrier[b3ParentKey] = spanContext._parentId.toString('hex')
+      carrier[b3ParentKey] = spanContext._parentId.toString(16)
     }
   }
 
@@ -99,8 +132,8 @@ class TextMapPropagator {
     if (!this._config.experimental.traceparent) return
 
     const sampling = spanContext._sampling.priority >= AUTO_KEEP ? '01' : '00'
-    const traceId = spanContext._traceId.toString('hex').padStart(32, '0')
-    const spanId = spanContext._spanId.toString('hex').padStart(16, '0')
+    const traceId = spanContext._traceId.toString(16).padStart(32, '0')
+    const spanId = spanContext._spanId.toString(16).padStart(16, '0')
     carrier[traceparentKey] = `01-${traceId}-${spanId}-${sampling}`
   }
 
@@ -118,6 +151,7 @@ class TextMapPropagator {
       this._extractOrigin(carrier, spanContext)
       this._extractBaggageItems(carrier, spanContext)
       this._extractSamplingPriority(carrier, spanContext)
+      this._extractTags(carrier, spanContext)
     }
 
     return spanContext
@@ -129,7 +163,7 @@ class TextMapPropagator {
     const b3 = this._extractB3Headers(carrier)
     const debug = b3[b3FlagsKey] === '1'
     const priority = this._getPriority(b3[b3SampledKey], debug)
-    const spanContext = this._extractGenericContext(b3, b3TraceKey, b3SpanKey)
+    const spanContext = this._extractGenericContext(b3, b3TraceKey, b3SpanKey, 16)
 
     if (priority !== undefined) {
       if (!spanContext) {
@@ -273,6 +307,43 @@ class TextMapPropagator {
     }
   }
 
+  _extractTags (carrier, spanContext) {
+    if (!carrier[tagsKey]) return
+
+    const trace = spanContext._trace
+
+    if (this._config.tagsHeaderMaxLength === 0) {
+      log.debug('Trace tag propagation is disabled, skipping extraction.')
+    } else if (carrier[tagsKey].length > this._config.tagsHeaderMaxLength) {
+      log.error('Trace tags from carrier are too large, skipping extraction.')
+    } else {
+      const pairs = carrier[tagsKey].split(',')
+      const tags = {}
+
+      for (const pair of pairs) {
+        const [key, ...rest] = pair.split('=')
+        const value = rest.join('=')
+
+        if (!this._validateTagKey(key) || !this._validateTagValue(value)) {
+          log.error('Trace tags from carrier are invalid, skipping extraction.')
+          return
+        }
+
+        tags[key] = value
+      }
+
+      Object.assign(trace.tags, tags)
+    }
+  }
+
+  _validateTagKey (key) {
+    return tagKeyExpr.test(key)
+  }
+
+  _validateTagValue (value) {
+    return tagValueExpr.test(value)
+  }
+
   _getPriority (sampled, debug) {
     if (debug) {
       return USER_KEEP

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

@@ -28,7 +28,7 @@ class DatadogTracer {
     this._tags = config.tags
     this._logInjection = config.logInjection
     this._debug = config.debug
-    this._prioritySampler = new PrioritySampler(config.env, config.experimental.sampler)
+    this._prioritySampler = new PrioritySampler(config.env, config.sampler)
     this._exporter = new Exporter(config, this._prioritySampler)
     this._processor = new SpanProcessor(this._exporter, this._prioritySampler, config)
     this._url = this._exporter._url

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

@@ -1,112 +1,154 @@
 'use strict'
 
-const { isTrue } = require('./util')
+const { channel } = require('diagnostics_channel')
+const { isFalse } = require('./util')
 const plugins = require('./plugins')
 const log = require('./log')
 
+const loadChannel = channel('dd-trace:instrumentation:load')
+
 // instrument everything that needs Plugin System V2 instrumentation
 require('../../datadog-instrumentations')
 
-// TODO this is shared w/ instrumenter. DRY up.
-function getConfig (name, config = {}) {
-  const enabled = process.env[`DD_TRACE_${name.toUpperCase()}_ENABLED`.replace(/[^a-z0-9_]/ig, '_')]
-  if (enabled !== undefined) {
-    config.enabled = isTrue(enabled)
-  }
+const { DD_TRACE_DISABLED_PLUGINS } = process.env
 
-  // TODO is this the best/correct place for this default?
-  if (!('enabled' in config)) {
-    config.enabled = true
-  }
+const disabledPlugins = new Set(
+  DD_TRACE_DISABLED_PLUGINS && DD_TRACE_DISABLED_PLUGINS.split(',').map(plugin => plugin.trim())
+)
 
-  return config
-}
+// TODO actually ... should we be looking at envrionment variables this deep down in the code?
 
-// TODO: maybe needs to DRY up as well, but depending on how the remaining old plugins
-// are migrated to the new system, can stay here for now, since this is the level
-// this check maybe should be happening on, even if it deals with env variabls
-const disabledPlugins = process.env.DD_TRACE_DISABLED_PLUGINS
+const pluginClasses = {}
 
-const collectDisabledPlugins = () => {
-  return new Set(disabledPlugins && disabledPlugins.split(',').map(plugin => plugin.trim()))
-}
+loadChannel.subscribe(({ name }) => {
+  const Plugin = plugins[name]
 
-// TODO actually ... should we be looking at envrionment variables this deep down in the code?
+  if (!Plugin || typeof Plugin !== 'function') return
+  if (!pluginClasses[Plugin.name]) {
+    const envName = `DD_TRACE_${Plugin.name.toUpperCase()}_ENABLED`
+    const enabled = process.env[envName.replace(/[^a-z0-9_]/ig, '_')]
+
+    // TODO: remove the need to load the plugin class in order to disable the plugin
+    if (isFalse(enabled) || disabledPlugins.has(Plugin.name)) {
+      log.debug(`Plugin "${Plugin.name}" was disabled via configuration option.`)
+
+      pluginClasses[Plugin.name] = null
+    } else {
+      pluginClasses[Plugin.name] = Plugin
+    }
+  }
+})
 
 // TODO this must always be a singleton.
 module.exports = class PluginManager {
   constructor (tracer) {
     this._tracer = tracer
+    this._tracerConfig = null
     this._pluginsByName = {}
     this._configsByName = {}
-    this._disabledPlugins = collectDisabledPlugins()
+
+    this._loadedSubscriber = ({ name }) => {
+      const Plugin = plugins[name]
+
+      if (!Plugin || typeof Plugin !== 'function') return
+
+      this.loadPlugin(Plugin.name)
+    }
+
+    loadChannel.subscribe(this._loadedSubscriber)
   }
 
-  // like instrumenter.use()
-  configurePlugin (name, pluginConfig) {
-    if (typeof pluginConfig === 'boolean') {
-      pluginConfig = { enabled: pluginConfig }
+  loadPlugin (name) {
+    const Plugin = pluginClasses[name]
+
+    if (!Plugin) return
+    if (!this._pluginsByName[name]) {
+      this._pluginsByName[name] = new Plugin(this._tracer)
     }
-    if (!pluginConfig) {
-      pluginConfig = { enabled: true }
+    if (!this._tracerConfig) return // TODO: don't wait for tracer to be initialized
+
+    const pluginConfig = this._configsByName[name] || {
+      enabled: this._tracerConfig.plugins !== false
     }
 
-    this._configsByName[name] = {
-      ...this._configsByName[name],
+    this._pluginsByName[name].configure({
+      ...this._getSharedConfig(name),
       ...pluginConfig
-    }
+    })
+  }
+
+  // TODO: merge config instead of replacing
+  configurePlugin (name, pluginConfig) {
+    const enabled = this._isEnabled(pluginConfig)
 
-    if (this._pluginsByName[name]) {
-      this._pluginsByName[name].configure(getConfig(name, this._configsByName[name]))
+    this._configsByName[name] = {
+      ...pluginConfig,
+      enabled
     }
+
+    this.loadPlugin(name)
   }
 
   // like instrumenter.enable()
   configure (config = {}) {
-    const { logInjection, serviceMapping, experimental } = config
-
-    for (const PluginClass of Object.values(plugins)) {
-      const name = PluginClass.name
+    this._tracerConfig = config
 
-      if (this._disabledPlugins.has(name)) {
-        log.debug(`Plugin "${name}" was disabled via configuration option.`)
-        continue
-      }
+    for (const name in pluginClasses) {
+      this.loadPlugin(name)
+    }
+  }
 
-      if (typeof PluginClass !== 'function') continue
+  // This is basically just for testing. like intrumenter.disable()
+  destroy () {
+    for (const name in this._pluginsByName) {
+      this._pluginsByName[name].configure({ enabled: false })
+    }
 
-      this._pluginsByName[name] = new PluginClass(this._tracer)
+    loadChannel.unsubscribe(this._loadedSubscriber)
+  }
 
-      if (config.plugins === false) continue
+  _isEnabled (pluginConfig) {
+    if (typeof pluginConfig === 'boolean') return pluginConfig
+    if (!pluginConfig) return true
 
-      const pluginConfig = {
-        ...this._configsByName[name]
-      }
+    return pluginConfig.enabled !== false
+  }
 
-      if (logInjection !== undefined) {
-        pluginConfig.logInjection = logInjection
-      }
+  // TODO: figure out a better way to handle this
+  _getSharedConfig (name) {
+    const {
+      logInjection,
+      serviceMapping,
+      clientIpHeaderDisabled,
+      clientIpHeader,
+      isIntelligentTestRunnerEnabled,
+      experimental
+    } = this._tracerConfig
+
+    const sharedConfig = {}
+
+    if (logInjection !== undefined) {
+      sharedConfig.logInjection = logInjection
+    }
 
-      // TODO: update so that it's available for every CI Visibility's plugin
-      if (name === 'mocha') {
-        pluginConfig.isAgentlessEnabled = experimental && experimental.exporter === 'datadog'
-      }
+    if (clientIpHeaderDisabled !== undefined) {
+      sharedConfig.clientIpHeaderDisabled = clientIpHeaderDisabled
+    }
 
-      if (serviceMapping && serviceMapping[name]) {
-        pluginConfig.service = serviceMapping[name]
-      }
+    if (clientIpHeader !== undefined) {
+      sharedConfig.clientIpHeader = clientIpHeader
+    }
 
-      this.configurePlugin(name, pluginConfig)
+    if (experimental) {
+      sharedConfig.isAgentlessEnabled = experimental.exporter === 'datadog'
     }
-  }
 
-  // This is basically just for testing. like intrumenter.disable()
-  destroy () {
-    for (const name in this._pluginsByName) {
-      this._pluginsByName[name].configure({ enabled: false })
+    sharedConfig.isIntelligentTestRunnerEnabled = isIntelligentTestRunnerEnabled
+
+    if (serviceMapping && serviceMapping[name]) {
+      sharedConfig.service = serviceMapping[name]
     }
 
-    this._pluginsByName = {}
-    this._configsByName = {}
+    return sharedConfig
   }
 }

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

@@ -1,49 +1,62 @@
 'use strict'
 
 module.exports = {
-  'amqp10': require('../../../datadog-plugin-amqp10/src'),
-  'amqplib': require('../../../datadog-plugin-amqplib/src'),
-  'aws-sdk': require('../../../datadog-plugin-aws-sdk/src'),
-  'bunyan': require('../../../datadog-plugin-bunyan/src'),
-  'cassandra-driver': require('../../../datadog-plugin-cassandra-driver/src'),
-  'connect': require('../../../datadog-plugin-connect/src'),
-  'couchbase': require('../../../datadog-plugin-couchbase/src'),
-  'cucumber': require('../../../datadog-plugin-cucumber/src'),
-  'cypress': require('../../../datadog-plugin-cypress/src'),
-  'dns': require('../../../datadog-plugin-dns/src'),
-  'elasticsearch': require('../../../datadog-plugin-elasticsearch/src'),
-  'express': require('../../../datadog-plugin-express/src'),
-  'fastify': require('../../../datadog-plugin-fastify/src'),
-  'find-my-way': require('../../../datadog-plugin-find-my-way/src'),
-  'fs': require('../../../datadog-plugin-fs/src'),
-  'google-cloud-pubsub': require('../../../datadog-plugin-google-cloud-pubsub/src'),
-  'graphql': require('../../../datadog-plugin-graphql/src'),
-  'grpc': require('../../../datadog-plugin-grpc/src'),
-  'hapi': require('../../../datadog-plugin-hapi/src'),
-  'http': require('../../../datadog-plugin-http/src'),
-  'http2': require('../../../datadog-plugin-http2/src'),
-  'ioredis': require('../../../datadog-plugin-ioredis/src'),
-  'jest': require('../../../datadog-plugin-jest/src'),
-  'koa': require('../../../datadog-plugin-koa/src'),
-  'kafkajs': require('../../../datadog-plugin-kafkajs/src'),
-  'memcached': require('../../../datadog-plugin-memcached/src'),
-  'microgateway-core': require('../../../datadog-plugin-microgateway-core/src'),
-  'mocha': require('../../../datadog-plugin-mocha/src'),
-  'moleculer': require('../../../datadog-plugin-moleculer/src'),
-  'mongodb-core': require('../../../datadog-plugin-mongodb-core/src'),
-  'mysql': require('../../../datadog-plugin-mysql/src'),
-  'mysql2': require('../../../datadog-plugin-mysql2/src'),
-  'net': require('../../../datadog-plugin-net/src'),
-  'next': require('../../../datadog-plugin-next/src'),
-  'oracledb': require('../../../datadog-plugin-oracledb/src'),
-  'paperplane': require('../../../datadog-plugin-paperplane/src'),
-  'pg': require('../../../datadog-plugin-pg/src'),
-  'pino': require('../../../datadog-plugin-pino/src'),
-  'redis': require('../../../datadog-plugin-redis/src'),
-  'restify': require('../../../datadog-plugin-restify/src'),
-  'rhea': require('../../../datadog-plugin-rhea/src'),
-  'router': require('../../../datadog-plugin-router/src'),
-  'sharedb': require('../../../datadog-plugin-sharedb/src'),
-  'tedious': require('../../../datadog-plugin-tedious/src'),
-  'winston': require('../../../datadog-plugin-winston/src')
+  get '@cucumber/cucumber' () { return require('../../../datadog-plugin-cucumber/src') },
+  get '@elastic/elasticsearch' () { return require('../../../datadog-plugin-elasticsearch/src') },
+  get '@elastic/transport' () { return require('../../../datadog-plugin-elasticsearch/src') },
+  get '@google-cloud/pubsub' () { return require('../../../datadog-plugin-google-cloud-pubsub/src') },
+  get '@grpc/grpc-js' () { return require('../../../datadog-plugin-grpc/src') },
+  get '@hapi/hapi' () { return require('../../../datadog-plugin-hapi/src') },
+  get '@koa/router' () { return require('../../../datadog-plugin-koa/src') },
+  get '@node-redis/client' () { return require('../../../datadog-plugin-redis/src') },
+  get 'amqp10' () { return require('../../../datadog-plugin-amqp10/src') },
+  get 'amqplib' () { return require('../../../datadog-plugin-amqplib/src') },
+  get 'aws-sdk' () { return require('../../../datadog-plugin-aws-sdk/src') },
+  get 'bunyan' () { return require('../../../datadog-plugin-bunyan/src') },
+  get 'cassandra-driver' () { return require('../../../datadog-plugin-cassandra-driver/src') },
+  get 'connect' () { return require('../../../datadog-plugin-connect/src') },
+  get 'couchbase' () { return require('../../../datadog-plugin-couchbase/src') },
+  get 'cypress' () { return require('../../../datadog-plugin-cypress/src') },
+  get 'dns' () { return require('../../../datadog-plugin-dns/src') },
+  get 'elasticsearch' () { return require('../../../datadog-plugin-elasticsearch/src') },
+  get 'express' () { return require('../../../datadog-plugin-express/src') },
+  get 'fastify' () { return require('../../../datadog-plugin-fastify/src') },
+  get 'find-my-way' () { return require('../../../datadog-plugin-find-my-way/src') },
+  get 'fs' () { return require('../../../datadog-plugin-fs/src') },
+  get 'graphql' () { return require('../../../datadog-plugin-graphql/src') },
+  get 'grpc' () { return require('../../../datadog-plugin-grpc/src') },
+  get 'hapi' () { return require('../../../datadog-plugin-hapi/src') },
+  get 'http' () { return require('../../../datadog-plugin-http/src') },
+  get 'http2' () { return require('../../../datadog-plugin-http2/src') },
+  get 'https' () { return require('../../../datadog-plugin-http/src') },
+  get 'ioredis' () { return require('../../../datadog-plugin-ioredis/src') },
+  get 'jest-environment-node' () { return require('../../../datadog-plugin-jest/src') },
+  get 'jest-environment-jsdom' () { return require('../../../datadog-plugin-jest/src') },
+  get 'jest-jasmine2' () { return require('../../../datadog-plugin-jest/src') },
+  get 'koa' () { return require('../../../datadog-plugin-koa/src') },
+  get 'koa-router' () { return require('../../../datadog-plugin-koa/src') },
+  get 'kafkajs' () { return require('../../../datadog-plugin-kafkajs/src') },
+  get 'memcached' () { return require('../../../datadog-plugin-memcached/src') },
+  get 'microgateway-core' () { return require('../../../datadog-plugin-microgateway-core/src') },
+  get 'mocha' () { return require('../../../datadog-plugin-mocha/src') },
+  get 'mocha-each' () { return require('../../../datadog-plugin-mocha/src') },
+  get 'moleculer' () { return require('../../../datadog-plugin-moleculer/src') },
+  get 'mongodb' () { return require('../../../datadog-plugin-mongodb-core/src') },
+  get 'mongodb-core' () { return require('../../../datadog-plugin-mongodb-core/src') },
+  get 'mysql' () { return require('../../../datadog-plugin-mysql/src') },
+  get 'mysql2' () { return require('../../../datadog-plugin-mysql2/src') },
+  get 'net' () { return require('../../../datadog-plugin-net/src') },
+  get 'next' () { return require('../../../datadog-plugin-next/src') },
+  get 'oracledb' () { return require('../../../datadog-plugin-oracledb/src') },
+  get 'paperplane' () { return require('../../../datadog-plugin-paperplane/src') },
+  get 'pg' () { return require('../../../datadog-plugin-pg/src') },
+  get 'pino' () { return require('../../../datadog-plugin-pino/src') },
+  get 'pino-pretty' () { return require('../../../datadog-plugin-pino/src') },
+  get 'redis' () { return require('../../../datadog-plugin-redis/src') },
+  get 'restify' () { return require('../../../datadog-plugin-restify/src') },
+  get 'rhea' () { return require('../../../datadog-plugin-rhea/src') },
+  get 'router' () { return require('../../../datadog-plugin-router/src') },
+  get 'sharedb' () { return require('../../../datadog-plugin-sharedb/src') },
+  get 'tedious' () { return require('../../../datadog-plugin-tedious/src') },
+  get 'winston' () { return require('../../../datadog-plugin-winston/src') }
 }

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

@@ -9,25 +9,32 @@ const hasOwn = (obj, prop) => Object.prototype.hasOwnProperty.call(obj, prop)
 function messageProxy (message, holder) {
   return new Proxy(message, {
     get (target, p, receiver) {
-      switch (p) {
-        case Symbol.toStringTag:
-          return Object.prototype.toString.call(target).slice(8, -1)
-        case 'dd':
-          return holder.dd
-        default:
-          return Reflect.get(target, p, receiver)
+      if (p === Symbol.toStringTag) {
+        return Object.prototype.toString.call(target).slice(8, -1)
       }
+
+      if (shouldOverride(target, p)) {
+        return holder.dd
+      }
+
+      return Reflect.get(target, p, receiver)
     },
     ownKeys (target) {
       const ownKeys = Reflect.ownKeys(target)
-      return hasOwn(target, 'dd') ? ownKeys : ['dd', ...ownKeys]
+      return hasOwn(target, 'dd') || !Reflect.isExtensible(target)
+        ? ownKeys
+        : ['dd', ...ownKeys]
     },
     getOwnPropertyDescriptor (target, p) {
-      return Reflect.getOwnPropertyDescriptor(p === 'dd' ? holder : target, p)
+      return Reflect.getOwnPropertyDescriptor(shouldOverride(target, p) ? holder : target, p)
     }
   })
 }
 
+function shouldOverride (target, p) {
+  return p === 'dd' && !Reflect.has(target, p) && Reflect.isExtensible(target)
+}
+
 module.exports = class LogPlugin extends Plugin {
   constructor (...args) {
     super(...args)

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

@@ -17,7 +17,8 @@ const {
   CI_WORKSPACE_PATH,
   CI_JOB_URL,
   CI_JOB_NAME,
-  CI_STAGE_NAME
+  CI_STAGE_NAME,
+  CI_ENV_VARS
 } = require('./tags')
 
 // Receives a string with the form 'John Doe <john.doe@gmail.com>'
@@ -104,7 +105,8 @@ module.exports = {
         GIT_BRANCH: JENKINS_GIT_BRANCH,
         GIT_COMMIT: JENKINS_GIT_COMMIT,
         GIT_URL: JENKINS_GIT_REPOSITORY_URL,
-        GIT_URL_1: JENKINS_GIT_REPOSITORY_URL_1
+        GIT_URL_1: JENKINS_GIT_REPOSITORY_URL_1,
+        DD_CUSTOM_TRACE_ID
       } = env
 
       tags = {
@@ -114,7 +116,8 @@ module.exports = {
         [CI_PROVIDER_NAME]: 'jenkins',
         [GIT_COMMIT_SHA]: JENKINS_GIT_COMMIT,
         [GIT_REPOSITORY_URL]: JENKINS_GIT_REPOSITORY_URL || JENKINS_GIT_REPOSITORY_URL_1,
-        [CI_WORKSPACE_PATH]: WORKSPACE
+        [CI_WORKSPACE_PATH]: WORKSPACE,
+        [CI_ENV_VARS]: JSON.stringify({ DD_CUSTOM_TRACE_ID })
       }
 
       const isTag = JENKINS_GIT_BRANCH && JENKINS_GIT_BRANCH.includes('tags')
@@ -152,7 +155,9 @@ module.exports = {
         CI_JOB_NAME: GITLAB_CI_JOB_NAME,
         CI_COMMIT_MESSAGE,
         CI_COMMIT_TIMESTAMP,
-        CI_COMMIT_AUTHOR
+        CI_COMMIT_AUTHOR,
+        CI_PROJECT_URL: GITLAB_PROJECT_URL,
+        CI_JOB_ID: GITLAB_CI_JOB_ID
       } = env
 
       const { name, email } = parseEmailAndName(CI_COMMIT_AUTHOR)
@@ -174,7 +179,12 @@ module.exports = {
         [GIT_COMMIT_MESSAGE]: CI_COMMIT_MESSAGE,
         [GIT_COMMIT_AUTHOR_NAME]: name,
         [GIT_COMMIT_AUTHOR_EMAIL]: email,
-        [GIT_COMMIT_AUTHOR_DATE]: CI_COMMIT_TIMESTAMP
+        [GIT_COMMIT_AUTHOR_DATE]: CI_COMMIT_TIMESTAMP,
+        [CI_ENV_VARS]: JSON.stringify({
+          CI_PROJECT_URL: GITLAB_PROJECT_URL,
+          CI_PIPELINE_ID: GITLAB_PIPELINE_ID,
+          CI_JOB_ID: GITLAB_CI_JOB_ID
+        })
       }
     }
 
@@ -188,7 +198,8 @@ module.exports = {
         CIRCLE_TAG,
         CIRCLE_SHA1,
         CIRCLE_REPOSITORY_URL,
-        CIRCLE_JOB
+        CIRCLE_JOB,
+        CIRCLE_BUILD_NUM
       } = env
 
       const pipelineUrl = `https://app.circleci.com/pipelines/workflows/${CIRCLE_WORKFLOW_ID}`
@@ -203,7 +214,11 @@ module.exports = {
         [GIT_REPOSITORY_URL]: CIRCLE_REPOSITORY_URL,
         [CI_JOB_URL]: CIRCLE_BUILD_URL,
         [CI_WORKSPACE_PATH]: CIRCLE_WORKING_DIRECTORY,
-        [CIRCLE_TAG ? GIT_TAG : GIT_BRANCH]: CIRCLE_TAG || CIRCLE_BRANCH
+        [CIRCLE_TAG ? GIT_TAG : GIT_BRANCH]: CIRCLE_TAG || CIRCLE_BRANCH,
+        [CI_ENV_VARS]: JSON.stringify({
+          CIRCLE_WORKFLOW_ID,
+          CIRCLE_BUILD_NUM
+        })
       }
     }
 
@@ -243,7 +258,13 @@ module.exports = {
         [GIT_REPOSITORY_URL]: repositoryURL,
         [CI_JOB_URL]: jobUrl,
         [CI_WORKSPACE_PATH]: GITHUB_WORKSPACE,
-        [refKey]: ref
+        [refKey]: ref,
+        [CI_ENV_VARS]: JSON.stringify({
+          GITHUB_SERVER_URL,
+          GITHUB_REPOSITORY,
+          GITHUB_RUN_ID,
+          GITHUB_RUN_ATTEMPT
+        })
       }
     }
 
@@ -443,7 +464,11 @@ module.exports = {
         [refKey]: ref,
         [GIT_COMMIT_AUTHOR_NAME]: BUILDKITE_BUILD_AUTHOR,
         [GIT_COMMIT_AUTHOR_EMAIL]: BUILDKITE_BUILD_AUTHOR_EMAIL,
-        [GIT_COMMIT_MESSAGE]: BUILDKITE_MESSAGE
+        [GIT_COMMIT_MESSAGE]: BUILDKITE_MESSAGE,
+        [CI_ENV_VARS]: JSON.stringify({
+          BUILDKITE_BUILD_ID,
+          BUILDKITE_JOB_ID
+        })
       }
     }