Call URL.Clean() only once when setting metric tags

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