Support for hapi 9 + 10

googleapis · Mar 18, 2016 · 2d0f103 · 2d0f103
1 parent 26cc278
commit 2d0f103
Show file tree

Hide file tree

Showing 6 changed files with 159 additions and 133 deletions.
diff --git a/lib/hooks/userspace/hook-hapi.js b/lib/hooks/userspace/hook-hapi.js
@@ -23,7 +23,7 @@ var semver = require('semver');
 var constants = require('../../constants.js');
 var agent;
 
-var SUPPORTED_VERSIONS = '8.x';
+var SUPPORTED_VERSIONS = '8 - 10';
 
 function connectionWrap(connection) {
   return function connectionTrace() {

diff --git a/test/hooks/fixtures/hapi10/index.js b/test/hooks/fixtures/hapi10/index.js
@@ -0,0 +1 @@
+module.exports = require('hapi');
diff --git a/test/hooks/fixtures/hapi10/package.json b/test/hooks/fixtures/hapi10/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "hapi10",
+  "version": "1.0.0",
+  "main": "index.js",
+  "dependencies": {
+    "hapi": "^10.5.0"
+  }
+}
diff --git a/test/hooks/fixtures/hapi9/index.js b/test/hooks/fixtures/hapi9/index.js
@@ -0,0 +1 @@
+module.exports = require('hapi');
diff --git a/test/hooks/fixtures/hapi9/package.json b/test/hooks/fixtures/hapi9/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "hapi9",
+  "version": "1.0.0",
+  "main": "index.js",
+  "dependencies": {
+    "hapi": "^9.5.1"
+  }
+}
diff --git a/test/hooks/test-trace-hapi.js b/test/hooks/test-trace-hapi.js
@@ -20,72 +20,115 @@ var common = require('./common.js');
 var traceLabels = require('../../lib/trace-labels.js');
 var http = require('http');
 var assert = require('assert');
-var hapi = require('./fixtures/hapi8');
 
 var server;
 
