dd-trace 5.80.0 → 5.82.0

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

@@ -5,25 +5,22 @@ const fs = require('fs')
 const { URL } = require('url')
 const log = require('../../log')
 const { getEnvironmentVariable } = require('../../config-helper')
-const satisfies = require('semifies')
+const satisfies = require('../../../../../vendor/dist/semifies')
 
-const istanbul = require('istanbul-lib-coverage')
-const ignore = require('ignore')
+const istanbul = require('../../../../../vendor/dist/istanbul-lib-coverage')
+const ignore = require('../../../../../vendor/dist/ignore')
 
+const id = require('../../id')
 const {
-  getGitMetadata,
-  getGitInformationDiscrepancy,
-  getGitDiff,
-  getGitRemoteName,
-  getSourceBranch,
-  checkAndFetchBranch,
-  getLocalBranches,
-  getMergeBase,
-  getCounts
-} = require('./git')
-const { getUserProviderGitMetadata, validateGitRepositoryUrl, validateGitCommitSha } = require('./user-provided-git')
-const { getCIMetadata } = require('./ci')
-const { getRuntimeAndOSMetadata } = require('./env')
+  incrementCountMetric,
+  TELEMETRY_GIT_COMMIT_SHA_DISCREPANCY,
+  TELEMETRY_GIT_SHA_MATCH
+} = require('../../ci-visibility/telemetry')
+
+const { SPAN_TYPE, RESOURCE_NAME, SAMPLING_PRIORITY } = require('../../../../../ext/tags')
+const { SAMPLING_RULE_DECISION } = require('../../constants')
+const { AUTO_KEEP } = require('../../../../../ext/priority')
+const { version: ddTraceVersion } = require('../../../../../package.json')
 const {
   GIT_BRANCH,
   GIT_COMMIT_SHA,
@@ -37,17 +34,20 @@ const {
   CI_JOB_NAME,
   GIT_COMMIT_HEAD_SHA
 } = require('./tags')
-const id = require('../../id')
+const { getRuntimeAndOSMetadata } = require('./env')
+const { getCIMetadata } = require('./ci')
+const { getUserProviderGitMetadata, validateGitRepositoryUrl, validateGitCommitSha } = require('./user-provided-git')
 const {
-  incrementCountMetric,
-  TELEMETRY_GIT_COMMIT_SHA_DISCREPANCY,
-  TELEMETRY_GIT_SHA_MATCH
-} = require('../../ci-visibility/telemetry')
-
-const { SPAN_TYPE, RESOURCE_NAME, SAMPLING_PRIORITY } = require('../../../../../ext/tags')
-const { SAMPLING_RULE_DECISION } = require('../../constants')
-const { AUTO_KEEP } = require('../../../../../ext/priority')
-const { version: ddTraceVersion } = require('../../../../../package.json')
+  getGitMetadata,
+  getGitInformationDiscrepancy,
+  getGitDiff,
+  getGitRemoteName,
+  getSourceBranch,
+  checkAndFetchBranch,
+  getLocalBranches,
+  getMergeBase,
+  getCounts
+} = require('./git')
 
 /**
  * JSDoc types for test environment metadata helpers.
@@ -813,7 +813,7 @@ function getTestEndLine (testFn, startLine = 0) {
 
 /**
  * Gets an object of test tags from an Playwright annotations array.
- * @param {Object[]} annotations - Annotations from a Playwright test.
+ * @param {object[]} annotations - Annotations from a Playwright test.
  * @param {string} annotations[].type - Type of annotation. A string of the shape DD_TAGS[$tag_name].
  * @param {string} annotations[].description - Value of the tag.
  */

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

@@ -2,6 +2,118 @@
 
 const { URL } = require('url')
 
