From d3039a52f3a66d7ce29e9e0df28a60f78a8d03b5 Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Wed, 7 Nov 2018 08:29:34 +0000 Subject: [PATCH 1/5] First attempt to use my stackdriver branch --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f2183ef..b646f7b 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "lockfile": "^1.0.3", "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.4", "lynx": "0.0.11", - "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v1.8.1", + "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#csh-stackdriver", "mkdirp": "0.3.5", "mysql": "2.6.2", "request": "^2.21.0", From bcdac34a0b4922e688a6fa8a2981b705d0075aec Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Thu, 29 Nov 2018 10:10:48 +0000 Subject: [PATCH 2/5] Use v1.9.0 of metrics to get Prometheus support --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b646f7b..1bacde3 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "lockfile": "^1.0.3", "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.4", "lynx": "0.0.11", - "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#csh-stackdriver", + "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#1.9.0", "mkdirp": "0.3.5", "mysql": "2.6.2", "request": "^2.21.0", From 49d5ad711aa341aafa7e975ee08b7fa53123dad8 Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Thu, 29 Nov 2018 10:24:25 +0000 Subject: [PATCH 3/5] Bump metrics to v2.0.3 - specify tag correctly this time --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1bacde3..3de282a 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "lockfile": "^1.0.3", "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.4", "lynx": "0.0.11", - "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#1.9.0", + "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v2.0.3", "mkdirp": "0.3.5", "mysql": "2.6.2", "request": "^2.21.0", From 6159aff00177d5443cd9052a5998c7809c2a22ee Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Thu, 29 Nov 2018 14:30:00 +0000 Subject: [PATCH 4/5] Inject metrics --- app.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/app.coffee b/app.coffee index 367174f..0db79dd 100644 --- a/app.coffee +++ b/app.coffee @@ -16,6 +16,7 @@ Metrics = require "metrics-sharelatex" Metrics.initialize("clsi") Metrics.open_sockets.monitor(logger) Metrics.memory.monitor(logger) +Metrics.injectMetricsRoute(app) ProjectPersistenceManager = require "./app/js/ProjectPersistenceManager" OutputCacheManager = require "./app/js/OutputCacheManager" From f92e6266471b773a82a4576340b88fd0fb1356e6 Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Thu, 29 Nov 2018 15:49:12 +0000 Subject: [PATCH 5/5] Inject routes after app defined --- app.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.coffee b/app.coffee index 0db79dd..10bceee 100644 --- a/app.coffee +++ b/app.coffee @@ -16,7 +16,6 @@ Metrics = require "metrics-sharelatex" Metrics.initialize("clsi") Metrics.open_sockets.monitor(logger) Metrics.memory.monitor(logger) -Metrics.injectMetricsRoute(app) ProjectPersistenceManager = require "./app/js/ProjectPersistenceManager" OutputCacheManager = require "./app/js/OutputCacheManager" @@ -27,6 +26,7 @@ express = require "express" bodyParser = require "body-parser" app = express() +Metrics.injectMetricsRoute(app) app.use Metrics.http.monitor(logger) # Compile requests can take longer than the default two