-describe('test-trace-hapi', function() {
-  afterEach(function() {
-    common.cleanTraces();
-    server.stop();
-  });
+var versions = {
+  hapi8: require('./fixtures/hapi8'),
+  hapi9: require('./fixtures/hapi9'),
+  hapi10: require('./fixtures/hapi10')
+};
 
-  it('should accurately measure get time, get', function(done) {
-    server = new hapi.Server();
-    server.connection({ port: common.serverPort });
-    server.route({
-      method: 'GET',
-      path: '/',
-      handler: function(req, reply) {
-        setTimeout(function() {
-          reply(common.serverRes);
-        }, common.serverWait);
-      }
+Object.keys(versions).forEach(function(version) {
+  var hapi = versions[version];
+  describe(version, function() {
+    afterEach(function(done) {
+      common.cleanTraces();
+      server.stop(done);
     });
-    server.start(function() {
-      common.doRequest('GET', done, hapiPredicate);
+
+    it('should accurately measure get time, get', function(done) {
+      server = new hapi.Server();
+      server.connection({ port: common.serverPort });
+      server.route({
+        method: 'GET',
+        path: '/',
+        handler: function(req, reply) {
+          setTimeout(function() {
+            reply(common.serverRes);
+          }, common.serverWait);
+        }
+      });
+      server.start(function() {
+        common.doRequest('GET', done, hapiPredicate);
+      });
     });
-  });
 
-  it('should accurately measure get time, post', function(done) {
-    server = new hapi.Server();
-    server.connection({ port: common.serverPort });
-    server.route({
-      method: 'POST',
-      path: '/',
-      handler: function(req, reply) {
-        setTimeout(function() {
-          reply(common.serverRes);
-        }, common.serverWait);
-      }
+    it('should accurately measure get time, post', function(done) {
+      server = new hapi.Server();
+      server.connection({ port: common.serverPort });
+      server.route({
+        method: 'POST',
+        path: '/',
+        handler: function(req, reply) {
+          setTimeout(function() {
+            reply(common.serverRes);
+          }, common.serverWait);
+        }
+      });
+      server.start(function() {
+        common.doRequest('POST', done, hapiPredicate);
+      });
     });
-    server.start(function() {
-      common.doRequest('POST', done, hapiPredicate);
+
+    it('should accurately measure get time, custom handlers', function(done) {
+      server = new hapi.Server();
+      server.connection({ port: common.serverPort });
+      server.handler('custom', function(route, options) {
+        return function(requeset, reply) {
+          setTimeout(function() {
+            reply(options.val);
+          }, common.serverWait);
+        };
+      });
+      server.route({
+        method: 'GET',
+        path: '/',
+        handler: { custom: { val: common.serverRes } }
+      });
+      server.start(function() {
+        common.doRequest('GET', done, hapiPredicate);
+      });
     });
-  });
 
-  it('should accurately measure get time, custom handlers', function(done) {
-    server = new hapi.Server();
-    server.connection({ port: common.serverPort });
-    server.handler('custom', function(route, options) {
-      return function(requeset, reply) {
-        setTimeout(function() {
-          reply(options.val);
-        }, common.serverWait);
+    it('should accurately measure get time, custom plugin', function(done) {
+      var plugin = function(server, options, next) {
+        server.route({
+          method: 'GET',
+          path: '/',
+          handler: function(req, reply) {
+            setTimeout(function() {
+              reply(common.serverRes);
+            }, common.serverWait);
+          }
+        });
+        return next();
       };
+      plugin.attributes = {
+        name: 'plugin',
+        version: '1.0.0'
+      };
+      server = new hapi.Server();
+      server.connection({ port: common.serverPort });
+      server.register({
+        register: plugin,
+        options : {}
+      }, function(err) {
+        assert(!err);
+        server.start(function() {
+          common.doRequest('GET', done, hapiPredicate);
+        });
+      });
     });
-    server.route({
-      method: 'GET',
-      path: '/',
-      handler: { custom: { val: common.serverRes } }
-    });
-    server.start(function() {
-      common.doRequest('GET', done, hapiPredicate);
-    });
-  });
 
-  it('should accurately measure get time, custom plugin', function(done) {
-    var plugin = function(server, options, next) {
+    it('should accurately measure get time, after + get', function(done) {
+      var afterSuccess = false;
+      server = new hapi.Server();
+      server.connection({ port: common.serverPort });
+      server.after(function(server, next) {
+        afterSuccess = true;
+        next();
+      });
       server.route({
         method: 'GET',
         path: '/',
@@ -95,94 +138,59 @@ describe('test-trace-hapi', function() {
           }, common.serverWait);
         }
       });
-      return next();
-    };
-    plugin.attributes = {
-      name: 'plugin',
-      version: '1.0.0'
-    };
-    server = new hapi.Server();
-    server.connection({ port: common.serverPort });
-    server.register({
-      register: plugin,
-      options : {}
-    }, function(err) {
-      assert(!err);
       server.start(function() {
+        assert(afterSuccess);
         common.doRequest('GET', done, hapiPredicate);
       });
     });
-  });
-
-  it('should accurately measure get time, after + get', function(done) {
-    var afterSuccess = false;
-    server = new hapi.Server();
-    server.connection({ port: common.serverPort });
-    server.after(function(server, next) {
-      afterSuccess = true;
-      next();
-    });
-    server.route({
-      method: 'GET',
-      path: '/',
-      handler: function(req, reply) {
-        setTimeout(function() {
-          reply(common.serverRes);
-        }, common.serverWait);
-      }
-    });
-    server.start(function() {
-      assert(afterSuccess);
-      common.doRequest('GET', done, hapiPredicate);
-    });
-  });
 
-  it('should accurately measure get time, extension + get', function(done) {
-    var extensionSuccess = false;
-    server = new hapi.Server();
-    server.connection({ port: common.serverPort });
-    server.ext('onRequest', function(request, reply) {
-      setTimeout(function() {
-        extensionSuccess = true;
-        return reply.continue();
-      }, common.serverWait / 2);
-    });
-    server.route({
-      method: 'GET',
-      path: '/',
-      handler: function(req, reply) {
+    it('should accurately measure get time, extension + get', function(done) {
+      var extensionSuccess = false;
+      server = new hapi.Server();
+      server.connection({ port: common.serverPort });
+      server.ext('onRequest', function(request, reply) {
         setTimeout(function() {
-          reply(common.serverRes);
+          extensionSuccess = true;
+          return reply.continue();
         }, common.serverWait / 2);
-      }
-    });
-    server.start(function() {
-      var cb = function() {
-        assert(extensionSuccess);
-        done();
-      };
-      common.doRequest('GET', cb, hapiPredicate);
+      });
+      server.route({
+        method: 'GET',
+        path: '/',
+        handler: function(req, reply) {
+          setTimeout(function() {
+            reply(common.serverRes);
+          }, common.serverWait / 2);
+        }
+      });
+      server.start(function() {
+        var cb = function() {
+          assert(extensionSuccess);
+          done();
+        };
+        common.doRequest('GET', cb, hapiPredicate);
+      });
     });
-  });
 
-  it('should have proper labels', function(done) {
-    server = new hapi.Server();
-    server.connection({ port: common.serverPort });
-    server.route({
-      method: 'GET',
-      path: '/',
-      handler: function(req, reply) {
-        reply(common.serverRes);
-      }
-    });
-    server.start(function() {
-      http.get({port: common.serverPort}, function(res) {
-        var labels = common.getMatchingSpan(hapiPredicate).labels;
-        assert.equal(labels[traceLabels.HTTP_RESPONSE_CODE_LABEL_KEY], '200');
-        assert.equal(labels[traceLabels.HTTP_METHOD_LABEL_KEY], 'GET');
-        assert.equal(labels[traceLabels.HTTP_URL_LABEL_KEY], 'http://localhost:9042/');
-        assert(labels[traceLabels.HTTP_SOURCE_IP]);
-        done();
+    it('should have proper labels', function(done) {
+      server = new hapi.Server();
+      server.connection({ port: common.serverPort });
+      server.route({
+        method: 'GET',
+        path: '/',
+        handler: function(req, reply) {
+          reply(common.serverRes);
+        }
+      });
+      server.start(function() {
+        http.get({port: common.serverPort}, function(res) {
+          var labels = common.getMatchingSpan(hapiPredicate).labels;
+          assert.equal(labels[traceLabels.HTTP_RESPONSE_CODE_LABEL_KEY], '200');
+          assert.equal(labels[traceLabels.HTTP_METHOD_LABEL_KEY], 'GET');
+          assert.equal(labels[traceLabels.HTTP_URL_LABEL_KEY], 'http://localhost:9042/');
+          assert(labels[traceLabels.HTTP_SOURCE_IP]);
+          done();
+        });
       });
     });
   });