dd-trace 5.83.0 → 5.85.0

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

@@ -1,6 +1,5 @@
 'use strict'
 
-const { URL, format } = require('url')
 const uuid = require('../../../../vendor/dist/crypto-randomuuid')
 const tracerVersion = require('../../../../package.json').version
 const request = require('../exporters/common/request')
@@ -8,7 +7,7 @@ const log = require('../log')
 const { getExtraServices } = require('../service-naming/extra-services')
 const { GIT_REPOSITORY_URL, GIT_COMMIT_SHA } = require('../plugins/util/tags')
 const tagger = require('../tagger')
-const defaults = require('../config/defaults')
+const { getAgentUrl } = require('../agent/url')
 const processTags = require('../process-tags')
 const Scheduler = require('./scheduler')
 const { UNACKNOWLEDGED, ACKNOWLEDGED, ERROR } = require('./apply_states')
@@ -29,21 +28,17 @@ class RemoteConfig {
   constructor (config) {
     const pollInterval = Math.floor(config.remoteConfig.pollInterval * 1000)
 
-    this.url = config.url || new URL(format({
-      protocol: 'http:',
-      hostname: config.hostname || defaults.hostname,
-      port: config.port
-    }))
+    this.url = getAgentUrl(config)
 
     tagger.add(config.tags, {
-      '_dd.rc.client_id': clientId
+      '_dd.rc.client_id': clientId,
     })
 
     const tags = config.repositoryUrl
       ? {
           ...config.tags,
           [GIT_REPOSITORY_URL]: config.repositoryUrl,
-          [GIT_COMMIT_SHA]: config.commitSHA
+          [GIT_COMMIT_SHA]: config.commitSHA,
         }
       : config.tags
 
@@ -65,14 +60,14 @@ class RemoteConfig {
                 version: conf.version,
                 product: conf.product,
                 apply_state: conf.apply_state,
-                apply_error: conf.apply_error
+                apply_error: conf.apply_error,
               })
             }
             return configs
           },
           has_error: false,
           error: '',
-          backend_client_state: ''
+          backend_client_state: '',
         },
         id: clientId,
         products: /** @type {string[]} */ ([]), // updated by `updateProducts()`
@@ -86,11 +81,11 @@ class RemoteConfig {
           app_version: config.version,
           extra_services: /** @type {string[]} */ ([]),
           tags: Object.entries(tags).map((pair) => pair.join(':')),
-          [processTags.REMOTE_CONFIG_FIELD_NAME]: processTags.tagsArray
+          [processTags.REMOTE_CONFIG_FIELD_NAME]: processTags.tagsArray,
         },
-        capabilities: DEFAULT_CAPABILITY // updated by `updateCapabilities()`
+        capabilities: DEFAULT_CAPABILITY, // updated by `updateCapabilities()`
       },
-      cached_target_files: /** @type {RcCachedTargetFile[]} */ ([]) // updated by `parseConfig()`
+      cached_target_files: /** @type {RcCachedTargetFile[]} */ ([]), // updated by `parseConfig()`
     }
   }
 
@@ -220,8 +215,8 @@ class RemoteConfig {
       method: 'POST',
       path: '/v0.7/config',
       headers: {
-        'Content-Type': 'application/json; charset=utf-8'
-      }
+        'Content-Type': 'application/json; charset=utf-8',
+      },
     }
 
     request(this.getPayload(), options, (err, data, statusCode) => {
@@ -260,7 +255,7 @@ class RemoteConfig {
   parseConfig ({
     client_configs: clientConfigs = [],
     targets,
-    target_files: targetFiles = []
+    target_files: targetFiles = [],
   }) {
     const toUnapply = /** @type {RcConfigState[]} */ ([])
     const toApply = /** @type {RcConfigState[]} */ ([])
@@ -315,7 +310,7 @@ class RemoteConfig {
           apply_error: '',
           length: meta.length,
           hashes: meta.hashes,
-          file: fromBase64JSON(file.raw)
+          file: fromBase64JSON(file.raw),
         })
         transactionByPath.set(path, newConf)
       }
@@ -356,7 +351,7 @@ class RemoteConfig {
         this.state.cached_target_files.push({
           path: conf.path,
           length: conf.length,
-          hashes
+          hashes,
         })
       }
     }
@@ -489,7 +484,7 @@ function createUpdateTransaction ({ toUnapply, toApply, toModify }, handledPaths
     error (path, err) {
       outcomes.set(path, { state: ERROR, error: err ? err.toString() : 'Error' })
       handledPaths.add(path)
-    }
+    },
   }
 }
 
