fix: rename instrumentation modules

Author: Shadowbeetle

lib/instrumentations/q.js

@@ -1,5 +1,5 @@
 var expect = require('chai').expect
-var express = require('./express')
+var express = require('./trace-instrumentation-express')
 var Shimmer = require('../utils/shimmer')
 
 describe('The express wrapper module', function () {

lib/instrumentations/amqplib.js renamed to lib/instrumentations/trace-instrumentation-amqplib.js

@@ -6,15 +6,15 @@ var wrapper = function (http, agent) {
       return function (type, listener) {
         if (type === 'request' && typeof listener === 'function') {
           return addListener.call(this, type,
-            require('./http/server.js')(listener, agent))
+            require('./server.js')(listener, agent))
         } else {
           return addListener.apply(this, arguments)
         }
       }
     })
 
   Shimmer.wrap(http, 'request', function (original) {
-    return require('./http/request.js')(original, agent)
+    return require('./request.js')(original, agent)
   })
 
   agent.storage.bindEmitter(http.Server.prototype)

lib/instrumentations/express.js renamed to lib/instrumentations/trace-instrumentation-express.js

@@ -1,6 +1,6 @@
-var debug = require('../../../utils/debug')('instrumentation')
+var debug = require('../../utils/debug')('instrumentation')
 var url = require('url')
-var microtime = require('../../../optionalDependencies/microtime')
+var microtime = require('../../optionalDependencies/microtime')
 
 var util = require('./util')
 var format = require('util').format

lib/instrumentations/express.spec.js renamed to lib/instrumentations/trace-instrumentation-express.spec.js

@@ -1,8 +1,8 @@
 var expect = require('chai').expect
 var request = require('./request')
-var ExternalEdgeMetrics = require('../../../agent/metrics/externalEdge')
-var Collector = require('../../../agent/tracer/collector')
-var microtime = require('../../../optionalDependencies/microtime')
+var ExternalEdgeMetrics = require('../../agent/metrics/externalEdge/index')
+var Collector = require('../../agent/tracer/collector')
+var microtime = require('../../optionalDependencies/microtime')
 
 describe('The http.request wrapper module', function () {
   var config

lib/instrumentations/core/http.js renamed to lib/instrumentations/trace-instrumentation-http/index.js

@@ -1,6 +1,6 @@
-var microtime = require('../../../optionalDependencies/microtime')
-var debug = require('../../../utils/debug')('instrumentation')
-var Shimmer = require('../../../utils/shimmer')
+var microtime = require('../../optionalDependencies/microtime')
+var debug = require('../../utils/debug')('instrumentation')
+var Shimmer = require('../../utils/shimmer')
 
 var util = require('./util')
 var format = require('util').format

lib/instrumentations/core/http/request.js renamed to lib/instrumentations/trace-instrumentation-http/request.js

@@ -1,7 +1,7 @@
 var expect = require('chai').expect
-var microtime = require('../../../optionalDependencies/microtime')
-var Collector = require('../../../agent/tracer/collector')
-var IncomingEdgeMetrics = require('../../../agent/metrics/incomingEdge')
+var microtime = require('../../optionalDependencies/microtime')
+var Collector = require('../../agent/tracer/collector')
+var IncomingEdgeMetrics = require('../../agent/metrics/incomingEdge/index')
 
 var server = require('./server')