From c257482e155ee299daf1dce613ad59a2f985aa47 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Tue, 11 Dec 2018 15:46:29 +0000 Subject: [PATCH] add ENABLE_DEBUG_AGENT and don't require modules unless they are enabled --- libraries/metrics/metrics.coffee | 22 +++++++++++++--------- libraries/metrics/package.json | 2 +- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/libraries/metrics/metrics.coffee b/libraries/metrics/metrics.coffee index 71ee9f617a..150c77676d 100644 --- a/libraries/metrics/metrics.coffee +++ b/libraries/metrics/metrics.coffee @@ -1,5 +1,3 @@ -debugAgent = require('@google-cloud/debug-agent') -traceAgent = require('@google-cloud/trace-agent') prom = require('prom-client') Register = require('prom-client').register @@ -21,17 +19,23 @@ module.exports = Metrics = initialize: (_name) -> appname = _name collectDefaultMetrics({ timeout: 5000, prefix: Metrics.buildPromKey()}) + if process.env['ENABLE_TRACE_AGENT'] == "true" + traceAgent = require('@google-cloud/trace-agent') + traceOpts = ignoreUrls: [/^\/status/, /^\/health_check/] traceAgent.start(traceOpts) - debugAgent.start({ - serviceContext: { - allowExpressions: true, - service: appname, - version: process.env['BUILD_VERSION'] - } - }) + + if process.env['ENABLE_DEBUG_AGENT'] == "true" + debugAgent = require('@google-cloud/debug-agent') + debugAgent.start({ + serviceContext: { + allowExpressions: true, + service: appname, + version: process.env['BUILD_VERSION'] + } + }) Metrics.inc("process_startup") registerDestructor: (func) -> diff --git a/libraries/metrics/package.json b/libraries/metrics/package.json index 3e1491106a..bbfcaa7f9d 100644 --- a/libraries/metrics/package.json +++ b/libraries/metrics/package.json @@ -1,6 +1,6 @@ { "name": "metrics-sharelatex", - "version": "2.0.10", + "version": "2.0.11", "description": "A drop-in metrics and monitoring module for node.js apps", "repository": { "type": "git",