dd-trace 5.57.1 → 5.59.0

package/packages/dd-trace/src/appsec/sdk/track_event.js

@@ -130,7 +130,7 @@ function trackUserLoginFailureV2 (tracer, login, exists, metadata) {
 
   const wafData = { login }
 
-  if (typeof exists === 'object' && metadata === undefined) {
+  if (exists !== null && typeof exists === 'object' && metadata === undefined) {
     metadata = exists
     exists = false
   }
@@ -167,10 +167,8 @@ function flattenFields (fields, depth = 0) {
           result[`${key}.${flatKey}`] = flatValue[flatKey]
         }
       }
-    } else {
-      if (value !== undefined) {
-        result[key] = value
-      }
+    } else if (value !== undefined) {
+      result[key] = value
     }
   }
 

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

@@ -9,36 +9,36 @@ const STACK_TRACE_NAMESPACES = {
   IAST: 'vulnerability'
 }
 
-function getCallSiteList (maxDepth = 100) {
+function prepareStackTrace (_, callsites) {
+  return callsites
+}
+
+function getCallSiteList (maxDepth = 100, constructorOpt) {
   const previousPrepareStackTrace = Error.prepareStackTrace
   const previousStackTraceLimit = Error.stackTraceLimit
-  let callsiteList
   // Since some frames will be discarded because they come from tracer codebase, a buffer is added
   // to the limit in order to get as close as `maxDepth` number of frames.
   Error.stackTraceLimit = maxDepth + LIBRARY_FRAMES_BUFFER
 
   try {
-    Error.prepareStackTrace = function (_, callsites) {
-      callsiteList = callsites
-    }
-    const e = new Error('message')
-    e.stack
+    Error.prepareStackTrace = prepareStackTrace
+    const obj = {}
+    Error.captureStackTrace(obj, constructorOpt)
+    return obj.stack
   } finally {
     Error.prepareStackTrace = previousPrepareStackTrace
     Error.stackTraceLimit = previousStackTraceLimit
   }
-
-  return callsiteList
 }
 
 function filterOutFramesFromLibrary (callSiteList) {
   return callSiteList.filter(callSite => !callSite.getFileName()?.startsWith(ddBasePath))
 }
 
-function getCallsiteFrames (maxDepth = 32, callSiteListGetter = getCallSiteList) {
+function getCallsiteFrames (maxDepth = 32, constructorOpt = getCallsiteFrames, callSiteListGetter = getCallSiteList) {
   if (maxDepth < 1) maxDepth = Infinity
 
-  const callSiteList = callSiteListGetter(maxDepth)
+  const callSiteList = callSiteListGetter(maxDepth, constructorOpt)
   const filteredFrames = filterOutFramesFromLibrary(callSiteList)
 
   const half = filteredFrames.length > maxDepth ? Math.round(maxDepth / 2) : Infinity

package/packages/dd-trace/src/appsec/telemetry/common.js

@@ -1,4 +1,4 @@
-'use strinct'
+'use strict'
 
 const DD_TELEMETRY_REQUEST_METRICS = Symbol('_dd.appsec.telemetry.request.metrics')
 
@@ -17,7 +17,7 @@ const tags = {
 function getVersionsTags (wafVersion, rulesVersion) {
   return {
     [tags.WAF_VERSION]: wafVersion,
-    [tags.EVENT_RULES_VERSION]: rulesVersion
+    [tags.EVENT_RULES_VERSION]: rulesVersion || 'unknown'
   }
 }
 

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

@@ -13,6 +13,7 @@ const {
   trackWafMetrics,
   incrementWafInit,
   incrementWafUpdates,
+  incrementWafConfigErrors,
   incrementWafRequests
 } = require('./waf')
 const telemetryMetrics = require('../../telemetry/metrics')
@@ -151,6 +152,12 @@ function incrementWafUpdatesMetric (wafVersion, rulesVersion, success) {
   incrementWafUpdates(wafVersion, rulesVersion, success)
 }
 
+function incrementWafConfigErrorsMetric (wafVersion, rulesVersion) {
+  if (!enabled) return
+
+  incrementWafConfigErrors(wafVersion, rulesVersion)
+}
+
 function incrementWafRequestsMetric (req) {
   if (!req || !enabled) return
 
@@ -197,6 +204,7 @@ module.exports = {
   updateRaspRuleSkippedMetricTags,
   incrementWafInitMetric,
   incrementWafUpdatesMetric,
+  incrementWafConfigErrorsMetric,
   incrementWafRequestsMetric,
   incrementMissingUserLoginMetric,
   incrementMissingUserIdMetric,

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

@@ -103,10 +103,11 @@ function incrementWafInit (wafVersion, rulesVersion, success) {
 function incrementWafUpdates (wafVersion, rulesVersion, success) {
   const versionsTags = getVersionsTags(wafVersion, rulesVersion)
   appsecMetrics.count('waf.updates', { ...versionsTags, success }).inc()
+}
 
-  if (!success) {
-    appsecMetrics.count('waf.config_errors', versionsTags).inc()
-  }
+function incrementWafConfigErrors (wafVersion, rulesVersion) {
+  const versionsTags = getVersionsTags(wafVersion, rulesVersion)
+  appsecMetrics.count('waf.config_errors', versionsTags).inc()
 }
 
 function incrementWafRequests (store) {
@@ -137,5 +138,6 @@ module.exports = {
   trackWafMetrics,
   incrementWafInit,
   incrementWafUpdates,
+  incrementWafConfigErrors,
   incrementWafRequests
 }

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

@@ -0,0 +1,15 @@
+'use strict'
+
+module.exports = {
+  DIAGNOSTIC_KEYS: [
+    'rules',
+    'custom_rules',
+    'exclusions',
+    'actions',
+    'processors',
+    'scanners',
+    'rules_override',
+    'rules_data',
+    'exclusion_data'
+  ]
+}

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

@@ -2,14 +2,26 @@
 
 const { storage } = require('../../../../datadog-core')
 const log = require('../../log')
+const Reporter = require('../reporter')
+
+class WafUpdateError extends Error {
+  constructor (diagnosticErrors) {
+    super('WafUpdateError')
+    this.name = 'WafUpdateError'
+    this.diagnosticErrors = diagnosticErrors
+  }
+}
 
 const waf = {
   wafManager: null,
   init,
   destroy,
-  update,
+  updateConfig,
+  removeConfig,
+  checkAsmDdFallback,
   run: noop,
-  disposeContext: noop
+  disposeContext: noop,
+  WafUpdateError
 }
 
 function init (rules, config) {
@@ -34,14 +46,43 @@ function destroy () {
   waf.disposeContext = noop
 }
 
-function update (newRules) {
-  // TODO: check race conditions between Appsec enable/disable and WAF updates, the whole RC state management in general
+function checkAsmDdFallback () {
+  if (!waf.wafManager) throw new Error('Cannot update disabled WAF')
+
+  try {
+    waf.wafManager.setAsmDdFallbackConfig()
+  } catch {
+    log.error('[ASM] Could not apply default ruleset back as fallback')
+  }
+}
+
+function updateConfig (product, configId, configPath, config) {
+  if (!waf.wafManager) throw new Error('Cannot update disabled WAF')
+
+  try {
+    if (product === 'ASM_DD') {
+      waf.wafManager.removeConfig(waf.wafManager.constructor.defaultWafConfigPath)
+    }
+
+    const updateSucceeded = waf.wafManager.updateConfig(configPath, config)
+    Reporter.reportWafConfigUpdate(product, configId, waf.wafManager.ddwaf.diagnostics, waf.wafManager.ddwafVersion)
+
+    if (!updateSucceeded) {
+      throw new WafUpdateError(waf.wafManager.ddwaf.diagnostics)
+    }
+  } catch (err) {
+    log.error('[ASM] Could not update config from RC')
+    throw err
+  }
+}
+
+function removeConfig (configPath) {
   if (!waf.wafManager) throw new Error('Cannot update disabled WAF')
 
   try {
-    waf.wafManager.update(newRules)
+    waf.wafManager.removeConfig(configPath)
   } catch (err) {
-    log.error('[ASM] Could not apply rules from remote config')
+    log.error('[ASM] Could not remove config from RC')
     throw err
   }
 }

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

@@ -135,7 +135,7 @@ class WAFContextWrapper {
         this.setUserIdCache(userId, result)
       }
 
-      metrics.duration = result.totalRuntime / 1e3
+      metrics.duration = result.duration / 1e3
       metrics.blockTriggered = blockTriggered
       metrics.ruleTriggered = ruleTriggered
       metrics.wafTimeout = result.timeout
@@ -144,7 +144,7 @@ class WAFContextWrapper {
         Reporter.reportAttack(result.events)
       }
 
-      Reporter.reportDerivatives(result.derivatives)
+      Reporter.reportAttributes(result.attributes)
 
       return result
     } catch (err) {

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

@@ -7,11 +7,14 @@ const WAFContextWrapper = require('./waf_context_wrapper')
 const contexts = new WeakMap()
 
 class WAFManager {
+  static get defaultWafConfigPath () { return 'datadog/00/ASM_DD/default/config' }
+
   constructor (rules, config) {
     this.config = config
     this.wafTimeout = config.wafTimeout
     this.ddwaf = this._loadDDWAF(rules)
     this.rulesVersion = this.ddwaf.diagnostics.ruleset_version
+    this.defaultRules = rules
 
     Reporter.reportWafInit(this.ddwafVersion, this.rulesVersion, this.ddwaf.diagnostics.rules, true)
   }
@@ -23,7 +26,7 @@ class WAFManager {
       this.ddwafVersion = DDWAF.version()
 
       const { obfuscatorKeyRegex, obfuscatorValueRegex } = this.config
-      return new DDWAF(rules, { obfuscatorKeyRegex, obfuscatorValueRegex })
+      return new DDWAF(rules, WAFManager.defaultWafConfigPath, { obfuscatorKeyRegex, obfuscatorValueRegex })
     } catch (err) {
       this.ddwafVersion = this.ddwafVersion || 'unknown'
       Reporter.reportWafInit(this.ddwafVersion, 'unknown')
@@ -51,20 +54,27 @@ class WAFManager {
     return wafContext
   }
 
-  update (newRules) {
-    try {
-      this.ddwaf.update(newRules)
+  setRulesVersion () {
+    if (this.ddwaf.diagnostics.ruleset_version) {
+      this.rulesVersion = this.ddwaf.diagnostics.ruleset_version
+    }
+  }
 
-      if (this.ddwaf.diagnostics.ruleset_version) {
-        this.rulesVersion = this.ddwaf.diagnostics.ruleset_version
-      }
+  setAsmDdFallbackConfig () {
+    if (!this.ddwaf.configPaths.some(cp => cp.includes('ASM_DD'))) {
+      this.updateConfig(WAFManager.defaultWafConfigPath, this.defaultRules)
+    }
+  }
 
-      Reporter.reportWafUpdate(this.ddwafVersion, this.rulesVersion, true)
-    } catch (error) {
-      Reporter.reportWafUpdate(this.ddwafVersion, 'unknown', false)
+  updateConfig (path, rules) {
+    const updateResult = this.ddwaf.createOrUpdateConfig(rules, path)
+    this.setRulesVersion()
+    return updateResult
+  }
 
-      throw error
-    }
+  removeConfig (path) {
+    this.ddwaf.removeConfig(path)
+    this.setRulesVersion()
   }
 
   destroy () {

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

@@ -62,7 +62,7 @@ class TestVisDynamicInstrumentation {
 
     log.debug('Starting Test Visibility - Dynamic Instrumentation client...')
 
-    const rcChannel = new MessageChannel() // mock channel
+    const probeChannel = new MessageChannel() // mock channel
     const configChannel = new MessageChannel() // mock channel
 
     this.worker = new Worker(
@@ -84,14 +84,14 @@ class TestVisDynamicInstrumentation {
         workerData: {
           config: this._config.serialize(),
           parentThreadId,
-          rcPort: rcChannel.port1,
+          probePort: probeChannel.port1,
           configPort: configChannel.port1,
           breakpointSetChannel: this.breakpointSetChannel.port1,
           breakpointHitChannel: this.breakpointHitChannel.port1,
           breakpointRemoveChannel: this.breakpointRemoveChannel.port1
         },
         transferList: [
-          rcChannel.port1,
+          probeChannel.port1,
           configChannel.port1,
           this.breakpointSetChannel.port1,
           this.breakpointHitChannel.port1,

package/packages/dd-trace/src/ci-visibility/early-flake-detection/get-known-tests.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const request = require('../../exporters/common/request')
 const id = require('../../id')
 const log = require('../../log')

package/packages/dd-trace/src/ci-visibility/exporters/git/git_metadata.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const fs = require('fs')
 const path = require('path')
 
@@ -287,7 +289,7 @@ function sendGitMetadata (url, { isEvpProxy, evpProxyPrefix }, configRepositoryU
     // Otherwise we unshallow and get commits to upload again
     log.debug('It is shallow clone, unshallowing...')
     if (!isFalse(getEnvironmentVariable('DD_CIVISIBILITY_GIT_UNSHALLOW_ENABLED'))) {
-      unshallowRepository()
+      unshallowRepository(false)
     }
 
     // The latest commits change after unshallowing

package/packages/dd-trace/src/ci-visibility/intelligent-test-runner/get-skippable-suites.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const request = require('../../exporters/common/request')
 const log = require('../../log')
 const { getEnvironmentVariable } = require('../../config-helper')

package/packages/dd-trace/src/ci-visibility/log-submission/log-submission-plugin.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const Plugin = require('../../plugins/plugin')
 const log = require('../../log')
 const { getEnvironmentVariable } = require('../../config-helper')

package/packages/dd-trace/src/ci-visibility/requests/get-library-configuration.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const request = require('../../exporters/common/request')
 const id = require('../../id')
 const log = require('../../log')

package/packages/dd-trace/src/ci-visibility/telemetry.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const telemetryMetrics = require('../telemetry/metrics')
 
 const ciVisibilityMetrics = telemetryMetrics.manager.namespace('civisibility')

package/packages/dd-trace/src/ci-visibility/test-api-manual/test-api-manual-plugin.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const CiPlugin = require('../../plugins/ci_plugin')
 const {
   TEST_STATUS,

package/packages/dd-trace/src/ci-visibility/test-management/get-test-management-tests.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const request = require('../../exporters/common/request')
 const id = require('../../id')
 const { getEnvironmentVariable } = require('../../config-helper')
@@ -9,7 +11,9 @@ function getTestManagementTests ({
   isGzipCompatible,
   repositoryUrl,
   commitMessage,
-  sha
+  sha,
+  commitHeadSha,
+  commitHeadMessage
 }, done) {
   const options = {
     path: '/api/v2/test/libraries/test-management/tests',
@@ -43,8 +47,8 @@ function getTestManagementTests ({
       type: 'ci_app_libraries_tests_request',
       attributes: {
         repository_url: repositoryUrl,
-        commit_message: commitMessage,
-        sha
+        commit_message: commitHeadMessage || commitMessage,
+        sha: commitHeadSha || sha
       }
     }
   })

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

@@ -16,7 +16,7 @@ const { updateConfig } = require('./telemetry')
 const telemetryMetrics = require('./telemetry/metrics')
 const { isInServerlessEnvironment, getIsGCPFunction, getIsAzureFunction } = require('./serverless')
 const {
-  ORIGIN_KEY, GRPC_CLIENT_ERROR_STATUSES, GRPC_SERVER_ERROR_STATUSES, INSTRUMENTED_BY_SSI
+  ORIGIN_KEY, GRPC_CLIENT_ERROR_STATUSES, GRPC_SERVER_ERROR_STATUSES
 } = require('./constants')
 const { appendRules } = require('./payload-tagging/config')
 const { getEnvironmentVariable, getEnvironmentVariables } = require('./config-helper')
@@ -516,6 +516,7 @@ class Config {
     defaults['dogstatsd.port'] = '8125'
     defaults.dsmEnabled = false
     defaults['dynamicInstrumentation.enabled'] = false
+    defaults['dynamicInstrumentation.probeFile'] = undefined
     defaults['dynamicInstrumentation.redactedIdentifiers'] = []
     defaults['dynamicInstrumentation.redactionExcludedIdentifiers'] = []
     defaults['dynamicInstrumentation.uploadIntervalSeconds'] = 1
@@ -529,6 +530,9 @@ class Config {
     defaults['grpc.client.error.statuses'] = GRPC_CLIENT_ERROR_STATUSES
     defaults['grpc.server.error.statuses'] = GRPC_SERVER_ERROR_STATUSES
     defaults.headerTags = []
+    defaults['heapSnapshot.count'] = 0
+    defaults['heapSnapshot.destination'] = ''
+    defaults['heapSnapshot.interval'] = 3600
     defaults.hostname = '127.0.0.1'
     defaults['iast.dbRowsToTaint'] = 1
     defaults['iast.deduplicationEnabled'] = true
@@ -704,6 +708,7 @@ class Config {
       DD_DOGSTATSD_HOST,
       DD_DOGSTATSD_PORT,
       DD_DYNAMIC_INSTRUMENTATION_ENABLED,
+      DD_DYNAMIC_INSTRUMENTATION_PROBE_FILE,
       DD_DYNAMIC_INSTRUMENTATION_REDACTED_IDENTIFIERS,
       DD_DYNAMIC_INSTRUMENTATION_REDACTION_EXCLUDED_IDENTIFIERS,
       DD_DYNAMIC_INSTRUMENTATION_UPLOAD_INTERVAL_SECONDS,
@@ -713,6 +718,9 @@ class Config {
       DD_GRPC_CLIENT_ERROR_STATUSES,
       DD_GRPC_SERVER_ERROR_STATUSES,
       JEST_WORKER_ID,
+      DD_HEAP_SNAPSHOT_COUNT,
+      DD_HEAP_SNAPSHOT_DESTINATION,
+      DD_HEAP_SNAPSHOT_INTERVAL,
       DD_IAST_DB_ROWS_TO_TAINT,
       DD_IAST_DEDUPLICATION_ENABLED,
       DD_IAST_ENABLED,
@@ -877,6 +885,7 @@ class Config {
     this._setString(env, 'dogstatsd.port', DD_DOGSTATSD_PORT)
     this._setBoolean(env, 'dsmEnabled', DD_DATA_STREAMS_ENABLED)
     this._setBoolean(env, 'dynamicInstrumentation.enabled', DD_DYNAMIC_INSTRUMENTATION_ENABLED)
+    this._setString(env, 'dynamicInstrumentation.probeFile', DD_DYNAMIC_INSTRUMENTATION_PROBE_FILE)
     this._setArray(env, 'dynamicInstrumentation.redactedIdentifiers', DD_DYNAMIC_INSTRUMENTATION_REDACTED_IDENTIFIERS)
     this._setArray(
       env,
@@ -896,6 +905,9 @@ class Config {
     this._setIntegerRangeSet(env, 'grpc.client.error.statuses', DD_GRPC_CLIENT_ERROR_STATUSES)
     this._setIntegerRangeSet(env, 'grpc.server.error.statuses', DD_GRPC_SERVER_ERROR_STATUSES)
     this._setArray(env, 'headerTags', DD_TRACE_HEADER_TAGS)
+    env['heapSnapshot.count'] = maybeInt(DD_HEAP_SNAPSHOT_COUNT)
+    this._setString(env, 'heapSnapshot.destination', DD_HEAP_SNAPSHOT_DESTINATION)
+    env['heapSnapshot.interval'] = maybeInt(DD_HEAP_SNAPSHOT_INTERVAL)
     this._setString(env, 'hostname', DD_AGENT_HOST)
     env['iast.dbRowsToTaint'] = maybeInt(DD_IAST_DB_ROWS_TO_TAINT)
     this._setBoolean(env, 'iast.deduplicationEnabled', DD_IAST_DEDUPLICATION_ENABLED)
@@ -916,6 +928,7 @@ class Config {
     this._setString(env, 'iast.telemetryVerbosity', DD_IAST_TELEMETRY_VERBOSITY)
     this._setBoolean(env, 'iast.stackTrace.enabled', DD_IAST_STACK_TRACE_ENABLED)
     this._setArray(env, 'injectionEnabled', DD_INJECTION_ENABLED)
+    this._setString(env, 'instrumentationSource', DD_INJECTION_ENABLED ? 'ssi' : 'manual')
     this._setBoolean(env, 'injectForce', DD_INJECT_FORCE)
     this._setBoolean(env, 'isAzureFunction', getIsAzureFunction())
     this._setBoolean(env, 'isGCPFunction', getIsGCPFunction())
@@ -1098,6 +1111,7 @@ class Config {
     }
     this._setBoolean(opts, 'dsmEnabled', options.dsmEnabled)
     this._setBoolean(opts, 'dynamicInstrumentation.enabled', options.dynamicInstrumentation?.enabled)
+    this._setString(opts, 'dynamicInstrumentation.probeFile', options.dynamicInstrumentation?.probeFile)
     this._setArray(
       opts,
       'dynamicInstrumentation.redactedIdentifiers',
@@ -1141,9 +1155,6 @@ class Config {
     opts['iast.securityControlsConfiguration'] = options.iast?.securityControlsConfiguration
     this._setBoolean(opts, 'iast.stackTrace.enabled', options.iast?.stackTrace?.enabled)
     this._setString(opts, 'iast.telemetryVerbosity', options.iast && options.iast.telemetryVerbosity)
-    if (options[INSTRUMENTED_BY_SSI]) {
-      this._setString(opts, 'instrumentationSource', options[INSTRUMENTED_BY_SSI])
-    }
     this._setBoolean(opts, 'isCiVisibility', options.isCiVisibility)
     this._setBoolean(opts, 'legacyBaggageEnabled', options.legacyBaggageEnabled)
     this._setBoolean(opts, 'llmobs.agentlessEnabled', options.llmobs?.agentlessEnabled)

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const os = require('os')
 const fs = require('fs')
 const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')

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

@@ -53,6 +53,5 @@ module.exports = {
   SPAN_POINTER_DIRECTION: Object.freeze({
     UPSTREAM: 'u',
     DOWNSTREAM: 'd'
-  }),
-  INSTRUMENTED_BY_SSI: Symbol('_dd.instrumented.by.ssi')
+  })
 }

package/packages/dd-trace/src/datastreams/checkpointer.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const DataStreamsContext = require('./context')
 
 class DataStreamsCheckpointer {

package/packages/dd-trace/src/datastreams/context.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const { storage } = require('../../../datadog-core')
 const log = require('../log')
 

package/packages/dd-trace/src/datastreams/encoding.js

@@ -1,3 +1,5 @@
+'use strict'
+
 // encodes positive and negative numbers, using zig zag encoding to reduce the size of the variable length encoding.
 // uses high and low part to ensure those parts are under the limit for byte operations in javascript (32 bits)
 // maximum number possible to encode is MAX_SAFE_INTEGER/2 (using zig zag shifts the bits by 1 to the left)

package/packages/dd-trace/src/datastreams/fnv.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const FNV_64_PRIME = BigInt('0x100000001B3')
 const FNV1_64_INIT = BigInt('0xCBF29CE484222325')
 

package/packages/dd-trace/src/datastreams/pathway.js

@@ -1,14 +1,15 @@
+'use strict'
+
 // encoding used here is sha256
 // other languages use FNV1
 // this inconsistency is ok because hashes do not need to be consistent across services
 const crypto = require('crypto')
 const { encodeVarint, decodeVarint } = require('./encoding')
-const LRUCache = require('lru-cache')
+const { LRUCache } = require('lru-cache')
 const log = require('../log')
 const pick = require('../../../datadog-core/src/utils/src/pick')
 
-const options = { max: 500 }
-const cache = new LRUCache(options)
+const cache = new LRUCache({ max: 500 })
 
 const CONTEXT_PROPAGATION_KEY = 'dd-pathway-ctx'
 const CONTEXT_PROPAGATION_KEY_BASE64 = 'dd-pathway-ctx-base64'
@@ -24,15 +25,16 @@ function computeHash (service, env, edgeTags, parentHash) {
   edgeTags.sort()
   const hashableEdgeTags = edgeTags.filter(item => item !== 'manual_checkpoint:true')
 
-  const key = `${service}${env}` + hashableEdgeTags.join('') + parentHash.toString()
-  if (cache.get(key)) {
-    return cache.get(key)
+  const key = `${service}${env}${hashableEdgeTags.join('')}${parentHash}`
+  let value = cache.get(key)
+  if (value) {
+    return value
   }
   const currentHash = shaHash(`${service}${env}` + hashableEdgeTags.join(''))
   const buf = Buffer.concat([currentHash, parentHash], 16)
-  const val = shaHash(buf.toString())
-  cache.set(key, val)
-  return val
+  value = shaHash(buf.toString())
+  cache.set(key, value)
+  return value
 }
 
 function encodePathwayContext (dataStreamsContext) {

package/packages/dd-trace/src/datastreams/processor.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const os = require('os')
 const pkg = require('../../../../package.json')
 
@@ -78,15 +80,14 @@ class StatsBucket {
     return this._backlogs
   }
 
-  forCheckpoint (checkpoint) {
-    const key = checkpoint.hash
-    if (!this._checkpoints.has(key)) {
-      this._checkpoints.set(
-        key, new StatsPoint(checkpoint.hash, checkpoint.parentHash, checkpoint.edgeTags)
-      )
+  forCheckpoint ({ hash, parentHash, edgeTags }) {
+    let checkpoint = this._checkpoints.get(hash)
+    if (!checkpoint) {
+      checkpoint = new StatsPoint(hash, parentHash, edgeTags)
+      this._checkpoints.set(hash, checkpoint)
     }
 
-    return this._checkpoints.get(key)
+    return checkpoint
   }
 
   /**

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

@@ -1,3 +1,5 @@
+'use strict'
+
 class Schema {
   constructor (definition, id) {
     this.definition = definition