dd-trace 5.81.0 → 5.83.0

package/packages/dd-trace/src/openfeature/writers/base.js

@@ -1,21 +1,21 @@
 'use strict'
 
+const { URL, format } = require('node:url')
 const request = require('../../exporters/common/request')
 const { safeJSONStringify } = require('../../exporters/common/util')
-const { URL, format } = require('node:url')
 
 const log = require('../../log')
 
 /**
- * @typedef {Object} BaseFFEWriterOptions
+ * @typedef {object} BaseFFEWriterOptions
  * @property {number} [interval] - Flush interval in milliseconds
  * @property {number} [timeout] - Request timeout in milliseconds
- * @property {Object} config - Tracer configuration object
+ * @property {object} config - Tracer configuration object
  * @property {string} endpoint - API endpoint path
  * @property {URL} [agentUrl] - Base URL for the agent
  * @property {number} [payloadSizeLimit] - Maximum payload size in bytes
  * @property {number} [eventSizeLimit] - Maximum individual event size in bytes
- * @property {Object} [headers] - Additional HTTP headers
+ * @property {object} [headers] - Additional HTTP headers
  */
 
 /**
@@ -23,6 +23,7 @@ const log = require('../../log')
  * @class BaseFFEWriter
  */
 class BaseFFEWriter {
+  #destroyer
   /**
    * @param {BaseFFEWriterOptions} options - Writer configuration options
    */
@@ -56,18 +57,16 @@ class BaseFFEWriter {
       this.flush()
     }, this._interval).unref()
 
-    this._beforeExitHandler = () => {
-      this.destroy()
-    }
-    process.once('beforeExit', this._beforeExitHandler)
+    const destroyer = this.destroy.bind(this)
+    globalThis[Symbol.for('dd-trace')].beforeExitHandlers.add(destroyer)
 
