From 1d75a8fb5044fa15059470994e6653af4c72ba2f Mon Sep 17 00:00:00 2001
From: Paul Coignet <paulcoignet1996@gmail.com>
Date: Thu, 23 Jul 2020 11:04:10 +0200
Subject: [PATCH] Fix tests

---
 agent/config/runtime_test.go | 4 ++--
 agent/http.go                | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/agent/config/runtime_test.go b/agent/config/runtime_test.go
index b49ee9b676..eaf74b3678 100644
--- a/agent/config/runtime_test.go
+++ b/agent/config/runtime_test.go
@@ -2263,7 +2263,7 @@ func TestConfigFlagsAndEdgecases(t *testing.T) {
 			patch: func(rt *RuntimeConfig) {
 				rt.DataDir = dataDir
 				rt.Telemetry.AllowedPrefixes = []string{"foo"}
-				rt.Telemetry.BlockedPrefixes = []string{"bar"}
+				rt.Telemetry.BlockedPrefixes = []string{"consul.api.http", "bar"}
 			},
 			warns: []string{`Filter rule must begin with either '+' or '-': "nix"`},
 		},
@@ -6361,7 +6361,7 @@ func TestFullConfig(t *testing.T) {
 			DogstatsdTags:                      []string{"3N81zSUB", "Xtj8AnXZ"},
 			FilterDefault:                      true,
 			AllowedPrefixes:                    []string{"oJotS8XJ"},
-			BlockedPrefixes:                    []string{"cazlEhGn"},
+			BlockedPrefixes:                    []string{"consul.api.http", "cazlEhGn"},
 			MetricsPrefix:                      "ftO6DySn",
 			PrometheusRetentionTime:            15 * time.Second,
 			StatsdAddr:                         "drce87cy",
diff --git a/agent/http.go b/agent/http.go
index 0778dd5832..8133cbe95a 100644
--- a/agent/http.go
+++ b/agent/http.go
@@ -259,6 +259,8 @@ func (s *HTTPServer) handler(enableDebug bool) http.Handler {
 			start := time.Now()
 			handler(resp, req)
 
+			// This new metric is disabled by default with the prefix_filter option.
+			// It will be enabled by default in a future version.
 			labels := []metrics.Label{{Name: "method", Value: req.Method}, {Name: "path", Value: path_label}}
 			metrics.MeasureSinceWithLabels([]string{"api", "http"}, start, labels)