dd-trace 5.97.0 → 5.99.0

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

@@ -51,24 +51,28 @@ module.exports = {
     const trackEventLoop = config.runtimeMetrics.eventLoop !== false
     const trackGc = config.runtimeMetrics.gc !== false
 
+    client = new MetricsAggregationClient(new DogStatsDClient(clientConfig))
+
     if (trackGc) {
       startGCObserver()
     }
 
-    // Using no-gc prevents the native gc metrics from being tracked. Not
-    // passing any options means all metrics are tracked.
-    // TODO: This is a workaround. We should find a better solution.
-    const watchers = trackEventLoop ? ['loop'] : ['no-gc']
-
-    try {
-      nativeMetrics = require('@datadog/native-metrics')
-      nativeMetrics.start(...watchers)
-    } catch (error) {
-      log.error('Error starting native metrics', error)
-      nativeMetrics = null
-    }
+    const useNative = config.runtimeMetrics.native !== false
 
-    client = new MetricsAggregationClient(new DogStatsDClient(clientConfig))
+    if (useNative) {
+      // Using no-gc prevents the native gc metrics from being tracked. Not
+      // passing any options means all metrics are tracked.
+      // TODO: This is a workaround. We should find a better solution.
+      const watchers = trackEventLoop ? ['loop'] : ['no-gc']
+
+      try {
+        nativeMetrics = require('@datadog/native-metrics')
+        nativeMetrics.start(...watchers)
+      } catch (error) {
+        log.error('Error starting native metrics', error)
+        nativeMetrics = null
+      }
+    }
 
     lastTime = performance.now()
 

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

@@ -41,7 +41,7 @@ class SchemaManager {
    * @param {string} kind
    * @param {string} plugin
    * @param {object} opts
-   * @returns {string}
+   * @returns {object} {name, source}
    */
   serviceName (type, kind, plugin, opts) {
     const schema = this.shouldUseConsistentServiceNaming

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

@@ -12,7 +12,10 @@ class SchemaDefinition {
 
   getServiceName (type, kind, plugin, opts) {
     const item = this.schema[type][kind][plugin]
-    return item.serviceName(opts)
+    return {
+      name: item.serviceName(opts),
+      source: item.serviceSource?.(opts),
+    }
   }
 }
 

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

@@ -18,8 +18,22 @@ function httpPluginClientService ({ tracerService, pluginConfig, sessionDetails
   return tracerService
 }
 
+function optionServiceSource ({ pluginConfig }) {
+  if (pluginConfig.splitByDomain) {
+    return 'opt.split_by_domain'
+  }
+
+  if (pluginConfig.service) {
+    return 'opt.plugin'
+  }
+}
+
 function awsServiceV0 ({ tracerService, awsService }) {
   return `${tracerService}-aws-${awsService}`
 }
 
-module.exports = { identityService, httpPluginClientService, awsServiceV0 }
+function awsServiceSource ({ awsService }) {
+  return awsService
+}
+
+module.exports = { identityService, httpPluginClientService, awsServiceV0, optionServiceSource, awsServiceSource }

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

@@ -1,66 +1,83 @@
 'use strict'
 
-const { identityService, awsServiceV0 } = require('../util')
+const { identityService, awsServiceV0, awsServiceSource } = require('../util')
 
 function amqpServiceName ({ tracerService }) {
   return `${tracerService}-amqp`
 }
 
+function integrationSource (source) {
+  return () => source
+}
+
 const messaging = {
   producer: {
     amqplib: {
       opName: () => 'amqp.command',
       serviceName: amqpServiceName,
+      serviceSource: integrationSource('amqp'),
     },
     amqp10: {
       opName: () => 'amqp.send',
       serviceName: amqpServiceName,
+      serviceSource: integrationSource('amqp'),
     },
     'azure-event-hubs': {
       opName: () => 'azure.eventhubs.send',
       serviceName: ({ tracerService }) => `${tracerService}-azure-event-hubs`,
+      serviceSource: integrationSource('azure-event-hubs'),
     },
     'azure-service-bus': {
       opName: () => 'azure.servicebus.send',
       serviceName: ({ tracerService }) => `${tracerService}-azure-service-bus`,
+      serviceSource: integrationSource('azure-service-bus'),
     },
     'google-cloud-pubsub': {
       opName: () => 'pubsub.request',
       serviceName: ({ tracerService }) => `${tracerService}-pubsub`,
+      serviceSource: integrationSource('google-cloud-pubsub'),
     },
     kafkajs: {
       opName: () => 'kafka.produce',
       serviceName: ({ tracerService }) => `${tracerService}-kafka`,
+      serviceSource: integrationSource('kafka'),
     },
     'confluentinc-kafka-javascript': {
       opName: () => 'kafka.produce',
       serviceName: ({ tracerService }) => `${tracerService}-kafka`,
+      serviceSource: integrationSource('kafka'),
     },
     rhea: {
       opName: () => 'amqp.send',
       serviceName: ({ tracerService }) => `${tracerService}-amqp-producer`,
+      serviceSource: integrationSource('amqp'),
     },
     sqs: {
       opName: () => 'aws.request',
       serviceName: awsServiceV0,
+      serviceSource: awsServiceSource,
     },
     sns: {
       opName: () => 'aws.request',
       serviceName: awsServiceV0,
+      serviceSource: awsServiceSource,
     },
     bullmq: {
       opName: () => 'bullmq.add',
       serviceName: ({ tracerService }) => `${tracerService}-bullmq`,
+      serviceSource: integrationSource('bullmq'),
     },
   },
   consumer: {
     amqplib: {
       opName: () => 'amqp.command',
       serviceName: amqpServiceName,
+      serviceSource: integrationSource('amqp'),
     },
     amqp10: {
       opName: () => 'amqp.receive',
       serviceName: amqpServiceName,
+      serviceSource: integrationSource('amqp'),
     },
     'google-cloud-pubsub': {
       opName: () => 'pubsub.receive',
@@ -69,10 +86,12 @@ const messaging = {
     kafkajs: {
       opName: () => 'kafka.consume',
       serviceName: ({ tracerService }) => `${tracerService}-kafka`,
+      serviceSource: integrationSource('kafka'),
     },
     'confluentinc-kafka-javascript': {
       opName: () => 'kafka.consume',
       serviceName: ({ tracerService }) => `${tracerService}-kafka`,
+      serviceSource: integrationSource('kafka'),
     },
     rhea: {
       opName: () => 'amqp.receive',
@@ -81,20 +100,24 @@ const messaging = {
     sqs: {
       opName: () => 'aws.request',
       serviceName: awsServiceV0,
+      serviceSource: awsServiceSource,
     },
     bullmq: {
       opName: () => 'bullmq.processJob',
       serviceName: ({ tracerService }) => `${tracerService}-bullmq`,
+      serviceSource: integrationSource('bullmq'),
     },
   },
   client: {
     amqplib: {
       opName: () => 'amqp.command',
       serviceName: amqpServiceName,
+      serviceSource: integrationSource('amqp'),
     },
     'google-cloud-pubsub': {
       opName: () => 'pubsub.request',
       serviceName: ({ tracerService }) => `${tracerService}-pubsub`,
+      serviceSource: integrationSource('google-cloud-pubsub'),
     },
   },
 }

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

@@ -30,11 +30,26 @@ function withSuffixFunction (suffix) {
   }
 }
 
+function optionServiceSource ({ pluginConfig, integration, connectionName }) {
+  if (pluginConfig.splitByInstance && connectionName) {
+    return 'opt.split_by_instance'
+  }
+
+  if (pluginConfig.service) {
+    return 'opt.plugin'
+  }
+
+  return integration
+}
+
 const redisConfig = {
   opName: () => 'redis.command',
   serviceName: ({ tracerService, pluginConfig, system, connectionName }) => {
     return getRedisService(pluginConfig, connectionName) || fromSystem(tracerService, system)
   },
+  serviceSource: ({ tracerService, pluginConfig, connectionName }) => {
+    return optionServiceSource({ tracerService, pluginConfig, connectionName, integration: 'redis' })
+  },
 }
 
 const valkeyConfig = {
@@ -42,6 +57,9 @@ const valkeyConfig = {
   serviceName: ({ tracerService, pluginConfig, system, connectionName }) => {
     return getRedisService(pluginConfig, connectionName) || fromSystem(tracerService, system)
   },
+  serviceSource: ({ tracerService, pluginConfig, connectionName }) => {
+    return optionServiceSource({ tracerService, pluginConfig, connectionName, integration: 'valkey' })
+  },
 }
 
 const storage = {
@@ -50,67 +68,109 @@ const storage = {
       opName: () => 'aerospike.command',
       serviceName: ({ tracerService, pluginConfig }) =>
         pluginConfig.service || `${tracerService}-aerospike`,
+      serviceSource: ({ tracerService, pluginConfig, connectionName }) => {
+        return optionServiceSource({ tracerService, pluginConfig, connectionName, integration: 'aerospike' })
+      },
     },
     'cassandra-driver': {
       opName: () => 'cassandra.query',
       serviceName: ({ tracerService, pluginConfig, system }) =>
         pluginConfig.service || fromSystem(tracerService, system),
+      serviceSource: ({ tracerService, pluginConfig, connectionName }) => {
+        return optionServiceSource({ tracerService, pluginConfig, connectionName, integration: 'cassandra-driver' })
+      },
     },
     couchbase: {
       opName: ({ operation }) => `couchbase.${operation}`,
       serviceName: ({ tracerService, pluginConfig }) => pluginConfig.service || `${tracerService}-couchbase`,
+      serviceSource: ({ tracerService, pluginConfig, connectionName }) => {
+        return optionServiceSource({ tracerService, pluginConfig, connectionName, integration: 'couchbase' })
+      },
     },
     elasticsearch: {
       opName: () => 'elasticsearch.query',
       serviceName: ({ tracerService, pluginConfig }) =>
         pluginConfig.service || `${tracerService}-elasticsearch`,
+      serviceSource: ({ tracerService, pluginConfig, connectionName }) => {
+        return optionServiceSource({ tracerService, pluginConfig, connectionName, integration: 'elasticsearch' })
+      },
     },
     ioredis: redisConfig,
     iovalkey: valkeyConfig,
     mariadb: {
       opName: () => 'mariadb.query',
       serviceName: mysqlServiceName,
+      serviceSource: ({ tracerService, pluginConfig, connectionName }) => {
+        return optionServiceSource({ tracerService, pluginConfig, connectionName, integration: 'mysql' })
+      },
     },
     memcached: {
       opName: () => 'memcached.command',
       serviceName: ({ tracerService, pluginConfig, system }) =>
         pluginConfig.service || fromSystem(tracerService, system),
+      serviceSource: ({ tracerService, pluginConfig, connectionName }) => {
+        return optionServiceSource({ tracerService, pluginConfig, connectionName, integration: 'memcached' })
+      },
     },
     'mongodb-core': {
       opName: () => 'mongodb.query',
       serviceName: ({ tracerService, pluginConfig }) =>
         pluginConfig.service || `${tracerService}-mongodb`,
+      serviceSource: ({ tracerService, pluginConfig, connectionName }) => {
+        return optionServiceSource({ tracerService, pluginConfig, connectionName, integration: 'mongodb' })
+      },
     },
     mysql: {
       opName: () => 'mysql.query',
       serviceName: mysqlServiceName,
+      serviceSource: ({ tracerService, pluginConfig, connectionName }) => {
+        return optionServiceSource({ tracerService, pluginConfig, connectionName, integration: 'mysql' })
+      },
     },
     mysql2: {
       opName: () => 'mysql.query',
       serviceName: mysqlServiceName,
+      serviceSource: ({ tracerService, pluginConfig, connectionName }) => {
+        return optionServiceSource({ tracerService, pluginConfig, connectionName, integration: 'mysql' })
+      },
     },
     opensearch: {
       opName: () => 'opensearch.query',
       serviceName: ({ tracerService, pluginConfig }) =>
         pluginConfig.service || `${tracerService}-opensearch`,
+      serviceSource: ({ tracerService, pluginConfig, connectionName }) => {
+        return optionServiceSource({ tracerService, pluginConfig, connectionName, integration: 'opensearch' })
+      },
     },
     oracledb: {
       opName: () => 'oracle.query',
       serviceName: withSuffixFunction('oracle'),
+      serviceSource: ({ tracerService, pluginConfig, connectionName }) => {
+        return optionServiceSource({ tracerService, pluginConfig, connectionName, integration: 'oracledb' })
+      },
     },
     pg: {
       opName: () => 'pg.query',
       serviceName: withSuffixFunction('postgres'),
+      serviceSource: ({ tracerService, pluginConfig, connectionName }) => {
+        return optionServiceSource({ tracerService, pluginConfig, connectionName, integration: 'pg' })
+      },
     },
     prisma: {
       opName: ({ operation }) => `prisma.${operation}`,
       serviceName: withSuffixFunction('prisma'),
+      serviceSource: ({ tracerService, pluginConfig, connectionName }) => {
+        return optionServiceSource({ tracerService, pluginConfig, connectionName, integration: 'prisma' })
+      },
     },
     redis: redisConfig,
     tedious: {
       opName: () => 'tedious.request',
       serviceName: ({ tracerService, pluginConfig, system }) =>
         pluginConfig.service || fromSystem(tracerService, system),
+      serviceSource: ({ tracerService, pluginConfig, connectionName }) => {
+        return optionServiceSource({ tracerService, pluginConfig, connectionName, integration: 'tedious' })
+      },
     },
   },
 }

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

@@ -1,6 +1,9 @@
 'use strict'
 
-const { identityService, httpPluginClientService, awsServiceV0 } = require('../util')
+const {
+  identityService, httpPluginClientService, awsServiceV0,
+  optionServiceSource, awsServiceSource,
+} = require('../util')
 
 const web = {
   client: {
@@ -15,56 +18,73 @@ const web = {
     http: {
       opName: () => 'http.request',
       serviceName: httpPluginClientService,
+      serviceSource: optionServiceSource,
     },
     fetch: {
       opName: () => 'http.request',
       serviceName: httpPluginClientService,
+      serviceSource: optionServiceSource,
     },
     http2: {
       opName: () => 'http.request',
       serviceName: httpPluginClientService,
+      serviceSource: optionServiceSource,
     },
     genai: {
       opName: () => 'google_genai.request',
       serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+      serviceSource: optionServiceSource,
+    },
+    'modelcontextprotocol-sdk': {
+      opName: () => 'mcp.tool.call',
+      serviceName: ({ pluginService, tracerService }) => pluginService || tracerService,
     },
     aws: {
       opName: () => 'aws.request',
       serviceName: awsServiceV0,
+      serviceSource: awsServiceSource,
     },
     lambda: {
       opName: () => 'aws.request',
       serviceName: awsServiceV0,
+      serviceSource: awsServiceSource,
     },
     undici: {
       opName: () => 'undici.request',
       serviceName: httpPluginClientService,
+      serviceSource: optionServiceSource,
     },
   },
   server: {
     'apollo.gateway.request': {
       opName: () => 'apollo.gateway.request',
       serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+      serviceSource: optionServiceSource,
     },
     'apollo.gateway.plan': {
       opName: () => 'apollo.gateway.plan',
       serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+      serviceSource: optionServiceSource,
     },
     'apollo.gateway.validate': {
       opName: () => 'apollo.gateway.validate',
       serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+      serviceSource: optionServiceSource,
     },
     'apollo.gateway.execute': {
       opName: () => 'apollo.gateway.execute',
       serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+      serviceSource: optionServiceSource,
     },
     'apollo.gateway.fetch': {
       opName: () => 'apollo.gateway.fetch',
       serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+      serviceSource: optionServiceSource,
     },
     'apollo.gateway.postprocessing': {
       opName: () => 'apollo.gateway.postprocessing',
       serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+      serviceSource: optionServiceSource,
     },
     grpc: {
       opName: () => 'grpc.server',

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

@@ -1,28 +1,33 @@
 'use strict'
+const { optionServiceSource } = require('../util')
 
 const websocket = {
   request: {
     ws: {
       opName: () => 'web.request',
       serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+      serviceSource: optionServiceSource,
     },
   },
   producer: {
     ws: {
       opName: () => 'websocket.send',
       serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+      serviceSource: optionServiceSource,
     },
   },
   consumer: {
     ws: {
       opName: () => 'websocket.receive',
       serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+      serviceSource: optionServiceSource,
     },
   },
   close: {
     ws: {
       opName: () => 'websocket.close',
       serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+      serviceSource: optionServiceSource,
     },
   },
 }

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

@@ -1,5 +1,7 @@
 'use strict'
 
+const { optionServiceSource } = require('../util')
+
 function configWithFallback ({ tracerService, pluginConfig }) {
   return pluginConfig.service || tracerService
 }
@@ -7,11 +9,13 @@ function configWithFallback ({ tracerService, pluginConfig }) {
 const redisNaming = {
   opName: () => 'redis.command',
   serviceName: configWithFallback,
+  serviceSource: optionServiceSource,
 }
 
 const mySQLNaming = {
   opName: () => 'mysql.query',
   serviceName: withFunction,
+  serviceSource: optionServiceSource,
 }
 
 function withFunction ({ tracerService, pluginConfig, params }) {
@@ -27,58 +31,71 @@ const storage = {
     aerospike: {
       opName: () => 'aerospike.command',
       serviceName: configWithFallback,
+      serviceSource: optionServiceSource,
     },
     'cassandra-driver': {
       opName: () => 'cassandra.query',
       serviceName: configWithFallback,
+      serviceSource: optionServiceSource,
     },
     couchbase: {
       opName: () => 'couchbase.query',
       serviceName: configWithFallback,
+      serviceSource: optionServiceSource,
     },
     elasticsearch: {
       opName: () => 'elasticsearch.query',
       serviceName: configWithFallback,
+      serviceSource: optionServiceSource,
     },
     ioredis: redisNaming,
     iovalkey: {
       opName: () => 'valkey.command',
       serviceName: configWithFallback,
+      serviceSource: optionServiceSource,
     },
     mariadb: {
       opName: () => 'mariadb.query',
       serviceName: withFunction,
+      serviceSource: optionServiceSource,
     },
     memcached: {
       opName: () => 'memcached.command',
       serviceName: configWithFallback,
+      serviceSource: optionServiceSource,
     },
     'mongodb-core': {
       opName: () => 'mongodb.query',
       serviceName: configWithFallback,
+      serviceSource: optionServiceSource,
     },
     mysql: mySQLNaming,
     mysql2: mySQLNaming,
     opensearch: {
       opName: () => 'opensearch.query',
       serviceName: configWithFallback,
+      serviceSource: optionServiceSource,
     },
     oracledb: {
       opName: () => 'oracle.query',
       serviceName: withFunction,
+      serviceSource: optionServiceSource,
     },
     pg: {
       opName: () => 'postgresql.query',
       serviceName: withFunction,
+      serviceSource: optionServiceSource,
     },
     prisma: {
       opName: ({ operation }) => `prisma.${operation}`,
       serviceName: configWithFallback,
+      serviceSource: optionServiceSource,
     },
     redis: redisNaming,
     tedious: {
       opName: () => 'mssql.query',
       serviceName: configWithFallback,
+      serviceSource: optionServiceSource,
     },
   },
 }

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

@@ -1,6 +1,6 @@
 'use strict'
 
-const { identityService, httpPluginClientService } = require('../util')
+const { identityService, httpPluginClientService, optionServiceSource } = require('../util')
 
 const web = {
   client: {
@@ -15,18 +15,26 @@ const web = {
     http: {
       opName: () => 'http.client.request',
       serviceName: httpPluginClientService,
+      serviceSource: optionServiceSource,
     },
     genai: {
       opName: () => 'google_genai.request',
       serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+      serviceSource: optionServiceSource,
+    },
+    'modelcontextprotocol-sdk': {
+      opName: () => 'mcp.tool.call',
+      serviceName: identityService,
     },
     fetch: {
       opName: () => 'http.client.request',
       serviceName: httpPluginClientService,
+      serviceSource: optionServiceSource,
     },
     http2: {
       opName: () => 'http.client.request',
       serviceName: httpPluginClientService,
+      serviceSource: optionServiceSource,
     },
     aws: {
       opName: ({ awsService }) => `aws.${awsService}.request`,
@@ -45,26 +53,32 @@ const web = {
     'apollo.gateway.request': {
       opName: () => 'apollo.gateway.request',
       serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+      serviceSource: optionServiceSource,
     },
     'apollo.gateway.plan': {
       opName: () => 'apollo.gateway.plan',
       serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+      serviceSource: optionServiceSource,
     },
     'apollo.gateway.validate': {
       opName: () => 'apollo.gateway.validate',
       serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+      serviceSource: optionServiceSource,
     },
     'apollo.gateway.execute': {
       opName: () => 'apollo.gateway.execute',
       serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+      serviceSource: optionServiceSource,
     },
     'apollo.gateway.fetch': {
       opName: () => 'apollo.gateway.fetch',
       serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+      serviceSource: optionServiceSource,
     },
     'apollo.gateway.postprocessing': {
       opName: () => 'apollo.gateway.postprocessing',
       serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+      serviceSource: optionServiceSource,
     },
     grpc: {
       opName: () => 'grpc.server.request',

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

@@ -1,28 +1,34 @@
 'use strict'
 
+const { optionServiceSource } = require('../util')
+
 const websocket = {
   request: {
     ws: {
       opName: () => 'web.request',
       serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+      serviceSource: optionServiceSource,
     },
   },
   producer: {
     ws: {
       opName: () => 'websocket.send',
       serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+      serviceSource: optionServiceSource,
     },
   },
   consumer: {
     ws: {
       opName: () => 'websocket.receive',
       serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+      serviceSource: optionServiceSource,
     },
   },
   close: {
     ws: {
       opName: () => 'websocket.close',
       serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+      serviceSource: optionServiceSource,
     },
   },
 }