dd-trace 5.97.0 → 5.98.0

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,69 @@ 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,
     },
     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,22 @@ const web = {
     http: {
       opName: () => 'http.client.request',
       serviceName: httpPluginClientService,
+      serviceSource: optionServiceSource,
     },
     genai: {
       opName: () => 'google_genai.request',
       serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
+      serviceSource: optionServiceSource,
     },
     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 +49,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,
     },
   },
 }

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

@@ -11,7 +11,7 @@ const {
   HTTP_ROUTE,
   HTTP_METHOD,
 } = require('../../../ext/tags')
-const { ORIGIN_KEY, TOP_LEVEL_KEY } = require('./constants')
+const { ORIGIN_KEY, TOP_LEVEL_KEY, SVC_SRC_KEY } = require('./constants')
 const { version } = require('./pkg')
 const processTags = require('./process-tags')
 
@@ -60,6 +60,7 @@ class SpanAggStats {
       synthetics,
       method,
       endpoint,
+      srvSrc,
     } = this.aggKey
 
     return {
@@ -71,6 +72,7 @@ class SpanAggStats {
       Synthetics: synthetics,
       HTTPMethod: method,
       HTTPEndpoint: endpoint,
+      srv_src: srvSrc,
       Hits: this.hits,
       TopLevelHits: this.topLevelHits,
       Errors: this.errors,
@@ -91,6 +93,7 @@ class SpanAggKey {
     this.synthetics = span.meta[ORIGIN_KEY] === 'synthetics'
     this.endpoint = span.meta[HTTP_ROUTE] || span.meta[HTTP_ENDPOINT] || ''
     this.method = span.meta[HTTP_METHOD] || ''
+    this.srvSrc = span.meta[SVC_SRC_KEY] || ''
   }
 
   toString () {
@@ -103,6 +106,7 @@ class SpanAggKey {
       this.synthetics,
       this.method,
       this.endpoint,
+      this.srvSrc,
     ].join(',')
   }
 }

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

@@ -17,8 +17,8 @@ const SERVICE_NAME = tags.SERVICE_NAME
 const MEASURED = tags.MEASURED
 
 class DatadogTracer extends Tracer {
-  constructor (config, prioritySampler) {
-    super(config, prioritySampler)
+  constructor (config, prioritySampler, exporter) {
+    super(config, prioritySampler, exporter)
     this._dataStreamsProcessor = new DataStreamsProcessor(config)
     this._dataStreamsManager = new DataStreamsManager(this._dataStreamsProcessor)
     this.dataStreamsCheckpointer = new DataStreamsCheckpointer(this)