diff --git a/agent/http.go b/agent/http.go
index 7402ef5f9..e08d7c533 100644
--- a/agent/http.go
+++ b/agent/http.go
@@ -233,29 +233,18 @@ func (s *HTTPServer) handler(enableDebug bool) http.Handler {
 	// handleFuncMetrics takes the given pattern and handler and wraps to produce
 	// metrics based on the pattern and request.
 	handleFuncMetrics := func(pattern string, handler http.HandlerFunc) {
-		// Get the parts of the pattern. We omit any initial empty for the
-		// leading slash, and put an underscore as a "thing" placeholder if we
-		// see a trailing slash, which means the part after is parsed. This lets
-		// us distinguish from things like /v1/query and /v1/query/<query id>.
-		var parts []string
-		for i, part := range strings.Split(pattern, "/") {
-			if part == "" {
-				if i == 0 {
-					continue
-				}
-				part = "_"
-			}
-			parts = append(parts, part)
-		}
+		// Tranform the pattern to a valid label by replacing the '/' by '_'.
+		// Omit the leading slash.
+		// Distinguish thing like /v1/query from /v1/query/<query_id> by having
+		// an extra underscore.
+		path_label := strings.Replace(pattern[1:], "/", "_", -1)
 
-		// Register the wrapper, which will close over the expensive-to-compute
-		// parts from above.
-		// TODO (kyhavlov): Convert this to utilize metric labels in a major release
+		// Register the wrapper.
 		wrapper := func(resp http.ResponseWriter, req *http.Request) {
 			start := time.Now()
 			handler(resp, req)
-			key := append([]string{"http", req.Method}, parts...)
-			metrics.MeasureSince(key, start)
+			labels := []metrics.Label{{Name: "method", Value: req.Method}, {Name: "path", Value: path_label}}
+			metrics.MeasureSinceWithLabels([]string{"http"}, start, labels)
 		}
 
 		var gzipHandler http.Handler
diff --git a/website/pages/docs/agent/telemetry.mdx b/website/pages/docs/agent/telemetry.mdx
index cd9f66920..5022aef43 100644
--- a/website/pages/docs/agent/telemetry.mdx
+++ b/website/pages/docs/agent/telemetry.mdx
@@ -177,7 +177,7 @@ This is a full list of metrics emitted by Consul.
 | `consul.dns.stale_queries`                            | This increments when an agent serves a query within the allowed stale threshold.                                                                                                                                                                                                                                                                                                                                    | queries              | counter |
 | `consul.dns.ptr_query.`                               | This measures the time spent handling a reverse DNS query for the given node.                                                                                                                                                                                                                                                                                                                                       | ms                   | timer   |
 | `consul.dns.domain_query.`                            | This measures the time spent handling a domain query for the given node.                                                                                                                                                                                                                                                                                                                                            | ms                   | timer   |
-| `consul.http..`                                       | This tracks how long it takes to service the given HTTP request for the given verb and path. Paths do not include details like service or key names, for these an underscore will be present as a placeholder (eg. `consul.http.GET.v1.kv._`)                                                                                                                                                                       | ms                   | timer   |
+| `consul.http`                                         | This tracks how long it takes to service the given HTTP request for the given verb and path. Paths do not include details like service or key names, for these an underscore will be present as a placeholder (eg. label `path=v1_kv_`)                                                                                                                                                                       | ms                   | timer   |
 
 ## Server Health