diff --git a/lib/sender/spmsender.js b/lib/sender/spmsender.js index befa752..0781381 100644 --- a/lib/sender/spmsender.js +++ b/lib/sender/spmsender.js @@ -123,23 +123,24 @@ function SpmSender (spmToken, processMetricsInterval, metricsApiEndpoint) { '&dockerHostname=' + dockerHostName + '&containerHostname=' + os.hostname() + '&token=' + spmToken - // duplicate metrics to a second App + // duplicate metrics to a second App if (process.env.SPM_MIRROR_TOKEN) { self.metricsUrlMirror = metricsApiEndpointVerified + '?agentType=nodejs&v=' + clientVersion + '&host=' + hostname + - '&dockerHostname=' + dockerHostname + - '&containerHostname=' + containerHostname + - '&token=' + process.env.SPM_MIRROR_TOKEN + '&dockerHostname=' + dockerHostname + + '&containerHostname=' + containerHostname + + '&token=' + process.env.SPM_MIRROR_TOKEN } } else { logger.log('debug', 'warning, failed to get docker hostname: ' + err) self.metricsUrl = metricsApiEndpointVerified + '?agentType=nodejs&v=' + clientVersion + '&host=' + hostname + '&token=' + spmToken - // duplicate metrics to a second App + // duplicate metrics to a second App if (process.env.SPM_MIRROR_TOKEN) { self.metricsUrlMirror = metricsApiEndpointVerified + '?agentType=nodejs&v=' + clientVersion + '&host=' + hostname + - '&token=' + process.env.SPM_MIRROR_TOKEN + '&token=' + process.env.SPM_MIRROR_TOKEN } } + logger.info('SpmSender created for API endpoint: %s', self.metricsUrl) }) this.datapoints = [] this.datapointsToShip = [] @@ -159,7 +160,6 @@ function SpmSender (spmToken, processMetricsInterval, metricsApiEndpoint) { this.sendClientInfo() }.bind(this), 10) this.startSender() - logger.info('SpmSender created for API endpoint: %s', this.metricsUrl) } util.inherits(SpmSender, events.EventEmitter) @@ -399,8 +399,12 @@ SpmSender.prototype.retransmit = function (metrics, callback) { osData = [] } var dp = [appData, osData] + var dynamicUrlParameters = '' + if (global.spmSenderUrlParameters !== undefined) { + dynamicUrlParameters = global.spmSenderUrlParameters + } var options = [{ - url: this.metricsUrl + '&sct=APP', + url: this.metricsUrl + '&sct=APP' + dynamicUrlParameters, headers: { 'User-Agent': 'node-spm', 'Content-Type': 'application/json' @@ -474,8 +478,12 @@ SpmSender.prototype.sendToSpm = function (metricsUrl, callback) { return (metric.sct === 'OS') }) ] + var dynamicUrlParameters = '' + if (global.spmSenderUrlParameters !== undefined) { + dynamicUrlParameters = global.spmSenderUrlParameters + } var options = [{ - url: metricsUrl + '&sct=APP', + url: metricsUrl + '&sct=APP' + dynamicUrlParameters, headers: { 'User-Agent': 'node-spm', 'Content-Type': 'application/json'