dd-trace 5.0.0-pre-0fb796c → 5.0.0-pre-2fed3ce

package/LICENSE-3rdparty.csv

@@ -11,6 +11,7 @@ require,crypto-randomuuid,MIT,Copyright 2021 Node.js Foundation and contributors
 require,diagnostics_channel,MIT,Copyright 2021 Simon D.
 require,ignore,MIT,Copyright 2013 Kael Zhang and contributors
 require,import-in-the-middle,Apache license 2.0,Copyright 2021 Datadog Inc.
+require,int64-buffer,MIT,Copyright 2015-2016 Yusuke Kawasaki
 require,ipaddr.js,MIT,Copyright 2011-2017 whitequark
 require,istanbul-lib-coverage,BSD-3-Clause,Copyright 2012-2015 Yahoo! Inc.
 require,koalas,MIT,Copyright 2013-2017 Brian Woodward
@@ -22,6 +23,7 @@ require,lodash.uniq,MIT,Copyright JS Foundation and other contributors
 require,lru-cache,ISC,Copyright (c) 2010-2022 Isaac Z. Schlueter and Contributors
 require,methods,MIT,Copyright 2013-2014 TJ Holowaychuk
 require,module-details-from-path,MIT,Copyright 2016 Thomas Watson Steen
+require,msgpack-lite,MIT,Copyright 2015 Yusuke Kawasaki
 require,node-abort-controller,MIT,Copyright (c) 2019 Steve Faulkner
 require,opentracing,MIT,Copyright 2016 Resonance Labs Inc
 require,path-to-regexp,MIT,Copyright 2014 Blake Embrey
@@ -51,13 +53,11 @@ dev,express,MIT,Copyright 2009-2014 TJ Holowaychuk 2013-2014 Roman Shtylman 2014
 dev,get-port,MIT,Copyright Sindre Sorhus
 dev,glob,ISC,Copyright Isaac Z. Schlueter and Contributors
 dev,graphql,MIT,Copyright 2015 Facebook Inc.
-dev,int64-buffer,MIT,Copyright 2015-2016 Yusuke Kawasaki
 dev,jszip,MIT,Copyright 2015-2016 Stuart Knightley and contributors
 dev,knex,MIT,Copyright (c) 2013-present Tim Griesser
 dev,mkdirp,MIT,Copyright 2010 James Halliday
 dev,mocha,MIT,Copyright 2011-2018 JS Foundation and contributors https://js.foundation
 dev,multer,MIT,Copyright 2014 Hage Yaapa
-dev,msgpack-lite,MIT,Copyright 2015 Yusuke Kawasaki
 dev,nock,MIT,Copyright 2017 Pedro Teixeira and other contributors
 dev,nyc,ISC,Copyright 2015 Contributors
 dev,pprof-format,MIT,Copyright 2022 Stephen Belanger
@@ -67,5 +67,6 @@ dev,sinon,BSD-3-Clause,Copyright 2010-2017 Christian Johansen
 dev,sinon-chai,WTFPL and BSD-2-Clause,Copyright 2004 Sam Hocevar 2012–2017 Domenic Denicola
 dev,tap,ISC,Copyright 2011-2022 Isaac Z. Schlueter and Contributors
 dev,tape,MIT,Copyright James Halliday
-file,aws-lambda-nodejs-runtime-interface-client,Apache 2.0,Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+file,aws-lambda-nodejs-runtime-interface-client,Apache 2.0,Copyright 2019 Amazon.com Inc. or its affiliates. All Rights Reserved.
 file,profile.proto,Apache license 2.0,Copyright 2016 Google Inc.
+file,is-git-url,MIT,Copyright (c) 2017 Jon Schlinkert.

package/index.d.ts

