dd-trace 5.80.0 → 5.82.0

package/packages/dd-trace/src/opentelemetry/otlp/otlp_transformer_base.js

@@ -4,6 +4,7 @@ const log = require('../../log')
 
 /**
  * @typedef {import('@opentelemetry/api').Attributes} Attributes
+ * @typedef {import('@opentelemetry/api').AttributeValue} AttributeValue
  */
 
 /**
@@ -25,7 +26,7 @@ class OtlpTransformerBase {
    * @param {string} signalType - Signal type for warning messages (e.g., 'logs', 'metrics')
    */
   constructor (resourceAttributes, protocol, signalType) {
-    this.#resourceAttributes = this._transformAttributes(resourceAttributes)
+    this.#resourceAttributes = this.transformAttributes(resourceAttributes)
     if (protocol === 'grpc') {
       log.warn(`OTLP gRPC protocol is not supported for ${signalType}. ` +
         'Defaulting to http/protobuf. gRPC protobuf support may be added in a future release.')
@@ -40,12 +41,12 @@ class OtlpTransformerBase {
    * @returns {Map<string, Array>} Map of instrumentation scope key to items
    * @protected
    */
-  _groupByInstrumentationScope (items) {
+  groupByInstrumentationScope (items) {
     const grouped = new Map()
 
     for (const item of items) {
       const instrumentationScope = item.instrumentationScope || { name: '', version: '', schemaUrl: '', attributes: {} }
-      const attrsKey = JSON.stringify(instrumentationScope.attributes || {})
+      const attrsKey = stableStringify(instrumentationScope.attributes || {})
       const key = `${instrumentationScope.name}@${instrumentationScope.version}@` +
         `${instrumentationScope.schemaUrl}@${attrsKey}`
 
@@ -61,10 +62,10 @@ class OtlpTransformerBase {
 
   /**
    * Transforms resource attributes to OTLP resource format.
-   * @returns {Object} OTLP resource object
+   * @returns {object} OTLP resource object
    * @protected
    */
-  _transformResource () {
+  transformResource () {
     return {
       attributes: this.#resourceAttributes,
       droppedAttributesCount: 0
@@ -73,26 +74,24 @@ class OtlpTransformerBase {
 
   /**
    * Transforms attributes to OTLP KeyValue format.
-   * @param {Object} attributes - Attributes to transform
-   * @returns {Object[]} Array of OTLP KeyValue objects
+   * @param {Attributes} attributes - Attributes to transform
+   * @returns {object[]} Array of OTLP KeyValue objects
    * @protected
    */
-  _transformAttributes (attributes) {
-    if (!attributes) return []
-
+  transformAttributes (attributes) {
     return Object.entries(attributes).map(([key, value]) => ({
       key,
-      value: this._transformAnyValue(value)
+      value: this.transformAnyValue(value)
     }))
   }
 
   /**
    * Transforms attributes to JSON format (simplified).
-   * @param {Object} attributes - Attributes to transform
-   * @returns {Object[]} Array of OTLP KeyValue objects with string values
+   * @param {object} attributes - Attributes to transform
+   * @returns {object[]} Array of OTLP KeyValue objects with string values
    * @protected
    */
-  _attributesToJson (attributes) {
+  attributesToJson (attributes) {
     if (!attributes) return []
 
     return Object.entries(attributes).map(([key, value]) => ({
@@ -103,11 +102,13 @@ class OtlpTransformerBase {
 
   /**
    * Transforms any value to OTLP AnyValue format.
-   * @param {any} value - Value to transform
-   * @returns {Object} OTLP AnyValue object
+   * Supports: strings, numbers (int/double), booleans, arrays.
+   * Objects are filtered out by sanitizeAttributes before reaching this method.
+   * @param {AttributeValue | null | undefined} value - Value to transform
+   * @returns {object} OTLP AnyValue object
    * @protected
    */
-  _transformAnyValue (value) {
+  transformAnyValue (value) {
     if (typeof value === 'string') {
       return { stringValue: value }
     } else if (typeof value === 'number') {
@@ -120,30 +121,22 @@ class OtlpTransformerBase {
     } else if (Array.isArray(value)) {
       return {
         arrayValue: {
-          values: value.map(v => this._transformAnyValue(v))
-        }
-      }
-    } else if (value && typeof value === 'object') {
-      return {
-        kvlistValue: {
-          values: Object.entries(value).map(([k, v]) => ({
-            key: k,
-            value: this._transformAnyValue(v)
-          }))
+          values: value.map(v => this.transformAnyValue(v))
         }
       }
     }
+    // Fallback for any unexpected types
     return { stringValue: String(value) }
   }
 
   /**
    * Serializes data to protobuf format.
-   * @param {Object} protoType - Protobuf type from protobuf_loader
-   * @param {Object} data - Data to serialize
+   * @param {object} protoType - Protobuf type from protobuf_loader
+   * @param {object} data - Data to serialize
    * @returns {Buffer} Protobuf-encoded data
    * @protected
    */
-  _serializeToProtobuf (protoType, data) {
+  serializeToProtobuf (protoType, data) {
     const message = protoType.create(data)
     const buffer = protoType.encode(message).finish()
     return buffer
@@ -151,13 +144,35 @@ class OtlpTransformerBase {
 
   /**
    * Serializes data to JSON format.
-   * @param {Object} data - Data to serialize
+   * @param {object} data - Data to serialize
    * @returns {Buffer} JSON-encoded data
    * @protected
    */
-  _serializeToJson (data) {
+  serializeToJson (data) {
     return Buffer.from(JSON.stringify(data))
   }
 }
 
+/**
+ * Stable stringification of OpenTelemetry Attributes.
+ * Ensures consistent serialization regardless of key order by sorting keys.
+ * Supports string keys with primitive values or arrays of primitives.
+ *
+ * @param {Attributes} attributes - Attributes object to stringify
+ * @returns {string} Stable string representation
+ */
+function stableStringify (attributes) {
+  if (attributes == null) {
+    return JSON.stringify(attributes)
+  }
+  // Attributes are sorted by key to ensure consistent serialization regardless of key order.
+  // Keys are always strings and values are always strings, numbers, booleans,
+  // or arrays of strings, numbers, or booleans.
+  return Object.keys(attributes)
+    .sort()
+    .map(key => `${key}:${JSON.stringify(attributes[key])}`)
+    .join(',')
+}
+
 module.exports = OtlpTransformerBase
+module.exports.stableStringify = stableStringify

package/packages/dd-trace/src/opentelemetry/otlp/protobuf_loader.js

@@ -14,8 +14,8 @@
  * - https://github.com/open-telemetry/opentelemetry-proto (v1.7.0)
  */
 
-const protobuf = require('protobufjs')
 const path = require('path')
+const protobuf = require('../../../../../vendor/dist/protobufjs')
 
 let _root = null
 let protoLogsService = null

package/packages/dd-trace/src/opentelemetry/span.js

@@ -1,11 +1,11 @@
 'use strict'
 
+const { performance } = require('perf_hooks')
 const api = require('@opentelemetry/api')
 
-const { performance } = require('perf_hooks')
 const { timeOrigin } = performance
 
-const { timeInputToHrTime } = require('@opentelemetry/core')
+const { timeInputToHrTime } = require('../../../../vendor/dist/@opentelemetry/core')
 
 const tracer = require('../../')
 const DatadogSpan = require('../opentracing/span')
@@ -13,8 +13,8 @@ const { ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK, IGNORE_OTEL_ERROR } = require('.
 const { SERVICE_NAME, RESOURCE_NAME, SPAN_KIND } = require('../../../../ext/tags')
 const kinds = require('../../../../ext/kinds')
 
-const SpanContext = require('./span_context')
 const id = require('../id')
+const SpanContext = require('./span_context')
 
 // The one built into OTel rounds so we lose sub-millisecond precision.
 function hrTimeToMilliseconds (time) {

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

@@ -1,15 +1,15 @@
 'use strict'
 
 const api = require('@opentelemetry/api')
-const { sanitizeAttributes } = require('@opentelemetry/core')
+const { sanitizeAttributes } = require('../../../../vendor/dist/@opentelemetry/core')
 
-const Sampler = require('./sampler')
-const Span = require('./span')
 const id = require('../id')
 const log = require('../log')
-const SpanContext = require('./span_context')
 const TextMapPropagator = require('../opentracing/propagation/text_map')
 const TraceState = require('../opentracing/propagation/tracestate')
+const SpanContext = require('./span_context')
+const Span = require('./span')
+const Sampler = require('./sampler')
 
 class Tracer {
   constructor (library, config, tracerProvider) {

package/packages/dd-trace/src/opentelemetry/tracer_provider.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { trace, context, propagation } = require('@opentelemetry/api')
-const { W3CTraceContextPropagator } = require('@opentelemetry/core')
+const { W3CTraceContextPropagator } = require('../../../../vendor/dist/@opentelemetry/core')
 
 const tracer = require('../../')
 

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

@@ -1,16 +1,16 @@
 'use strict'
 
+const { channel } = require('dc-polyfill')
 const pick = require('../../../../datadog-core/src/utils/src/pick')
 const id = require('../../id')
 const DatadogSpanContext = require('../span_context')
 const log = require('../../log')
-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 TraceState = require('./tracestate')
 
 const tracerMetrics = telemetryMetrics.manager.namespace('tracers')
 
@@ -36,6 +36,9 @@ const b3HeaderExpr = /^(([0-9a-f]{16}){1,2}-[0-9a-f]{16}(-[01d](-[0-9a-f]{16})?)
 const baggageExpr = new RegExp(`^${baggagePrefix}(.+)$`)
 const tagKeyExpr = /^_dd\.p\.[\x21-\x2B\x2D-\x7E]+$/ // ASCII minus spaces and commas
 const tagValueExpr = /^[\x20-\x2B\x2D-\x7E]*$/ // ASCII minus commas
+// RFC7230 token (used by HTTP header field-name) and compatible with Node's header name validation.
+// See https://www.rfc-editor.org/rfc/rfc7230#section-3.2.6
+const httpHeaderNameExpr = /^[0-9A-Za-z!#$%&'*+\-.^_`|~]+$/
 const traceparentExpr = /^([a-f0-9]{2})-([a-f0-9]{32})-([a-f0-9]{16})-([a-f0-9]{2})(-.*)?$/i
 const traceparentKey = 'traceparent'
 const tracestateKey = 'tracestate'
@@ -130,9 +133,21 @@ class TextMapPropagator {
 
   _injectBaggageItems (spanContext, carrier) {
     if (this._config.legacyBaggageEnabled) {
-      spanContext?._baggageItems && Object.keys(spanContext._baggageItems).forEach(key => {
-        carrier[baggagePrefix + key] = String(spanContext._baggageItems[key])
-      })
+      const baggageItems = spanContext?._baggageItems
+      if (baggageItems) {
+        for (const key of Object.keys(baggageItems)) {
+          const headerName = baggagePrefix + key
+
+          // Legacy OpenTracing baggage is propagated as individual headers (ot-baggage-*),
+          // so it must always be representable as a valid HTTP header name.
+          if (!httpHeaderNameExpr.test(headerName)) {
+            tracerMetrics.count('context_header_style.malformed', ['header_style:baggage']).inc()
+            continue
+          }
+
+          carrier[headerName] = String(baggageItems[key])
+        }
+      }
     }
     if (this._hasPropagationStyle('inject', 'baggage')) {
       let baggage = ''
@@ -646,9 +661,10 @@ class TextMapPropagator {
 
   _extractBaggageItems (carrier, spanContext) {
     if (!this._hasPropagationStyle('extract', 'baggage')) return
-    if (!carrier || !carrier.baggage) return
+    if (!carrier?.baggage) return
     const baggages = carrier.baggage.split(',')
-    const keysToSpanTag = this._config.baggageTagKeys === '*'
+    const tagAllKeys = this._config.baggageTagKeys === '*'
+    const keysToSpanTag = tagAllKeys
       ? undefined
       : new Set(this._config.baggageTagKeys.split(','))
     for (const keyValue of baggages) {
@@ -665,7 +681,7 @@ class TextMapPropagator {
         removeAllBaggageItems()
         return
       }
-      if (spanContext && (this._config.baggageTagKeys === '*' || keysToSpanTag.has(key))) {
+      if (spanContext && (tagAllKeys || keysToSpanTag?.has(key))) {
         spanContext._trace.tags['baggage.' + key] = value
       }
       setBaggageItem(key, value)

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

@@ -4,16 +4,16 @@
 const { performance } = require('perf_hooks')
 const now = performance.now.bind(performance)
 const dateNow = Date.now
-const SpanContext = require('./span_context')
+const util = require('util')
+const { channel } = require('dc-polyfill')
 const id = require('../id')
 const tagger = require('../tagger')
 const runtimeMetrics = require('../runtime_metrics')
 const log = require('../log')
 const { storage } = require('../../../datadog-core')
 const telemetryMetrics = require('../telemetry/metrics')
-const { channel } = require('dc-polyfill')
-const util = require('util')
 const { getEnvironmentVariable } = require('../config-helper')
+const SpanContext = require('./span_context')
 
 const tracerMetrics = telemetryMetrics.manager.namespace('tracers')
 

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

@@ -1,19 +1,19 @@
 'use strict'
 
 const os = require('os')
-const Span = require('./span')
 const SpanProcessor = require('../span_processor')
 const PrioritySampler = require('../priority_sampler')
+const formats = require('../../../../ext/formats')
+const log = require('../log')
+const runtimeMetrics = require('../runtime_metrics')
+const getExporter = require('../exporter')
+const Span = require('./span')
 const TextMapPropagator = require('./propagation/text_map')
 const DSMTextMapPropagator = require('./propagation/text_map_dsm')
 const HttpPropagator = require('./propagation/http')
 const BinaryPropagator = require('./propagation/binary')
 const LogPropagator = require('./propagation/log')
-const formats = require('../../../../ext/formats')
 
-const log = require('../log')
-const runtimeMetrics = require('../runtime_metrics')
-const getExporter = require('../exporter')
 const SpanContext = require('./span_context')
 
 const REFERENCE_CHILD_OF = 'child_of'

package/packages/dd-trace/src/payload-tagging/index.js

@@ -1,13 +1,13 @@
 'use strict'
 
-const rfdc = require('rfdc')({ proto: false, circles: false })
+const rfdc = require('../../../../vendor/dist/rfdc')({ proto: false, circles: false })
 
 const {
   PAYLOAD_TAG_REQUEST_PREFIX,
   PAYLOAD_TAG_RESPONSE_PREFIX
 } = require('../constants')
 
-const jsonpath = require('jsonpath-plus').JSONPath
+const jsonpath = require('../../../../vendor/dist/jsonpath-plus').JSONPath
 
 const { tagsFromObject } = require('./tagging')
 
@@ -38,7 +38,9 @@ function maybeJSONParseValue (value) {
 function expand (object, expansionRules) {
   for (const rule of expansionRules) {
     jsonpath(rule, object, (value, _type, desc) => {
-      desc.parent[desc.parentProperty] = maybeJSONParseValue(value)
+      if (desc.parent && desc.parentProperty) {
+        desc.parent[desc.parentProperty] = maybeJSONParseValue(value)
+      }
     })
   }
 }
@@ -52,7 +54,9 @@ function expand (object, expansionRules) {
 function redact (object, redactionRules) {
   for (const rule of redactionRules) {
     jsonpath(rule, object, (_value, _type, desc) => {
-      desc.parent[desc.parentProperty] = 'redacted'
+      if (desc.parent && desc.parentProperty) {
+        desc.parent[desc.parentProperty] = 'redacted'
+      }
     })
   }
 }

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

@@ -1,10 +1,10 @@
 'use strict'
 
 const { channel } = require('dc-polyfill')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 const { isFalse, isTrue, normalizePluginEnvName } = require('./util')
 const plugins = require('./plugins')
 const log = require('./log')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
 // Test optimization plugins that should only be enabled when isCiVisibility is true
 const TEST_OPTIMIZATION_PLUGINS = new Set([
@@ -165,7 +165,8 @@ module.exports = class PluginManager {
       traceWebsocketMessagesEnabled,
       traceWebsocketMessagesInheritSampling,
       traceWebsocketMessagesSeparateTraces,
-      experimental
+      experimental,
+      resourceRenamingEnabled
     } = this._tracerConfig
 
     const sharedConfig = {
@@ -184,7 +185,8 @@ module.exports = class PluginManager {
       traceWebsocketMessagesEnabled,
       traceWebsocketMessagesInheritSampling,
       traceWebsocketMessagesSeparateTraces,
-      experimental
+      experimental,
+      resourceRenamingEnabled
     }
 
     if (logInjection !== undefined) {

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

@@ -1,7 +1,7 @@
 'use strict'
 
-const TracingPlugin = require('./tracing')
 const { storage } = require('../../../datadog-core')
+const TracingPlugin = require('./tracing')
 
 class ApolloBasePlugin extends TracingPlugin {
   static id = 'apollo.gateway'

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

@@ -1,6 +1,33 @@
 'use strict'
 
 const { storage } = require('../../../datadog-core')
+const { COMPONENT } = require('../constants')
+const log = require('../log')
+const {
+  incrementCountMetric,
+  distributionMetric,
+  TELEMETRY_EVENT_CREATED,
+  TELEMETRY_ITR_SKIPPED
+} = require('../ci-visibility/telemetry')
+const getDiClient = require('../ci-visibility/dynamic-instrumentation')
+const { DD_MAJOR } = require('../../../../version')
+const id = require('../id')
+const { OS_VERSION, OS_PLATFORM, OS_ARCHITECTURE, RUNTIME_NAME, RUNTIME_VERSION } = require('./util/env')
+const {
+  CI_PROVIDER_NAME,
+  GIT_REPOSITORY_URL,
+  GIT_COMMIT_SHA,
+  GIT_BRANCH,
+  CI_WORKSPACE_PATH,
+  GIT_COMMIT_MESSAGE,
+  GIT_TAG,
+  GIT_PULL_REQUEST_BASE_BRANCH_SHA,
+  GIT_COMMIT_HEAD_SHA,
+  GIT_PULL_REQUEST_BASE_BRANCH,
+  GIT_COMMIT_HEAD_MESSAGE
+} = require('./util/tags')
+const Plugin = require('./plugin')
+const { getRepositoryRoot } = require('./util/git')
 const {
   getTestEnvironmentMetadata,
   getTestSessionName,
@@ -37,33 +64,6 @@ const {
   getPullRequestBaseBranch,
   TEST_IS_TEST_FRAMEWORK_WORKER
 } = require('./util/test')
-const { getRepositoryRoot } = require('./util/git')
-const Plugin = require('./plugin')
-const { COMPONENT } = require('../constants')
-const log = require('../log')
-const {
-  incrementCountMetric,
-  distributionMetric,
-  TELEMETRY_EVENT_CREATED,
-  TELEMETRY_ITR_SKIPPED
-} = require('../ci-visibility/telemetry')
-const {
-  CI_PROVIDER_NAME,
-  GIT_REPOSITORY_URL,
-  GIT_COMMIT_SHA,
-  GIT_BRANCH,
-  CI_WORKSPACE_PATH,
-  GIT_COMMIT_MESSAGE,
-  GIT_TAG,
-  GIT_PULL_REQUEST_BASE_BRANCH_SHA,
-  GIT_COMMIT_HEAD_SHA,
-  GIT_PULL_REQUEST_BASE_BRANCH,
-  GIT_COMMIT_HEAD_MESSAGE
-} = require('./util/tags')
-const { OS_VERSION, OS_PLATFORM, OS_ARCHITECTURE, RUNTIME_NAME, RUNTIME_VERSION } = require('./util/env')
-const getDiClient = require('../ci-visibility/dynamic-instrumentation')
-const { DD_MAJOR } = require('../../../../version')
-const id = require('../id')
 
 const FRAMEWORK_TO_TRIMMED_COMMAND = {
   vitest: 'vitest run',

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

@@ -1,7 +1,7 @@
 'use strict'
 
-const StoragePlugin = require('./storage')
 const { PEER_SERVICE_KEY, PEER_SERVICE_SOURCE_KEY } = require('../constants')
+const StoragePlugin = require('./storage')
 
 class DatabasePlugin extends StoragePlugin {
   static operation = 'query'

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

@@ -1,6 +1,6 @@
 'use strict'
 
-module.exports = {
+const plugins = {
   get '@anthropic-ai/sdk' () { return require('../../../datadog-plugin-anthropic/src') },
   get '@apollo/gateway' () { return require('../../../datadog-plugin-apollo/src') },
   get '@aws-sdk/smithy-client' () { return require('../../../datadog-plugin-aws-sdk/src') },
@@ -13,6 +13,7 @@ module.exports = {
   get '@elastic/transport' () { return require('../../../datadog-plugin-elasticsearch/src') },
   get '@google-cloud/pubsub' () { return require('../../../datadog-plugin-google-cloud-pubsub/src') },
   get '@google-cloud/vertexai' () { return require('../../../datadog-plugin-google-cloud-vertexai/src') },
+  get '@google/genai' () { return require('../../../datadog-plugin-google-genai/src') },
   get '@grpc/grpc-js' () { return require('../../../datadog-plugin-grpc/src') },
   get '@hapi/hapi' () { return require('../../../datadog-plugin-hapi/src') },
   get '@happy-dom/jest-environment' () { return require('../../../datadog-plugin-jest/src') },
@@ -25,6 +26,7 @@ module.exports = {
   get '@node-redis/client' () { return require('../../../datadog-plugin-redis/src') },
   get '@opensearch-project/opensearch' () { return require('../../../datadog-plugin-opensearch/src') },
   get '@prisma/client' () { return require('../../../datadog-plugin-prisma/src') },
+  get './runtime/library.js' () { return require('../../../datadog-plugin-prisma/src') },
   get '@redis/client' () { return require('../../../datadog-plugin-redis/src') },
   get '@smithy/smithy-client' () { return require('../../../datadog-plugin-aws-sdk/src') },
   get '@vitest/runner' () { return require('../../../datadog-plugin-vitest/src') },
@@ -34,6 +36,7 @@ module.exports = {
   get amqplib () { return require('../../../datadog-plugin-amqplib/src') },
   get avsc () { return require('../../../datadog-plugin-avsc/src') },
   get 'aws-sdk' () { return require('../../../datadog-plugin-aws-sdk/src') },
+  get bullmq () { return require('../../../datadog-plugin-bullmq/src') },
   get bunyan () { return require('../../../datadog-plugin-bunyan/src') },
   get 'cassandra-driver' () { return require('../../../datadog-plugin-cassandra-driver/src') },
   get child_process () { return require('../../../datadog-plugin-child_process/src') },
@@ -109,3 +112,5 @@ module.exports = {
   get winston () { return require('../../../datadog-plugin-winston/src') },
   get ws () { return require('../../../datadog-plugin-ws/src') }
 }
+
+module.exports = plugins

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

@@ -1,8 +1,8 @@
 'use strict'
 
 const { LOG } = require('../../../../ext/formats')
-const Plugin = require('./plugin')
 const { storage } = require('../../../datadog-core')
+const Plugin = require('./plugin')
 
 function messageProxy (message, holder) {
   return new Proxy(message, {

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

@@ -6,9 +6,9 @@ const {
   PEER_SERVICE_SOURCE_KEY,
   PEER_SERVICE_REMAP_KEY
 } = require('../constants')
-const TracingPlugin = require('./tracing')
 const { exitTags } = require('../../../datadog-code-origin')
 const { storage } = require('../../../datadog-core')
+const TracingPlugin = require('./tracing')
 
 const COMMON_PEER_SVC_SOURCE_TAGS = [
   'net.peer.name',

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

@@ -1,9 +1,9 @@
 'use strict'
 
-const Plugin = require('./plugin')
 const { storage } = require('../../../datadog-core')
 const analyticsSampler = require('../analytics_sampler')
 const { COMPONENT } = require('../constants')
+const Plugin = require('./plugin')
 
 class TracingPlugin extends Plugin {
   constructor (...args) {

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

@@ -1,6 +1,7 @@
 'use strict'
 
 const { readFileSync } = require('fs')
+const { getEnvironmentVariable, getEnvironmentVariables } = require('../../config-helper')
 const {
   GIT_BRANCH,
   GIT_COMMIT_SHA,
@@ -32,7 +33,6 @@ const {
   GIT_PULL_REQUEST_BASE_BRANCH_HEAD_SHA
 } = require('./tags')
 const { filterSensitiveInfoFromRepository } = require('./url')
-const { getEnvironmentVariable, getEnvironmentVariables } = require('../../config-helper')
 
 // Receives a string with the form 'John Doe <john.doe@gmail.com>'
 // and returns { name: 'John Doe', email: 'john.doe@gmail.com' }

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

@@ -5,6 +5,14 @@ const path = require('path')
 const fs = require('fs')
 
 const log = require('../../log')
+const {
+  incrementCountMetric,
+  distributionMetric,
+  TELEMETRY_GIT_COMMAND,
+  TELEMETRY_GIT_COMMAND_MS,
+  TELEMETRY_GIT_COMMAND_ERRORS
+} = require('../../ci-visibility/telemetry')
+const { storage } = require('../../../../datadog-core')
 const {
   GIT_COMMIT_SHA,
   GIT_BRANCH,
@@ -26,15 +34,7 @@ const {
   GIT_COMMIT_HEAD_COMMITTER_NAME,
   GIT_COMMIT_HEAD_MESSAGE
 } = require('./tags')
-const {
-  incrementCountMetric,
-  distributionMetric,
-  TELEMETRY_GIT_COMMAND,
-  TELEMETRY_GIT_COMMAND_MS,
-  TELEMETRY_GIT_COMMAND_ERRORS
-} = require('../../ci-visibility/telemetry')
 const { filterSensitiveInfoFromRepository } = require('./url')
-const { storage } = require('../../../../datadog-core')
 const { cachedExec } = require('./git-cache')
 
 const GIT_REV_LIST_MAX_BUFFER = 12 * 1024 * 1024 // 12MB

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

@@ -72,7 +72,7 @@ function parseUserLandFrames (stack, limit = Infinity) {
  * @param {number} end - The end index of the line to parse within the stack trace.
  * @returns {StackFrame|undefined} The parsed frame if it is a user frame, `undefined` otherwise.
  *
- * @typedef {Object} StackFrame
+ * @typedef {object} StackFrame
  * @property {string} fileName - The file name of the frame.
  * @property {string} lineNumber - The line number of the frame.
  * @property {string} columnNumber - The column number of the frame.