dd-trace 5.83.0 → 5.85.0

package/packages/dd-trace/src/service-naming/schemas/v1/messaging.js

@@ -4,12 +4,12 @@ const { identityService } = require('../util')
 
 const amqpInbound = {
   opName: () => 'amqp.process',
-  serviceName: identityService
+  serviceName: identityService,
 }
 
 const amqpOutbound = {
   opName: () => 'amqp.send',
-  serviceName: identityService
+  serviceName: identityService,
 }
 
 const messaging = {
@@ -18,73 +18,73 @@ const messaging = {
     amqp10: amqpOutbound,
     'azure-service-bus': {
       opName: () => 'azure.servicebus.send',
-      serviceName: identityService
+      serviceName: identityService,
     },
     'azure-event-hubs': {
       opName: () => 'azure.eventhubs.send',
-      serviceName: identityService
+      serviceName: identityService,
     },
     'google-cloud-pubsub': {
       opName: () => 'gcp.pubsub.send',
-      serviceName: identityService
+      serviceName: identityService,
     },
     kafkajs: {
       opName: () => 'kafka.send',
-      serviceName: identityService
+      serviceName: identityService,
     },
     'confluentinc-kafka-javascript': {
       opName: () => 'kafka.send',
-      serviceName: identityService
+      serviceName: identityService,
     },
     rhea: amqpOutbound,
     sqs: {
       opName: () => 'aws.sqs.send',
-      serviceName: identityService
+      serviceName: identityService,
     },
     sns: {
       opName: () => 'aws.sns.send',
-      serviceName: identityService
+      serviceName: identityService,
     },
     bullmq: {
       opName: () => 'bullmq.add',
-      serviceName: identityService
-    }
+      serviceName: identityService,
+    },
   },
   consumer: {
     amqplib: amqpInbound,
     amqp10: amqpInbound,
     'google-cloud-pubsub': {
       opName: () => 'gcp.pubsub.process',
-      serviceName: identityService
+      serviceName: identityService,
     },
     kafkajs: {
       opName: () => 'kafka.process',
-      serviceName: identityService
+      serviceName: identityService,
     },
     'confluentinc-kafka-javascript': {
       opName: () => 'kafka.process',
-      serviceName: identityService
+      serviceName: identityService,
     },
     rhea: amqpInbound,
     sqs: {
       opName: () => 'aws.sqs.process',
-      serviceName: identityService
+      serviceName: identityService,
     },
     bullmq: {
       opName: () => 'bullmq.processJob',
-      serviceName: identityService
-    }
+      serviceName: identityService,
+    },
   },
   client: {
     amqplib: {
       opName: () => 'amqp.command',
-      serviceName: identityService
+      serviceName: identityService,
     },
     'google-cloud-pubsub': {
       opName: () => 'gcp.pubsub.request',
-      serviceName: identityService
-    }
-  }
+      serviceName: identityService,
+    },
+  },
 }
 
 module.exports = messaging

package/packages/dd-trace/src/service-naming/schemas/v1/serverless.js

@@ -6,9 +6,9 @@ const serverless = {
   server: {
     'azure-functions': {
       opName: () => 'azure.functions.invoke',
-      serviceName: identityService
-    }
-  }
+      serviceName: identityService,
+    },
+  },
 }
 
 module.exports = serverless

package/packages/dd-trace/src/service-naming/schemas/v1/storage.js

@@ -6,12 +6,12 @@ function configWithFallback ({ tracerService, pluginConfig }) {
 
 const redisNaming = {
   opName: () => 'redis.command',
-  serviceName: configWithFallback
+  serviceName: configWithFallback,
 }
 
 const mySQLNaming = {
   opName: () => 'mysql.query',
-  serviceName: withFunction
+  serviceName: withFunction,
 }
 
 function withFunction ({ tracerService, pluginConfig, params }) {
@@ -26,61 +26,61 @@ const storage = {
   client: {
     aerospike: {
       opName: () => 'aerospike.command',
-      serviceName: configWithFallback
+      serviceName: configWithFallback,
     },
     'cassandra-driver': {
       opName: () => 'cassandra.query',
-      serviceName: configWithFallback
+      serviceName: configWithFallback,
     },
     couchbase: {
       opName: () => 'couchbase.query',
-      serviceName: configWithFallback
+      serviceName: configWithFallback,
     },
     elasticsearch: {
       opName: () => 'elasticsearch.query',
-      serviceName: configWithFallback
+      serviceName: configWithFallback,
     },
     ioredis: redisNaming,
     iovalkey: {
       opName: () => 'valkey.command',
-      serviceName: configWithFallback
+      serviceName: configWithFallback,
     },
     mariadb: {
       opName: () => 'mariadb.query',
-      serviceName: withFunction
+      serviceName: withFunction,
     },
     memcached: {
       opName: () => 'memcached.command',
-      serviceName: configWithFallback
+      serviceName: configWithFallback,
     },
     'mongodb-core': {
       opName: () => 'mongodb.query',
-      serviceName: configWithFallback
+      serviceName: configWithFallback,
     },
     mysql: mySQLNaming,
     mysql2: mySQLNaming,
     opensearch: {
       opName: () => 'opensearch.query',
-      serviceName: configWithFallback
+      serviceName: configWithFallback,
     },
     oracledb: {
       opName: () => 'oracle.query',
-      serviceName: withFunction
+      serviceName: withFunction,
     },
     pg: {
       opName: () => 'postgresql.query',
-      serviceName: withFunction
+      serviceName: withFunction,
     },
     prisma: {
       opName: ({ operation }) => `prisma.${operation}`,
-      serviceName: configWithFallback
+      serviceName: configWithFallback,
     },
     redis: redisNaming,
     tedious: {
       opName: () => 'mssql.query',
-      serviceName: configWithFallback
-    }
-  }
+      serviceName: configWithFallback,
+    },
+  },
 }
 
 module.exports = storage

