feat(express-graphql): add support for v0.9 (#1255)

Author: watson

.tav.yml

@@ -144,7 +144,7 @@ express-graphql-0.6.12_13:
   versions: '^0.6.12'
   commands: node test/instrumentation/modules/express-graphql.js
 
-express-graphql-0.7,1_12:
+express-graphql-0.7.1_12:
   name: express-graphql
   preinstall: npm uninstall apollo-server-express
   peerDependencies: graphql@^0.12.0
@@ -163,6 +163,14 @@ express-graphql-0.7.1_14:
   versions: '>=0.7.1 <0.9.0'
   commands: node test/instrumentation/modules/express-graphql.js
 
+express-graphql-0.9.0:
+  name: express-graphql
+  preinstall: npm uninstall apollo-server-express
+  peerDependencies: graphql@^14.4.1
+  versions: '>=0.9.0 <0.10.0'
+  node: '>=7.6.0'
+  commands: node test/instrumentation/modules/express-graphql.js
+
 apollo-server-express-2_12:
   name: apollo-server-express
   preinstall: npm uninstall express-graphql

docs/supported-technologies.asciidoc

@@ -64,7 +64,7 @@ These modules override that behavior to give better insights into specialized HT
 [options="header"]
 |=======================================================================
 |Module |Version |Note
-|https://www.npmjs.com/package/express-graphql[express-graphql] |>=0.6.1 <0.9.0 |Will name all transactions by the GraphQL query name
+|https://www.npmjs.com/package/express-graphql[express-graphql] |>=0.6.1 <0.10.0 |Will name all transactions by the GraphQL query name
 |https://www.npmjs.com/package/apollo-server-express[apollo-server-express] |^2.0.4 |Will name all transactions by the GraphQL query name
 |=======================================================================
 

lib/instrumentation/modules/express-graphql.js

@@ -5,7 +5,7 @@ var semver = require('semver')
 module.exports = function (graphqlHTTP, agent, { version, enabled }) {
   if (!enabled) return graphqlHTTP
 
-  if (!semver.satisfies(version, '>=0.6.1 <0.9.0') || typeof graphqlHTTP !== 'function') {
+  if (!semver.satisfies(version, '>=0.6.1 <0.10.0') || typeof graphqlHTTP !== 'function') {
     agent.logger.debug('express-graphql version %s not supported - aborting...', version)
     return graphqlHTTP
   }

package.json

@@ -120,14 +120,14 @@
     "dependency-check": "^3.2.1",
     "elasticsearch": "^16.1.1",
     "express": "^4.16.4",
-    "express-graphql": "^0.8.0",
+    "express-graphql": "^0.9.0",
     "express-queue": "^0.0.12",
     "fastify": "^2.5.0",
     "finalhandler": "^1.1.2",
     "generic-pool": "^3.4.2",
     "get-port": "^4.0.0",
     "got": "^9.2.2",
-    "graphql": "^14.3.1",
+    "graphql": "^14.4.2",
     "handlebars": "^4.0.12",
     "hapi": "^18.1.0",
     "@hapi/hapi": "^18.2.0",

test/config.js

@@ -630,6 +630,7 @@ test('disableInstrumentations', function (t) {
   var hapiVersion = require('hapi/package.json').version
   var mysql2Version = require('mysql2/package.json').version
   var wsVersion = require('ws/package.json').version
+  var expressGraphqlVersion = require('express-graphql/package.json').version
 
   var flattenedModules = Instrumentation.modules.reduce((acc, val) => acc.concat(val), [])
   var modules = new Set(flattenedModules)
@@ -651,6 +652,9 @@ test('disableInstrumentations', function (t) {
   if (semver.lt(process.version, '8.6.0') && semver.gte(wsVersion, '7.0.0')) {
     modules.delete('ws')
   }
+  if (semver.lt(process.version, '7.6.0') && semver.gte(expressGraphqlVersion, '0.9.0')) {
+    modules.delete('express-graphql')
+  }
   if (semver.lt(process.version, '6.0.0')) {
     modules.delete('express-queue')
     modules.delete('apollo-server-core')

test/instrumentation/modules/express-graphql.js

@@ -8,6 +8,10 @@ var agent = require('../../..').start({
   centralConfig: false
 })
 
+var version = require('express-graphql/package').version
+var semver = require('semver')
+if (semver.lt(process.version, '7.6.0') && semver.gte(version, '0.9.0')) process.exit()
+
 var http = require('http')
 
 var buildSchema = require('graphql').buildSchema