flatten payload onto context

Author: rochdev

packages/datadog-instrumentations/src/mysql.js

@@ -15,14 +15,13 @@ addHook({ name: 'mysql', file: 'lib/Connection.js', versions: ['>=2'] }, Connect
 
     const sql = arguments[0].sql || arguments[0]
     const conf = this.config
-    const payload = { sql, conf }
-    const ctx = { payload }
+    const ctx = { sql, conf }
 
     return startCh.runStores(ctx, () => {
       if (arguments[0].sql) {
-        arguments[0].sql = payload.sql
+        arguments[0].sql = ctx.sql
       } else {
-        arguments[0] = payload.sql
+        arguments[0] = ctx.sql
       }
 
       try {
@@ -80,7 +79,7 @@ addHook({ name: 'mysql', file: 'lib/Pool.js', versions: ['>=2'] }, Pool => {
       const cb = arguments[arguments.length - 1]
       if (typeof cb === 'function') {
         arguments[arguments.length - 1] = shimmer.wrapFunction(cb, cb => function () {
-          return finishPoolQueryCh.runStores(ctx, cb, this, arguments)
+          return finishPoolQueryCh.runStores(ctx, cb, this, ...arguments)
         })
       }
 

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

@@ -8,22 +8,21 @@ class MySQLPlugin extends DatabasePlugin {
   static get system () { return 'mysql' }
 
   bindStart (ctx) {
-    const { payload } = ctx
-    const service = this.serviceName({ pluginConfig: this.config, dbConfig: payload.conf, system: this.system })
+    const service = this.serviceName({ pluginConfig: this.config, dbConfig: ctx.conf, system: this.system })
     const span = this.startSpan(this.operationName(), {
       service,
-      resource: payload.sql,
+      resource: ctx.sql,
       type: 'sql',
       kind: 'client',
       meta: {
         'db.type': this.system,
-        'db.user': payload.conf.user,
-        'db.name': payload.conf.database,
-        'out.host': payload.conf.host,
-        [CLIENT_PORT_KEY]: payload.conf.port
+        'db.user': ctx.conf.user,
+        'db.name': ctx.conf.database,
+        'out.host': ctx.conf.host,
+        [CLIENT_PORT_KEY]: ctx.conf.port
       }
     }, ctx)
-    payload.sql = this.injectDbmQuery(span, payload.sql, service)
+    ctx.sql = this.injectDbmQuery(span, ctx.sql, service)
 
     return ctx.currentStore
   }