Check name tag as per Mihail's wishes :)

#1570 (comment)
grafana · Sep 4, 2020 · 413d0fe · 413d0fe
1 parent 8ee1d1c
commit 413d0fe
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lib/netext/httpext/transport.go b/lib/netext/httpext/transport.go
@@ -116,13 +116,16 @@ func (t *transport) measureAndEmitMetrics(unfReq *unfinishedRequest) *finishedRe
 		}
 	} else {
 		urlEnabled := enabledTags.Has(stats.TagURL)
-		nameEnabled := enabledTags.Has(stats.TagName)
-		if urlEnabled || nameEnabled {
+		var setName bool
+		if _, ok := tags["name"]; !ok && enabledTags.Has(stats.TagName) {
+			setName = true
+		}
+		if urlEnabled || setName {
 			cleanURL := URL{u: unfReq.request.URL, URL: unfReq.request.URL.String()}.Clean()
 			if urlEnabled {
 				tags["url"] = cleanURL
 			}
-			if _, ok := tags["name"]; !ok && nameEnabled {
+			if setName {
 				tags["name"] = cleanURL
 			}
 		}