Merge branch 'master' into v2-api

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.10.1 - 2018/7/31
+  * fix(graphql): handle execute args object (#484)
+
+# 1.10.0 - 2018/7/30
+  * feat(cassandra): instrument Cassandra queries (#437)
+  * feat(mssql): instrument SQL Server queries (#444)
+
 # 1.9.0 - 2018/7/25
   * fix(parsers): use basic-auth rather than req.auth (#475)
   * feat(agent): add currentTransaction getter (#462)

lib/instrumentation/modules/graphql.js

@@ -95,7 +95,7 @@ module.exports = function (graphql, agent, version, enabled) {
   }
 
   function wrapExecute (orig) {
-    return function wrappedExecute (schema, document, rootValue, contextValue, variableValues, operationName) {
+    function wrappedExecuteImpl (schema, document, rootValue, contextValue, variableValues, operationName) {
       var trans = agent._instrumentation.currentTransaction
       var span = agent.buildSpan()
       var id = span && span.transaction.id
@@ -135,6 +135,26 @@ module.exports = function (graphql, agent, version, enabled) {
       }
       return p
     }
+
+    return function wrappedExecute (argsOrSchema, document, rootValue, contextValue, variableValues, operationName) {
+      return arguments.length === 1
+        ? wrappedExecuteImpl(
+          argsOrSchema.schema,
+          argsOrSchema.document,
+          argsOrSchema.rootValue,
+          argsOrSchema.contextValue,
+          argsOrSchema.variableValues,
+          argsOrSchema.operationName
+        )
+        : wrappedExecuteImpl(
+          argsOrSchema,
+          document,
+          rootValue,
+          contextValue,
+          variableValues,
+          operationName
+        )
+    }
   }
 
   function extractDetails (document, operationName) {

lib/instrumentation/modules/tedious.js

@@ -44,9 +44,10 @@ module.exports = function (tedious, agent, version, enabled) {
         return originalMakeRequest.apply(this, arguments)
       }
 
+      const preparing = request.sqlTextOrProcedure === 'sp_prepare'
       const params = request.parametersByName
       const sql = (params.statement || params.stmt || {}).value
-      const name = sqlSummary(sql) + (request.preparing ? ' (prepare)' : '')
+      const name = sqlSummary(sql) + (preparing ? ' (prepare)' : '')
       span.setDbContext({ statement: sql, type: 'sql' })
       span.start(name, 'db.mssql.query')
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "elastic-apm-node",
-  "version": "1.9.0",
+  "version": "1.10.1",
   "description": "The official Elastic APM agent for Node.js",
   "main": "index.js",
   "scripts": {
@@ -152,7 +152,7 @@
     ]
   },
   "coordinates": [
-    55.777395,
-    12.592147
+    55.777008,
+    12.592123
   ]
 }

test/.jenkins_tav.yml

@@ -1,5 +1,5 @@
 TAV:
   - generic-pool+mysql+mysql2+redis+koa-router+handlebars+mongodb-core
-  - ioredis+pg+cassandra-driver
+  - ioredis+pg+cassandra-driver+tedious
   - mimic-response+got+bluebird
   - knex+ws+graphql+express-graphql+elasticsearch+hapi+express+express-queue

test/instrumentation/modules/graphql.js

@@ -51,6 +51,31 @@ test('graphql.execute', function (t) {
   })
 })
 
+test('graphql.execute args object', function (t) {
+  resetAgent(done(t))
+
+  var schema = graphql.buildSchema('type Query { hello: String }')
+  var root = {hello () {
+    return Promise.resolve('Hello world!')
+  }}
+  var query = '{ hello }'
+  var source = new graphql.Source(query)
+  var documentAST = graphql.parse(source)
+  var args = {
+    schema: schema,
+    document: documentAST,
+    rootValue: root
+  }
+
+  agent.startTransaction('foo')
+
+  graphql.execute(args).then(function (response) {
+    agent.endTransaction()
+    t.deepEqual(response, {data: {hello: 'Hello world!'}})
+    agent.flush()
+  })
+})
+
 if (semver.satisfies(pkg.version, '>=0.12')) {
   test('graphql.execute sync', function (t) {
     resetAgent(done(t))