@@ -523,7 +518,7 @@ function filterTransactionByProducts (transaction, products) {
     toApply,
     toModify,
     ack: transaction.ack,
-    error: transaction.error
+    error: transaction.error,
   }
 }
 
@@ -554,7 +549,7 @@ function parseConfigPath (configPath) {
 
   return {
     product: match[1],
-    id: match[2]
+    id: match[2],
   }
 }
 

package/packages/dd-trace/src/remote_config/scheduler.js

@@ -17,7 +17,7 @@ class Scheduler {
   runAfterDelay (interval = this._interval) {
     this._timer = setTimeout(this._callback, interval, () => this.runAfterDelay())
 
-    this._timer.unref && this._timer.unref()
+    this._timer.unref()
   }
 
   stop () {

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

@@ -92,7 +92,7 @@ function Hook (modules, options, onrequire) {
 
     const payload = {
       filename,
-      request
+      request,
     }
 
     if (moduleLoadStartChannel.hasSubscribers) {

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

@@ -10,7 +10,7 @@ const noop = runtimeMetrics = {
   count () {},
   gauge () {},
   increment () {},
-  decrement () {}
+  decrement () {},
 }
 
 module.exports = {
@@ -28,7 +28,7 @@ module.exports = {
     runtimeMetrics.stop()
 
     Object.setPrototypeOf(module.exports, runtimeMetrics = noop)
-  }
+  },
 }
 
 Object.setPrototypeOf(module.exports, noop)

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

@@ -117,7 +117,7 @@ module.exports = {
       const handle = nativeMetrics.track(span)
 
       return {
-        finish: () => nativeMetrics.finish(handle)
+        finish: () => nativeMetrics.finish(handle),
       }
     }
 
@@ -146,7 +146,7 @@ module.exports = {
 
   decrement (name, tag) {
     this.count(name, -1, tag)
-  }
+  },
 }
 
 function captureCpuUsage () {
@@ -206,7 +206,7 @@ function captureEventLoopDelay () {
         total: sum,
         avg,
         count: eventLoopDelayObserver.count,
-        p95: Math.max(eventLoopDelayObserver.percentile(95) - minimum, 0)
+        p95: Math.max(eventLoopDelayObserver.percentile(95) - minimum, 0),
       }
 
       histogram('runtime.node.event_loop.delay', stats)

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

@@ -48,5 +48,5 @@ module.exports = {
   getIsAzureFunction,
   enableGCPPubSubPushSubscription,
   getIsFlexConsumptionAzureFunction,
-  isInServerlessEnvironment
+  IS_SERVERLESS: isInServerlessEnvironment(),
 }

package/packages/dd-trace/src/service-naming/extra-services.js

@@ -20,5 +20,5 @@ function clear () {
 module.exports = {
   registerExtraService,
   getExtraServices,
-  clear
+  clear,
 }

package/packages/dd-trace/src/service-naming/index.js

@@ -6,7 +6,7 @@ class SchemaManager {
    */
   config = {
     spanAttributeSchema: 'v0',
-    spanRemoveIntegrationFromService: false
+    spanRemoveIntegrationFromService: false,
   }
 
   schemas = {

package/packages/dd-trace/src/service-naming/schemas/v0/graphql.js

@@ -6,9 +6,9 @@ const graphql = {
   server: {
     graphql: {
       opName: () => 'graphql.execute',
-      serviceName: identityService
-    }
-  }
+      serviceName: identityService,
+    },
+  },
 }
 
 module.exports = graphql

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

@@ -10,93 +10,93 @@ const messaging = {
   producer: {
     amqplib: {
       opName: () => 'amqp.command',
-      serviceName: amqpServiceName
+      serviceName: amqpServiceName,
     },
     amqp10: {
       opName: () => 'amqp.send',
-      serviceName: amqpServiceName
+      serviceName: amqpServiceName,
     },
     'azure-event-hubs': {
       opName: () => 'azure.eventhubs.send',
-      serviceName: ({ tracerService }) => `${tracerService}-azure-event-hubs`
+      serviceName: ({ tracerService }) => `${tracerService}-azure-event-hubs`,
     },
     'azure-service-bus': {
       opName: () => 'azure.servicebus.send',
-      serviceName: ({ tracerService }) => `${tracerService}-azure-service-bus`
+      serviceName: ({ tracerService }) => `${tracerService}-azure-service-bus`,
     },
     'google-cloud-pubsub': {
       opName: () => 'pubsub.request',
-      serviceName: ({ tracerService }) => `${tracerService}-pubsub`
+      serviceName: ({ tracerService }) => `${tracerService}-pubsub`,
     },
     kafkajs: {
       opName: () => 'kafka.produce',
-      serviceName: ({ tracerService }) => `${tracerService}-kafka`
+      serviceName: ({ tracerService }) => `${tracerService}-kafka`,
     },
     'confluentinc-kafka-javascript': {
       opName: () => 'kafka.produce',
-      serviceName: ({ tracerService }) => `${tracerService}-kafka`
+      serviceName: ({ tracerService }) => `${tracerService}-kafka`,
     },
     rhea: {
       opName: () => 'amqp.send',
-      serviceName: ({ tracerService }) => `${tracerService}-amqp-producer`
+      serviceName: ({ tracerService }) => `${tracerService}-amqp-producer`,
     },
     sqs: {
       opName: () => 'aws.request',
-      serviceName: awsServiceV0
+      serviceName: awsServiceV0,
     },
     sns: {
       opName: () => 'aws.request',
-      serviceName: awsServiceV0
+      serviceName: awsServiceV0,
     },
     bullmq: {
       opName: () => 'bullmq.add',
-      serviceName: ({ tracerService }) => `${tracerService}-bullmq`
-    }
+      serviceName: ({ tracerService }) => `${tracerService}-bullmq`,
+    },
   },
   consumer: {
     amqplib: {
       opName: () => 'amqp.command',
-      serviceName: amqpServiceName
+      serviceName: amqpServiceName,
     },
     amqp10: {
       opName: () => 'amqp.receive',
-      serviceName: amqpServiceName
+      serviceName: amqpServiceName,
     },
     'google-cloud-pubsub': {
       opName: () => 'pubsub.receive',
-      serviceName: identityService
+      serviceName: identityService,
     },
     kafkajs: {
       opName: () => 'kafka.consume',
-      serviceName: ({ tracerService }) => `${tracerService}-kafka`
+      serviceName: ({ tracerService }) => `${tracerService}-kafka`,
     },
     'confluentinc-kafka-javascript': {
       opName: () => 'kafka.consume',
-      serviceName: ({ tracerService }) => `${tracerService}-kafka`
+      serviceName: ({ tracerService }) => `${tracerService}-kafka`,
     },
     rhea: {
       opName: () => 'amqp.receive',
-      serviceName: identityService
+      serviceName: identityService,
     },
     sqs: {
       opName: () => 'aws.request',
-      serviceName: awsServiceV0
+      serviceName: awsServiceV0,
     },
     bullmq: {
       opName: () => 'bullmq.processJob',
-      serviceName: ({ tracerService }) => `${tracerService}-bullmq`
-    }
+      serviceName: ({ tracerService }) => `${tracerService}-bullmq`,
+    },
   },
   client: {
     amqplib: {
       opName: () => 'amqp.command',
-      serviceName: amqpServiceName
+      serviceName: amqpServiceName,
     },
     'google-cloud-pubsub': {
       opName: () => 'pubsub.request',
-      serviceName: ({ tracerService }) => `${tracerService}-pubsub`
-    }
-  }
+      serviceName: ({ tracerService }) => `${tracerService}-pubsub`,
+    },
+  },
 }
 
 module.exports = messaging