package/packages/dd-trace/src/service-naming/schemas/v1/web.js

@@ -6,87 +6,87 @@ const web = {
   client: {
     grpc: {
       opName: () => 'grpc.client.request',
-      serviceName: identityService
+      serviceName: identityService,
     },
     moleculer: {
       opName: () => 'moleculer.client.request',
-      serviceName: identityService
+      serviceName: identityService,
     },
     http: {
       opName: () => 'http.client.request',
-      serviceName: httpPluginClientService
+      serviceName: httpPluginClientService,
     },
     genai: {
       opName: () => 'google_genai.request',
-      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
     },
     fetch: {
       opName: () => 'http.client.request',
-      serviceName: httpPluginClientService
+      serviceName: httpPluginClientService,
     },
     http2: {
       opName: () => 'http.client.request',
-      serviceName: httpPluginClientService
+      serviceName: httpPluginClientService,
     },
     aws: {
       opName: ({ awsService }) => `aws.${awsService}.request`,
-      serviceName: identityService
+      serviceName: identityService,
     },
     lambda: {
       opName: () => 'aws.lambda.invoke',
-      serviceName: identityService
+      serviceName: identityService,
     },
     undici: {
       opName: () => 'undici.request',
-      serviceName: httpPluginClientService
-    }
+      serviceName: httpPluginClientService,
+    },
   },
   server: {
     'apollo.gateway.request': {
       opName: () => 'apollo.gateway.request',
-      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
     },
     'apollo.gateway.plan': {
       opName: () => 'apollo.gateway.plan',
-      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
     },
     'apollo.gateway.validate': {
       opName: () => 'apollo.gateway.validate',
-      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
     },
     'apollo.gateway.execute': {
       opName: () => 'apollo.gateway.execute',
-      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
     },
     'apollo.gateway.fetch': {
       opName: () => 'apollo.gateway.fetch',
-      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
     },
     'apollo.gateway.postprocessing': {
       opName: () => 'apollo.gateway.postprocessing',
-      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
     },
     grpc: {
       opName: () => 'grpc.server.request',
-      serviceName: identityService
+      serviceName: identityService,
     },
     moleculer: {
       opName: () => 'moleculer.server.request',
-      serviceName: identityService
+      serviceName: identityService,
     },
     http: {
       opName: () => 'http.server.request',
-      serviceName: identityService
+      serviceName: identityService,
     },
     http2: {
       opName: () => 'http.server.request',
-      serviceName: identityService
+      serviceName: identityService,
     },
     next: {
       opName: () => 'http.server.request',
-      serviceName: identityService
-    }
-  }
+      serviceName: identityService,
+    },
+  },
 }
 
 module.exports = web

package/packages/dd-trace/src/service-naming/schemas/v1/websocket.js

@@ -4,27 +4,27 @@ const websocket = {
   request: {
     ws: {
       opName: () => 'web.request',
-      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
-    }
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+    },
   },
   producer: {
     ws: {
       opName: () => 'websocket.send',
-      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
-    }
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+    },
   },
   consumer: {
     ws: {
       opName: () => 'websocket.receive',
-      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
-    }
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+    },
   },
   close: {
     ws: {
       opName: () => 'websocket.close',
-      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
-    }
-  }
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+    },
+  },
 }
 
 module.exports = websocket

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

@@ -30,7 +30,7 @@ const map = {
   'operation.name': 'name',
   'service.name': 'service',
   'span.type': 'type',
-  'resource.name': 'resource'
+  'resource.name': 'resource',
 }
 
 function format (span, isFirstSpanInChunk = false, tagForFirstSpanInChunk = false) {
@@ -60,7 +60,7 @@ function formatSpan (span) {
     metrics: {},
     start: Math.round(span._startTime * 1e6),
     duration: Math.round(span._duration * 1e6),
-    links: []
+    links: [],
   }
 }
 