@@ -556,6 +556,19 @@ export declare interface TracerOptions {
      * Specifies a path to a custom blocking template json file.
      */
     blockedTemplateJson?: string,
+
+    /**
+     * Controls the automated user event tracking configuration
+     */
+    eventTracking?: {
+      /**
+       * Controls the automated user event tracking mode. Possible values are disabled, safe and extended.
+       * On safe mode, any detected Personally Identifiable Information (PII) about the user will be redacted from the event.
+       * On extended mode, no redaction will take place.
+       * @default 'safe'
+       */
+      mode?: 'safe' | 'extended' | 'disabled'
+    }
   };
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.0.0-pre-0fb796c",
+  "version": "5.0.0-pre-2fed3ce",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -19,7 +19,7 @@
     "test:appsec:ci": "nyc --no-clean --include \"packages/dd-trace/src/appsec/**/*.js\" --exclude \"packages/dd-trace/test/appsec/**/*.plugin.spec.js\" -- npm run test:appsec",
     "test:appsec:plugins": "mocha --colors --exit -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/dd-trace/test/appsec/**/*.@($(echo $PLUGINS)).plugin.spec.js\"",
     "test:appsec:plugins:ci": "yarn services && nyc --no-clean --include \"packages/dd-trace/test/appsec/**/*.@($(echo $PLUGINS)).plugin.spec.js\" -- npm run test:appsec:plugins",
-    "test:trace:core": "tap packages/dd-trace/test/*.spec.js \"packages/dd-trace/test/{ci-visibility,config,encode,exporters,opentelemetry,opentracing,plugins,telemetry}/**/*.spec.js\"",
+    "test:trace:core": "tap packages/dd-trace/test/*.spec.js \"packages/dd-trace/test/{ci-visibility,encode,exporters,opentelemetry,opentracing,plugins,service-naming,telemetry}/**/*.spec.js\"",
     "test:trace:core:ci": "npm run test:trace:core -- --coverage --nyc-arg=--include=\"packages/dd-trace/src/**/*.js\"",
     "test:instrumentations": "mocha --colors -r 'packages/dd-trace/test/setup/mocha.js' 'packages/datadog-instrumentations/test/**/*.spec.js'",
     "test:instrumentations:ci": "nyc --no-clean --include 'packages/datadog-instrumentations/src/**/*.js' -- npm run test:instrumentations",
@@ -78,6 +78,7 @@
     "diagnostics_channel": "^1.1.0",
     "ignore": "^5.2.0",
     "import-in-the-middle": "^1.3.5",
+    "int64-buffer": "^0.1.9",
     "ipaddr.js": "^2.0.1",
     "istanbul-lib-coverage": "3.2.0",
     "koalas": "^1.0.2",
@@ -89,6 +90,7 @@
     "lru-cache": "^7.14.0",
     "methods": "^1.1.2",
     "module-details-from-path": "^1.0.3",
+    "msgpack-lite": "^0.1.26",
     "node-abort-controller": "^3.0.1",
     "opentracing": ">=0.12.1",
     "path-to-regexp": "^0.1.2",
@@ -120,12 +122,10 @@
     "get-port": "^3.2.0",
     "glob": "^7.1.6",
     "graphql": "0.13.2",
-    "int64-buffer": "^0.1.9",
     "jszip": "^3.5.0",
     "knex": "^2.4.2",
     "mkdirp": "^0.5.1",
     "mocha": "8",
-    "msgpack-lite": "^0.1.26",
     "multer": "^1.4.5-lts.1",
     "nock": "^11.3.3",
     "nyc": "^15.1.0",

package/packages/datadog-instrumentations/src/aws-sdk.js

@@ -166,6 +166,11 @@ function getChannelSuffix (name) {
   ].includes(name) ? name : 'default'
 }
 
