Express route fix

README.md

@@ -1,9 +1,9 @@
 # Epimetheus
-[![CircleCI](https://img.shields.io/circleci/project/roylines/node-epimetheus.svg)]()
-[![Coveralls](https://img.shields.io/coveralls/roylines/node-epimetheus.svg)]()
-[![David](https://img.shields.io/david/roylines/node-epimetheus.svg)]()
+[![CircleCI](https://img.shields.io/circleci/project/ashoksahoo/node-epimetheus.svg)]()
+[![Coverage Status](https://coveralls.io/repos/github/ashoksahoo/node-epimetheus/badge.svg?branch=master)](https://coveralls.io/github/ashoksahoo/node-epimetheus?branch=master)
+[![David](https://img.shields.io/david/ashoksahoo/node-epimetheus.svg)]()
 
-[![NPM](https://nodei.co/npm/epimetheus.png)](https://nodei.co/npm/epimetheus/)
+[![NPM](https://nodei.co/npm/node-epimetheus.png)](https://nodei.co/npm/node-epimetheus/)
 
 Middleware to automatically instrument node applications for consumption by a [Prometheus](https://prometheus.io/) server.
 
@@ -35,7 +35,7 @@ These are metrics provided by [prom-client](https://github.com/siimon/prom-clien
 
 # Installation
 ```
-> npm install --save epimetheus
+> npm install --save node-epimetheus
 ```
 
 Epimetheus has only one method, instrument, and it has the following signature:
@@ -71,7 +71,7 @@ server.listen(8003, '127.0.0.1', () => {
 # <a name="express"></a> Express
 ```
 const express = require('express');
-const epimetheus = require('epimetheus');
+const epimetheus = require('node-epimetheus');
 
 const app = express();
 epimetheus.instrument(app);
@@ -88,7 +88,7 @@ app.listen(3000, () => {
 # <a name="hapi"></a> Hapi
 ```
 const Hapi = require('hapi');
-const epimetheus = require('epimetheus');
+const epimetheus = require('node-epimetheus');
 
 const server = new Hapi.Server();
 
@@ -113,7 +113,7 @@ server.start(() => {
 # <a name="restify"></a> Restify
 ```
 const restify = require('restify');
-const epimetheus = require('epimetheus');
+const epimetheus = require('node-epimetheus');
 
 const server = restify.createServer();
 

examples/express/express.js

@@ -1,5 +1,5 @@
 const express = require('express')
-const epithemeus = require('epimetheus')
+const epithemeus = require('node-epimetheus')
 
 const app = express()
 epithemeus.instrument(app)

examples/express/package.json

@@ -9,7 +9,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "epimetheus": "*",
+    "node-epimetheus":"*"
     "express": "*"
   }
 }

examples/hapi/hapi.js

@@ -1,5 +1,5 @@
 const Hapi = require('hapi')
-const epithemeus = require('epimetheus')
+const epithemeus = require('node-epimetheus')
 
 const server = new Hapi.Server()
 

examples/http/http.js

@@ -1,5 +1,5 @@
 const http = require('http')
-const epithemeus = require('epimetheus')
+const epithemeus = require('node-epimetheus')
 
 const server = http.createServer((req, res) => {
   if (req.url !== '/metrics') {

examples/restify/restify.js

@@ -1,5 +1,5 @@
 const restify = require('restify')
-const epithemeus = require('epimetheus')
+const epithemeus = require('node-epimetheus')
 
 const server = restify.createServer()
 epithemeus.instrument(server)

lib/express.js

@@ -4,8 +4,13 @@ function middleware (request, response, done) {
   var start = process.hrtime()
 
   response.on('finish', function () {
-    metrics.observe(request.method, request.path, response.statusCode, start)
-  })
+    if (request.route) {
+      metrics.observe(request.method, request.route.path, response.statusCode, start);
+    } else {
+      metrics.observe(request.method, '', response.statusCode, start);
+    }
+
+  });
 
   return done()
 };

lib/hapi.js

@@ -10,27 +10,27 @@ function plugin (options) {
           const response = reply(metrics.summary())
           response.type('text/plain')
         }
-      })
+      });
 
       server.ext('onRequest', (request, reply) => {
         request.epimetheus = {
           start: process.hrtime()
-        }
+        };
         return reply.continue()
-      })
+      });
 
       server.on('response', (response) => {
-        metrics.observe(response.method, response.path, response.response.statusCode, response.epimetheus.start)
-      })
+          metrics.observe(response.method, response.route.path, response.response.statusCode, response.epimetheus.start);
+      });
 
       return done()
     }
-  }
+  };
 
   plugin.register.attributes = {
     name: 'epimetheus',
     version: '1.0.0'
-  }
+  };
 
   return plugin
 }

lib/labels.js

@@ -2,14 +2,11 @@ function parse (path) {
   var ret = {
     path: path,
     cardinality: 'many'
-  }
+  };
 
   if (path[path.length - 1] != '/') {
-    if (!path.includes('.')) {
-      ret.path = path.substr(0, path.lastIndexOf('/') + 1)
-    }
     ret.cardinality = 'one'
-  };
+  }
 
   return ret
 }

lib/restify.js

@@ -7,7 +7,7 @@ function middleware (request, response, done) {
     if (typeof request.path === 'function') { // restify
       request.path = request.path()
     }
-    metrics.observe(request.method, request.path, response.statusCode, start)
+    metrics.observe(request.method, request.route.path, response.statusCode, start);
   })
 
   return done()
@@ -20,7 +20,7 @@ function instrument (server, options) {
     /**
      * Using send uses the native Node handlers rather than the restify one
      * changing send to end di the job
-     * 
+     *
      * see https://stackoverflow.com/questions/28680755/setting-content-type-header-with-restify-results-in-application-octet-stream
      */
     return res.end(metrics.summary())