@@ -79,7 +79,7 @@ function extractSpanLinks (formattedSpan, span) {
     const { context, attributes } = link
     const formattedLink = {
       trace_id: context.toTraceId(true),
-      span_id: context.toSpanId(true)
+      span_id: context.toSpanId(true),
     }
 
     if (attributes && Object.keys(attributes).length > 0) {
@@ -101,7 +101,7 @@ function extractSpanEvents (formattedSpan, span) {
     return {
       name: event.name,
       time_unix_nano: Math.round(event.startTime * 1e6),
-      attributes: event.attributes && Object.keys(event.attributes).length > 0 ? event.attributes : undefined
+      attributes: event.attributes && Object.keys(event.attributes).length > 0 ? event.attributes : undefined,
     }
   })
   formattedSpan.span_events = events

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

@@ -48,7 +48,7 @@ class SpanSampler {
       if (rule && rule.sample(spanContext)) {
         span.context()._spanSampling = {
           sampleRate: rule.sampleRate,
-          maxPerSecond: rule.maxPerSecond
+          maxPerSecond: rule.maxPerSecond,
         }
       }
     }

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

@@ -9,7 +9,7 @@ const {
   HTTP_STATUS_CODE,
   HTTP_ENDPOINT,
   HTTP_ROUTE,
-  HTTP_METHOD
+  HTTP_METHOD,
 } = require('../../../ext/tags')
 const { ORIGIN_KEY, TOP_LEVEL_KEY } = require('./constants')
 const { version } = require('./pkg')
@@ -19,7 +19,7 @@ const { SpanStatsExporter } = require('./exporters/span-stats')
 
 const {
   DEFAULT_SPAN_NAME,
-  DEFAULT_SERVICE_NAME
+  DEFAULT_SERVICE_NAME,
 } = require('./encode/tags-processors')
 
 class SpanAggStats {
@@ -59,7 +59,7 @@ class SpanAggStats {
       statusCode,
       synthetics,
       method,
-      endpoint
+      endpoint,
     } = this.aggKey
 
     return {
@@ -76,7 +76,7 @@ class SpanAggStats {
       Errors: this.errors,
       Duration: this.duration,
       OkSummary: this.okDistribution.toProto(), // TODO: custom proto encoding
-      ErrorSummary: this.errorDistribution.toProto() // TODO: custom proto encoding
+      ErrorSummary: this.errorDistribution.toProto(), // TODO: custom proto encoding
     }
   }
 }
@@ -102,7 +102,7 @@ class SpanAggKey {
       this.statusCode,
       this.synthetics,
       this.method,
-      this.endpoint
+      this.endpoint,
     ].join(',')
   }
 }
@@ -134,20 +134,20 @@ class SpanStatsProcessor {
   constructor ({
     stats: {
       enabled = false,
-      interval = 10
+      interval = 10,
     },
     hostname,
     port,
     url,
     env,
     tags,
-    version
+    version,
   } = {}) {
     this.exporter = new SpanStatsExporter({
       hostname,
       port,
       tags,
-      url
+      url,
     })
     this.interval = interval
     this.bucketSizeNs = interval * 1e9
@@ -178,7 +178,7 @@ class SpanStatsProcessor {
       TracerVersion: pkg.version,
       RuntimeID: this.tags['runtime-id'],
       Sequence: ++this.sequence,
-      ProcessTags: processTags.serialized
+      ProcessTags: processTags.serialized,
     })
   }
 
@@ -208,7 +208,7 @@ class SpanStatsProcessor {
       serializedBuckets.push({
         Start: timeNs,
         Duration: bucketSizeNs,
-        Stats: bucketAggStats
+        Stats: bucketAggStats,
       })
     }
 
@@ -223,5 +223,5 @@ module.exports = {
   SpanAggKey,
   SpanBuckets,
   TimeBuckets,
-  SpanStatsProcessor
+  SpanStatsProcessor,
 }

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

@@ -11,7 +11,7 @@ const MODES = {
   DISABLED: 0,
   // METRICS_ONLY
   LOG: 1,
-  GC_AND_LOG: 2
+  GC_AND_LOG: 2,
   // GC
 }
 

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