+addHook({ name: '@smithy/smithy-client', versions: ['>=1.0.3'] }, smithy => {
+  shimmer.wrap(smithy.Client.prototype, 'send', wrapSmithySend)
+  return smithy
+})
+
 addHook({ name: '@aws-sdk/smithy-client', versions: ['>=3'] }, smithy => {
   shimmer.wrap(smithy.Client.prototype, 'send', wrapSmithySend)
   return smithy

package/packages/datadog-instrumentations/src/cassandra-driver.js

@@ -28,7 +28,8 @@ addHook({ name: 'cassandra-driver', versions: ['>=3.0.0'] }, cassandra => {
     }
 
     return asyncResource.runInAsyncScope(() => {
-      startCh.publish({ keyspace: this.keyspace, query: queries })
+      const contactPoints = this.options && this.options.contactPoints
+      startCh.publish({ keyspace: this.keyspace, query: queries, contactPoints })
       try {
         const res = batch.apply(this, arguments)
         if (typeof res === 'function' || !res) {
@@ -56,7 +57,8 @@ addHook({ name: 'cassandra-driver', versions: ['>=4.4'] }, cassandra => {
     }
     const asyncResource = new AsyncResource('bound-anonymous-fn')
     return asyncResource.runInAsyncScope(() => {
-      startCh.publish({ keyspace: this.keyspace, query })
+      const contactPoints = this.options && this.options.contactPoints
+      startCh.publish({ keyspace: this.keyspace, query, contactPoints })
       const promise = _execute.apply(this, arguments)
 
       const promiseAsyncResource = new AsyncResource('bound-anonymous-fn')
@@ -88,7 +90,8 @@ addHook({ name: 'cassandra-driver', versions: ['3 - 4.3'] }, cassandra => {
       }
 
       return asyncResource.runInAsyncScope(() => {
-        startCh.publish({ keyspace: this.keyspace, query })
+        const contactPoints = this.options && this.options.contactPoints
+        startCh.publish({ keyspace: this.keyspace, query, contactPoints })
 
         const lastIndex = arguments.length - 1
         let cb = arguments[lastIndex]

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

@@ -9,11 +9,13 @@ const shimmer = require('../../datadog-shimmer')
 
 addHook({ name: '@elastic/transport', file: 'lib/Transport.js', versions: ['>=8'] }, (exports) => {
   shimmer.wrap(exports.default.prototype, 'request', createWrapRequest('elasticsearch'))
+  shimmer.wrap(exports.default.prototype, 'getConnection', createWrapGetConnection('elasticsearch'))
   return exports
 })
 
 addHook({ name: '@elastic/elasticsearch', file: 'lib/Transport.js', versions: ['>=5.6.16 <8', '>=8'] }, Transport => {
   shimmer.wrap(Transport.prototype, 'request', createWrapRequest('elasticsearch'))
+  shimmer.wrap(Transport.prototype, 'getConnection', createWrapGetConnection('elasticsearch'))
   return Transport
 })
 
@@ -22,6 +24,42 @@ addHook({ name: 'elasticsearch', file: 'src/lib/transport.js', versions: ['>=10'
   return Transport
 })
 
+addHook({ name: 'elasticsearch', file: 'src/lib/connection_pool.js', versions: ['>=10'] }, ConnectionPool => {
+  shimmer.wrap(ConnectionPool.prototype, 'select', createWrapSelect('elasticsearch'))
+  return ConnectionPool
+})
+
+function createWrapGetConnection (name) {
+  const connectCh = channel(`apm:${name}:query:connect`)
+  return function wrapRequest (request) {
+    return function () {
+      const connection = request.apply(this, arguments)
+      if (connectCh.hasSubscribers && connection && connection.url) {
+        connectCh.publish(connection.url)
+      }
+      return connection
+    }
+  }
+}
+
+function createWrapSelect () {
+  const connectCh = channel('apm:elasticsearch:query:connect')
+  return function wrapRequest (request) {
+    return function () {
+      if (arguments.length === 1) {
+        const cb = arguments[0]
+        arguments[0] = function (err, connection) {
+          if (connectCh.hasSubscribers && connection && connection.host) {
+            connectCh.publish({ hostname: connection.host.host, port: connection.host.port })
+          }
+          cb(err, connection)
+        }
+      }
+      return request.apply(this, arguments)
+    }
+  }
+}
+
 function createWrapRequest (name) {
   const startCh = channel(`apm:${name}:query:start`)
   const finishCh = channel(`apm:${name}:query:finish`)
@@ -83,4 +121,4 @@ function createWrapRequest (name) {
   }
 }
 
-module.exports = { createWrapRequest }
+module.exports = { createWrapRequest, createWrapGetConnection }

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

@@ -57,3 +57,26 @@ addHook({
     })
   })
 })
+
+const processParamsStartCh = channel('datadog:express:process_params:start')
+const wrapProcessParamsMethod = (requestPositionInArguments) => {
+  return (original) => {
+    return function () {
+      if (processParamsStartCh.hasSubscribers) {
+        processParamsStartCh.publish({ req: arguments[requestPositionInArguments] })
+      }
+
+      return original.apply(this, arguments)
+    }
+  }
+}
+
+addHook({ name: 'express', versions: ['>=4.0.0 <4.3.0'] }, express => {
+  shimmer.wrap(express.Router, 'process_params', wrapProcessParamsMethod(1))
+  return express
+})
+
+addHook({ name: 'express', versions: ['>=4.3.0'] }, express => {
+  shimmer.wrap(express.Router, 'process_params', wrapProcessParamsMethod(2))
+  return express
+})

package/packages/datadog-instrumentations/src/helpers/hooks.js

@@ -16,6 +16,7 @@ module.exports = {
   '@opensearch-project/opensearch': () => require('../opensearch'),
   '@opentelemetry/sdk-trace-node': () => require('../otel-sdk-trace'),
   '@redis/client': () => require('../redis'),
+  '@smithy/smithy-client': () => require('../aws-sdk'),
   'amqp10': () => require('../amqp10'),
   'amqplib': () => require('../amqplib'),
   'aws-sdk': () => require('../aws-sdk'),
@@ -71,6 +72,8 @@ module.exports = {
   'oracledb': () => require('../oracledb'),
   'openai': () => require('../openai'),
   'paperplane': () => require('../paperplane'),
+  'passport-http': () => require('../passport-http'),
+  'passport-local': () => require('../passport-local'),
   'pg': () => require('../pg'),
   'pino': () => require('../pino'),
   'pino-pretty': () => require('../pino'),

package/packages/datadog-instrumentations/src/http2/client.js

@@ -1,32 +1,27 @@
 'use strict'
 
 const shimmer = require('../../../datadog-shimmer')
-const { addHook, channel, AsyncResource } = require('../helpers/instrument')
+const { addHook, channel } = require('../helpers/instrument')
 
 const connectChannel = channel('apm:http2:client:connect:start')
 const startChannel = channel('apm:http2:client:request:start')
-const finishChannel = channel('apm:http2:client:request:finish')
+const endChannel = channel('apm:http2:client:request:end')
+const asyncStartChannel = channel('apm:http2:client:request:asyncStart')
+const asyncEndChannel = channel('apm:http2:client:request:asyncEnd')
 const errorChannel = channel('apm:http2:client:request:error')
-const responseChannel = channel('apm:http2:client:response')
 
-function createWrapEmit (requestResource, parentResource) {
+function createWrapEmit (ctx) {
   return function wrapEmit (emit) {
     return function (event, arg1) {
-      requestResource.runInAsyncScope(() => {
-        switch (event) {
-          case 'response':
-            responseChannel.publish(arg1)
-            break
-          case 'error':
-            errorChannel.publish(arg1)
-          case 'close': // eslint-disable-line no-fallthrough
-            finishChannel.publish()
-            break
-        }
-      })
+      ctx.eventName = event
+      ctx.eventData = arg1
 
-      return parentResource.runInAsyncScope(() => {
-        return emit.apply(this, arguments)
+      return asyncStartChannel.runStores(ctx, () => {
+        try {
+          return emit.apply(this, arguments)
+        } finally {
+          asyncEndChannel.publish(ctx)
+        }
       })
     }
   }
@@ -35,17 +30,21 @@ function createWrapEmit (requestResource, parentResource) {
 function createWrapRequest (authority, options) {
   return function wrapRequest (request) {
     return function (headers) {
-      const parentResource = new AsyncResource('bound-anonymous-fn')
-      const requestResource = new AsyncResource('bound-anonymous-fn')
+      const ctx = { headers, authority, options }
 
-      return requestResource.runInAsyncScope(() => {
-        startChannel.publish({ headers, authority, options })
+      return startChannel.runStores(ctx, () => {
+        try {
+          const req = request.apply(this, arguments)
 
-        const req = request.apply(this, arguments)
+          shimmer.wrap(req, 'emit', createWrapEmit(ctx))
 
-        shimmer.wrap(req, 'emit', createWrapEmit(requestResource, parentResource))
-
-        return req
+          return req
+        } catch (e) {
+          ctx.error = e
+          errorChannel.publish(ctx)
+        } finally {
+          endChannel.publish(ctx)
+        }
       })
     }
   }

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)
 
@@ -69,6 +78,7 @@ addHook({ name: 'kafkajs', versions: ['>=1.4'] }, (obj) => {
     const consumer = createConsumer.apply(this, arguments)
     const run = consumer.run
 
+    const groupId = arguments[0].groupId
     consumer.run = function ({ eachMessage, ...runArgs }) {
       if (typeof eachMessage !== 'function') return run({ eachMessage, ...runArgs })
 
@@ -77,10 +87,9 @@ addHook({ name: 'kafkajs', versions: ['>=1.4'] }, (obj) => {
           const innerAsyncResource = new AsyncResource('bound-anonymous-fn')
           return innerAsyncResource.runInAsyncScope(() => {
             const { topic, partition, message } = eachMessageArgs[0]
-            consumerStartCh.publish({ topic, partition, message })
+            consumerStartCh.publish({ topic, partition, message, groupId })
             try {
               const result = eachMessage.apply(this, eachMessageArgs)
-
               if (result && typeof result.then === 'function') {
                 result.then(
                   innerAsyncResource.bind(() => consumerFinishCh.publish(undefined)),

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

@@ -2,9 +2,10 @@
 
 const { addHook } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
-const { createWrapRequest } = require('./elasticsearch')
+const { createWrapRequest, createWrapGetConnection } = require('./elasticsearch')
 
 addHook({ name: '@opensearch-project/opensearch', file: 'lib/Transport.js', versions: ['>=1'] }, Transport => {
   shimmer.wrap(Transport.prototype, 'request', createWrapRequest('opensearch'))
+  shimmer.wrap(Transport.prototype, 'getConnection', createWrapGetConnection('opensearch'))
   return Transport
 })

package/packages/datadog-instrumentations/src/passport-http.js

@@ -0,0 +1,22 @@
+'use strict'
+
+const shimmer = require('../../datadog-shimmer')
+const { addHook } = require('./helpers/instrument')
+const { wrapVerify } = require('./passport-utils')
+
+addHook({
+  name: 'passport-http',
+  file: 'lib/passport-http/strategies/basic.js',
+  versions: ['>=0.3.0']
+}, BasicStrategy => {
+  return shimmer.wrap(BasicStrategy, function () {
+    const type = 'http'
+
+    if (typeof arguments[0] === 'function') {
+      arguments[0] = wrapVerify(arguments[0], false, type)
+    } else {
+      arguments[1] = wrapVerify(arguments[1], (arguments[0] && arguments[0].passReqToCallback), type)
+    }
+    return BasicStrategy.apply(this, arguments)
+  })
+})

package/packages/datadog-instrumentations/src/passport-local.js

@@ -0,0 +1,22 @@
+'use strict'
+
+const shimmer = require('../../datadog-shimmer')
+const { addHook } = require('./helpers/instrument')
+const { wrapVerify } = require('./passport-utils')
+
+addHook({
+  name: 'passport-local',
+  file: 'lib/strategy.js',
+  versions: ['>=1.0.0']
+}, Strategy => {
+  return shimmer.wrap(Strategy, function () {
+    const type = 'local'
+
+    if (typeof arguments[0] === 'function') {
+      arguments[0] = wrapVerify(arguments[0], false, type)
+    } else {
+      arguments[1] = wrapVerify(arguments[1], (arguments[0] && arguments[0].passReqToCallback), type)
+    }
+    return Strategy.apply(this, arguments)
+  })
+})

package/packages/datadog-instrumentations/src/passport-utils.js

@@ -0,0 +1,36 @@
+'use strict'
+
+const shimmer = require('../../datadog-shimmer')
+const { channel } = require('./helpers/instrument')
+
+const passportVerifyChannel = channel('datadog:passport:verify:finish')
+
+function wrapVerifiedAndPublish (username, password, verified, type) {
+  if (!passportVerifyChannel.hasSubscribers) {
+    return verified
+  }
+
+  return shimmer.wrap(verified, function (err, user, info) {
+    const credentials = { type, username }
+    passportVerifyChannel.publish({ credentials, user })
+    return verified.apply(this, arguments)
+  })
+}
+
+function wrapVerify (verify, passReq, type) {
+  if (passReq) {
+    return function (req, username, password, verified) {
+      arguments[3] = wrapVerifiedAndPublish(username, password, verified, type)
+      return verify.apply(this, arguments)
+    }
+  } else {
+    return function (username, password, verified) {
+      arguments[2] = wrapVerifiedAndPublish(username, password, verified, type)
+      return verify.apply(this, arguments)
+    }
+  }
+}
+
+module.exports = {
+  wrapVerify
+}

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

@@ -31,10 +31,23 @@ function wrapQuery (query) {
     const asyncResource = new AsyncResource('bound-anonymous-fn')
     const processId = this.processID
 
-    const pgQuery = arguments[0] && typeof arguments[0] === 'object' ? arguments[0] : { text: arguments[0] }
-
-    // shallow clone the existing query to swap out .text field
-    let newQuery = { ...pgQuery }
+    const pgQuery = arguments[0] && typeof arguments[0] === 'object'
+      ? arguments[0]
+      : { text: arguments[0] }
+
+    // The query objects passed in can be pretty complex. They can be instances of EventEmitter.
+    //   For this reason we can't make a shallow clone of the object.
+    // Some libraries, such as sql-template-tags, can provide a getter .text property.
+    //   For this reason we can't replace the .text property.
+    // Instead, we create a new object, and set the original query as the prototype.
+    // This allows any existing methods to still work and lets us easily provide a new query.
+    let newQuery = {
+      __ddInjectableQuery: '',
+      get text () {
+        return this.__ddInjectableQuery || Object.getPrototypeOf(this).text
+      }
+    }
+    Object.setPrototypeOf(newQuery, pgQuery)
 
     return asyncResource.runInAsyncScope(() => {
       startCh.publish({

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-aws-sdk/src/base.js

@@ -1,11 +1,11 @@
 'use strict'
 
 const analyticsSampler = require('../../dd-trace/src/analytics_sampler')
-const Plugin = require('../../dd-trace/src/plugins/plugin')
+const ClientPlugin = require('../../dd-trace/src/plugins/client')
 const { storage } = require('../../datadog-core')
 const { isTrue } = require('../../dd-trace/src/util')
 
-class BaseAwsSdkPlugin extends Plugin {
+class BaseAwsSdkPlugin extends ClientPlugin {
   static get id () { return 'aws' }
 
   get serviceIdentifier () {
@@ -116,7 +116,7 @@ class BaseAwsSdkPlugin extends Plugin {
       this.config.hooks.request(span, response)
     }
 
-    span.finish()
+    super.finish()
   }
 
   configure (config) {

package/packages/datadog-plugin-aws-sdk/src/services/dynamodb.js

@@ -4,6 +4,7 @@ const BaseAwsSdkPlugin = require('../base')
 
 class DynamoDb extends BaseAwsSdkPlugin {
   static get id () { return 'dynamodb' }
+  static get peerServicePrecursors () { return ['tablename'] }
 
   generateTags (params, operation, response) {
     const tags = {}

package/packages/datadog-plugin-aws-sdk/src/services/kinesis.js

@@ -3,6 +3,7 @@ const log = require('../../../dd-trace/src/log')
 const BaseAwsSdkPlugin = require('../base')
 class Kinesis extends BaseAwsSdkPlugin {
   static get id () { return 'kinesis' }
+  static get peerServicePrecursors () { return ['streamname'] }
 
   generateTags (params, operation, response) {
     if (!params || !params.StreamName) return {}

package/packages/datadog-plugin-aws-sdk/src/services/s3.js

@@ -4,6 +4,7 @@ const BaseAwsSdkPlugin = require('../base')
 
 class S3 extends BaseAwsSdkPlugin {
   static get id () { return 's3' }
+  static get peerServicePrecursors () { return ['bucketname'] }
 
   generateTags (params, operation, response) {
     const tags = {}

package/packages/datadog-plugin-aws-sdk/src/services/sns.js

@@ -4,6 +4,7 @@ const BaseAwsSdkPlugin = require('../base')
 
 class Sns extends BaseAwsSdkPlugin {
   static get id () { return 'sns' }
+  static get peerServicePrecursors () { return ['topicname'] }
 
   generateTags (params, operation, response) {
     if (!params) return {}