dd-trace 5.61.1 → 5.63.0

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

@@ -8,9 +8,12 @@ const TraceState = require('./tracestate')
 const tags = require('../../../../../ext/tags')
 const { channel } = require('dc-polyfill')
 const { setBaggageItem, getAllBaggageItems, removeAllBaggageItems } = require('../../baggage')
+const telemetryMetrics = require('../../telemetry/metrics')
 
 const { AUTO_KEEP, AUTO_REJECT, USER_KEEP } = require('../../../../../ext/priority')
 
+const tracerMetrics = telemetryMetrics.manager.namespace('tracers')
+
 const injectCh = channel('dd-trace:span:inject')
 const extractCh = channel('dd-trace:span:extract')
 
@@ -142,12 +145,27 @@ class TextMapPropagator {
         const item = `${this._encodeOtelBaggageKey(String(key).trim())}=${encodeURIComponent(String(value).trim())},`
         itemCounter += 1
         byteCounter += Buffer.byteLength(item)
-        if (itemCounter > this._config.baggageMaxItems || byteCounter > this._config.baggageMaxBytes) break
+
+        // Check for item count limit exceeded
+        if (itemCounter > this._config.baggageMaxItems) {
+          tracerMetrics.count('context_header_style.truncated', ['truncation_reason:baggage_item_count_exceeded']).inc()
+          break
+        }
+
+        // Check for byte count limit exceeded
+        if (byteCounter > this._config.baggageMaxBytes) {
+          tracerMetrics.count('context_header_style.truncated', ['truncation_reason:baggage_byte_count_exceeded']).inc()
+          break
+        }
+
         baggage += item
       }
 
       baggage = baggage.slice(0, -1)
-      if (baggage) carrier.baggage = baggage
+      if (baggage) {
+        carrier.baggage = baggage
+        tracerMetrics.count('context_header_style.injected', ['header_style:baggage']).inc()
+      }
     }
   }
 
