Merge pull request #1 from qubitdigital/updates

Updates
QubitProducts · Aug 1, 2016 · d0a0ddd · d0a0ddd
2 parents 4cb348f + b8f35d7
commit d0a0ddd
Show file tree

Hide file tree

Showing 26 changed files with 61 additions and 449 deletions.
diff --git a/README.md b/README.md
@@ -1,17 +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)]()
+# Epimetheus  - fork
+This is a customized fork of https://github.com/roylines/node-epimetheus
 
-[![NPM](https://nodei.co/npm/epimetheus.png)](https://nodei.co/npm/epimetheus/)
-
-Middleware to automatically instrument node applications for consumption by a [Prometheus](https://prometheus.io/) server. 
-
-Prometheus is an open source monitoring solution that obtains metrics from servers by querying against the /metrics endpoint upon them. 
-
-Once instrumented, Epimetheus automatically serves [response duration](#duration), [event loop lag](#lag) and [memory](#memory) metrics on the /metrics endpoint ready to be consumed by Prometheus.
-
-Epimetheus will instrument websites and webservices that use [http](#http), [express](#express), [hapi](#hapi) and [restify](#restify).
+Only express is supported.
+Histogram has additional buckets
+Summary has the 1.0 quntile added
 
 # Instrumentation
 Epimetheus automatically measures a number of metrics once instrumented. There are 3 categories of instrumentation measured: [response duration](#duration), [event loop lag](#lag) and [memory](#memory). See below for details on each.

diff --git a/examples/docker-compose.yml b/examples/docker-compose.yml
@@ -7,22 +7,10 @@ services:
   prometheus:
     image: prom/prometheus
     volumes:
-      - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml 
+      - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
     ports:
       - "9090:9090"
   express:
     build: ./express
     ports:
       - "8000:8000"
-  restify:
-    build: ./restify
-    ports:
-      - "8001:8001"
-  hapi:
-    build: ./hapi
-    ports:
-      - "8002:8002"
-  http:
-    build: ./http
-    ports:
-      - "8003:8003"
diff --git a/examples/hapi/Dockerfile b/examples/hapi/Dockerfile
diff --git a/examples/hapi/hapi.js b/examples/hapi/hapi.js
diff --git a/examples/hapi/package.json b/examples/hapi/package.json
diff --git a/examples/http/Dockerfile b/examples/http/Dockerfile
diff --git a/examples/http/http.js b/examples/http/http.js
diff --git a/examples/http/package.json b/examples/http/package.json
diff --git a/examples/prometheus/prometheus.yml b/examples/prometheus/prometheus.yml
@@ -6,12 +6,3 @@ scrape_configs:
   - job_name: 'express'
     target_groups:
       - targets: ['express:8000']
-  - job_name: 'restify'
-    target_groups:
-      - targets: ['restify:8001']
-  - job_name: 'hapi'
-    target_groups:
-      - targets: ['hapi:8002']
-  - job_name: 'http'
-    target_groups:
-      - targets: ['http:8003']
diff --git a/examples/restify/Dockerfile b/examples/restify/Dockerfile
diff --git a/examples/restify/package.json b/examples/restify/package.json
diff --git a/examples/restify/restify.js b/examples/restify/restify.js
diff --git a/index.js b/index.js
@@ -1,22 +1,13 @@
-const hapi = require('./lib/hapi');
 const express = require('./lib/express');
-const restify = require('./lib/restify');
-const http = require('./lib/http');
 const eventLoop = require('./lib/event-loop');
-const memoryUsage = require('./lib/memory-usage');
+const memoryUsage = require('./lib/statistics');
 
 function instrument(app) {
   eventLoop.instrument();
   memoryUsage.instrument();
 
-  if (hapi.instrumentable(app)) {
-    hapi.instrument(app);
-  } else if (express.instrumentable(app)) {
+  if (express.instrumentable(app)) {
     express.instrument(app);
-  } else if (restify.instrumentable(app)) {
-    restify.instrument(app);
-  } else if (http.instrumentable(app)) {
-    http.instrument(app);
   }
 }
 

diff --git a/lib/express.js b/lib/express.js
@@ -4,13 +4,11 @@ function middleware(request, response, done) {
   var start = process.hrtime();
 
   response.on('finish', function() {
-    var path = request.path
+    var handler = "unmatched"
     if (typeof request.route !== 'undefined'){
-      path = "handler:" + request.route.path
-    } else {
-      path = "handler:missing"
+      handler = request.route.path
     }
-    metrics.observe(request.method, path, response.statusCode, start);
+    metrics.observe(request.method, handler, response.statusCode, start);
   });
 
   return done();

diff --git a/lib/hapi.js b/lib/hapi.js
diff --git a/lib/http.js b/lib/http.js
diff --git a/lib/labels.js b/lib/labels.js