dd-trace 4.5.0 → 4.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "4.5.0",
+  "version": "4.6.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",

package/packages/datadog-instrumentations/src/kafkajs.js

@@ -16,10 +16,19 @@ const consumerFinishCh = channel('apm:kafkajs:consume:finish')
 const consumerErrorCh = channel('apm:kafkajs:consume:error')
 
 addHook({ name: 'kafkajs', versions: ['>=1.4'] }, (obj) => {
-  const Kafka = obj.Kafka
+  class Kafka extends obj.Kafka {
+    constructor (options) {
+      super(options)
+      this._brokers = (options.brokers && typeof options.brokers !== 'function')
+        ? options.brokers.join(',') : undefined
+    }
+  }
+  obj.Kafka = Kafka
+
   shimmer.wrap(Kafka.prototype, 'producer', createProducer => function () {
     const producer = createProducer.apply(this, arguments)
     const send = producer.send
+    const bootstrapServers = this._brokers
 
     producer.send = function () {
       const innerAsyncResource = new AsyncResource('bound-anonymous-fn')
@@ -36,7 +45,7 @@ addHook({ name: 'kafkajs', versions: ['>=1.4'] }, (obj) => {
               message.headers = message.headers || {}
             }
           }
-          producerStartCh.publish({ topic, messages })
+          producerStartCh.publish({ topic, messages, bootstrapServers })
 
           const result = send.apply(this, arguments)
 

package/packages/datadog-instrumentations/src/redis.js

@@ -11,6 +11,8 @@ const startCh = channel('apm:redis:command:start')
 const finishCh = channel('apm:redis:command:finish')
 const errorCh = channel('apm:redis:command:error')
 
+let createClientUrl
+
 function wrapAddCommand (addCommand) {
   return function (command) {
     if (!startCh.hasSubscribers) {
@@ -22,7 +24,7 @@ function wrapAddCommand (addCommand) {
 
     const asyncResource = new AsyncResource('bound-anonymous-fn')
     return asyncResource.runInAsyncScope(() => {
-      start(this, name, args)
+      start(this, name, args, this._url)
 
       const res = addCommand.apply(this, arguments)
       const onResolve = asyncResource.bind(() => finish(finishCh, errorCh))
@@ -35,12 +37,53 @@ function wrapAddCommand (addCommand) {
   }
 }
 
-addHook({ name: '@redis/client', file: 'dist/lib/client/commands-queue.js', versions: ['>=1.1'] }, redis => {
+function wrapCommandQueueClass (cls) {
+  const ret = class RedisCommandQueue extends cls {
+    constructor () {
+      super(arguments)
+      if (createClientUrl) {
+        try {
+          const parsed = new URL(createClientUrl)
+          if (parsed) {
+            this._url = { host: parsed.hostname, port: +parsed.port || 6379 }
+          }
+        } catch (error) {
+          // ignore
+        }
+      }
+      this._url = this._url || { host: 'localhost', port: 6379 }
+    }
+  }
+  return ret
+}
+
+function wrapCreateClient (request) {
+  return function (opts) {
+    createClientUrl = opts && opts.url
+    const ret = request.apply(this, arguments)
+    createClientUrl = undefined
+    return ret
+  }
+}
+
+addHook({ name: '@node-redis/client', file: 'dist/lib/client/commands-queue.js', versions: ['>=1'] }, redis => {
+  redis.default = wrapCommandQueueClass(redis.default)
   shimmer.wrap(redis.default.prototype, 'addCommand', wrapAddCommand)
   return redis
 })
 
-addHook({ name: '@node-redis/client', file: 'dist/lib/client/commands-queue.js', versions: ['>=1'] }, redis => {
+addHook({ name: '@node-redis/client', file: 'dist/lib/client/index.js', versions: ['>=1'] }, redis => {
+  shimmer.wrap(redis.default, 'create', wrapCreateClient)
+  return redis
+})
+
+addHook({ name: '@redis/client', file: 'dist/lib/client/index.js', versions: ['>=1.1'] }, redis => {
+  shimmer.wrap(redis.default, 'create', wrapCreateClient)
+  return redis
+})
+
+addHook({ name: '@redis/client', file: 'dist/lib/client/commands-queue.js', versions: ['>=1.1'] }, redis => {
+  redis.default = wrapCommandQueueClass(redis.default)
   shimmer.wrap(redis.default.prototype, 'addCommand', wrapAddCommand)
   return redis
 })
@@ -106,9 +149,9 @@ addHook({ name: 'redis', versions: ['>=0.12 <2.6'] }, redis => {
   return redis
 })
 
-function start (client, command, args) {
+function start (client, command, args, url = {}) {
   const db = client.selected_db
-  const connectionOptions = client.connection_options || client.connection_option || client.connectionOption || {}
+  const connectionOptions = client.connection_options || client.connection_option || client.connectionOption || url
   startCh.publish({ db, command, args, connectionOptions })
 }
 

package/packages/datadog-plugin-kafkajs/src/producer.js

@@ -2,12 +2,14 @@
 
 const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
 const { encodePathwayContext } = require('../../dd-trace/src/datastreams/pathway')
+const BOOTSTRAP_SERVERS_KEY = 'messaging.kafka.bootstrap.servers'
 
 class KafkajsProducerPlugin extends ProducerPlugin {
   static get id () { return 'kafkajs' }
   static get operation () { return 'produce' }
+  static get peerServicePrecursors () { return [BOOTSTRAP_SERVERS_KEY] }
 
-  start ({ topic, messages }) {
+  start ({ topic, messages, bootstrapServers }) {
     let pathwayCtx
     if (this.config.dsmEnabled) {
       const dataStreamsContext = this.tracer
@@ -24,6 +26,9 @@ class KafkajsProducerPlugin extends ProducerPlugin {
         'kafka.batch_size': messages.length
       }
     })
+    if (bootstrapServers) {
+      span.setTag(BOOTSTRAP_SERVERS_KEY, bootstrapServers)
+    }
     for (const message of messages) {
       if (typeof message === 'object') {
         if (this.config.dsmEnabled) message.headers['dd-pathway-ctx'] = pathwayCtx

package/packages/datadog-plugin-openai/src/services.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const DogStatsDClient = require('../../dd-trace/src/dogstatsd')
+const { DogStatsDClient, NoopDogStatsDClient } = require('../../dd-trace/src/dogstatsd')
 const ExternalLogger = require('../../dd-trace/src/external-logger/src')
 
 const FLUSH_INTERVAL = 10 * 1000
@@ -10,15 +10,19 @@ let logger = null
 let interval = null
 
 module.exports.init = function (tracerConfig) {
-  metrics = new DogStatsDClient({
-    host: tracerConfig.dogstatsd.hostname,
-    port: tracerConfig.dogstatsd.port,
-    tags: [
-      `service:${tracerConfig.tags.service}`,
-      `env:${tracerConfig.tags.env}`,
-      `version:${tracerConfig.tags.version}`
-    ]
-  })
+  if (tracerConfig.dogstatsd) {
+    metrics = new DogStatsDClient({
+      host: tracerConfig.dogstatsd.hostname,
+      port: tracerConfig.dogstatsd.port,
+      tags: [
+        `service:${tracerConfig.tags.service}`,
+        `env:${tracerConfig.tags.env}`,
+        `version:${tracerConfig.tags.version}`
+      ]
+    })
+  } else {
+    metrics = new NoopDogStatsDClient()
+  }
 
   logger = new ExternalLogger({
     ddsource: 'openai',

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

@@ -143,4 +143,17 @@ class DogStatsDClient {
   }
 }
 
-module.exports = DogStatsDClient
+class NoopDogStatsDClient {
+  gauge () { }
+
+  increment () { }
+
+  distribution () { }
+
+  flush () { }
+}
+
+module.exports = {
+  DogStatsDClient,
+  NoopDogStatsDClient
+}

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

@@ -5,7 +5,7 @@
 const { URL, format } = require('url')
 const v8 = require('v8')
 const os = require('os')
-const Client = require('./dogstatsd')
+const { DogStatsDClient } = require('./dogstatsd')
 const log = require('./log')
 const Histogram = require('./histogram')
 const { performance } = require('perf_hooks')
@@ -67,7 +67,7 @@ module.exports = {
       }))
     }
 
-    client = new Client(clientConfig)
+    client = new DogStatsDClient(clientConfig)
 
     time = process.hrtime()