From 93bef54c39ea9fa61d0958550f286a762fbce19b Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Tue, 15 Jan 2019 15:36:35 +0000 Subject: [PATCH 1/4] Make register public so we can support other servers e.g. hapi --- libraries/metrics/metrics.coffee | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/metrics/metrics.coffee b/libraries/metrics/metrics.coffee index 963c471294..1ecba6eb5f 100644 --- a/libraries/metrics/metrics.coffee +++ b/libraries/metrics/metrics.coffee @@ -1,5 +1,5 @@ prom = require('prom-client') -Register = require('prom-client').register + collectDefaultMetrics = prom.collectDefaultMetrics appname = "unknown" @@ -15,6 +15,7 @@ destructors = [] require "./uv_threadpool_size" module.exports = Metrics = + register: require('prom-client').register initialize: (_name) -> appname = _name collectDefaultMetrics({ timeout: 5000, prefix: Metrics.buildPromKey()}) @@ -60,8 +61,8 @@ module.exports = Metrics = injectMetricsRoute: (app) -> app.get('/metrics', (req, res) -> - res.set('Content-Type', Register.contentType) - res.end(Register.metrics()) + res.set('Content-Type', register.contentType) + res.end(register.metrics()) ) buildPromKey: (key = "")-> From d4caa48118f278a291fa35d7b5948e78f8b82baa Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Tue, 15 Jan 2019 15:44:01 +0000 Subject: [PATCH 2/4] Bump package version --- libraries/metrics/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/metrics/package.json b/libraries/metrics/package.json index 5d9d068ba1..f9d374c00f 100644 --- a/libraries/metrics/package.json +++ b/libraries/metrics/package.json @@ -1,6 +1,6 @@ { "name": "metrics-sharelatex", - "version": "2.0.12", + "version": "2.0.13", "description": "A drop-in metrics and monitoring module for node.js apps", "repository": { "type": "git", From 20e45b7a2e0710ba5228f2b191feaa7c275165fd Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Tue, 15 Jan 2019 16:12:15 +0000 Subject: [PATCH 3/4] Fix Register --- libraries/metrics/metrics.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/metrics/metrics.coffee b/libraries/metrics/metrics.coffee index 1ecba6eb5f..ed8dff5d93 100644 --- a/libraries/metrics/metrics.coffee +++ b/libraries/metrics/metrics.coffee @@ -1,4 +1,5 @@ prom = require('prom-client') +Register = require('prom-client').register collectDefaultMetrics = prom.collectDefaultMetrics @@ -15,7 +16,7 @@ destructors = [] require "./uv_threadpool_size" module.exports = Metrics = - register: require('prom-client').register + register:Register initialize: (_name) -> appname = _name collectDefaultMetrics({ timeout: 5000, prefix: Metrics.buildPromKey()}) From 02907fd2e7c6022479628e34857a3f28bead04cb Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Tue, 15 Jan 2019 16:16:12 +0000 Subject: [PATCH 4/4] Fix Register II --- libraries/metrics/metrics.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/metrics/metrics.coffee b/libraries/metrics/metrics.coffee index ed8dff5d93..e1f46a46b2 100644 --- a/libraries/metrics/metrics.coffee +++ b/libraries/metrics/metrics.coffee @@ -62,8 +62,8 @@ module.exports = Metrics = injectMetricsRoute: (app) -> app.get('/metrics', (req, res) -> - res.set('Content-Type', register.contentType) - res.end(register.metrics()) + res.set('Content-Type', Register.contentType) + res.end(Register.metrics()) ) buildPromKey: (key = "")->