dd-trace 2.43.0 → 2.45.0

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

@@ -1,37 +1,37 @@
-function getRedisService (config, connectionName) {
-  if (config.splitByInstance && connectionName) {
-    return config.service
-      ? `${config.service}-${connectionName}`
+function getRedisService (pluginConfig, connectionName) {
+  if (pluginConfig.splitByInstance && connectionName) {
+    return pluginConfig.service
+      ? `${pluginConfig.service}-${connectionName}`
       : connectionName
   }
 
-  return config.service
+  return pluginConfig.service
 }
 
-function fromSystem (service, system) {
-  return system ? `${service}-${system}` : undefined
+function fromSystem (tracerService, system) {
+  return system ? `${tracerService}-${system}` : undefined
 }
 
-function mysqlServiceName (service, config, dbConfig, system) {
-  if (typeof config.service === 'function') {
-    return config.service(dbConfig)
+function mysqlServiceName ({ tracerService, pluginConfig, dbConfig, system }) {
+  if (typeof pluginConfig.service === 'function') {
+    return pluginConfig.service(dbConfig)
   }
-  return config.service || fromSystem(service, system)
+  return pluginConfig.service || fromSystem(tracerService, system)
 }
 
 function withSuffixFunction (suffix) {
-  return (service, config, params) => {
-    if (typeof config.service === 'function') {
-      return config.service(params)
+  return ({ tracerService, pluginConfig, params }) => {
+    if (typeof pluginConfig.service === 'function') {
+      return pluginConfig.service(params)
     }
-    return config.service || `${service}-${suffix}`
+    return pluginConfig.service || `${tracerService}-${suffix}`
   }
 }
 
 const redisConfig = {
   opName: () => 'redis.command',
-  serviceName: (service, config, system, connectionName) => {
-    return getRedisService(config, connectionName) || fromSystem(service, system)
+  serviceName: ({ tracerService, pluginConfig, system, connectionName }) => {
+    return getRedisService(pluginConfig, connectionName) || fromSystem(tracerService, system)
   }
 }
 
@@ -39,11 +39,17 @@ const storage = {
   client: {
     'cassandra-driver': {
       opName: () => 'cassandra.query',
-      serviceName: (service, config, system) => config.service || fromSystem(service, system)
+      serviceName: ({ tracerService, pluginConfig, system }) =>
+        pluginConfig.service || fromSystem(tracerService, system)
+    },
+    couchbase: {
+      opName: ({ operation }) => `couchbase.${operation}`,
+      serviceName: ({ tracerService, pluginConfig }) => pluginConfig.service || `${tracerService}-couchbase`
     },
     elasticsearch: {
       opName: () => 'elasticsearch.query',
-      serviceName: (service, config) => config.service || `${service}-elasticsearch`
+      serviceName: ({ tracerService, pluginConfig }) =>
+        pluginConfig.service || `${tracerService}-elasticsearch`
     },
     ioredis: redisConfig,
     mariadb: {
@@ -52,11 +58,13 @@ const storage = {
     },
     memcached: {
       opName: () => 'memcached.command',
-      serviceName: (service, config, system) => config.service || fromSystem(service, system)
+      serviceName: ({ tracerService, pluginConfig, system }) =>
+        pluginConfig.service || fromSystem(tracerService, system)
     },
     'mongodb-core': {
       opName: () => 'mongodb.query',
-      serviceName: (service, config) => config.service || `${service}-mongodb`
+      serviceName: ({ tracerService, pluginConfig }) =>
+        pluginConfig.service || `${tracerService}-mongodb`
     },
     mysql: {
       opName: () => 'mysql.query',
@@ -68,7 +76,8 @@ const storage = {
     },
     opensearch: {
       opName: () => 'opensearch.query',
-      serviceName: (service, config) => config.service || `${service}-opensearch`
+      serviceName: ({ tracerService, pluginConfig }) =>
+        pluginConfig.service || `${tracerService}-opensearch`
     },
     oracledb: {
       opName: () => 'oracle.query',
@@ -81,7 +90,8 @@ const storage = {
     redis: redisConfig,
     tedious: {
       opName: () => 'tedious.request',
-      serviceName: (service, config, system) => config.service || fromSystem(service, system)
+      serviceName: ({ tracerService, pluginConfig, system }) =>
+        pluginConfig.service || fromSystem(tracerService, system)
     }
   }
 }

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

@@ -1,6 +1,14 @@
-const { identityService } = require('../util')
+const { identityService, httpPluginClientService, awsServiceV0 } = require('../util')
 const { DD_MAJOR } = require('../../../../../../version')
 
+function withTracerV2Suffix (argsObj, fn, suffix) {
+  const { tracerService } = argsObj
+  if (DD_MAJOR <= 2) {
+    return fn({ ...argsObj, tracerService: `${tracerService}${suffix}` })
+  }
+  return fn(argsObj)
+}
+
 const web = {
   client: {
     grpc: {
@@ -10,6 +18,26 @@ const web = {
     moleculer: {
       opName: () => 'moleculer.call',
       serviceName: identityService
+    },
+    http: {
+      opName: () => 'http.request',
+      serviceName: argsObj => withTracerV2Suffix(argsObj, httpPluginClientService, '-http-client')
+    },
+    fetch: {
+      opName: () => 'http.request',
+      serviceName: argsObj => withTracerV2Suffix(argsObj, httpPluginClientService, '-http-client')
+    },
+    http2: {
+      opName: () => 'http.request',
+      serviceName: argsObj => withTracerV2Suffix(argsObj, httpPluginClientService, '-http-client')
+    },
+    aws: {
+      opName: () => 'aws.request',
+      serviceName: awsServiceV0
+    },
+    lambda: {
+      opName: () => 'aws.request',
+      serviceName: awsServiceV0
     }
   },
   server: {
@@ -20,6 +48,18 @@ const web = {
     moleculer: {
       opName: () => 'moleculer.action',
       serviceName: identityService
+    },
+    http: {
+      opName: () => DD_MAJOR <= 2 ? 'http.request' : 'web.request',
+      serviceName: identityService
+    },
+    http2: {
+      opName: () => 'web.request',
+      serviceName: identityService
+    },
+    next: {
+      opName: () => 'next.request',
+      serviceName: identityService
     }
   }
 }

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

@@ -22,7 +22,15 @@ const messaging = {
       opName: () => 'kafka.send',
       serviceName: identityService
     },
-    rhea: amqpOutbound
+    rhea: amqpOutbound,
+    sqs: {
+      opName: () => 'aws.sqs.send',
+      serviceName: identityService
+    },
+    sns: {
+      opName: () => 'aws.sns.send',
+      serviceName: identityService
+    }
   },
   consumer: {
     amqplib: amqpInbound,
@@ -35,7 +43,11 @@ const messaging = {
       opName: () => 'kafka.process',
       serviceName: identityService
     },
-    rhea: amqpInbound
+    rhea: amqpInbound,
+    sqs: {
+      opName: () => 'aws.sqs.process',
+      serviceName: identityService
+    }
   },
   client: {
     amqplib: {

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

@@ -1,7 +1,6 @@
-const { identityService } = require('../util')
 
-function configWithFallback (service, config) {
-  return config.service || service
+function configWithFallback ({ tracerService, pluginConfig }) {
+  return pluginConfig.service || tracerService
 }
 
 const redisNaming = {
@@ -11,14 +10,14 @@ const redisNaming = {
 
 const mySQLNaming = {
   opName: () => 'mysql.query',
-  serviceName: identityService
+  serviceName: withFunction
 }
 
-function withFunction (service, config, params) {
-  if (typeof config.service === 'function') {
-    return config.service(params)
+function withFunction ({ tracerService, pluginConfig, params }) {
+  if (typeof pluginConfig.service === 'function') {
+    return pluginConfig.service(params)
   }
-  return configWithFallback(service, config)
+  return configWithFallback({ tracerService, pluginConfig })
 }
 
 const storage = {
@@ -27,6 +26,10 @@ const storage = {
       opName: () => 'cassandra.query',
       serviceName: configWithFallback
     },
+    couchbase: {
+      opName: () => 'couchbase.query',
+      serviceName: configWithFallback
+    },
     elasticsearch: {
       opName: () => 'elasticsearch.query',
       serviceName: configWithFallback
@@ -34,7 +37,7 @@ const storage = {
     ioredis: redisNaming,
     mariadb: {
       opName: () => 'mariadb.query',
-      serviceName: identityService
+      serviceName: withFunction
     },
     memcached: {
       opName: () => 'memcached.command',

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

@@ -1,4 +1,4 @@
-const { identityService } = require('../util')
+const { identityService, httpPluginClientService } = require('../util')
 
 const web = {
   client: {
@@ -9,6 +9,26 @@ const web = {
     moleculer: {
       opName: () => 'moleculer.client.request',
       serviceName: identityService
+    },
+    http: {
+      opName: () => 'http.client.request',
+      serviceName: httpPluginClientService
+    },
+    fetch: {
+      opName: () => 'http.client.request',
+      serviceName: httpPluginClientService
+    },
+    http2: {
+      opName: () => 'http.client.request',
+      serviceName: httpPluginClientService
+    },
+    aws: {
+      opName: ({ awsService }) => `aws.${awsService}.request`,
+      serviceName: identityService
+    },
+    lambda: {
+      opName: () => 'aws.lambda.invoke',
+      serviceName: identityService
     }
   },
   server: {
@@ -19,6 +39,18 @@ const web = {
     moleculer: {
       opName: () => 'moleculer.server.request',
       serviceName: identityService
+    },
+    http: {
+      opName: () => 'http.server.request',
+      serviceName: identityService
+    },
+    http2: {
+      opName: () => 'http.server.request',
+      serviceName: identityService
+    },
+    next: {
+      opName: () => 'http.server.request',
+      serviceName: identityService
     }
   }
 }

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

@@ -62,7 +62,7 @@ function startupLog ({ agentError } = {}) {
     out.agent_error = agentError.message
   }
   out.debug = !!config.debug
-  out.sample_rate = config.sampleRate
+  out.sample_rate = config.sampler.sampleRate
   out.sampling_rules = samplingRules
   out.tags = config.tags
   if (config.tags && config.tags.version) {

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

@@ -66,7 +66,7 @@ function onBeforeExit () {
   sendData(config, application, host, 'app-closing')
 }
 
-function createAppObject () {
+function createAppObject (config) {
   return {
     service_name: config.service,
     env: config.env,
@@ -116,7 +116,7 @@ function start (aConfig, thePluginManager) {
   }
   config = aConfig
   pluginManager = thePluginManager
-  application = createAppObject()
+  application = createAppObject(config)
   host = createHostObject()
   heartbeatInterval = config.telemetry.heartbeatInterval
 
@@ -155,8 +155,36 @@ function updateIntegrations () {
   sendData(config, application, host, 'app-integrations-change', { integrations })
 }
 
+function updateConfig (changes, config) {
+  if (!config.telemetry.enabled) return
+  if (changes.length === 0) return
+
+  // Hack to make system tests happy until we ship telemetry v2
+  if (process.env.DD_INTERNAL_TELEMETRY_V2_ENABLED !== '1') return
+
+  const application = createAppObject(config)
+  const host = createHostObject()
+
+  const names = {
+    sampleRate: 'DD_TRACE_SAMPLE_RATE',
+    logInjection: 'DD_LOG_INJECTION',
+    headerTags: 'DD_TRACE_HEADER_TAGS'
+  }
+
+  const configuration = changes.map(change => ({
+    name: names[change.name],
+    value: Array.isArray(change.value) ? change.value.join(',') : change.value,
+    origin: change.origin
+  }))
+
+  sendData(config, application, host, 'app-client-configuration-change', {
+    configuration
+  })
+}
+
 module.exports = {
   start,
   stop,
-  updateIntegrations
+  updateIntegrations,
+  updateConfig
 }

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

@@ -25,6 +25,10 @@ class DatadogTracer extends Tracer {
     setStartupLogConfig(config)
   }
 
+  configure ({ env, sampler }) {
+    this._prioritySampler.configure(env, sampler)
+  }
+
   // todo[piochelepiotr] These two methods are not related to the tracer, but to data streams monitoring.
   // They should be moved outside of the tracer in the future.
   setCheckpoint (edgeTags) {