dd-trace 5.84.0 → 5.86.0

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

@@ -111,14 +111,14 @@ class LoggerProvider {
     return {
       instrumentationScope: {
         name: 'dd-trace-js',
-        version: ''
+        version: '',
       },
       emit: () => {},
       debug: () => {},
       info: () => {},
       warn: () => {},
       error: () => {},
-      fatal: () => {}
+      fatal: () => {},
     }
   }
 }

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

@@ -35,7 +35,7 @@ const SEVERITY_MAP = {
   [SeverityNumber.FATAL]: 'SEVERITY_NUMBER_FATAL',
   [SeverityNumber.FATAL2]: 'SEVERITY_NUMBER_FATAL2',
   [SeverityNumber.FATAL3]: 'SEVERITY_NUMBER_FATAL3',
-  [SeverityNumber.FATAL4]: 'SEVERITY_NUMBER_FATAL4'
+  [SeverityNumber.FATAL4]: 'SEVERITY_NUMBER_FATAL4',
 }
 
 /**
@@ -82,7 +82,7 @@ class OtlpTransformer extends OtlpTransformerBase {
       resourceLogs: [{
         resource: this.transformResource(),
         scopeLogs: this.#transformScope(logRecords),
-      }]
+      }],
     }
 
     return this.serializeToProtobuf(protoLogsService, logsData)
@@ -97,8 +97,8 @@ class OtlpTransformer extends OtlpTransformerBase {
     const logsData = {
       resourceLogs: [{
         resource: this.transformResource(),
-        scopeLogs: this.#transformScope(logRecords)
-      }]
+        scopeLogs: this.#transformScope(logRecords),
+      }],
     }
     return this.serializeToJson(logsData)
   }
@@ -119,10 +119,10 @@ class OtlpTransformer extends OtlpTransformerBase {
           name: records[0]?.instrumentationScope?.name || 'dd-trace-js',
           version: records[0]?.instrumentationScope?.version || '',
           attributes: [],
-          droppedAttributesCount: 0
+          droppedAttributesCount: 0,
         },
         schemaUrl,
-        logRecords: records.map(record => this.#transformLogRecord(record))
+        logRecords: records.map(record => this.#transformLogRecord(record)),
       })
     }
 
@@ -139,7 +139,7 @@ class OtlpTransformer extends OtlpTransformerBase {
 
     const result = {
       timeUnixNano: logRecord.timestamp,
-      body: this.#transformBody(logRecord.body)
+      body: this.#transformBody(logRecord.body),
     }
 
     // Add optional fields only if they are set
@@ -233,9 +233,9 @@ class OtlpTransformer extends OtlpTransformerBase {
         kvlistValue: {
           values: Object.entries(body).map(([key, value]) => ({
             key,
-            value: this.transformAnyValue(value)
-          }))
-        }
+            value: this.transformAnyValue(value),
+          })),
+        },
       }
     }
     return { stringValue: String(body) }

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

@@ -7,7 +7,7 @@ const METRIC_TYPES = {
   UPDOWNCOUNTER: 'updowncounter',
   OBSERVABLECOUNTER: 'observable-counter',
   OBSERVABLEUPDOWNCOUNTER: 'observable-updowncounter',
-  GAUGE: 'gauge'
+  GAUGE: 'gauge',
 }
 
 // Temporality constants
@@ -15,7 +15,7 @@ const TEMPORALITY = {
   DELTA: 'DELTA',
   CUMULATIVE: 'CUMULATIVE',
   GAUGE: 'GAUGE',
-  LOWMEMORY: 'LOWMEMORY'
+  LOWMEMORY: 'LOWMEMORY',
 }
 
 // Default histogram bucket boundaries (in milliseconds for latency metrics)
@@ -30,5 +30,5 @@ module.exports = {
   METRIC_TYPES,
   TEMPORALITY,
   DEFAULT_HISTOGRAM_BUCKETS,
-  DEFAULT_MAX_MEASUREMENT_QUEUE_SIZE
+  DEFAULT_MAX_MEASUREMENT_QUEUE_SIZE,
 }

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

@@ -41,7 +41,7 @@ function initializeOpenTelemetryMetrics (config) {
   const resourceAttributes = {
     'service.name': config.service,
     'service.version': config.version,
-    'deployment.environment': config.env
+    'deployment.environment': config.env,
   }
 
   if (config.tags) {
@@ -77,5 +77,5 @@ function initializeOpenTelemetryMetrics (config) {
 
 module.exports = {
   MeterProvider,
-  initializeOpenTelemetryMetrics
+  initializeOpenTelemetryMetrics,
 }

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

@@ -62,7 +62,7 @@ class Instrument {
       type,
       value,
       attributes: sanitizeAttributes(attributes),
-      timestamp: Number(process.hrtime.bigint())
+      timestamp: Number(process.hrtime.bigint()),
     }
   }
 }
@@ -165,7 +165,7 @@ class ObservableInstrument extends Instrument {
     const observableResult = {
       observe: (value, attributes = {}) => {
         observations.push(this.createMeasurement(this.#type, value, attributes))
-      }
+      },
     }
 
     for (const callback of this.#callbacks) {
@@ -221,5 +221,5 @@ module.exports = {
   Gauge,
   ObservableGauge,
   ObservableCounter,
-  ObservableUpDownCounter
+  ObservableUpDownCounter,
 }

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

@@ -3,7 +3,7 @@
 const { VERSION: packageVersion } = require('../../../../../version')
 const log = require('../../log')
 const {
-  Counter, UpDownCounter, Histogram, Gauge, ObservableGauge, ObservableCounter, ObservableUpDownCounter
+  Counter, UpDownCounter, Histogram, Gauge, ObservableGauge, ObservableCounter, ObservableUpDownCounter,
 } = require('./instruments')
 const { METRIC_TYPES } = require('./constants')
 

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

@@ -59,7 +59,7 @@ class OtlpTransformer extends OtlpTransformerBase {
       resourceMetrics: [{
         resource: this.transformResource(),
         scopeMetrics: this.#transformScope(metrics),
-      }]
+      }],
     }
 
     return this.serializeToProtobuf(protoMetricsService, metricsData)
@@ -75,8 +75,8 @@ class OtlpTransformer extends OtlpTransformerBase {
     const metricsData = {
       resourceMetrics: [{
         resource: this.transformResource(),
-        scopeMetrics: this.#transformScope(metrics, true)
-      }]
+        scopeMetrics: this.#transformScope(metrics, true),
+      }],
     }
     return this.serializeToJson(metricsData)
   }
@@ -100,7 +100,7 @@ class OtlpTransformer extends OtlpTransformerBase {
       const scope = {
         name,
         version,
-        droppedAttributesCount: 0
+        droppedAttributesCount: 0,
       }
 
       if (attributes) {
@@ -113,7 +113,7 @@ class OtlpTransformer extends OtlpTransformerBase {
       scopeMetrics.push({
         scope,
         schemaUrl,
-        metrics: metricsInScope.map(metric => this.#transformMetric(metric, isJson))
+        metrics: metricsInScope.map(metric => this.#transformMetric(metric, isJson)),
       })
     }
 
@@ -131,7 +131,7 @@ class OtlpTransformer extends OtlpTransformerBase {
     const result = {
       name: metric.name,
       description: metric.description || '',
-      unit: metric.unit || ''
+      unit: metric.unit || '',
     }
 
     const isCumulative = metric.temporality === TEMPORALITY.CUMULATIVE
@@ -146,7 +146,7 @@ class OtlpTransformer extends OtlpTransformerBase {
       case METRIC_TYPES.HISTOGRAM:
         result.histogram = {
           dataPoints: Array.from(metric.dataPointMap.values(), dp => this.#transformHistogramDataPoint(dp, isJson)),
-          aggregationTemporality: temporality
+          aggregationTemporality: temporality,
         }
         break
 
@@ -157,13 +157,13 @@ class OtlpTransformer extends OtlpTransformerBase {
         result.sum = {
           dataPoints: Array.from(metric.dataPointMap.values(), dp => this.#transformNumberDataPoint(dp, isJson)),
           aggregationTemporality: temporality,
-          isMonotonic: metric.type === METRIC_TYPES.COUNTER || metric.type === METRIC_TYPES.OBSERVABLECOUNTER
+          isMonotonic: metric.type === METRIC_TYPES.COUNTER || metric.type === METRIC_TYPES.OBSERVABLECOUNTER,
         }
         break
 
       case METRIC_TYPES.GAUGE:
         result.gauge = {
-          dataPoints: Array.from(metric.dataPointMap.values(), dp => this.#transformNumberDataPoint(dp, isJson))
+          dataPoints: Array.from(metric.dataPointMap.values(), dp => this.#transformNumberDataPoint(dp, isJson)),
         }
         break
     }
@@ -192,7 +192,7 @@ class OtlpTransformer extends OtlpTransformerBase {
       bucketCounts: dp.bucketCounts || [],
       explicitBounds: dp.explicitBounds || [],
       min: dp.min,
-      max: dp.max
+      max: dp.max,
     }
 
     if (isJson) {
@@ -221,7 +221,7 @@ class OtlpTransformer extends OtlpTransformerBase {
 
     const result = {
       attributes,
-      timeUnixNano
+      timeUnixNano,
     }
 
     if (dataPoint.startTimeUnixNano) {

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

@@ -3,7 +3,7 @@
 const log = require('../../log')
 const { stableStringify } = require('../otlp/otlp_transformer_base')
 const {
-  METRIC_TYPES, TEMPORALITY, DEFAULT_HISTOGRAM_BUCKETS, DEFAULT_MAX_MEASUREMENT_QUEUE_SIZE
+  METRIC_TYPES, TEMPORALITY, DEFAULT_HISTOGRAM_BUCKETS, DEFAULT_MAX_MEASUREMENT_QUEUE_SIZE,
 } = require('./constants')
 
 /**
@@ -138,7 +138,7 @@ class PeriodicMetricReader {
    */
   forceFlush () {
     if (this.#isShutdown) {
-      log.warn(`PeriodicMetricReader is shutdown. ${this.#droppedCount} measurement(s) were dropped`)
+      log.warn('PeriodicMetricReader is shutdown. %d measurement(s) were dropped', this.#droppedCount)
       return
     }
     this.#collectAndExport()
@@ -210,10 +210,8 @@ class PeriodicMetricReader {
     }
 
     if (this.#droppedCount > 0) {
-      log.warn(
-        `Metric queue exceeded limit (max: ${DEFAULT_MAX_MEASUREMENT_QUEUE_SIZE}). ` +
-        `Dropping ${this.#droppedCount} measurements. `
-      )
+      log.warn('Metric queue exceeded limit (max: %d). Dropping %d measurements.',
+        DEFAULT_MAX_MEASUREMENT_QUEUE_SIZE, this.#droppedCount)
       this.#droppedCount = 0
     }
 
@@ -296,7 +294,7 @@ class MetricAggregator {
         instrumentationScope,
         value,
         attributes,
-        timestamp
+        timestamp,
       } = measurement
 
       const scopeKey = this.#getScopeKey(instrumentationScope)
@@ -308,9 +306,11 @@ class MetricAggregator {
       if (!metric) {
         if (metricsMap.size >= this.#maxBatchedQueueSize) {
           log.warn(
-            `Metric queue exceeded limit (max: ${this.#maxBatchedQueueSize}). ` +
-            `Dropping metric: ${metricKey}, value: ${value}. ` +
-            'Consider increasing OTEL_BSP_MAX_QUEUE_SIZE or decreasing OTEL_METRIC_EXPORT_INTERVAL.'
+            // eslint-disable-next-line @stylistic/max-len
+            'Metric queue exceeded limit (max: %d). Dropping metric: %s, value: %s. Consider increasing OTEL_BSP_MAX_QUEUE_SIZE or decreasing OTEL_METRIC_EXPORT_INTERVAL.',
+            this.#maxBatchedQueueSize,
+            metricKey,
+            value
           )
           continue
         }
@@ -321,7 +321,7 @@ class MetricAggregator {
           type,
           instrumentationScope,
           temporality: this.#getTemporality(type),
-          dataPointMap: new Map()
+          dataPointMap: new Map(),
         }
         metricsMap.set(metricKey, metric)
       }
@@ -398,14 +398,14 @@ class MetricAggregator {
             const lastState = lastExportedState.get(stateKey) || {
               count: 0,
               sum: 0,
-              bucketCounts: new Array(dataPoint.bucketCounts.length).fill(0)
+              bucketCounts: new Array(dataPoint.bucketCounts.length).fill(0),
             }
             const currentState = {
               count: dataPoint.count,
               sum: dataPoint.sum,
               min: dataPoint.min,
               max: dataPoint.max,
-              bucketCounts: [...dataPoint.bucketCounts]
+              bucketCounts: [...dataPoint.bucketCounts],
             }
             dataPoint.count = currentState.count - lastState.count
             dataPoint.sum = currentState.sum - lastState.sum
@@ -455,7 +455,7 @@ class MetricAggregator {
     if (!cumulativeState.has(stateKey)) {
       cumulativeState.set(stateKey, {
         value: 0,
-        startTime: metric.temporality === TEMPORALITY.CUMULATIVE ? this.#startTime : timestamp
+        startTime: metric.temporality === TEMPORALITY.CUMULATIVE ? this.#startTime : timestamp,
       })
     }
 
@@ -465,7 +465,7 @@ class MetricAggregator {
     const dataPoint = this.#findOrCreateDataPoint(metric, attributes, attrKey, () => ({
       startTimeUnixNano: state.startTime,
       timeUnixNano: timestamp,
-      value: 0
+      value: 0,
     }))
 
     dataPoint.value = state.value
@@ -485,7 +485,7 @@ class MetricAggregator {
   #aggregateLastValue (metric, value, attributes, attrKey, timestamp) {
     const dataPoint = this.#findOrCreateDataPoint(metric, attributes, attrKey, () => ({
       timeUnixNano: timestamp,
-      value: 0
+      value: 0,
     }))
 
     dataPoint.value = value
@@ -514,7 +514,7 @@ class MetricAggregator {
         min: Infinity,
         max: -Infinity,
         bucketCounts: new Array(DEFAULT_HISTOGRAM_BUCKETS.length + 1).fill(0),
-        startTime: metric.temporality === TEMPORALITY.CUMULATIVE ? this.#startTime : timestamp
+        startTime: metric.temporality === TEMPORALITY.CUMULATIVE ? this.#startTime : timestamp,
       })
     }
 