-    this._destroyed = false
+    this.#destroyer = destroyer
     this._droppedEvents = 0
   }
 
   /**
    * Appends an event array to the buffer
-   * @param {Array|Object} events - Event object(s) to append to buffer
+   * @param {Array | object} events - Event object(s) to append to buffer
    */
   append (events) {
     const eventArray = Array.isArray(events) ? events : [events]
@@ -141,12 +140,12 @@ class BaseFFEWriter {
    * Cleans up resources and flushes remaining events
    */
   destroy () {
-    if (!this._destroyed) {
+    if (this.#destroyer) {
       log.debug(() => `Stopping ${this.constructor.name}`)
       clearInterval(this._periodic)
-      process.removeListener('beforeExit', this._beforeExitHandler)
       this.flush()
-      this._destroyed = true
+      globalThis[Symbol.for('dd-trace')].beforeExitHandlers.delete(this.#destroyer)
+      this.#destroyer = undefined
 
       if (this._droppedEvents > 0) {
         log.warn(`${this.constructor.name} dropped ${this._droppedEvents} events due to buffer overflow`)

package/packages/dd-trace/src/openfeature/writers/exposures.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const BaseFFEWriter = require('./base')
 const {
   EXPOSURES_ENDPOINT,
   EVP_PROXY_AGENT_BASE_PATH,
@@ -9,31 +8,32 @@ const {
   EVP_PAYLOAD_SIZE_LIMIT,
   EVP_EVENT_SIZE_LIMIT
 } = require('../constants/constants')
+const BaseFFEWriter = require('./base')
 
 /**
- * @typedef {Object} ExposureEvent
+ * @typedef {object} ExposureEvent
  * @property {number} timestamp - Unix timestamp in milliseconds
- * @property {Object} allocation - Allocation information
+ * @property {object} allocation - Allocation information
  * @property {string} allocation.key - Allocation key
- * @property {Object} flag - Flag information
+ * @property {object} flag - Flag information
  * @property {string} flag.key - Flag key
- * @property {Object} variant - Variant information
+ * @property {object} variant - Variant information
  * @property {string} variant.key - Variant key
- * @property {Object} subject - Subject (user/entity) information
+ * @property {object} subject - Subject (user/entity) information
  * @property {string} subject.id - Subject identifier
  * @property {string} [subject.type] - Subject type
- * @property {Object} [subject.attributes] - Additional subject attributes
+ * @property {object} [subject.attributes] - Additional subject attributes
  */
 
 /**
- * @typedef {Object} ExposureContext
+ * @typedef {object} ExposureContext
  * @property {string} service - Service name
  * @property {string} [version] - Service version
  * @property {string} [env] - Service environment
  */
 
 /**
- * @typedef {Object} ExposureEventPayload
+ * @typedef {object} ExposureEventPayload
  * @property {ExposureContext} context - Service context metadata
  * @property {ExposureEvent[]} exposures - Formatted exposure events
  */

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

@@ -1,11 +1,11 @@
 'use strict'
 
-const { storage } = require('../../../datadog-core')
 const { trace, ROOT_CONTEXT, propagation } = require('@opentelemetry/api')
+const { storage } = require('../../../datadog-core')
 const DataDogSpanContext = require('../opentracing/span_context')
 
-const SpanContext = require('./span_context')
 const tracer = require('../../')
+const SpanContext = require('./span_context')
 
 class ContextManager {
   constructor () {

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

@@ -1,7 +1,7 @@
 'use strict'
 
-const { sanitizeAttributes } = require('../../../../../vendor/dist/@opentelemetry/core')
 const { context } = require('@opentelemetry/api')
+const { sanitizeAttributes } = require('../../../../../vendor/dist/@opentelemetry/core')
 const { VERSION: packageVersion } = require('../../../../../version')
 
 /**

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_http_exporter_base.js

@@ -90,7 +90,7 @@ class OtlpHttpExporterBase {
         data += chunk
       })
 
-      res.on('end', () => {
+      res.once('end', () => {
         if (res.statusCode >= 200 && res.statusCode < 300) {
           resultCallback({ code: 0 })
         } else {
@@ -105,7 +105,7 @@ class OtlpHttpExporterBase {
       resultCallback({ code: 1, error })
     })
 
-    req.on('timeout', () => {
+    req.once('timeout', () => {
       req.destroy()
       const error = new Error('Request timeout')
       resultCallback({ code: 1, error })

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,49 @@
 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 DatadogSpanContext = require('../opentracing/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')
+
+function normalizeLinkContext (context) {
+  if (!context) return
+
+  // OTel API bridge SpanContext wrapper
+  if (context._ddContext) return context._ddContext
+
+  // Datadog span context
+  if (typeof context.toTraceId === 'function' && typeof context.toSpanId === 'function') {
+    return context
+  }
+
+  // Standard OTel SpanContext (traceId/spanId)
+  if (typeof context.traceId !== 'string' || typeof context.spanId !== 'string') {
+    // Invalid
+    return
+  }
+
+  let sampling
+  if (typeof context.traceFlags === 'number') {
+    sampling = { priority: context.traceFlags & 1 }
+  }
+
+  let tracestate
+  if (context.traceState?.serialize) {
+    tracestate = TraceState.fromString(context.traceState.serialize())
+  }
+
+  return new DatadogSpanContext({
+    traceId: id(context.traceId, 16),
+    spanId: id(context.spanId, 16),
+    sampling,
+    tracestate
+  })
+}
 
 class Tracer {
   constructor (library, config, tracerProvider) {
@@ -96,7 +132,7 @@ class Tracer {
       context = api.trace.deleteSpan(context)
     }
     const parentSpan = api.trace.getSpan(context)
-    const parentSpanContext = parentSpan && parentSpan.spanContext()
+    const parentSpanContext = parentSpan?.spanContext()
     let spanContext
     if (parentSpanContext && api.trace.isSpanContextValid(parentSpanContext)) {
       spanContext = parentSpanContext._ddContext
@@ -107,12 +143,18 @@ class Tracer {
     }
 
     const spanKind = options.kind || api.SpanKind.INTERNAL
-    const links = (options.links || []).map(link => {
-      return {
-        context: link.context,
-        attributes: sanitizeAttributes(link.attributes)
+    const links = []
+    if (options.links?.length) {
+      for (const link of options.links) {
+        const ddContext = normalizeLinkContext(link?.context)
+        if (!ddContext) continue
+
+        links.push({
+          context: ddContext,
+          attributes: sanitizeAttributes(link.attributes)
+        })
       }
-    })
+    }
     const attributes = sanitizeAttributes(options.attributes)
 
     // TODO: sampling API is not yet supported