Update _handleStaticLabels

clarakosi · Pchelolo · commit cd923802a668 · 2020-12-10T15:52:03.000-06:00
diff --git a/lib/metrics/prometheus.js b/lib/metrics/prometheus.js
@@ -34,13 +34,15 @@ class PrometheusMetric {
     }
 
     _handleStaticLabels(labels) {
+        const updatedLabels = [...labels];
         if (this.staticLabels !== undefined) {
             Object.keys(this.staticLabels).forEach((name) => {
-                if (labels.indexOf(this.staticLabels[name]) === -1) {
-                    labels.unshift(this.staticLabels[name]);
+                if (updatedLabels.indexOf(this.staticLabels[name]) === -1) {
+                    updatedLabels.unshift(this.staticLabels[name]);
                 }
             });
         }
+        return updatedLabels;
     }
 
     _normalize(str) {
@@ -50,30 +52,22 @@ class PrometheusMetric {
     }
 
     increment(amount, labels) {
-        let updatedLabels = [...labels];
-        this._handleStaticLabels(updatedLabels);
-        updatedLabels = updatedLabels.map(this._normalize);
+        const updatedLabels = this._handleStaticLabels(labels).map(this._normalize);
         this.metric.labels.apply(this.metric, updatedLabels).inc(amount);
     }
 
     decrement(amount, labels) {
-        let updatedLabels = [...labels];
-        this._handleStaticLabels(updatedLabels);
-        updatedLabels = updatedLabels.map(this._normalize);
+        const updatedLabels = this._handleStaticLabels(labels).map(this._normalize);
         this.metric.labels.apply(this.metric, updatedLabels).dec(amount);
     }
 
     observe(value, labels) {
-        let updatedLabels = [...labels];
-        this._handleStaticLabels(updatedLabels);
-        updatedLabels = updatedLabels.map(this._normalize);
+        const updatedLabels = this._handleStaticLabels(labels).map(this._normalize);
         this.metric.labels.apply(this.metric, updatedLabels).observe(value);
     }
 
     gauge(amount, labels) {
-        let updatedLabels = [...labels];
-        this._handleStaticLabels(updatedLabels);
-        updatedLabels = updatedLabels.map(this._normalize);
+        const updatedLabels = this._handleStaticLabels(labels).map(this._normalize);
         if (amount < 0) {
             this.metric.labels.apply(this.metric, updatedLabels).dec(Math.abs(amount));
         } else {
@@ -82,23 +76,17 @@ class PrometheusMetric {
     }
 
     set(value, labels) {
-        let updatedLabels = [...labels];
-        this._handleStaticLabels(updatedLabels);
-        updatedLabels = updatedLabels.map(this._normalize);
+        const updatedLabels = this._handleStaticLabels(labels).map(this._normalize);
         this.metric.labels.apply(this.metric, updatedLabels).set(value);
     }
 
     timing(value, labels) {
-        let updatedLabels = [...labels];
-        this._handleStaticLabels(updatedLabels);
-        updatedLabels = updatedLabels.map(this._normalize);
+        const updatedLabels = this._handleStaticLabels(labels).map(this._normalize);
         this.observe(value, updatedLabels);
     }
 
     endTiming(startTime, labels) {
-        let updatedLabels = [...labels];
-        this._handleStaticLabels(updatedLabels);
-        updatedLabels = updatedLabels.map(this._normalize);
+        const updatedLabels = this._handleStaticLabels(labels).map(this._normalize);
         this.timing(Date.now() - startTime, updatedLabels);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -34,13 +34,15 @@ class PrometheusMetric {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`_handleStaticLabels(labels) {`
	`37`	`+ const updatedLabels = [...labels];`
`37`	`38`	`if (this.staticLabels !== undefined) {`
`38`	`39`	`Object.keys(this.staticLabels).forEach((name) => {`
`39`		`- if (labels.indexOf(this.staticLabels[name]) === -1) {`
`40`		`- labels.unshift(this.staticLabels[name]);`
	`40`	`+ if (updatedLabels.indexOf(this.staticLabels[name]) === -1) {`
	`41`	`+ updatedLabels.unshift(this.staticLabels[name]);`
`41`	`42`	`}`
`42`	`43`	`});`
`43`	`44`	`}`
	`45`	`+ return updatedLabels;`
`44`	`46`	`}`
`45`	`47`
`46`	`48`	`_normalize(str) {`
`@@ -50,30 +52,22 @@ class PrometheusMetric {`
`50`	`52`	`}`
`51`	`53`
`52`	`54`	`increment(amount, labels) {`
`53`		`- let updatedLabels = [...labels];`
`54`		`- this._handleStaticLabels(updatedLabels);`
`55`		`- updatedLabels = updatedLabels.map(this._normalize);`
	`55`	`+ const updatedLabels = this._handleStaticLabels(labels).map(this._normalize);`
`56`	`56`	`this.metric.labels.apply(this.metric, updatedLabels).inc(amount);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`decrement(amount, labels) {`
`60`		`- let updatedLabels = [...labels];`
`61`		`- this._handleStaticLabels(updatedLabels);`
`62`		`- updatedLabels = updatedLabels.map(this._normalize);`
	`60`	`+ const updatedLabels = this._handleStaticLabels(labels).map(this._normalize);`
`63`	`61`	`this.metric.labels.apply(this.metric, updatedLabels).dec(amount);`
`64`	`62`	`}`
`65`	`63`
`66`	`64`	`observe(value, labels) {`
`67`		`- let updatedLabels = [...labels];`
`68`		`- this._handleStaticLabels(updatedLabels);`
`69`		`- updatedLabels = updatedLabels.map(this._normalize);`
	`65`	`+ const updatedLabels = this._handleStaticLabels(labels).map(this._normalize);`
`70`	`66`	`this.metric.labels.apply(this.metric, updatedLabels).observe(value);`
`71`	`67`	`}`
`72`	`68`
`73`	`69`	`gauge(amount, labels) {`
`74`		`- let updatedLabels = [...labels];`
`75`		`- this._handleStaticLabels(updatedLabels);`
`76`		`- updatedLabels = updatedLabels.map(this._normalize);`
	`70`	`+ const updatedLabels = this._handleStaticLabels(labels).map(this._normalize);`
`77`	`71`	`if (amount < 0) {`
`78`	`72`	`this.metric.labels.apply(this.metric, updatedLabels).dec(Math.abs(amount));`
`79`	`73`	`} else {`
`@@ -82,23 +76,17 @@ class PrometheusMetric {`
`82`	`76`	`}`
`83`	`77`
`84`	`78`	`set(value, labels) {`
`85`		`- let updatedLabels = [...labels];`
`86`		`- this._handleStaticLabels(updatedLabels);`
`87`		`- updatedLabels = updatedLabels.map(this._normalize);`
	`79`	`+ const updatedLabels = this._handleStaticLabels(labels).map(this._normalize);`
`88`	`80`	`this.metric.labels.apply(this.metric, updatedLabels).set(value);`
`89`	`81`	`}`
`90`	`82`
`91`	`83`	`timing(value, labels) {`
`92`		`- let updatedLabels = [...labels];`
`93`		`- this._handleStaticLabels(updatedLabels);`
`94`		`- updatedLabels = updatedLabels.map(this._normalize);`
	`84`	`+ const updatedLabels = this._handleStaticLabels(labels).map(this._normalize);`
`95`	`85`	`this.observe(value, updatedLabels);`
`96`	`86`	`}`
`97`	`87`
`98`	`88`	`endTiming(startTime, labels) {`
`99`		`- let updatedLabels = [...labels];`
`100`		`- this._handleStaticLabels(updatedLabels);`
`101`		`- updatedLabels = updatedLabels.map(this._normalize);`
	`89`	`+ const updatedLabels = this._handleStaticLabels(labels).map(this._normalize);`
`102`	`90`	`this.timing(Date.now() - startTime, updatedLabels);`
`103`	`91`	`}`
`104`	`92`	`}`