+const HTTP2_HEADER_AUTHORITY = ':authority'
+const HTTP2_HEADER_SCHEME = ':scheme'
+const HTTP2_HEADER_PATH = ':path'
+
+const PATH_REGEX = /^(?:[a-z]+:\/\/(?:[^?/]+))?(?<path>\/[^?]*)(?:(\?).*)?$/
+
+const INT_SEGMENT = /^[1-9][0-9]+$/ // Integer of size at least 2 (>=10)
+const INT_ID_SEGMENT = /^(?=.*[0-9].*)[0-9._-]{3,}$/ // Mixed string with digits and delimiters
+const HEX_SEGMENT = /^(?=.*[0-9].*)[A-Fa-f0-9]{6,}$/ // Hexadecimal digits of size at least 6 with at least one decimal digit
+const HEX_ID_SEGMENT = /^(?=.*[0-9].*)[A-Fa-f0-9._-]{6,}$/ // Mixed string with hex digits and delimiters
+const STRING_SEGMENT = /^.{20,}|.*[%&'()*+,:=@].*$/ // Long string or a string containing special characters
+
+/**
+ * Extract full URL from HTTP request
+ * @param {import('http').IncomingMessage} req
+ * @returns {string} Full URL
+ */
+function extractURL (req) {
+  const headers = req.headers
+
+  if (req.stream) {
+    return `${headers[HTTP2_HEADER_SCHEME]}://${headers[HTTP2_HEADER_AUTHORITY]}${headers[HTTP2_HEADER_PATH]}`
+  }
+
+  const protocol = getProtocol(req)
+  return `${protocol}://${req.headers.host}${req.originalUrl || req.url}`
+}
+
+function getProtocol (req) {
+  return (req.socket?.encrypted || req.connection?.encrypted) ? 'https' : 'http'
+}
+
+/**
+ * Obfuscate query string
+ *
+ * @param {object} config
+ * @param {string} url
+ * @returns {string} obfuscated URL
+ */
+function obfuscateQs (config, url) {
+  const { queryStringObfuscation } = config
+
+  if (queryStringObfuscation === false) return url
+
+  const i = url.indexOf('?')
+  if (i === -1) return url
+
+  const path = url.slice(0, i)
+  if (queryStringObfuscation === true) return path
+
+  let qs = url.slice(i + 1)
+
+  qs = qs.replace(queryStringObfuscation, '<redacted>')
+
+  return `${path}?${qs}`
+}
+
+/**
+ * Extract URL path from URL using regex pattern instead of Node.js URL API because:
+ *
+ * - Handles edge cases like malformed URLs
+ * - Works with relative paths
+ * - Cross tracers compatibility
+ *
+ * @param {string} url
+ * @returns {string} Url path
+ */
+function extractPathFromUrl (url) {
+  if (!url) return '/'
+  const match = url.match(PATH_REGEX)
+
+  return match?.groups?.path || '/'
+}
+
+/**
+ * Calculate http.endpoint from URL path
+ *
+ * @param {string} url
+ * @returns {string} The normalized endpoint
+ */
+function calculateHttpEndpoint (url) {
+  const path = extractPathFromUrl(url)
+
+  // Split path by '/' and filter empty elements
+  const elements = path.split('/').filter(Boolean)
+
+  // Keep only first 8 non-empty elements
+  const limitedElements = elements.slice(0, 8)
+
+  // Apply regex replacements to each element respecting this order
+  const normalizedElements = limitedElements.map(element => {
+    if (INT_SEGMENT.test(element)) return '{param:int}'
+
+    if (INT_ID_SEGMENT.test(element)) return '{param:int_id}'
+
+    if (HEX_SEGMENT.test(element)) return '{param:hex}'
+
+    if (HEX_ID_SEGMENT.test(element)) return '{param:hex_id}'
+
+    if (STRING_SEGMENT.test(element)) return '{param:str}'
+
+    // No match
+    return element
+  })
+
+  const endpoint = normalizedElements.length > 0
+    ? '/' + normalizedElements.join('/')
+    : '/'
+
+  return endpoint
+}
+
 function filterSensitiveInfoFromRepository (repositoryUrl) {
   if (!repositoryUrl) {
     return ''
@@ -25,4 +137,10 @@ function filterSensitiveInfoFromRepository (repositoryUrl) {
   }
 }
 
-module.exports = { filterSensitiveInfoFromRepository }
+module.exports = {
+  extractURL,
+  obfuscateQs,
+  calculateHttpEndpoint,
+  filterSensitiveInfoFromRepository,
+  extractPathFromUrl // test only
+}

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

@@ -1,5 +1,6 @@
 'use strict'
 
+const { getEnvironmentVariables } = require('../../config-helper')
 const {
   GIT_COMMIT_SHA,
   GIT_BRANCH,
@@ -19,7 +20,6 @@ const {
 
 const { normalizeRef } = require('./ci')
 const { filterSensitiveInfoFromRepository } = require('./url')
-const { getEnvironmentVariables } = require('../../config-helper')
 
 function removeEmptyValues (tags) {
   return Object.keys(tags).reduce((filteredTags, tag) => {

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

@@ -7,10 +7,11 @@ const log = require('../../log')
 const tags = require('../../../../../ext/tags')
 const types = require('../../../../../ext/types')
 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')
+const urlFilter = require('./urlfilter')
+const { createInferredProxySpan, finishInferredProxySpan } = require('./inferred_proxy')
+const { extractURL, obfuscateQs, calculateHttpEndpoint } = require('./url')
 
 let extractIp
 
@@ -25,16 +26,13 @@ const HTTP_METHOD = tags.HTTP_METHOD
 const HTTP_URL = tags.HTTP_URL
 const HTTP_STATUS_CODE = tags.HTTP_STATUS_CODE
 const HTTP_ROUTE = tags.HTTP_ROUTE
+const HTTP_ENDPOINT = tags.HTTP_ENDPOINT
 const HTTP_REQUEST_HEADERS = tags.HTTP_REQUEST_HEADERS
 const HTTP_RESPONSE_HEADERS = tags.HTTP_RESPONSE_HEADERS
 const HTTP_USERAGENT = tags.HTTP_USERAGENT
 const HTTP_CLIENT_IP = tags.HTTP_CLIENT_IP
 const MANUAL_DROP = tags.MANUAL_DROP
 
-const HTTP2_HEADER_AUTHORITY = ':authority'
-const HTTP2_HEADER_SCHEME = ':scheme'
-const HTTP2_HEADER_PATH = ':path'
-
 const contexts = new WeakMap()
 const ends = new WeakMap()
 
@@ -276,11 +274,14 @@ const web = {
     return context.middleware.at(-1)
   },
 
-  // Extract the parent span from the headers and start a new span as its child
   startChildSpan (tracer, config, name, req, traceCtx) {
     const headers = req.headers
     const reqCtx = contexts.get(req)
-    let childOf = tracer.extract(FORMAT_HTTP_HEADERS, headers)
+    const { storage } = require('../../../../datadog-core')
+    const store = storage('legacy').getStore()
+    const pubsubSpan = store?.span?._name === 'pubsub.push.receive' ? store.span : null
+
+    let childOf = pubsubSpan || 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) {
@@ -363,24 +364,6 @@ const web = {
     finishInferredProxySpan(context)
   },
 
-  obfuscateQs (config, url) {
-    const { queryStringObfuscation } = config
-
-    if (queryStringObfuscation === false) return url
-
-    const i = url.indexOf('?')
-    if (i === -1) return url
-
-    const path = url.slice(0, i)
-    if (queryStringObfuscation === true) return path
-
-    let qs = url.slice(i + 1)
-
-    qs = qs.replace(queryStringObfuscation, '<redacted>')
-
-    return `${path}?${qs}`
-  },
-
   wrapWriteHead (context) {
     const { req, res } = context
     const writeHead = res.writeHead
@@ -475,7 +458,7 @@ function addRequestTags (context, spanType) {
   const url = extractURL(req)
 
   span.addTags({
-    [HTTP_URL]: web.obfuscateQs(config, url),
+    [HTTP_URL]: obfuscateQs(config, url),
     [HTTP_METHOD]: req.method,
     [SPAN_KIND]: SERVER,
     [SPAN_TYPE]: spanType,
@@ -496,11 +479,17 @@ function addRequestTags (context, spanType) {
 }
 
 function addResponseTags (context) {
-  const { req, res, paths, span, inferredProxySpan } = context
+  const { req, res, paths, span, inferredProxySpan, config } = context
 
   const route = paths.join('')
   if (route) {
+    // Use http.route from trusted framework instrumentation
     span.setTag(HTTP_ROUTE, route)
+  } else if (config.resourceRenamingEnabled) {
+    // Route is unavailable, compute http.endpoint instead
+    const url = span.context()._tags[HTTP_URL]
+    const endpoint = url ? calculateHttpEndpoint(url) : '/'
+    span.setTag(HTTP_ENDPOINT, endpoint)
   }
 
   span.addTags({
@@ -517,7 +506,7 @@ function addResourceTag (context) {
   const { req, span } = context
   const tags = span.context()._tags
 
-  if (tags['resource.name']) return
+  if (tags[RESOURCE_NAME]) return
 
   const resource = [req.method, tags[HTTP_ROUTE]]
     .filter(Boolean)
@@ -545,23 +534,6 @@ function addHeaders (context) {
   })
 }
 
-function extractURL (req) {
-  const headers = req.headers
-
-  if (req.stream) {
-    return `${headers[HTTP2_HEADER_SCHEME]}://${headers[HTTP2_HEADER_AUTHORITY]}${headers[HTTP2_HEADER_PATH]}`
-  }
-  const protocol = getProtocol(req)
-  return `${protocol}://${req.headers.host}${req.originalUrl || req.url}`
-}
-
-function getProtocol (req) {
-  if (req.socket && req.socket.encrypted) return 'https'
-  if (req.connection && req.connection.encrypted) return 'https'
-
-  return 'http'
-}
-
 function getHeadersToRecord (config) {
   if (Array.isArray(config.headers)) {
     try {

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

@@ -1,5 +1,19 @@
 'use strict'
 
+const {
+  tags: {
+    MANUAL_KEEP,
+    MANUAL_DROP,
+    SAMPLING_PRIORITY,
+    SERVICE_NAME
+  },
+  priority: {
+    AUTO_REJECT,
+    AUTO_KEEP,
+    USER_REJECT,
+    USER_KEEP
+  }
+} = require('../../../ext')
 const log = require('./log')
 const RateLimiter = require('./rate_limiter')
 const Sampler = require('./sampler')
@@ -19,21 +33,6 @@ const {
   DECISION_MAKER_KEY
 } = require('./constants')
 
-const {
-  tags: {
-    MANUAL_KEEP,
-    MANUAL_DROP,
-    SAMPLING_PRIORITY,
-    SERVICE_NAME
-  },
-  priority: {
-    AUTO_REJECT,
-    AUTO_KEEP,
-    USER_REJECT,
-    USER_KEEP
-  }
-} = require('../../../ext')
-
 const DEFAULT_KEY = 'service:,env:'
 
 const defaultSampler = new Sampler(AUTO_KEEP)
@@ -54,7 +53,7 @@ class PrioritySampler {
   /**
    * Creates an instance of PrioritySampler.
    *
-   * @typedef {Object} SamplingConfig
+   * @typedef {object} SamplingConfig
    * @property {number} [sampleRate] - The default sample rate for traces.
    * @property {string} [provenance] - Optional rule provenance ("customer" or "dynamic").
    * @property {number} [rateLimit=100] - The maximum number of traces to sample per second.

package/packages/dd-trace/src/process-tags/index.js

@@ -0,0 +1,83 @@
+'use strict'
+
+const path = require('node:path')
+
+const CURRENT_WORKING_DIRECTORY = process.cwd()
+const ENTRYPOINT_PATH = require.main?.filename || ''
+
+// $ cd /foo/bar && node baz/banana.js
+// entrypoint.workdir = bar
+// entrypoint.name = banana
+// entrypoint.type = script
+// entrypoint.basedir = baz
+// package.json.name = <from package.json>
+
+// process tags are constant throughout the lifetime of a process
+function getProcessTags () {
+  // Lazy load pkg to avoid issues with require.main during test initialization
+  const pkg = require('../pkg')
+
+  // this list is sorted alphabetically for consistent serialization
+  const tags = [
+    // the parent directory name of the entrypoint script, e.g. /foo/bar/baz/banana.js -> baz
+    ['entrypoint.basedir', ENTRYPOINT_PATH === '' ? undefined : path.basename(path.dirname(ENTRYPOINT_PATH))],
+
+    // the entrypoint script filename without the extension, e.g. /foo/bar/baz/banana.js -> banana
+    ['entrypoint.name', path.basename(ENTRYPOINT_PATH, path.extname(ENTRYPOINT_PATH)) || undefined],
+
+    // always script for JavaScript applications
+    ['entrypoint.type', 'script'],
+
+    // last segment of the current working directory, e.g. /foo/bar/baz/ -> baz
+    ['entrypoint.workdir', path.basename(CURRENT_WORKING_DIRECTORY) || undefined],
+
+    // the .name field from the application's package.json
+    ['package.json.name', pkg.name || undefined]
+  ]
+
+  const tagsArray = []
+  const tagsObject = {}
+
+  for (const [key, value] of tags) {
+    if (value !== undefined) {
+      const sanitizedValue = sanitize(value)
+      tagsArray.push(`${key}:${sanitizedValue}`)
+      tagsObject[key] = sanitizedValue
+    }
+  }
+
+  const serialized = tagsArray.join(',')
+
+  return {
+    tags,
+    serialized,
+    tagsObject,
+    tagsArray
+  }
+}
+
+// Export the singleton
+module.exports = getProcessTags()
+
+module.exports.TRACING_FIELD_NAME = '_dd.tags.process'
+module.exports.DSM_FIELD_NAME = 'ProcessTags'
+module.exports.PROFILING_FIELD_NAME = 'process_tags'
+module.exports.DYNAMIC_INSTRUMENTATION_FIELD_NAME = 'process_tags'
+module.exports.TELEMETRY_FIELD_NAME = 'process_tags'
+module.exports.REMOTE_CONFIG_FIELD_NAME = 'process_tags'
+module.exports.CRASH_TRACKING_FIELD_NAME = 'process_tags'
+module.exports.CLIENT_TRACE_STATISTICS_FIELD_NAME = 'ProcessTags'
+
+/**
+ * Sanitize a process tag value
+ *
+ * @param {string} value
+ * @returns {string}
+ */
+function sanitize (value) {
+  return String(value)
+    .toLowerCase()
+    .replaceAll(/[^a-zA-Z0-9/_.-]+/g, '_')
+}
+
+module.exports.sanitize = sanitize

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

@@ -3,7 +3,13 @@
 const os = require('os')
 const path = require('path')
 const { URL, format, pathToFileURL } = require('url')
-const satisfies = require('semifies')
+const satisfies = require('../../../../vendor/dist/semifies')
+const { GIT_REPOSITORY_URL, GIT_COMMIT_SHA } = require('../plugins/util/tags')
+const { getIsAzureFunction } = require('../serverless')
+const { isFalse, isTrue } = require('../util')
+const { getAzureTagsFromMetadata, getAzureAppMetadata, getAzureFunctionMetadata } = require('../azure_metadata')
+const { getEnvironmentVariables } = require('../config-helper')
+const defaults = require('../config_defaults')
 const { AgentExporter } = require('./exporters/agent')
 const { FileExporter } = require('./exporters/file')
 const { ConsoleLogger } = require('./loggers/console')
@@ -11,12 +17,7 @@ const WallProfiler = require('./profilers/wall')
 const SpaceProfiler = require('./profilers/space')
 const EventsProfiler = require('./profilers/events')
 const { oomExportStrategies, snapshotKinds } = require('./constants')
-const { GIT_REPOSITORY_URL, GIT_COMMIT_SHA } = require('../plugins/util/tags')
 const { tagger } = require('./tagger')
-const { isFalse, isTrue } = require('../util')
-const { getAzureTagsFromMetadata, getAzureAppMetadata } = require('../azure_metadata')
-const { getEnvironmentVariables } = require('../config-helper')
-const defaults = require('../config_defaults')
 
 class Config {
   constructor (options = {}) {
@@ -73,7 +74,7 @@ class Config {
       tagger.parse(DD_TAGS),
       tagger.parse(options.tags),
       tagger.parse({ env, host, service, version, functionname }),
-      getAzureTagsFromMetadata(getAzureAppMetadata())
+      getAzureTagsFromMetadata(getIsAzureFunction() ? getAzureFunctionMetadata() : getAzureAppMetadata())
     )
 
     // Add source code integration tags if available
@@ -178,6 +179,9 @@ class Config {
 
     this.heapSamplingInterval = options.heapSamplingInterval ??
       (Number(DD_PROFILING_HEAP_SAMPLING_INTERVAL) || 512 * 1024)
+
+    const isAtLeast24 = satisfies(process.versions.node, '>=24.0.0')
+
     const uploadCompression0 = options.uploadCompression ?? DD_PROFILING_DEBUG_UPLOAD_COMPRESSION ?? 'on'
     let [uploadCompression, level0] = uploadCompression0.split('-')
     if (!['on', 'off', 'gzip', 'zstd'].includes(uploadCompression)) {
@@ -205,9 +209,12 @@ class Config {
       }
     }
 
-    // Default to gzip
+    // Default to either zstd (on Node.js 24+) or gzip (earlier Node.js). We could default to ztsd
+    // everywhere as we ship a Rust zstd compressor for older Node.js versions, but on 24+ we use
+    // the built-in one that runs asynchronously on libuv worker threads, just as gzip does. This is
+    // the least disruptive choice.
     if (uploadCompression === 'on') {
-      uploadCompression = 'gzip'
+      uploadCompression = isAtLeast24 ? 'zstd' : 'gzip'
     }
 
     this.uploadCompression = { method: uploadCompression, level }
@@ -221,20 +228,24 @@ class Config {
 
     const hasExecArg = (arg) => process.execArgv.includes(arg) || String(NODE_OPTIONS).includes(arg)
 
-    this.asyncContextFrameEnabled = isTrue(options.useAsyncContextFrame ?? DD_PROFILING_ASYNC_CONTEXT_FRAME_ENABLED)
-    if (this.asyncContextFrameEnabled) {
-      if (satisfies(process.versions.node, '>=24.0.0')) {
-        if (hasExecArg('--no-async-context-frame')) {
-          turnOffAsyncContextFrame('with --no-async-context-frame')
-        }
-      } else if (satisfies(process.versions.node, '>=23.0.0')) {
-        if (!hasExecArg('--experimental-async-context-frame')) {
-          turnOffAsyncContextFrame('without --experimental-async-context-frame')
-        }
+    let canUseAsyncContextFrame = false
+    if (samplingContextsAvailable) {
+      if (isAtLeast24) {
+        canUseAsyncContextFrame = !hasExecArg('--no-async-context-frame')
+      } else if (satisfies(process.versions.node, '>=22.9.0')) {
+        canUseAsyncContextFrame = hasExecArg('--experimental-async-context-frame')
+      }
+    }
+    this.asyncContextFrameEnabled = isTrue(DD_PROFILING_ASYNC_CONTEXT_FRAME_ENABLED ?? canUseAsyncContextFrame)
+    if (this.asyncContextFrameEnabled && !canUseAsyncContextFrame) {
+      if (!samplingContextsAvailable) {
+        turnOffAsyncContextFrame(`on ${process.platform}`)
+      } else if (isAtLeast24) {
+        turnOffAsyncContextFrame('with --no-async-context-frame')
+      } else if (satisfies(process.versions.node, '>=22.9.0')) {
+        turnOffAsyncContextFrame('without --experimental-async-context-frame')
       } else {
-        // NOTE: technically, this should work starting with 22.7.0 which is when
-        // AsyncContextFrame debuted, but it would require a change in pprof-nodejs too.
-        turnOffAsyncContextFrame('but it requires at least Node.js 23')
+        turnOffAsyncContextFrame('but it requires at least Node.js 22.9.0')
       }
     }
 

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

@@ -1,14 +1,14 @@
 'use strict'
 
+const fs = require('fs')
+const { fileURLToPath } = require('url')
+const { SourceMapper, heap, encode } = require('@datadog/pprof')
+const { getEnvironmentVariable } = require('../config-helper')
 const { AgentExporter } = require('./exporters/agent')
 const { FileExporter } = require('./exporters/file')
 
-const { SourceMapper, heap, encode } = require('@datadog/pprof')
 const { ConsoleLogger } = require('./loggers/console')
 const { tagger } = require('./tagger')
-const fs = require('fs')
-const { fileURLToPath } = require('url')
-const { getEnvironmentVariable } = require('../config-helper')
 
 const logger = new ConsoleLogger()
 const timeoutMs = 15 * 1000

package/packages/dd-trace/src/profiling/exporters/agent.js

@@ -1,19 +1,19 @@
 'use strict'
 
-const retry = require('retry')
 const { request: httpRequest } = require('http')
 const { request: httpsRequest } = require('https')
-const { EventSerializer } = require('./event_serializer')
+const perf = require('perf_hooks').performance
+const { urlToHttpOptions } = require('url')
 
+const retry = require('../../../../../vendor/dist/retry')
 // TODO: avoid using dd-trace internals. Make this a separate module?
 const docker = require('../../exporters/common/docker')
 const FormData = require('../../exporters/common/form-data')
 const { storage } = require('../../../../datadog-core')
 const version = require('../../../../../package.json').version
-const { urlToHttpOptions } = require('url')
-const perf = require('perf_hooks').performance
-
 const telemetryMetrics = require('../../telemetry/metrics')
+const { EventSerializer } = require('./event_serializer')
+
 const profilersNamespace = telemetryMetrics.manager.namespace('profilers')
 
 const statusCodeCounters = []

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

@@ -1,12 +1,12 @@
 'use strict'
 
+const { getEnvironmentVariable } = require('../config-helper')
 const { Profiler, ServerlessProfiler } = require('./profiler')
 const WallProfiler = require('./profilers/wall')
 const SpaceProfiler = require('./profilers/space')
 const { AgentExporter } = require('./exporters/agent')
 const { FileExporter } = require('./exporters/file')
 const { ConsoleLogger } = require('./loggers/console')
-const { getEnvironmentVariable } = require('../config-helper')
 
 const profiler = getEnvironmentVariable('AWS_LAMBDA_FUNCTION_NAME') ? new ServerlessProfiler() : new Profiler()
 

package/packages/dd-trace/src/profiling/libuv-size.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const { getEnvironmentVariable } = require('../config-helper')
 const os = require('node:os')
+const { getEnvironmentVariable } = require('../config-helper')
 
 function getLibuvThreadPoolSize (envVar) {
   if (envVar === undefined) {