@@ -542,7 +542,7 @@ class MetricAggregator {
       min: Infinity,
       max: -Infinity,
       bucketCounts: new Array(DEFAULT_HISTOGRAM_BUCKETS.length + 1).fill(0),
-      explicitBounds: DEFAULT_HISTOGRAM_BUCKETS
+      explicitBounds: DEFAULT_HISTOGRAM_BUCKETS,
     }))
 
     dataPoint.count = state.count

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

@@ -44,12 +44,12 @@ class OtlpHttpExporterBase {
       timeout,
       headers: {
         'Content-Type': isJson ? 'application/json' : 'application/x-protobuf',
-        ...this.#parseAdditionalHeaders(headers)
-      }
+        ...this.#parseAdditionalHeaders(headers),
+      },
     }
     this.telemetryTags = [
       'protocol:http',
-      `encoding:${isJson ? 'json' : 'protobuf'}`
+      `encoding:${isJson ? 'json' : 'protobuf'}`,
     ]
   }
 
@@ -79,8 +79,8 @@ class OtlpHttpExporterBase {
       ...this.options,
       headers: {
         ...this.options.headers,
-        'Content-Length': payload.length
-      }
+        'Content-Length': payload.length,
+      },
     }
 
     const req = http.request(options, (res) => {
@@ -101,7 +101,7 @@ class OtlpHttpExporterBase {
     })
 
     req.on('error', (error) => {
-      log.error(`Error sending OTLP ${this.signalType}:`, error)
+      log.error('Error sending OTLP %s:', this.signalType, error)
       resultCallback({ code: 1, error })
     })
 

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

@@ -28,8 +28,11 @@ class OtlpTransformerBase {
   constructor (resourceAttributes, protocol, signalType) {
     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.')
+      log.warn(
+        // eslint-disable-next-line @stylistic/max-len
+        'OTLP gRPC protocol is not supported for %s. Defaulting to http/protobuf. gRPC protobuf support may be added in a future release.',
+        signalType
+      )
       protocol = 'http/protobuf'
     }
     this.protocol = protocol
@@ -68,7 +71,7 @@ class OtlpTransformerBase {
   transformResource () {
     return {
       attributes: this.#resourceAttributes,
-      droppedAttributesCount: 0
+      droppedAttributesCount: 0,
     }
   }
 
@@ -81,7 +84,7 @@ class OtlpTransformerBase {
   transformAttributes (attributes) {
     return Object.entries(attributes).map(([key, value]) => ({
       key,
-      value: this.transformAnyValue(value)
+      value: this.transformAnyValue(value),
     }))
   }
 
@@ -96,7 +99,7 @@ class OtlpTransformerBase {
 
     return Object.entries(attributes).map(([key, value]) => ({
       key,
-      value: { stringValue: String(value) }
+      value: { stringValue: String(value) },
     }))
   }
 
@@ -121,8 +124,8 @@ class OtlpTransformerBase {
     } else if (Array.isArray(value)) {
       return {
         arrayValue: {
-          values: value.map(v => this.transformAnyValue(v))
-        }
+          values: value.map(v => this.transformAnyValue(v)),
+        },
       }
     }
     // Fallback for any unexpected types

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

@@ -29,7 +29,7 @@ function getProtobufTypes () {
       protoLogsService,
       protoSeverityNumber,
       protoMetricsService,
-      protoAggregationTemporality
+      protoAggregationTemporality,
     }
   }
   // Load the proto files
@@ -40,7 +40,7 @@ function getProtobufTypes () {
     'logs.proto',
     'logs_service.proto',
     'metrics.proto',
-    'metrics_service.proto'
+    'metrics_service.proto',
   ].map(file => path.join(protoDir, file))
 
   _root = protobuf.loadSync(protoFiles)
@@ -57,7 +57,7 @@ function getProtobufTypes () {
     protoLogsService,
     protoSeverityNumber,
     protoMetricsService,
-    protoAggregationTemporality
+    protoAggregationTemporality,
   }
 }
 

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

@@ -40,7 +40,7 @@ const spanKindNames = {
   [api.SpanKind.SERVER]: kinds.SERVER,
   [api.SpanKind.CLIENT]: kinds.CLIENT,
   [api.SpanKind.PRODUCER]: kinds.PRODUCER,
-  [api.SpanKind.CONSUMER]: kinds.CONSUMER
+  [api.SpanKind.CONSUMER]: kinds.CONSUMER,
 }
 
 /**
@@ -147,9 +147,9 @@ class Span {
       tags: {
         [SERVICE_NAME]: _tracer._service,
         [RESOURCE_NAME]: spanName,
-        [SPAN_KIND]: spanKindNames[kind]
+        [SPAN_KIND]: spanKindNames[kind],
       },
-      links
+      links,
     }, _tracer._debug)
 
     if (attributes) {
@@ -226,20 +226,20 @@ class Span {
   }
 
   addLinks (links) {
-    links.forEach(link => this.addLink(link))
+    for (const link of links) this.addLink(link)
     return this
   }
 
   addSpanPointer (ptrKind, ptrDir, ptrHash) {
     const zeroContext = new SpanContext({
       traceId: id('0'),
-      spanId: id('0')
+      spanId: id('0'),
     })
     const attributes = {
       'ptr.kind': ptrKind,
       'ptr.dir': ptrDir,
       'ptr.hash': ptrHash,
-      'link.kind': 'span-pointer'
+      'link.kind': 'span-pointer',
     }
     return this.addLink(zeroContext, attributes)
   }
@@ -250,7 +250,7 @@ class Span {
       if (code === 2) {
         this._ddSpan.addTags({
           [ERROR_MESSAGE]: message,
-          [IGNORE_OTEL_ERROR]: false
+          [IGNORE_OTEL_ERROR]: false,
         })
       }
     }
@@ -295,7 +295,7 @@ class Span {
       [ERROR_TYPE]: exception.name,
       [ERROR_MESSAGE]: exception.message,
       [ERROR_STACK]: exception.stack,
-      [IGNORE_OTEL_ERROR]: this._ddSpan.context()._tags[IGNORE_OTEL_ERROR] ?? true
+      [IGNORE_OTEL_ERROR]: this._ddSpan.context()._tags[IGNORE_OTEL_ERROR] ?? true,
     })
     const attributes = {}
     if (exception.message) attributes['exception.message'] = exception.message

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

@@ -9,7 +9,7 @@ function newContext () {
   const spanId = id()
   return new DatadogSpanContext({
     traceId: spanId,
-    spanId
+    spanId,
   })
 }
 

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

@@ -46,5 +46,5 @@ class MultiSpanProcessor extends NoopSpanProcessor {
 
 module.exports = {
   MultiSpanProcessor,
-  NoopSpanProcessor
+  NoopSpanProcessor,
 }

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

@@ -43,7 +43,7 @@ function normalizeLinkContext (context) {
     traceId: id(context.traceId, 16),
     spanId: id(context.spanId, 16),
     sampling,
-    tracestate
+    tracestate,
   })
 }
 
@@ -70,7 +70,7 @@ class Tracer {
       sampling: parentSpanContext._sampling,
       baggageItems: { ...parentSpanContext._baggageItems },
       trace: parentSpanContext._trace,
-      tracestate: parentSpanContext._tracestate
+      tracestate: parentSpanContext._tracestate,
     })
   }
 
@@ -118,7 +118,7 @@ class Tracer {
     }
 
     const spanContext = new SpanContext({
-      traceId: id(traceId, 16), spanId: id(), tags: meta, parentId: id(spanId, 16)
+      traceId: id(traceId, 16), spanId: id(), tags: meta, parentId: id(spanId, 16),
     })
 
     spanContext._sampling = { priority: samplingPriority }
@@ -151,7 +151,7 @@ class Tracer {
 
         links.push({
           context: ddContext,
-          attributes: sanitizeAttributes(link.attributes)
+          attributes: sanitizeAttributes(link.attributes),
         })
       }
     }

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

@@ -37,7 +37,7 @@ class LogPropagator {
       const lo = carrier.dd.trace_id.slice(16, 32)
       const spanContext = new DatadogSpanContext({
         traceId: id(lo, 16),
-        spanId: id(carrier.dd.span_id, 10)
+        spanId: id(carrier.dd.span_id, 10),
       })
 
       spanContext._trace.tags['_dd.p.tid'] = hi
@@ -46,7 +46,7 @@ class LogPropagator {
     }
     return new DatadogSpanContext({
       traceId: id(carrier.dd.trace_id, 10),
-      spanId: id(carrier.dd.span_id, 10)
+      spanId: id(carrier.dd.span_id, 10),
     })
   }
 }