package/packages/dd-trace/src/service-naming/schemas/v0/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/v0/storage.js

@@ -34,14 +34,14 @@ const redisConfig = {
   opName: () => 'redis.command',
   serviceName: ({ tracerService, pluginConfig, system, connectionName }) => {
     return getRedisService(pluginConfig, connectionName) || fromSystem(tracerService, system)
-  }
+  },
 }
 
 const valkeyConfig = {
   opName: () => 'valkey.command',
   serviceName: ({ tracerService, pluginConfig, system, connectionName }) => {
     return getRedisService(pluginConfig, connectionName) || fromSystem(tracerService, system)
-  }
+  },
 }
 
 const storage = {
@@ -49,70 +49,70 @@ const storage = {
     aerospike: {
       opName: () => 'aerospike.command',
       serviceName: ({ tracerService, pluginConfig }) =>
-        pluginConfig.service || `${tracerService}-aerospike`
+        pluginConfig.service || `${tracerService}-aerospike`,
     },
     'cassandra-driver': {
       opName: () => 'cassandra.query',
       serviceName: ({ tracerService, pluginConfig, system }) =>
-        pluginConfig.service || fromSystem(tracerService, system)
+        pluginConfig.service || fromSystem(tracerService, system),
     },
     couchbase: {
       opName: ({ operation }) => `couchbase.${operation}`,
-      serviceName: ({ tracerService, pluginConfig }) => pluginConfig.service || `${tracerService}-couchbase`
+      serviceName: ({ tracerService, pluginConfig }) => pluginConfig.service || `${tracerService}-couchbase`,
     },
     elasticsearch: {
       opName: () => 'elasticsearch.query',
       serviceName: ({ tracerService, pluginConfig }) =>
-        pluginConfig.service || `${tracerService}-elasticsearch`
+        pluginConfig.service || `${tracerService}-elasticsearch`,
     },
     ioredis: redisConfig,
     iovalkey: valkeyConfig,
     mariadb: {
       opName: () => 'mariadb.query',
-      serviceName: mysqlServiceName
+      serviceName: mysqlServiceName,
     },
     memcached: {
       opName: () => 'memcached.command',
       serviceName: ({ tracerService, pluginConfig, system }) =>
-        pluginConfig.service || fromSystem(tracerService, system)
+        pluginConfig.service || fromSystem(tracerService, system),
     },
     'mongodb-core': {
       opName: () => 'mongodb.query',
       serviceName: ({ tracerService, pluginConfig }) =>
-        pluginConfig.service || `${tracerService}-mongodb`
+        pluginConfig.service || `${tracerService}-mongodb`,
     },
     mysql: {
       opName: () => 'mysql.query',
-      serviceName: mysqlServiceName
+      serviceName: mysqlServiceName,
     },
     mysql2: {
       opName: () => 'mysql.query',
-      serviceName: mysqlServiceName
+      serviceName: mysqlServiceName,
     },
     opensearch: {
       opName: () => 'opensearch.query',
       serviceName: ({ tracerService, pluginConfig }) =>
-        pluginConfig.service || `${tracerService}-opensearch`
+        pluginConfig.service || `${tracerService}-opensearch`,
     },
     oracledb: {
       opName: () => 'oracle.query',
-      serviceName: withSuffixFunction('oracle')
+      serviceName: withSuffixFunction('oracle'),
     },
     pg: {
       opName: () => 'pg.query',
-      serviceName: withSuffixFunction('postgres')
+      serviceName: withSuffixFunction('postgres'),
     },
     prisma: {
       opName: ({ operation }) => `prisma.${operation}`,
-      serviceName: withSuffixFunction('prisma')
+      serviceName: withSuffixFunction('prisma'),
     },
     redis: redisConfig,
     tedious: {
       opName: () => 'tedious.request',
       serviceName: ({ tracerService, pluginConfig, system }) =>
-        pluginConfig.service || fromSystem(tracerService, system)
-    }
-  }
+        pluginConfig.service || fromSystem(tracerService, system),
+    },
+  },
 }
 
 module.exports = storage

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