@@ -66,5 +66,5 @@ function onSpanExtract ({ spanContext = {} }) {
 
 module.exports = {
   configure,
-  hasTraceSourcePropagationTag
+  hasTraceSourcePropagationTag,
 }

package/packages/dd-trace/src/standalone/product.js

@@ -25,11 +25,11 @@ const PRODUCTS = {
   ASM: { id: 1 << 1, mechanism: SAMPLING_MECHANISM_APPSEC },
   DSM: { id: 1 << 2 },
   DJM: { id: 1 << 3 },
-  DBM: { id: 1 << 4 }
+  DBM: { id: 1 << 4 },
 }
 
 module.exports = {
   ...PRODUCTS,
 
-  getProductRateLimiter
+  getProductRateLimiter,
 }

package/packages/dd-trace/src/standalone/tracesource.js

@@ -32,5 +32,5 @@ function hasTraceSourcePropagationTag (tags) {
 
 module.exports = {
   addTraceSourceTag,
-  hasTraceSourcePropagationTag
+  hasTraceSourcePropagationTag,
 }

package/packages/dd-trace/src/startup-log.js

@@ -3,7 +3,7 @@
 const os = require('os')
 const { inspect } = require('util')
 const tracerVersion = require('../../../package.json').version
-const defaults = require('./config/defaults')
+const { getAgentUrl } = require('./agent/url')
 const { info, warn } = require('./log/writer')
 
 const errors = {}
@@ -34,7 +34,7 @@ function startupLog (agentError) {
     warn('DATADOG TRACER DIAGNOSTIC - Agent Error: ' + agentError.message)
     errors.agentError = {
       code: agentError.status,
-      message: `Agent Error: ${agentError.message}`
+      message: `Agent Error: ${agentError.message}`,
     }
   }
 }
@@ -43,7 +43,7 @@ function startupLog (agentError) {
  * @returns {Record<string, unknown>}
  */
 function tracerInfo () {
-  const url = config.url || `http://${config.hostname || defaults.hostname}:${config.port}`
+  const url = getAgentUrl(config)
 
   const out = {
     [inspect.custom] () {
@@ -107,5 +107,5 @@ module.exports = {
   setStartupLogPluginManager,
   setSamplingRules,
   tracerInfo,
-  errors
+  errors,
 }

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

@@ -44,7 +44,9 @@ function add (carrier, keyValuePairs) {
         )
       }
     } else if (Array.isArray(keyValuePairs)) {
-      return keyValuePairs.forEach(tags => add(carrier, tags))
+      for (const tags of keyValuePairs) {
+        add(carrier, tags)
+      }
     } else {
       Object.assign(carrier, keyValuePairs)
     }

package/packages/dd-trace/src/telemetry/dependencies.js

@@ -59,10 +59,10 @@ function waitAndSend (config, application, host) {
     if (retryData) {
       payload = [{
         request_type: 'app-dependencies-loaded',
-        payload
+        payload,
       }, {
         request_type: retryData.reqType,
-        payload: retryData.payload
+        payload: retryData.payload,
       }]
       reqType = 'message-batch'
     } else if (!dependencies.length) {
@@ -81,9 +81,9 @@ function waitAndSend (config, application, host) {
 function loadAllTheLoadedModules () {
   if (require.cache) {
     const filenames = Object.keys(require.cache)
-    filenames.forEach(filename => {
+    for (const filename of filenames) {
       onModuleLoad({ filename })
-    })
+    }
   }
 }
 

package/packages/dd-trace/src/telemetry/endpoints.js

@@ -126,7 +126,7 @@ function buildEndpointObjects (endpoints) {
       method,
       path,
       operation_name: operationName,
-      resource_name: endpointKey(method, path)
+      resource_name: endpointKey(method, path),
     }
   })
 }
@@ -148,7 +148,7 @@ function flushAndSend () {
 
   const payloadObj = {
     is_first: isFirstPayload,
-    endpoints: buildEndpointObjects(batchEndpoints)
+    endpoints: buildEndpointObjects(batchEndpoints),
   }
 
   /** @type {import('./send-data').TelemetryRequestType} */
@@ -161,7 +161,7 @@ function flushAndSend () {
   if (retryData) {
     payload = [
       { request_type: 'app-endpoints', payload: payloadObj },
-      { request_type: retryData.reqType, payload: retryData.payload }
+      { request_type: retryData.reqType, payload: retryData.payload },
     ]
     reqType = 'message-batch'
   }
@@ -208,5 +208,5 @@ function stop () {
 
 module.exports = {
   start,
-  stop
+  stop,
 }

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

@@ -22,5 +22,5 @@ module.exports = {
   },
   appClosing () {
     telemetry?.appClosing()
-  }
+  },
 }

package/packages/dd-trace/src/telemetry/logs/index.js

@@ -43,7 +43,7 @@ function onErrorLog (msg) {
     count: 1,
 
     // existing log.error(err) without message will be reported as 'Generic Error'
-    message: message ?? 'Generic Error'
+    message: message ?? 'Generic Error',
   }
 
   if (cause) {
@@ -86,5 +86,5 @@ function send (config, application, host) {
 module.exports = {
   start,
   stop,
-  send
+  send,
 }