From a86c4d8abd5d23a2d382832cd84046aa1279eb42 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 12 Dec 2018 20:11:40 +0000 Subject: [PATCH 1/5] add profiler --- libraries/metrics/metrics.coffee | 13 ++++++++++++- libraries/metrics/package.json | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libraries/metrics/metrics.coffee b/libraries/metrics/metrics.coffee index 95dad3a44f..17e85a5202 100644 --- a/libraries/metrics/metrics.coffee +++ b/libraries/metrics/metrics.coffee @@ -34,8 +34,19 @@ module.exports = Metrics = logger.log("starting google debug agent") debugAgent = require('@google-cloud/debug-agent') debugAgent.start({ + allowExpressions: true, + serviceContext: { + service: appname, + version: process.env['BUILD_VERSION'] + } + }) + + logger.log("ENABLE_PROFILER_AGENT set to #{process.env['ENABLE_PROFILER_AGENT']}") + if process.env['ENABLE_PROFILER_AGENT'] == "true" + logger.log("starting google profile agent") + profiler = require('@google-cloud/profiler') + profiler.start({ serviceContext: { - allowExpressions: true, service: appname, version: process.env['BUILD_VERSION'] } diff --git a/libraries/metrics/package.json b/libraries/metrics/package.json index bbfcaa7f9d..7e827f9e7e 100644 --- a/libraries/metrics/package.json +++ b/libraries/metrics/package.json @@ -12,6 +12,7 @@ "prom-client": "^11.1.3", "underscore": "~1.6.0", "@google-cloud/debug-agent": "^3.0.0", + "@google-cloud/profiler": "0.2.3", "@google-cloud/trace-agent": "^3.2.0" }, "devDependencies": { From db4ae84bda70323bcc5f12d151aaa1c7a7360ef4 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 12 Dec 2018 21:05:33 +0000 Subject: [PATCH 2/5] require logger --- libraries/metrics/metrics.coffee | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/metrics/metrics.coffee b/libraries/metrics/metrics.coffee index 17e85a5202..fc528b875d 100644 --- a/libraries/metrics/metrics.coffee +++ b/libraries/metrics/metrics.coffee @@ -1,4 +1,3 @@ - prom = require('prom-client') Register = require('prom-client').register collectDefaultMetrics = prom.collectDefaultMetrics @@ -19,6 +18,8 @@ module.exports = Metrics = initialize: (_name) -> appname = _name collectDefaultMetrics({ timeout: 5000, prefix: Metrics.buildPromKey()}) + + logger = require("logger-sharelatex") logger.log("ENABLE_TRACE_AGENT set to #{process.env['ENABLE_TRACE_AGENT']}") if process.env['ENABLE_TRACE_AGENT'] == "true" @@ -51,6 +52,7 @@ module.exports = Metrics = version: process.env['BUILD_VERSION'] } }) + Metrics.inc("process_startup") registerDestructor: (func) -> From 287effb13977599f74385d2b06ab23dc3e686064 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 12 Dec 2018 21:17:12 +0000 Subject: [PATCH 3/5] use ENABLE_PROFILE_AGENT --- libraries/metrics/metrics.coffee | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/metrics/metrics.coffee b/libraries/metrics/metrics.coffee index fc528b875d..963c471294 100644 --- a/libraries/metrics/metrics.coffee +++ b/libraries/metrics/metrics.coffee @@ -18,7 +18,7 @@ module.exports = Metrics = initialize: (_name) -> appname = _name collectDefaultMetrics({ timeout: 5000, prefix: Metrics.buildPromKey()}) - + logger = require("logger-sharelatex") logger.log("ENABLE_TRACE_AGENT set to #{process.env['ENABLE_TRACE_AGENT']}") @@ -42,8 +42,8 @@ module.exports = Metrics = } }) - logger.log("ENABLE_PROFILER_AGENT set to #{process.env['ENABLE_PROFILER_AGENT']}") - if process.env['ENABLE_PROFILER_AGENT'] == "true" + logger.log("ENABLE_PROFILE_AGENT set to #{process.env['ENABLE_PROFILE_AGENT']}") + if process.env['ENABLE_PROFILE_AGENT'] == "true" logger.log("starting google profile agent") profiler = require('@google-cloud/profiler') profiler.start({ From 1a34f3db1be5a949e6baa985f44dd18a7eacd321 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 13 Dec 2018 08:46:58 +0000 Subject: [PATCH 4/5] Update package.json --- 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 7e827f9e7e..2add09396c 100644 --- a/libraries/metrics/package.json +++ b/libraries/metrics/package.json @@ -1,6 +1,6 @@ { "name": "metrics-sharelatex", - "version": "2.0.11", + "version": "2.0.12", "description": "A drop-in metrics and monitoring module for node.js apps", "repository": { "type": "git", From dfead32d6902d2ca95843aeba8ca719694609a02 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 13 Dec 2018 09:19:05 +0000 Subject: [PATCH 5/5] Update package.json --- 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 2add09396c..5d9d068ba1 100644 --- a/libraries/metrics/package.json +++ b/libraries/metrics/package.json @@ -12,7 +12,7 @@ "prom-client": "^11.1.3", "underscore": "~1.6.0", "@google-cloud/debug-agent": "^3.0.0", - "@google-cloud/profiler": "0.2.3", + "@google-cloud/profiler": "^0.2.3", "@google-cloud/trace-agent": "^3.2.0" }, "devDependencies": {