@@ -6,87 +6,87 @@ const web = {
   client: {
     grpc: {
       opName: () => 'grpc.client',
-      serviceName: identityService
+      serviceName: identityService,
     },
     moleculer: {
       opName: () => 'moleculer.call',
-      serviceName: identityService
+      serviceName: identityService,
     },
     http: {
       opName: () => 'http.request',
-      serviceName: httpPluginClientService
+      serviceName: httpPluginClientService,
     },
     fetch: {
       opName: () => 'http.request',
-      serviceName: httpPluginClientService
+      serviceName: httpPluginClientService,
     },
     http2: {
       opName: () => 'http.request',
-      serviceName: httpPluginClientService
+      serviceName: httpPluginClientService,
     },
     genai: {
       opName: () => 'google_genai.request',
-      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService
+      serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
     },
     aws: {
       opName: () => 'aws.request',
-      serviceName: awsServiceV0
+      serviceName: awsServiceV0,
     },
     lambda: {
       opName: () => 'aws.request',
-      serviceName: awsServiceV0
+      serviceName: awsServiceV0,
     },
     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',
-      serviceName: identityService
+      serviceName: identityService,
     },
     moleculer: {
       opName: () => 'moleculer.action',
-      serviceName: identityService
+      serviceName: identityService,
     },
     http: {
       opName: () => 'web.request',
-      serviceName: identityService
+      serviceName: identityService,
     },
     http2: {
       opName: () => 'web.request',
-      serviceName: identityService
+      serviceName: identityService,
     },
     next: {
       opName: () => 'next.request',
-      serviceName: identityService
-    }
-  }
+      serviceName: identityService,
+    },
+  },
 }
 
 module.exports = web

package/packages/dd-trace/src/service-naming/schemas/v0/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/service-naming/schemas/v1/graphql.js

@@ -6,9 +6,9 @@ const graphql = {
   server: {
     graphql: {
       opName: () => 'graphql.server.request',
-      serviceName: identityService
-    }
-  }
+      serviceName: identityService,
+    },
+  },
 }
 
 module.exports = graphql