Merge pull request #110 from m4x1m1l14n/development

Override loki transport label with log label when label with same name is provided
JaniAnttonen · Jun 8, 2022 · 7e64531 · 7e64531
2 parents f720011 + 8e07109
commit 7e64531
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -56,14 +56,15 @@ class LokiTransport extends Transport {
 
     // build custom labels if provided
     let lokiLabels = { level: level }
-    lokiLabels = Object.assign(lokiLabels, labels)
 
     if (this.labels) {
       lokiLabels = Object.assign(lokiLabels, this.labels)
     } else {
       lokiLabels.job = label
     }
 
+    lokiLabels = Object.assign(lokiLabels, labels)
+
     // follow the format provided
     const line = this.useCustomFormat
       ? info[MESSAGE]