From a78a2b89999a62abb342871e89aa9fc49921e13d 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 --- services/clsi/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/clsi/package.json b/services/clsi/package.json index f2183ef9bc..b646f7be03 100644 --- a/services/clsi/package.json +++ b/services/clsi/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 12192464cbd841fafffad5ba778669797afcccc8 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 --- services/clsi/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/clsi/package.json b/services/clsi/package.json index b646f7be03..1bacde3da8 100644 --- a/services/clsi/package.json +++ b/services/clsi/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 8d1d479980c1abba5f25eab52810864915f6a734 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 --- services/clsi/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/clsi/package.json b/services/clsi/package.json index 1bacde3da8..3de282ab97 100644 --- a/services/clsi/package.json +++ b/services/clsi/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 ae92438cc47aec9a2a8fb0f863eefec29e46386d 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 --- services/clsi/app.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/services/clsi/app.coffee b/services/clsi/app.coffee index 367174f387..0db79dd563 100644 --- a/services/clsi/app.coffee +++ b/services/clsi/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 1783d9d74b1e38a60a35a84f0273531b3702addd 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 --- services/clsi/app.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/clsi/app.coffee b/services/clsi/app.coffee index 0db79dd563..10bceee5d5 100644 --- a/services/clsi/app.coffee +++ b/services/clsi/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