dd-trace 5.59.0 → 5.61.0

package/packages/dd-trace/src/appsec/reporter.js

@@ -3,7 +3,6 @@
 const dc = require('dc-polyfill')
 const zlib = require('zlib')
 
-const Limiter = require('../rate_limiter')
 const { storage } = require('../../../datadog-core')
 const web = require('../plugins/util/web')
 const { ipHeaderList } = require('../plugins/util/ip_extractor')
@@ -15,7 +14,6 @@ const {
   updateWafRequestsMetricTags,
   updateRaspRequestsMetricTags,
   updateRaspRuleSkippedMetricTags,
-  updateRateLimitedMetric,
   getRequestMetrics
 } = require('./telemetry')
 const { keepTrace } = require('../priority_sampler')
@@ -31,9 +29,6 @@ const COLLECTED_REQUEST_BODY_MAX_ELEMENTS_PER_NODE = 256
 
 const telemetryLogCh = dc.channel('datadog:telemetry:log')
 
-// default limiter, configurable with setRateLimit()
-let limiter = new Limiter(100)
-
 const config = {
   headersExtendedCollectionEnabled: false,
   maxHeadersCollected: 0,
@@ -91,7 +86,6 @@ const NON_EXTENDED_REQUEST_HEADERS = new Set([...requestHeadersList, ...eventHea
 const NON_EXTENDED_RESPONSE_HEADERS = new Set(contentHeaderList)
 
 function init (_config) {
-  limiter = new Limiter(_config.rateLimit)
   config.headersExtendedCollectionEnabled = _config.extendedHeadersCollection.enabled
   config.maxHeadersCollected = _config.extendedHeadersCollection.maxHeaders
   config.headersRedaction = _config.extendedHeadersCollection.redaction
@@ -325,12 +319,6 @@ function reportAttack (attackData) {
     'appsec.event': 'true'
   }
 
-  if (limiter.isAllowed()) {
-    keepTrace(rootSpan, ASM)
-  } else {
-    updateRateLimitedMetric(req)
-  }
-
   // TODO: maybe add this to format.js later (to take decision as late as possible)
   if (!currentTags['_dd.origin']) {
     newTags['_dd.origin'] = 'appsec'
@@ -430,8 +418,8 @@ function isRaspAttack (events) {
   return events.some(e => e.rule?.tags?.module === 'rasp')
 }
 
-function isFingerprintAttribute (attribute) {
-  return attribute.startsWith('_dd.appsec.fp')
+function isSchemaAttribute (attribute) {
+  return attribute.startsWith('_dd.appsec.s.')
 }
 
 function reportAttributes (attributes) {
@@ -444,7 +432,7 @@ function reportAttributes (attributes) {
 
   const tags = {}
   for (let [tag, value] of Object.entries(attributes)) {
-    if (!isFingerprintAttribute(tag)) {
+    if (isSchemaAttribute(tag)) {
       const gzippedValue = zlib.gzipSync(JSON.stringify(value))
       value = gzippedValue.toString('base64')
     }

package/packages/dd-trace/src/appsec/waf/index.js

@@ -3,6 +3,11 @@
 const { storage } = require('../../../../datadog-core')
 const log = require('../../log')
 const Reporter = require('../reporter')
+const Limiter = require('../../rate_limiter')
+const { keepTrace } = require('../../priority_sampler')
+const { ASM } = require('../../standalone/product')
+const web = require('../../plugins/util/web')
+const { updateRateLimitedMetric } = require('../telemetry')
 
 class WafUpdateError extends Error {
   constructor (diagnosticErrors) {
@@ -12,6 +17,8 @@ class WafUpdateError extends Error {
   }
 }
 
+let limiter = new Limiter(100)
+
 const waf = {
   wafManager: null,
   init,
@@ -27,6 +34,8 @@ const waf = {
 function init (rules, config) {
   destroy()
 
+  limiter = new Limiter(config.rateLimit)
+
   // dirty require to make startup faster for serverless
   const WAFManager = require('./waf_manager')
 
@@ -99,8 +108,18 @@ function run (data, req, raspRule) {
   }
 
   const wafContext = waf.wafManager.getWAFContext(req)
+  const result = wafContext.run(data, raspRule)
+
+  if (result?.keep) {
+    if (limiter.isAllowed()) {
+      const rootSpan = web.root(req)
+      keepTrace(rootSpan, ASM)
+    } else {
+      updateRateLimitedMetric(req)
+    }
+  }
 
-  return wafContext.run(data, raspRule)
+  return result
 }
 
 function disposeContext (req) {

package/packages/dd-trace/src/ci-visibility/dynamic-instrumentation/index.js

@@ -5,6 +5,7 @@ const { Worker, threadId: parentThreadId } = require('worker_threads')
 const { randomUUID } = require('crypto')
 const log = require('../../log')
 const { getEnvironmentVariables } = require('../../config-helper')
+const getDebuggerConfig = require('../../debugger/config')
 
 const probeIdToResolveBreakpointSet = new Map()
 const probeIdToResolveBreakpointRemove = new Map()
@@ -82,7 +83,7 @@ class TestVisDynamicInstrumentation {
           DD_INSTRUMENTATION_TELEMETRY_ENABLED: 'false'
         },
         workerData: {
-          config: this._config.serialize(),
+          config: getDebuggerConfig(this._config),
           parentThreadId,
           probePort: probeChannel.port1,
           configPort: configChannel.port1,

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

@@ -1546,22 +1546,6 @@ class Config {
       }
     }
   }
-
-  // TODO: Refactor the Config class so it never produces any config objects that are incompatible with MessageChannel
-  /**
-   * Serializes the config object so it can be passed over a Worker Thread MessageChannel.
-   * @returns {Object} The serialized config object.
-   */
-  serialize () {
-    // URL objects cannot be serialized over the MessageChannel, so we need to convert them to strings first
-    if (this.url instanceof URL) {
-      const config = { ...this }
-      config.url = this.url.toString()
-      return config
-    }
-
-    return this
-  }
 }
 
 function handleOtel (tagString) {

package/packages/dd-trace/src/datastreams/schemas/schema_builder.js

@@ -66,17 +66,13 @@ class SchemaBuilder {
 }
 
 class OpenApiSchema {
-  constructor () {
-    this.openapi = '3.0.0'
-    this.components = new OpenApiComponents()
-  }
+  openapi = '3.0.0'
+  components = new OpenApiComponents()
 }
 
 OpenApiSchema.SCHEMA = class {
-  constructor () {
-    this.type = 'object'
-    this.properties = {}
-  }
+  type = 'object'
+  properties = {}
 }
 
 OpenApiSchema.PROPERTY = class {

package/packages/dd-trace/src/datastreams/schemas/schema_sampler.js

@@ -3,10 +3,8 @@
 const SAMPLE_INTERVAL_MILLIS = 30 * 1000
 
 class SchemaSampler {
-  constructor () {
-    this.weight = 0
-    this.lastSampleMs = 0
-  }
+  weight = 0
+  lastSampleMs = 0
 
   trySample (currentTimeMs) {
     if (currentTimeMs >= this.lastSampleMs + SAMPLE_INTERVAL_MILLIS) {

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

@@ -0,0 +1,16 @@
+'use strict'
+
+module.exports = function getDebuggerConfig (config) {
+  return {
+    commitSHA: config.commitSHA,
+    debug: config.debug,
+    dynamicInstrumentation: config.dynamicInstrumentation,
+    hostname: config.hostname,
+    logLevel: config.logLevel,
+    port: config.port,
+    repositoryUrl: config.repositoryUrl,
+    runtimeId: config.tags['runtime-id'],
+    service: config.service,
+    url: config.url?.toString(),
+  }
+}

package/packages/dd-trace/src/debugger/devtools_client/breakpoints.js

@@ -12,7 +12,7 @@ const {
   breakpointToProbes,
   probeToLocation
 } = require('./state')
-const log = require('../../log')
+const log = require('./log')
 
 let sessionStarted = false
 const probes = new Map()

package/packages/dd-trace/src/debugger/devtools_client/config.js

@@ -2,14 +2,10 @@
 
 const { workerData: { config: parentConfig, parentThreadId, configPort } } = require('node:worker_threads')
 const { format } = require('node:url')
-const log = require('../../log')
+const log = require('./log')
 
 const config = module.exports = {
-  dynamicInstrumentation: parentConfig.dynamicInstrumentation,
-  runtimeId: parentConfig.tags['runtime-id'],
-  service: parentConfig.service,
-  commitSHA: parentConfig.commitSHA,
-  repositoryUrl: parentConfig.repositoryUrl,
+  ...parentConfig,
   parentThreadId,
   maxTotalPayloadSize: 5 * 1024 * 1024 // 5MB
 }

package/packages/dd-trace/src/debugger/devtools_client/index.js

@@ -9,7 +9,7 @@ const { getStackFromCallFrames } = require('./state')
 const { ackEmitting } = require('./status')
 const { parentThreadId } = require('./config')
 const { MAX_SNAPSHOTS_PER_SECOND_GLOBALLY } = require('./defaults')
-const log = require('../../log')
+const log = require('./log')
 const { version } = require('../../../../../package.json')
 const { NODE_MAJOR } = require('../../../../../version')
 

package/packages/dd-trace/src/debugger/devtools_client/log.js

@@ -0,0 +1,19 @@
+'use strict'
+
+const { workerData } = require('node:worker_threads')
+
+// For testing purposes, we allow `workerData` to be undefined and fallback to a default config
+const { config: { debug, logLevel }, logPort } = workerData ?? { config: { debug: false } }
+
+const LEVELS = ['error', 'warn', 'info', 'debug']
+const on = (level, ...args) => {
+  if (typeof args[0] === 'function') {
+    args = [args[0]()]
+  }
+  logPort.postMessage({ level, args })
+}
+const off = () => {}
+
+for (const level of LEVELS) {
+  module.exports[level] = debug && LEVELS.indexOf(logLevel) >= LEVELS.indexOf(level) ? on.bind(null, level) : off
+}

package/packages/dd-trace/src/debugger/devtools_client/remote_config.js

@@ -3,7 +3,7 @@
 const { workerData: { probePort } } = require('node:worker_threads')
 const { addBreakpoint, removeBreakpoint, modifyBreakpoint } = require('./breakpoints')
 const { ackReceived, ackInstalled, ackError } = require('./status')
-const log = require('../../log')
+const log = require('./log')
 
 // Example log line probe (simplified):
 // {

package/packages/dd-trace/src/debugger/devtools_client/send.js

@@ -7,7 +7,7 @@ const config = require('./config')
 const JSONBuffer = require('./json-buffer')
 const request = require('../../exporters/common/request')
 const { GIT_COMMIT_SHA, GIT_REPOSITORY_URL } = require('../../plugins/util/tags')
-const log = require('../../log')
+const log = require('./log')
 const { version } = require('../../../../../package.json')
 const { getEnvironmentVariable } = require('../../config-helper')
 

package/packages/dd-trace/src/debugger/devtools_client/snapshot/index.js

@@ -2,7 +2,7 @@
 
 const { getRuntimeObject } = require('./collector')
 const { processRawState } = require('./processor')
-const log = require('../../../log')
+const log = require('../log')
 
 const DEFAULT_MAX_REFERENCE_DEPTH = 3
 const DEFAULT_MAX_COLLECTION_SIZE = 100

package/packages/dd-trace/src/debugger/devtools_client/state.js

@@ -4,7 +4,7 @@ const { join, dirname } = require('path')
 const { normalize } = require('source-map/lib/util')
 const { loadSourceMapSync } = require('./source-maps')
 const session = require('./session')
-const log = require('../../log')
+const log = require('./log')
 
 const WINDOWS_DRIVE_LETTER_REGEX = /[a-zA-Z]/
 

package/packages/dd-trace/src/debugger/devtools_client/status.js

@@ -5,7 +5,7 @@ const config = require('./config')
 const JSONBuffer = require('./json-buffer')
 const request = require('../../exporters/common/request')
 const FormData = require('../../exporters/common/form-data')
-const log = require('../../log')
+const log = require('./log')
 
 module.exports = {
   ackReceived,

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

@@ -4,6 +4,7 @@ const { readFile } = require('fs')
 const { types } = require('util')
 const { join } = require('path')
 const { Worker, MessageChannel, threadId: parentThreadId } = require('worker_threads')
+const getDebuggerConfig = require('./config')
 const log = require('../log')
 
 let worker = null
@@ -25,6 +26,7 @@ function start (config, rc) {
 
   const rcAckCallbacks = new Map()
   const probeChannel = new MessageChannel()
+  const logChannel = new MessageChannel()
   configChannel = new MessageChannel()
 
   process[Symbol.for('datadog:node:util:types')] = types
@@ -54,18 +56,24 @@ function start (config, rc) {
   })
   probeChannel.port2.on('messageerror', (err) => log.error('[debugger] received "messageerror" on probe port', err))
 
+  logChannel.port2.on('message', ({ level, args }) => {
+    log[level](...args)
+  })
+  logChannel.port2.on('messageerror', (err) => log.error('[debugger] received "messageerror" on log port', err))
+
   worker = new Worker(
     join(__dirname, 'devtools_client', 'index.js'),
     {
       execArgv: [], // Avoid worker thread inheriting the `-r` command line argument
       env, // Avoid worker thread inheriting the `NODE_OPTIONS` environment variable (in case it contains `-r`)
       workerData: {
-        config: config.serialize(),
+        config: getDebuggerConfig(config),
         parentThreadId,
         probePort: probeChannel.port1,
+        logPort: logChannel.port1,
         configPort: configChannel.port1
       },
-      transferList: [probeChannel.port1, configChannel.port1]
+      transferList: [probeChannel.port1, logChannel.port1, configChannel.port1]
     }
   )
 
@@ -94,13 +102,15 @@ function start (config, rc) {
   worker.unref()
   probeChannel.port1.unref()
   probeChannel.port2.unref()
+  logChannel.port1.unref()
+  logChannel.port2.unref()
   configChannel.port1.unref()
   configChannel.port2.unref()
 }
 
 function configure (config) {
   if (configChannel === null) return
-  configChannel.port2.postMessage(config.serialize())
+  configChannel.port2.postMessage(getDebuggerConfig(config))
 }
 
 function readProbeFile (path, cb) {

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

@@ -4,6 +4,7 @@ module.exports = {
   get '@apollo/gateway' () { return require('../../../datadog-plugin-apollo/src') },
   get '@aws-sdk/smithy-client' () { return require('../../../datadog-plugin-aws-sdk/src') },
   get '@azure/functions' () { return require('../../../datadog-plugin-azure-functions/src') },
+  get '@azure/service-bus' () { return require('../../../datadog-plugin-azure-service-bus/src') },
   get '@cucumber/cucumber' () { return require('../../../datadog-plugin-cucumber/src') },
   get '@playwright/test' () { return require('../../../datadog-plugin-playwright/src') },
   get '@elastic/elasticsearch' () { return require('../../../datadog-plugin-elasticsearch/src') },

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

@@ -27,7 +27,8 @@ const {
   GIT_COMMIT_COMMITTER_EMAIL,
   CI_NODE_LABELS,
   CI_NODE_NAME,
-  PR_NUMBER
+  PR_NUMBER,
+  CI_JOB_ID
 } = require('./tags')
 const { filterSensitiveInfoFromRepository } = require('./url')
 const { getEnvironmentVariable, getEnvironmentVariables } = require('../../config-helper')
@@ -85,6 +86,13 @@ function resolveTilde (filePath) {
   return filePath
 }
 
+function normalizeNumber (number) {
+  if (typeof number !== 'number') {
+    return number
+  }
+  return number.toString()
+}
+
 function getGitHubEventPayload () {
   if (!getEnvironmentVariable('GITHUB_EVENT_PATH')) {
     return
@@ -210,7 +218,8 @@ module.exports = {
         [CI_NODE_LABELS]: CI_RUNNER_TAGS,
         [CI_NODE_NAME]: CI_RUNNER_ID,
         [GIT_PULL_REQUEST_BASE_BRANCH]: CI_MERGE_REQUEST_TARGET_BRANCH_NAME,
-        [PR_NUMBER]: CI_MERGE_REQUEST_IID
+        [PR_NUMBER]: CI_MERGE_REQUEST_IID,
+        [CI_JOB_ID]: GITLAB_CI_JOB_ID
       }
     }
 
@@ -247,7 +256,8 @@ module.exports = {
           CIRCLE_WORKFLOW_ID,
           CIRCLE_BUILD_NUM,
         }),
-        [PR_NUMBER]: CIRCLE_PR_NUMBER
+        [PR_NUMBER]: CIRCLE_PR_NUMBER,
+        [CI_JOB_ID]: CIRCLE_BUILD_NUM
       }
     }
 
@@ -298,7 +308,8 @@ module.exports = {
           GITHUB_REPOSITORY,
           GITHUB_RUN_ID,
           GITHUB_RUN_ATTEMPT
-        })
+        }),
+        [CI_JOB_ID]: GITHUB_JOB
       }
       if (GITHUB_BASE_REF) { // `pull_request` or `pull_request_target` event
         tags[GIT_PULL_REQUEST_BASE_BRANCH] = GITHUB_BASE_REF
@@ -407,7 +418,8 @@ module.exports = {
         [CI_JOB_NAME]: SYSTEM_JOBDISPLAYNAME,
         [CI_ENV_VARS]: JSON.stringify({ SYSTEM_TEAMPROJECTID, BUILD_BUILDID, SYSTEM_JOBID }),
         [PR_NUMBER]: SYSTEM_PULLREQUEST_PULLREQUESTNUMBER,
-        [GIT_PULL_REQUEST_BASE_BRANCH]: SYSTEM_PULLREQUEST_TARGETBRANCH
+        [GIT_PULL_REQUEST_BASE_BRANCH]: SYSTEM_PULLREQUEST_TARGETBRANCH,
+        [CI_JOB_ID]: SYSTEM_JOBID
       }
 
       if (SYSTEM_TEAMFOUNDATIONSERVERURI && SYSTEM_TEAMPROJECTID && BUILD_BUILDID) {
@@ -510,7 +522,8 @@ module.exports = {
         BUILDKITE_MESSAGE,
         BUILDKITE_AGENT_ID,
         BUILDKITE_PULL_REQUEST,
-        BUILDKITE_PULL_REQUEST_BASE_BRANCH
+        BUILDKITE_PULL_REQUEST_BASE_BRANCH,
+        BUILDKITE_CI_JOB_ID
       } = env
 
       const extraTags = Object.keys(env).filter(envVar =>
@@ -542,6 +555,7 @@ module.exports = {
         [CI_NODE_NAME]: BUILDKITE_AGENT_ID,
         [CI_NODE_LABELS]: JSON.stringify(extraTags),
         [PR_NUMBER]: BUILDKITE_PULL_REQUEST,
+        [CI_JOB_ID]: BUILDKITE_CI_JOB_ID
       }
 
       if (BUILDKITE_PULL_REQUEST) {
@@ -682,7 +696,8 @@ module.exports = {
           CODEBUILD_BUILD_ARN,
           DD_PIPELINE_EXECUTION_ID,
           DD_ACTION_EXECUTION_ID
-        })
+        }),
+        [CI_JOB_ID]: DD_ACTION_EXECUTION_ID
       }
     }
 
@@ -727,6 +742,7 @@ module.exports = {
     normalizeTag(tags, GIT_BRANCH, normalizeRef)
     normalizeTag(tags, GIT_TAG, normalizeRef)
     normalizeTag(tags, GIT_PULL_REQUEST_BASE_BRANCH, normalizeRef)
+    normalizeTag(tags, PR_NUMBER, normalizeNumber)
 
     return removeEmptyValues(tags)
   }

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

@@ -22,9 +22,9 @@ const {
   GIT_COMMIT_HEAD_AUTHOR_DATE,
   GIT_COMMIT_HEAD_AUTHOR_EMAIL,
   GIT_COMMIT_HEAD_AUTHOR_NAME,
-  GIT_COMMIT_HEAD_COMMITER_DATE,
-  GIT_COMMIT_HEAD_COMMITER_EMAIL,
-  GIT_COMMIT_HEAD_COMMITER_NAME,
+  GIT_COMMIT_HEAD_COMMITTER_DATE,
+  GIT_COMMIT_HEAD_COMMITTER_EMAIL,
+  GIT_COMMIT_HEAD_COMMITTER_NAME,
   GIT_COMMIT_HEAD_MESSAGE
 } = require('./tags')
 const {
@@ -485,27 +485,41 @@ function getGitMetadata (ciMetadata) {
 
   if (headCommitSha) {
     if (isShallowRepository()) {
-      unshallowRepository(true)
+      fetchHeadCommitSha(headCommitSha)
     }
 
-    tags[GIT_COMMIT_HEAD_MESSAGE] =
-      sanitizedExec('git', ['show', '-s', '--format=%B', headCommitSha], null, null, null, false)
-
     const [
+      gitHeadCommitSha,
+      headAuthorDate,
       headAuthorName,
       headAuthorEmail,
-      headAuthorDate,
+      headCommitterDate,
       headCommitterName,
       headCommitterEmail,
-      headCommitterDate
-    ] = sanitizedExec('git', ['show', '-s', '--format=%an,%ae,%aI,%cn,%ce,%cI', headCommitSha]).split(',')
-
-    tags[GIT_COMMIT_HEAD_AUTHOR_DATE] = headAuthorDate
-    tags[GIT_COMMIT_HEAD_AUTHOR_EMAIL] = headAuthorEmail
-    tags[GIT_COMMIT_HEAD_AUTHOR_NAME] = headAuthorName
-    tags[GIT_COMMIT_HEAD_COMMITER_DATE] = headCommitterDate
-    tags[GIT_COMMIT_HEAD_COMMITER_EMAIL] = headCommitterEmail
-    tags[GIT_COMMIT_HEAD_COMMITER_NAME] = headCommitterName
+      headCommitMessage
+    ] = sanitizedExec(
+      'git',
+      [
+        'show',
+        '-s',
+        '--format=\'%H","%aI","%an","%ae","%cI","%cn","%ce","%B\'',
+        headCommitSha
+      ],
+      null,
+      null,
+      null,
+      false
+    ).split('","')
+
+    if (gitHeadCommitSha) {
+      tags[GIT_COMMIT_HEAD_AUTHOR_DATE] = headAuthorDate
+      tags[GIT_COMMIT_HEAD_AUTHOR_EMAIL] = headAuthorEmail
+      tags[GIT_COMMIT_HEAD_AUTHOR_NAME] = headAuthorName
+      tags[GIT_COMMIT_HEAD_COMMITTER_DATE] = headCommitterDate
+      tags[GIT_COMMIT_HEAD_COMMITTER_EMAIL] = headCommitterEmail
+      tags[GIT_COMMIT_HEAD_COMMITTER_NAME] = headCommitterName
+      tags[GIT_COMMIT_HEAD_MESSAGE] = headCommitMessage
+    }
   }
 
   const entries = [
@@ -544,6 +558,26 @@ function getGitInformationDiscrepancy () {
   return { gitRepositoryUrl, gitCommitSHA }
 }
 
+function fetchHeadCommitSha (headSha) {
+  const remoteName = getGitRemoteName()
+
+  sanitizedExec(
+    'git',
+    [
+      'fetch',
+      '--update-shallow',
+      '--filter=blob:none',
+      '--recurse-submodules=no',
+      '--no-write-fetch-head',
+      remoteName,
+      headSha
+    ],
+    { name: TELEMETRY_GIT_COMMAND, tags: { command: 'fetch_head_commit_sha' } },
+    { name: TELEMETRY_GIT_COMMAND_MS, tags: { command: 'fetch_head_commit_sha' } },
+    { name: TELEMETRY_GIT_COMMAND_ERRORS, tags: { command: 'fetch_head_commit_sha' } }
+  )
+}
+
 module.exports = {
   getGitMetadata,
   getLatestCommits,
@@ -561,5 +595,6 @@ module.exports = {
   checkAndFetchBranch,
   getLocalBranches,
   getMergeBase,
-  getCounts
+  getCounts,
+  fetchHeadCommitSha
 }

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

@@ -16,9 +16,9 @@ const GIT_COMMIT_HEAD_MESSAGE = 'git.commit.head.message'
 const GIT_COMMIT_HEAD_AUTHOR_DATE = 'git.commit.head.author.date'
 const GIT_COMMIT_HEAD_AUTHOR_EMAIL = 'git.commit.head.author.email'
 const GIT_COMMIT_HEAD_AUTHOR_NAME = 'git.commit.head.author.name'
-const GIT_COMMIT_HEAD_COMMITER_DATE = 'git.commit.head.commiter.date'
-const GIT_COMMIT_HEAD_COMMITER_EMAIL = 'git.commit.head.commiter.email'
-const GIT_COMMIT_HEAD_COMMITER_NAME = 'git.commit.head.commiter.name'
+const GIT_COMMIT_HEAD_COMMITTER_DATE = 'git.commit.head.committer.date'
+const GIT_COMMIT_HEAD_COMMITTER_EMAIL = 'git.commit.head.committer.email'
+const GIT_COMMIT_HEAD_COMMITTER_NAME = 'git.commit.head.committer.name'
 
 const GIT_PULL_REQUEST_BASE_BRANCH_SHA = 'git.pull_request.base_branch_sha'
 const GIT_PULL_REQUEST_BASE_BRANCH = 'git.pull_request.base_branch'
@@ -31,6 +31,7 @@ const CI_PROVIDER_NAME = 'ci.provider.name'
 const CI_WORKSPACE_PATH = 'ci.workspace_path'
 const CI_JOB_URL = 'ci.job.url'
 const CI_JOB_NAME = 'ci.job.name'
+const CI_JOB_ID = 'ci.job.id'
 const CI_STAGE_NAME = 'ci.stage.name'
 const CI_NODE_NAME = 'ci.node.name'
 const CI_NODE_LABELS = 'ci.node.labels'
@@ -56,9 +57,9 @@ module.exports = {
   GIT_COMMIT_HEAD_AUTHOR_DATE,
   GIT_COMMIT_HEAD_AUTHOR_EMAIL,
   GIT_COMMIT_HEAD_AUTHOR_NAME,
-  GIT_COMMIT_HEAD_COMMITER_DATE,
-  GIT_COMMIT_HEAD_COMMITER_EMAIL,
-  GIT_COMMIT_HEAD_COMMITER_NAME,
+  GIT_COMMIT_HEAD_COMMITTER_DATE,
+  GIT_COMMIT_HEAD_COMMITTER_EMAIL,
+  GIT_COMMIT_HEAD_COMMITTER_NAME,
   GIT_PULL_REQUEST_BASE_BRANCH_SHA,
   GIT_PULL_REQUEST_BASE_BRANCH,
   CI_PIPELINE_ID,
@@ -69,6 +70,7 @@ module.exports = {
   CI_WORKSPACE_PATH,
   CI_JOB_URL,
   CI_JOB_NAME,
+  CI_JOB_ID,
   CI_STAGE_NAME,
   CI_ENV_VARS,
   CI_NODE_NAME,

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

@@ -375,10 +375,10 @@ function createPossionProcessSamplingFilter (samplingIntervalMillis) {
  * source with a sampling event filter and an event serializer.
  */
 class EventsProfiler {
-  constructor (options = {}) {
-    this.type = 'events'
-    this.eventSerializer = new EventSerializer()
+  type = 'events'
+  eventSerializer = new EventSerializer()
 
+  constructor (options = {}) {
     const eventHandler = event => this.eventSerializer.addEvent(event)
     const eventFilter = options.timelineSamplingEnabled
       // options.samplingInterval comes in microseconds, we need millis

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

@@ -8,13 +8,14 @@ function strategiesToCallbackMode (strategies, callbackMode) {
 }
 
 class NativeSpaceProfiler {
+  type = 'space'
+  _pprof
+  _started = false
+
   constructor (options = {}) {
-    this.type = 'space'
     this._samplingInterval = options.heapSamplingInterval || 512 * 1024
     this._stackDepth = options.stackDepth || 64
-    this._pprof = undefined
     this._oomMonitoring = options.oomMonitoring || {}
-    this._started = false
   }
 
   start ({ mapper, nearOOMCallback } = {}) {