@@ -635,6 +653,7 @@ class TextMapPropagator {
       : new Set(this._config.baggageTagKeys.split(','))
     for (const keyValue of baggages) {
       if (!keyValue.includes('=')) {
+        tracerMetrics.count('context_header_style.malformed', ['header_style:baggage']).inc()
         removeAllBaggageItems()
         return
       }
@@ -642,6 +661,7 @@ class TextMapPropagator {
       key = this._decodeOtelBaggageKey(key.trim())
       value = decodeURIComponent(value.trim())
       if (!key || !value) {
+        tracerMetrics.count('context_header_style.malformed', ['header_style:baggage']).inc()
         removeAllBaggageItems()
         return
       }
@@ -650,6 +670,9 @@ class TextMapPropagator {
       }
       setBaggageItem(key, value)
     }
+
+    // Successfully extracted baggage
+    tracerMetrics.count('context_header_style.extracted', ['header_style:baggage']).inc()
   }
 
   _extractSamplingPriority (carrier, spanContext) {

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

@@ -59,6 +59,10 @@ class DatadogSpanContext {
     return this._spanId.toString(10)
   }
 
+  toBigIntSpanId () {
+    return this._spanId.toBigInt()
+  }
+
   toTraceparent () {
     const flags = this._sampling.priority >= AUTO_KEEP ? '01' : '00'
     const traceId = this.toTraceId(true)

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

@@ -1,7 +1,7 @@
 'use strict'
 
 const { channel } = require('dc-polyfill')
-const { isFalse, normalizePluginEnvName } = require('./util')
+const { isFalse, isTrue, normalizePluginEnvName } = require('./util')
 const plugins = require('./plugins')
 const log = require('./log')
 const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
@@ -32,8 +32,7 @@ loadChannel.subscribe(({ name }) => {
 function maybeEnable (Plugin) {
   if (!Plugin || typeof Plugin !== 'function') return
   if (!pluginClasses[Plugin.id]) {
-    const envName = `DD_TRACE_${Plugin.id.toUpperCase()}_ENABLED`
-    const enabled = getEnvironmentVariable(normalizePluginEnvName(envName))
+    const enabled = getEnvEnabled(Plugin)
 
     // TODO: remove the need to load the plugin class in order to disable the plugin
     if (isFalse(enabled) || disabledPlugins.has(Plugin.id)) {
@@ -46,6 +45,11 @@ function maybeEnable (Plugin) {
   }
 }
 
+function getEnvEnabled (Plugin) {
+  const envName = `DD_TRACE_${Plugin.id.toUpperCase()}_ENABLED`
+  return getEnvironmentVariable(normalizePluginEnvName(envName))
+}
+
 // TODO this must always be a singleton.
 module.exports = class PluginManager {
   constructor (tracer) {
@@ -74,7 +78,7 @@ module.exports = class PluginManager {
       this._pluginsByName[name] = new Plugin(this._tracer, this._tracerConfig)
     }
     const pluginConfig = this._configsByName[name] || {
-      enabled: this._tracerConfig.plugins !== false
+      enabled: this._tracerConfig.plugins !== false && (!Plugin.experimental || isTrue(getEnvEnabled(Plugin)))
     }
 
     // extracts predetermined configuration from tracer and combines it with plugin-specific config

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

@@ -4,9 +4,9 @@ const TracingPlugin = require('./tracing')
 const { storage } = require('../../../datadog-core')
 
 class ApolloBasePlugin extends TracingPlugin {
-  static get id () { return 'apollo.gateway' }
-  static get type () { return 'web' }
-  static get kind () { return 'server' }
+  static id = 'apollo.gateway'
+  static type = 'web'
+  static kind = 'server'
 
   bindStart (ctx) {
     const store = storage('legacy').getStore()

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

@@ -3,7 +3,7 @@
 const StoragePlugin = require('./storage')
 
 class CachePlugin extends StoragePlugin {
-  static get operation () { return 'command' }
+  static operation = 'command'
 
   startSpan (options, ctx) {
     if (!options.kind) {

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

@@ -3,9 +3,9 @@
 const OutboundPlugin = require('./outbound')
 
 class ClientPlugin extends OutboundPlugin {
-  static get operation () { return 'request' }
-  static get kind () { return 'client' }
-  static get type () { return 'web' } // overridden by storage and other client type plugins
+  static operation = 'request'
+  static kind = 'client'
+  static type = 'web' // overridden by storage and other client type plugins
 }
 
 module.exports = ClientPlugin

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

@@ -3,9 +3,9 @@
 const InboundPlugin = require('./inbound')
 
 class ConsumerPlugin extends InboundPlugin {
-  static get operation () { return 'receive' }
-  static get kind () { return 'consumer' }
-  static get type () { return 'messaging' }
+  static operation = 'receive'
+  static kind = 'consumer'
+  static type = 'messaging'
 
   startSpan (options, enterOrCtx) {
     if (!options.service) {

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

@@ -4,8 +4,8 @@ const StoragePlugin = require('./storage')
 const { PEER_SERVICE_KEY, PEER_SERVICE_SOURCE_KEY } = require('../constants')
 
 class DatabasePlugin extends StoragePlugin {
-  static get operation () { return 'query' }
-  static get peerServicePrecursors () { return ['db.name'] }
+  static operation = 'query'
+  static peerServicePrecursors = ['db.name']
 
   constructor (...args) {
     super(...args)

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

@@ -26,6 +26,7 @@ module.exports = {
   get '@smithy/smithy-client' () { return require('../../../datadog-plugin-aws-sdk/src') },
   get '@vitest/runner' () { return require('../../../datadog-plugin-vitest/src') },
   get aerospike () { return require('../../../datadog-plugin-aerospike/src') },
+  get ai () { return require('../../../datadog-plugin-ai/src') },
   get amqp10 () { return require('../../../datadog-plugin-amqp10/src') },
   get amqplib () { return require('../../../datadog-plugin-amqplib/src') },
   get avsc () { return require('../../../datadog-plugin-avsc/src') },
@@ -75,6 +76,7 @@ module.exports = {
   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 mongoose () { return require('../../../datadog-plugin-mongoose/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') },

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

@@ -45,14 +45,10 @@ module.exports = class LogPlugin extends Plugin {
     })
   }
 
-  _isEnabled (config) {
-    return config.enabled && (config.logInjection === true || config.ciVisAgentlessLogSubmissionEnabled)
-  }
-
   configure (config) {
     return super.configure({
       ...config,
-      enabled: this._isEnabled(config)
+      enabled: config.enabled && (config.logInjection || config.ciVisAgentlessLogSubmissionEnabled)
     })
   }
 }

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

@@ -17,7 +17,7 @@ const COMMON_PEER_SVC_SOURCE_TAGS = [
 
 // TODO: Exit span on finish when AsyncResource instances are removed.
 class OutboundPlugin extends TracingPlugin {
-  static get peerServicePrecursors () { return [] }
+  static peerServicePrecursors = []
 
   constructor (...args) {
     super(...args)

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

@@ -60,7 +60,7 @@ module.exports = class Plugin {
   }
 
   get tracer () {
-    return this._tracer._tracer
+    return this._tracer?._tracer || this._tracer
   }
 
   enter (span, store) {

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

@@ -3,9 +3,9 @@
 const OutboundPlugin = require('./outbound')
 
 class ProducerPlugin extends OutboundPlugin {
-  static get operation () { return 'publish' }
-  static get kind () { return 'producer' }
-  static get type () { return 'messaging' }
+  static operation = 'publish'
+  static kind = 'producer'
+  static type = 'messaging'
 
   startSpan (options, enterOrCtx) {
     const spanDefaults = {

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

@@ -3,9 +3,9 @@
 const InboundPlugin = require('./inbound')
 
 class ServerPlugin extends InboundPlugin {
-  static get operation () { return 'request' }
-  static get kind () { return 'server' }
-  static get type () { return 'web' } // a default that may eventually be overriden by nonweb servers
+  static operation = 'request'
+  static kind = 'server'
+  static type = 'web' // a default that may eventually be overriden by nonweb servers
 }
 
 module.exports = ServerPlugin

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

@@ -3,7 +3,7 @@
 const ClientPlugin = require('./client')
 
 class StoragePlugin extends ClientPlugin {
-  static get type () { return 'storage' }
+  static type = 'storage'
 
   constructor (...args) {
     super(...args)

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

@@ -102,28 +102,46 @@ class TracingPlugin extends Plugin {
     }
   }
 
-  startSpan (name, { childOf, kind, meta, metrics, service, resource, type } = {}, enterOrCtx = true) {
+  startSpan (name, options = {}, enterOrCtx = true) {
+    // TODO: modularize this code to a helper function
+    let {
+      component = this.component,
+      childOf,
+      integrationName,
+      kind,
+      meta,
+      metrics,
+      service,
+      startTime,
+      resource,
+      type
+    } = options
+
+    const tracer = options.tracer || this.tracer
+    const config = options.config || this.config
+
     const store = storage('legacy').getStore()
     if (store && childOf === undefined) {
       childOf = store.span
     }
 
-    const span = this.tracer.startSpan(name, {
+    const span = tracer.startSpan(name, {
+      startTime,
       childOf,
       tags: {
-        [COMPONENT]: this.component,
-        'service.name': service || this.tracer._service,
+        [COMPONENT]: component,
+        'service.name': service || meta?.service || tracer._service,
         'resource.name': resource,
         'span.kind': kind,
         'span.type': type,
         ...meta,
         ...metrics
       },
-      integrationName: this.component,
+      integrationName: integrationName || component,
       links: childOf?._links
     })
 
-    analyticsSampler.sample(span, this.config.measured)
+    analyticsSampler.sample(span, config.measured)
 
     // TODO: Remove this after migration to TracingChannel is done.
     if (enterOrCtx === true) {

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

@@ -28,7 +28,8 @@ const {
   CI_NODE_LABELS,
   CI_NODE_NAME,
   PR_NUMBER,
-  CI_JOB_ID
+  CI_JOB_ID,
+  GIT_PULL_REQUEST_BASE_BRANCH_HEAD_SHA
 } = require('./tags')
 const { filterSensitiveInfoFromRepository } = require('./url')
 const { getEnvironmentVariable, getEnvironmentVariables } = require('../../config-helper')
@@ -187,7 +188,9 @@ module.exports = {
         CI_RUNNER_ID,
         CI_RUNNER_TAGS,
         CI_MERGE_REQUEST_TARGET_BRANCH_NAME,
-        CI_MERGE_REQUEST_IID
+        CI_MERGE_REQUEST_IID,
+        CI_MERGE_REQUEST_TARGET_BRANCH_SHA,
+        CI_MERGE_REQUEST_DIFF_BASE_SHA
       } = env
 
       const { name, email } = parseEmailAndName(CI_COMMIT_AUTHOR)
@@ -219,7 +222,9 @@ module.exports = {
         [CI_NODE_NAME]: CI_RUNNER_ID,
         [GIT_PULL_REQUEST_BASE_BRANCH]: CI_MERGE_REQUEST_TARGET_BRANCH_NAME,
         [PR_NUMBER]: CI_MERGE_REQUEST_IID,
-        [CI_JOB_ID]: GITLAB_CI_JOB_ID
+        [CI_JOB_ID]: GITLAB_CI_JOB_ID,
+        [GIT_PULL_REQUEST_BASE_BRANCH_SHA]: CI_MERGE_REQUEST_DIFF_BASE_SHA,
+        [GIT_PULL_REQUEST_BASE_BRANCH_HEAD_SHA]: CI_MERGE_REQUEST_TARGET_BRANCH_SHA
       }
     }
 
@@ -315,7 +320,7 @@ module.exports = {
         tags[GIT_PULL_REQUEST_BASE_BRANCH] = GITHUB_BASE_REF
         try {
           const eventContent = getGitHubEventPayload()
-          tags[GIT_PULL_REQUEST_BASE_BRANCH_SHA] = eventContent.pull_request.base.sha
+          tags[GIT_PULL_REQUEST_BASE_BRANCH_HEAD_SHA] = eventContent.pull_request.base.sha
           tags[GIT_COMMIT_HEAD_SHA] = eventContent.pull_request.head.sha
         } catch {
           // ignore malformed event content
@@ -522,8 +527,7 @@ module.exports = {
         BUILDKITE_MESSAGE,
         BUILDKITE_AGENT_ID,
         BUILDKITE_PULL_REQUEST,
-        BUILDKITE_PULL_REQUEST_BASE_BRANCH,
-        BUILDKITE_CI_JOB_ID
+        BUILDKITE_PULL_REQUEST_BASE_BRANCH
       } = env
 
       const extraTags = Object.keys(env).filter(envVar =>
@@ -555,7 +559,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
+        [CI_JOB_ID]: BUILDKITE_JOB_ID
       }
 
       if (BUILDKITE_PULL_REQUEST) {

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

@@ -22,7 +22,7 @@ const supportedProxies = {
   }
 }
 
-function createInferredProxySpan (headers, childOf, tracer, context) {
+function createInferredProxySpan (headers, childOf, tracer, reqCtx, traceCtx, config, startSpanHelper) {
   if (!headers) {
     return null
   }
@@ -41,26 +41,22 @@ function createInferredProxySpan (headers, childOf, tracer, context) {
 
   log.debug('Successfully extracted inferred span info %s for proxy:', proxyContext, proxyContext.proxySystemName)
 
-  const span = tracer.startSpan(
-    proxySpanInfo.spanName,
-    {
-      childOf,
-      type: 'web',
-      startTime: proxyContext.requestTime,
-      integrationName: proxySpanInfo.component,
-      tags: {
-        service: proxyContext.domainName || tracer._config.service,
-        component: proxySpanInfo.component,
-        [SPAN_TYPE]: 'web',
-        [HTTP_METHOD]: proxyContext.method,
-        [HTTP_URL]: proxyContext.domainName + proxyContext.path,
-        stage: proxyContext.stage
-      }
+  const span = startSpanHelper(tracer, proxySpanInfo.spanName, {
+    childOf,
+    type: 'web',
+    startTime: proxyContext.requestTime,
+    integrationName: proxySpanInfo.component,
+    meta: {
+      service: proxyContext.domainName || tracer._config.service,
+      component: proxySpanInfo.component,
+      [SPAN_TYPE]: 'web',
+      [HTTP_METHOD]: proxyContext.method,
+      [HTTP_URL]: proxyContext.domainName + proxyContext.path,
+      stage: proxyContext.stage
     }
-  )
+  }, traceCtx, config)
 
-  tracer.scope().activate(span)
-  context.inferredProxySpan = span
+  reqCtx.inferredProxySpan = span
   childOf = span
 
   log.debug('Successfully created inferred proxy span.')

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

@@ -3,11 +3,14 @@
 const { BlockList } = require('net')
 const net = require('net')
 
+const FORWARED_HEADER_NAME = 'forwarded'
+
 const ipHeaderList = [
   'x-forwarded-for',
   'x-real-ip',
   'true-client-ip',
   'x-client-ip',
+  FORWARED_HEADER_NAME,
   'forwarded-for',
   'x-cluster-client-ip',
   'fastly-client-ip',
@@ -49,7 +52,8 @@ function extractIp (config, req) {
   let firstPrivateIp
   if (headers) {
     for (const ipHeaderName of ipHeaderList) {
-      const firstIp = findFirstIp(headers[ipHeaderName])
+      const header = headers[ipHeaderName]
+      const firstIp = ipHeaderName === FORWARED_HEADER_NAME ? findFirstIpForwardedFormat(header) : findFirstIp(header)
 
       if (firstIp.public) {
         return firstIp.public
@@ -62,6 +66,10 @@ function extractIp (config, req) {
   return firstPrivateIp || req.socket?.remoteAddress
 }
 
+function isPublicIp (ip, type) {
+  return !privateIPMatcher.check(ip, type === 6 ? 'ipv6' : 'ipv4')
+}
+
 function findFirstIp (str) {
   const result = {}
   if (!str) return result
@@ -76,10 +84,10 @@ function findFirstIp (str) {
     const type = net.isIP(chunk)
     if (!type) continue
 
-    if (!privateIPMatcher.check(chunk, type === 6 ? 'ipv6' : 'ipv4')) {
+    if (isPublicIp(chunk, type)) {
       // it's public, return it immediately
       result.public = chunk
-      break
+      return result
     }
 
     // it's private, only save the first one found
@@ -89,6 +97,39 @@ function findFirstIp (str) {
   return result
 }
 
+const forwardedForRegexp = /for="?\[?(([0-9]+\.)+[0-9]+|[0-9a-f:]*:[0-9a-f]*)/i
+const forwardedByRegexp = /by="?\[?(([0-9]+\.)+[0-9]+|[0-9a-f:]*:[0-9a-f]*)/i
+const forwardedRegexps = [forwardedForRegexp, forwardedByRegexp]
+
+function findFirstIpForwardedFormat (str) {
+  const result = {}
+  if (!str) return result
+
+  const splitted = str.split(',')
+
+  for (const part of splitted) {
+    const chunk = part.trim()
+
+    for (const regex of forwardedRegexps) {
+      const ip = regex.exec(chunk)?.[1]
+
+      const type = net.isIP(ip)
+      if (!type) continue
+
+      if (isPublicIp(ip, type)) {
+        // it's public, return it immediately
+        result.public = ip
+        return result
+      }
+
+      // it's private, only save the first one found
+      if (!result.private) result.private = ip
+    }
+  }
+
+  return result
+}
+
 module.exports = {
   extractIp,
   ipHeaderList

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

@@ -21,6 +21,7 @@ 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_HEAD_SHA = 'git.pull_request.base_branch_head_sha'
 const GIT_PULL_REQUEST_BASE_BRANCH = 'git.pull_request.base_branch'
 
 const CI_PIPELINE_ID = 'ci.pipeline.id'
@@ -61,6 +62,7 @@ module.exports = {
   GIT_COMMIT_HEAD_COMMITTER_EMAIL,
   GIT_COMMIT_HEAD_COMMITTER_NAME,
   GIT_PULL_REQUEST_BASE_BRANCH_SHA,
+  GIT_PULL_REQUEST_BASE_BRANCH_HEAD_SHA,
   GIT_PULL_REQUEST_BASE_BRANCH,
   CI_PIPELINE_ID,
   CI_PIPELINE_NAME,

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

@@ -10,6 +10,7 @@ const kinds = require('../../../../../ext/kinds')
 const urlFilter = require('./urlfilter')
 const { ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK } = require('../../constants')
 const { createInferredProxySpan, finishInferredProxySpan } = require('./inferred_proxy')
+const TracingPlugin = require('../tracing')
 
 let extractIp
 
@@ -37,8 +38,25 @@ const HTTP2_HEADER_PATH = ':path'
 const contexts = new WeakMap()
 const ends = new WeakMap()
 
+// TODO: change this to no longer rely on creating a dummy plugin to be able to access startSpan
+function createWebPlugin (tracer, config = {}) {
+  const plugin = new TracingPlugin(tracer, tracer._config)
+  plugin.component = 'web'
+  plugin.config = config
+  return plugin
+}
+
+function startSpanHelper (tracer, name, options, traceCtx, config = {}) {
+  if (!web.plugin) {
+    web.plugin = createWebPlugin(tracer, config)
+  }
+
+  return web.plugin.startSpan(name, { ...options, tracer, config }, traceCtx)
+}
+
 const web = {
   TYPE: WEB,
+  plugin: null,
 
   // Ensure the configuration has the correct structure and defaults.
   normalizeConfig (config) {
@@ -93,7 +111,7 @@ const web = {
     analyticsSampler.sample(span, config.measured, true)
   },
 
-  startSpan (tracer, config, req, res, name) {
+  startSpan (tracer, config, req, res, name, traceCtx) {
     const context = this.patch(req)
 
     let span
@@ -102,7 +120,7 @@ const web = {
       context.span.context()._name = name
       span = context.span
     } else {
-      span = web.startChildSpan(tracer, name, req)
+      span = web.startChildSpan(tracer, config, name, req, traceCtx)
     }
 
     context.tracer = tracer
@@ -163,10 +181,11 @@ const web = {
     const tracer = context.tracer
     const childOf = this.active(req)
     const config = context.config
+    const traceCtx = context.traceCtx
 
     if (config.middleware === false) return this.bindAndWrapMiddlewareErrors(fn, req, tracer, childOf)
 
-    const span = tracer.startSpan(name, { childOf })
+    const span = startSpanHelper(tracer, name, { childOf }, traceCtx, config)
 
     analyticsSampler.sample(span, config.measured)
 
@@ -258,20 +277,20 @@ const web = {
   },
 
   // Extract the parent span from the headers and start a new span as its child
-  startChildSpan (tracer, name, req) {
+  startChildSpan (tracer, config, name, req, traceCtx) {
     const headers = req.headers
-    const context = contexts.get(req)
+    const reqCtx = contexts.get(req)
     let childOf = tracer.extract(FORMAT_HTTP_HEADERS, headers)
 
     // we may have headers signaling a router proxy span should be created (such as for AWS API Gateway)
     if (tracer._config?.inferredProxyServicesEnabled) {
-      const proxySpan = createInferredProxySpan(headers, childOf, tracer, context)
+      const proxySpan = createInferredProxySpan(headers, childOf, tracer, reqCtx, traceCtx, config, startSpanHelper)
       if (proxySpan) {
         childOf = proxySpan
       }
     }
 
-    const span = tracer.startSpan(name, { childOf, links: childOf?._links })
+    const span = startSpanHelper(tracer, name, { childOf }, traceCtx, config)
 
     return span
   },

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

@@ -171,6 +171,8 @@ class Config {
       samplingContextsAvailable))
     checkOptionWithSamplingContextAllowed(this.cpuProfilingEnabled, 'CPU profiling')
 
+    this.samplingInterval = coalesce(options.samplingInterval, 1e3 / 99) // 99hz in millis
+
     this.heapSamplingInterval = coalesce(options.heapSamplingInterval,
       Number(DD_PROFILING_HEAP_SAMPLING_INTERVAL))
     const uploadCompression0 = coalesce(options.uploadCompression, DD_PROFILING_DEBUG_UPLOAD_COMPRESSION, 'on')