dd-trace 5.81.0 → 5.82.0

package/packages/dd-trace/src/opentelemetry/logs/logger_provider.js

@@ -1,9 +1,9 @@
 'use strict'
 const { logs } = require('@opentelemetry/api-logs')
 const { context } = require('@opentelemetry/api')
-const Logger = require('./logger')
 const log = require('../../log')
 const ContextManager = require('../context_manager')
+const Logger = require('./logger')
 
 /**
  * @typedef {import('@opentelemetry/api-logs').Logger} Logger
@@ -26,7 +26,7 @@ class LoggerProvider {
   /**
    * Creates a new LoggerProvider instance with a single processor for Datadog Agent export.
    *
-   * @param {Object} [options] - LoggerProvider options
+   * @param {object} [options] - LoggerProvider options
    * @param {BatchLogRecordProcessor} [options.processor] - Single LogRecordProcessor instance for
    *   exporting logs to Datadog Agent
    */
@@ -40,9 +40,9 @@ class LoggerProvider {
   /**
    * Gets or creates a logger instance.
    *
-   * @param {string|Object} nameOrOptions - Logger name or options object
+   * @param {string | object} nameOrOptions - Logger name or options object
    * @param {string} [version] - Logger version (when nameOrOptions is a string)
-   * @param {Object} [options] - Additional options (when nameOrOptions is a string)
+   * @param {object} [options] - Additional options (when nameOrOptions is a string)
    * @returns {Logger} Logger instance
    */
   getLogger (nameOrOptions, version, options = {}) {

package/packages/dd-trace/src/opentelemetry/logs/otlp_transformer.js

@@ -1,10 +1,11 @@
 'use strict'
 
-const OtlpTransformerBase = require('../otlp/otlp_transformer_base')
 const { SeverityNumber } = require('@opentelemetry/api-logs')
-const { getProtobufTypes } = require('../otlp/protobuf_loader')
 const { trace } = require('@opentelemetry/api')
 
+const OtlpTransformerBase = require('../otlp/otlp_transformer_base')
+const { getProtobufTypes } = require('../otlp/protobuf_loader')
+
 /**
  * @typedef {import('@opentelemetry/api-logs').LogRecord} LogRecord
  */
@@ -105,7 +106,7 @@ class OtlpTransformer extends OtlpTransformerBase {
   /**
    * Creates scope logs grouped by instrumentation library.
    * @param {LogRecord[]} logRecords - Array of log records to transform
-   * @returns {Object[]} Array of scope log objects
+   * @returns {object[]} Array of scope log objects
    */
   #transformScope (logRecords) {
     const groupedRecords = this.groupByInstrumentationScope(logRecords)
@@ -131,7 +132,7 @@ class OtlpTransformer extends OtlpTransformerBase {
   /**
    * Transforms a single log record to OTLP format.
    * @param {LogRecord} logRecord - Log record to transform
-   * @returns {Object} OTLP log record object
+   * @returns {object} OTLP log record object
    */
   #transformLogRecord (logRecord) {
     const spanContext = this.#extractSpanContext(logRecord.context)
@@ -176,8 +177,8 @@ class OtlpTransformer extends OtlpTransformerBase {
 
   /**
    * Extracts span context from the log record's context.
-   * @param {Object} logContext - The log record's context
-   * @returns {Object|null} Span context or null if not available
+   * @param {object} logContext - The log record's context
+   * @returns {object | null} Span context or null if not available
    */
   #extractSpanContext (logContext) {
     if (!logContext) return null
@@ -214,8 +215,8 @@ class OtlpTransformer extends OtlpTransformerBase {
 
   /**
    * Transforms log body to OTLP AnyValue format.
-   * @param {any} body - Log body to transform
-   * @returns {Object} OTLP AnyValue object
+   * @param {import('@opentelemetry/api-logs').LogBody} body - Log body to transform
+   * @returns {object} OTLP AnyValue object
    */
   #transformBody (body) {
     if (typeof body === 'string') {

package/packages/dd-trace/src/opentelemetry/metrics/instruments.js

@@ -9,7 +9,7 @@ const { METRIC_TYPES } = require('./constants')
  */
 
 /**
- * @typedef {Object} Measurement
+ * @typedef {object} Measurement
  * @property {string} name - Instrument name
  * @property {string} description - Instrument description
  * @property {string} unit - Measurement unit
@@ -30,11 +30,11 @@ class Instrument {
    * Creates a new instrument instance.
    *
    * @param {string} name - Instrument name (e.g., 'http.request.duration')
-   * @param {Object} options - Instrument configuration options
+   * @param {object} options - Instrument configuration options
    * @param {string} [options.description] - Human-readable description of the instrument
    * @param {string} [options.unit] - Unit of measurement (e.g., 'ms', 'bytes', '1')
    * @param {InstrumentationScope} instrumentationScope - Instrumentation scope for this instrument
-   * @param {Object} reader - Metric reader for recording measurements
+   * @param {object} reader - Metric reader for recording measurements
    */
   constructor (name, options, instrumentationScope, reader) {
     this.name = name

package/packages/dd-trace/src/opentelemetry/metrics/meter.js

@@ -1,10 +1,10 @@
 'use strict'
 
 const { VERSION: packageVersion } = require('../../../../../version')
+const log = require('../../log')
 const {
   Counter, UpDownCounter, Histogram, Gauge, ObservableGauge, ObservableCounter, ObservableUpDownCounter
 } = require('./instruments')
-const log = require('../../log')
 const { METRIC_TYPES } = require('./constants')
 
 /**
@@ -31,7 +31,7 @@ class Meter {
    * @param {string} [instrumentationScope.name] - Meter name (defaults to 'dd-trace-js')
    * @param {string} [instrumentationScope.version] - Meter version (defaults to tracer version)
    * @param {string} [instrumentationScope.schemaUrl] - Schema URL
-   * @param {Object} [instrumentationScope.attributes] - Attributes for the instrumentation scope
+   * @param {object} [instrumentationScope.attributes] - Attributes for the instrumentation scope
    */
   constructor (
     meterProvider,

package/packages/dd-trace/src/opentelemetry/metrics/otlp_transformer.js

@@ -85,7 +85,7 @@ class OtlpTransformer extends OtlpTransformerBase {
    * Creates scope metrics grouped by instrumentation scope.
    * @param {Iterable<AggregatedMetric>} metrics - Iterable of metrics to transform
    * @param {boolean} isJson - Whether to format for JSON output
-   * @returns {Array<Object>} Array of scope metric objects
+   * @returns {Array<object>} Array of scope metric objects
    *
    */
   #transformScope (metrics, isJson = false) {
@@ -125,7 +125,7 @@ class OtlpTransformer extends OtlpTransformerBase {
    *
    * @param {AggregatedMetric} metric - The metric to transform
    * @param {boolean} isJson - Whether to output JSON format (vs protobuf)
-   * @returns {Object} - The metric transformed to OTLP protobuf or JSON format
+   * @returns {object} - The metric transformed to OTLP protobuf or JSON format
    */
   #transformMetric (metric, isJson = false) {
     const result = {
@@ -176,7 +176,7 @@ class OtlpTransformer extends OtlpTransformerBase {
    *
    * @param {HistogramDataPoint} dp - The histogram data point to transform
    * @param {boolean} isJson - Whether to output JSON format (vs protobuf)
-   * @returns {Object} The histogram data point transformed to OTLP protobuf format
+   * @returns {object} The histogram data point transformed to OTLP protobuf format
    */
   #transformHistogramDataPoint (dp, isJson) {
     const attributes = isJson
@@ -209,7 +209,7 @@ class OtlpTransformer extends OtlpTransformerBase {
    *
    * @param {NumberDataPoint} dataPoint - The number data point to transform
    * @param {boolean} isJson - Whether to output JSON format (vs protobuf)
-   * @returns {Object} The number data point transformed to OTLP protobuf format
+   * @returns {object} The number data point transformed to OTLP protobuf format
    */
   #transformNumberDataPoint (dataPoint, isJson) {
     const attributes = isJson

package/packages/dd-trace/src/opentelemetry/metrics/periodic_metric_reader.js

@@ -1,10 +1,10 @@
 'use strict'
 
+const log = require('../../log')
+const { stableStringify } = require('../otlp/otlp_transformer_base')
 const {
   METRIC_TYPES, TEMPORALITY, DEFAULT_HISTOGRAM_BUCKETS, DEFAULT_MAX_MEASUREMENT_QUEUE_SIZE
 } = require('./constants')
-const log = require('../../log')
-const { stableStringify } = require('../otlp/otlp_transformer_base')
 
 /**
  * @typedef {import('@opentelemetry/api').Attributes} Attributes
@@ -13,7 +13,32 @@ const { stableStringify } = require('../otlp/otlp_transformer_base')
  */
 
 /**
- * @typedef {Object} NumberDataPoint
+ * @typedef {{ value: number, startTime: number }} SumCumulativeState
+ *
+ * @typedef {{
+ *   count: number,
+ *   sum: number,
+ *   min: number,
+ *   max: number,
+ *   bucketCounts: number[],
+ *   startTime: number
+ * }} HistogramCumulativeState
+ *
+ * @typedef {SumCumulativeState | HistogramCumulativeState} CumulativeStateValue
+ *
+ * @typedef {{
+ *   count: number,
+ *   sum: number,
+ *   min?: number,
+ *   max?: number,
+ *   bucketCounts: number[]
+ * }} HistogramLastExportedState
+ *
+ * @typedef {number | HistogramLastExportedState} LastExportedStateValue
+ */
+
+/**
+ * @typedef {object} NumberDataPoint
  * @property {Attributes} attributes - Number data point metric attributes
  * @property {string} attrKey - Stable stringified key for attributes
  * @property {number} timeUnixNano - Timestamp in nanoseconds
@@ -22,7 +47,7 @@ const { stableStringify } = require('../otlp/otlp_transformer_base')
  */
 
 /**
- * @typedef {Object} HistogramDataPoint
+ * @typedef {object} HistogramDataPoint
  * @property {Attributes} attributes - Histogram data point metric attributes
  * @property {string} attrKey - Stable stringified key for attributes
  * @property {number} timeUnixNano - Timestamp in nanoseconds
@@ -36,7 +61,7 @@ const { stableStringify } = require('../otlp/otlp_transformer_base')
  */
 
 /**
- * @typedef {Object} AggregatedMetricDataPoint
+ * @typedef {object} AggregatedMetricDataPoint
  * @property {Attributes} attributes - Aggregated metric data point metric attributes
  * @property {string} attrKey - Stable stringified key for attributes
  * @property {number} timeUnixNano - Timestamp in nanoseconds
@@ -50,7 +75,7 @@ const { stableStringify } = require('../otlp/otlp_transformer_base')
  */
 
 /**
- * @typedef {Object} AggregatedMetric
+ * @typedef {object} AggregatedMetric
  * @property {string} name - Metric name
  * @property {string} description - Metric description
  * @property {string} unit - Metric unit
@@ -255,8 +280,8 @@ class MetricAggregator {
    * Aggregates measurements into metrics.
    *
    * @param {Measurement[]} measurements - The measurements to aggregate
-   * @param {Map<string, any>} cumulativeState - The cumulative state of the metrics
-   * @param {Map<string, any>} lastExportedState - The last exported state of the metrics
+   * @param {Map<string, CumulativeStateValue>} cumulativeState - The cumulative state of the metrics
+   * @param {Map<string, LastExportedStateValue>} lastExportedState - The last exported state of the metrics
    * @returns {Iterable<AggregatedMetric>} The aggregated metrics
    */
   aggregate (measurements, cumulativeState, lastExportedState) {
@@ -353,7 +378,7 @@ class MetricAggregator {
    * Applies delta temporality to the metrics.
    *
    * @param {Iterable<AggregatedMetric>} metrics - The metrics to apply delta temporality to
-   * @param {Map<string, any>} lastExportedState - The last exported state of the metrics
+   * @param {Map<string, LastExportedStateValue>} lastExportedState - The last exported state of the metrics
    * @returns {void}
    */
   #applyDeltaTemporality (metrics, lastExportedState) {
@@ -424,7 +449,7 @@ class MetricAggregator {
    * @param {string} attrKey - The attribute key
    * @param {number} timestamp - The timestamp of the measurement
    * @param {string} stateKey - The state key
-   * @param {Map<string, any>} cumulativeState - The cumulative state of the metrics
+   * @param {Map<string, CumulativeStateValue>} cumulativeState - The cumulative state of the metrics
    */
   #aggregateSum (metric, value, attributes, attrKey, timestamp, stateKey, cumulativeState) {
     if (!cumulativeState.has(stateKey)) {
@@ -478,7 +503,7 @@ class MetricAggregator {
    * @param {string} attrKey - The attribute key
    * @param {number} timestamp - The timestamp of the measurement
    * @param {string} stateKey - The state key
-   * @param {Map<string, any>} cumulativeState - The cumulative state of the metrics
+   * @param {Map<string, CumulativeStateValue>} cumulativeState - The cumulative state of the metrics
    * @returns {void}
    */
   #aggregateHistogram (metric, value, attributes, attrKey, timestamp, stateKey, cumulativeState) {

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
  */
 
 /**
@@ -61,7 +62,7 @@ class OtlpTransformerBase {
 
   /**
    * Transforms resource attributes to OTLP resource format.
-   * @returns {Object} OTLP resource object
+   * @returns {object} OTLP resource object
    * @protected
    */
   transformResource () {
@@ -73,8 +74,8 @@ 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) {
@@ -86,8 +87,8 @@ class OtlpTransformerBase {
 
   /**
    * 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) {
@@ -103,8 +104,8 @@ class OtlpTransformerBase {
    * Transforms any value to OTLP AnyValue format.
    * Supports: strings, numbers (int/double), booleans, arrays.
    * Objects are filtered out by sanitizeAttributes before reaching this method.
-   * @param {any} value - Value to transform
-   * @returns {Object} OTLP AnyValue object
+   * @param {AttributeValue | null | undefined} value - Value to transform
+   * @returns {object} OTLP AnyValue object
    * @protected
    */
   transformAnyValue (value) {
@@ -130,8 +131,8 @@ class OtlpTransformerBase {
 
   /**
    * 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
    */
@@ -143,7 +144,7 @@ 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
    */

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('../../../../../vendor/dist/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,8 +1,8 @@
 'use strict'
 
+const { performance } = require('perf_hooks')
 const api = require('@opentelemetry/api')
 
-const { performance } = require('perf_hooks')
 const { timeOrigin } = performance
 
 const { timeInputToHrTime } = require('../../../../vendor/dist/@opentelemetry/core')
@@ -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

@@ -3,13 +3,13 @@
 const api = require('@opentelemetry/api')
 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/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

@@ -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([

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'