dd-trace 2.1.0 → 2.1.1

package/NOTICE

@@ -0,0 +1,4 @@
+Datadog dd-trace-js
+Copyright 2016-Present Datadog, Inc.
+
+This product includes software developed at Datadog, Inc. (https://www.datadoghq.com/).

package/package.json

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

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

@@ -20,9 +20,9 @@ addHook({ name: 'mysql', file: 'lib/Connection.js', versions: ['>=2'] }, Connect
     }
 
     const sql = arguments[0].sql ? arguments[0].sql : arguments[0]
-    const startArgs = [sql, this.config]
+    const conf = this.config
 
-    startCh.publish(startArgs)
+    startCh.publish({ sql, conf })
 
     try {
       const res = query.apply(this, arguments)

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

@@ -8,10 +8,10 @@ const {
 const shimmer = require('../../datadog-shimmer')
 
 addHook({ name: 'mysql2', file: 'lib/connection.js', versions: ['>=1'] }, Connection => {
-  const startCh = channel('apm:mysql:query:start')
-  const asyncEndCh = channel('apm:mysql:query:async-end')
-  const endCh = channel('apm:mysql:query:end')
-  const errorCh = channel('apm:mysql:query:error')
+  const startCh = channel('apm:mysql2:query:start')
+  const asyncEndCh = channel('apm:mysql2:query:async-end')
+  const endCh = channel('apm:mysql2:query:end')
+  const errorCh = channel('apm:mysql2:query:error')
 
   shimmer.wrap(Connection.prototype, 'addCommand', addCommand => function (cmd) {
     if (!startCh.hasSubscribers) return addCommand.apply(this, arguments)
@@ -45,7 +45,7 @@ addHook({ name: 'mysql2', file: 'lib/connection.js', versions: ['>=1'] }, Connec
     return asyncResource.bind(function executeWithTrace (packet, connection) {
       const sql = cmd.statement ? cmd.statement.query : cmd.sql
 
-      startCh.publish([sql, config])
+      startCh.publish({ sql, conf: config })
 
       if (this.onResult) {
         const onResult = asyncResource.bind(this.onResult)

package/packages/datadog-plugin-aws-sdk/src/helpers.js

@@ -80,7 +80,7 @@ const helpers = {
     if (!span) return
 
     const service = services[serviceName] && services[serviceName]
-    if (service.requestInject) service.requestInject(span, request, tracer)
+    if (service && service.requestInject) service.requestInject(span, request, tracer)
   },
 
   wrapCb (cb, serviceName, tags, request, tracer, childOf) {

package/packages/datadog-plugin-mysql/src/index.js

@@ -4,7 +4,6 @@ const Plugin = require('../../dd-trace/src/plugins/plugin')
 const { storage } = require('../../datadog-core')
 const analyticsSampler = require('../../dd-trace/src/analytics_sampler')
 
-// This plugin supports both mysql and mysql2
 class MySQLPlugin extends Plugin {
   static get name () {
     return 'mysql'
@@ -13,7 +12,7 @@ class MySQLPlugin extends Plugin {
   constructor (...args) {
     super(...args)
 
-    this.addSub('apm:mysql:query:start', ([sql, conf]) => {
+    this.addSub(`apm:${this.constructor.name}:query:start`, ({ sql, conf }) => {
       const store = storage.getStore()
       const childOf = store ? store.span : store
       const span = this.tracer.startSpan('mysql.query', {
@@ -38,18 +37,18 @@ class MySQLPlugin extends Plugin {
       this.enter(span, store)
     })
 
-    this.addSub('apm:mysql:query:end', () => {
+    this.addSub(`apm:${this.constructor.name}:query:end`, () => {
       this.exit()
     })
 
-    this.addSub('apm:mysql:query:error', err => {
+    this.addSub(`apm:${this.constructor.name}:query:error`, err => {
       if (err) {
         const span = storage.getStore().span
         span.setTag('error', err)
       }
     })
 
-    this.addSub('apm:mysql:query:async-end', () => {
+    this.addSub(`apm:${this.constructor.name}:query:async-end`, () => {
       const span = storage.getStore().span
       span.finish()
     })

package/packages/datadog-plugin-mysql2/src/index.js

@@ -0,0 +1,11 @@
+'use strict'
+
+const MySQLPlugin = require('../../datadog-plugin-mysql/src')
+
+class MySQL2Plugin extends MySQLPlugin {
+  static get name () {
+    return 'mysql2'
+  }
+}
+
+module.exports = MySQL2Plugin

package/packages/dd-trace/lib/version.js

@@ -1 +1 @@
-module.exports = '2.1.0'
+module.exports = '2.1.1'

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

@@ -35,7 +35,7 @@ module.exports = {
   'mongodb-core': require('../../../datadog-plugin-mongodb-core/src'),
   'mongoose': require('../../../datadog-plugin-mongoose/src'),
   'mysql': require('../../../datadog-plugin-mysql/src'),
-  'mysql2': require('../../../datadog-plugin-mysql/src'),
+  'mysql2': require('../../../datadog-plugin-mysql2/src'),
   'net': require('../../../datadog-plugin-net/src'),
   'next': require('../../../datadog-plugin-next/src'),
   'oracledb': require('../../../datadog-plugin-oracledb/src'),

package/scripts/tracer-runner.js

@@ -0,0 +1,13 @@
+'use strict'
+
+const spawnWrap = require('spawn-wrap')
+const path = require('path')
+
+spawnWrap(['--require', path.join(__dirname, '..', 'init.js')])
+
+const { spawn } = require('child_process')
+
+const [command, ...argv] = process.argv.slice(2)
+spawn(command, argv, {
+  stdio: 'inherit'
+})