luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Fix tests

This commit is contained in:
Paul Coignet 2020-07-23 11:04:10 +02:00
parent 6f80d33a22
commit 9faa0a2a02
No known key found for this signature in database
GPG Key ID: 07E52EA388E408FD
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agent/config/runtime_test.go
View File

@ -2263,7 +2263,7 @@ func TestConfigFlagsAndEdgecases(t *testing.T) {
patch: func(rt *RuntimeConfig) { patch: func(rt *RuntimeConfig) {
rt.DataDir = dataDir rt.DataDir = dataDir
rt.Telemetry.AllowedPrefixes = []string{"foo"} 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"`}, warns: []string{`Filter rule must begin with either '+' or '-': "nix"`},
}, },
@ -6361,7 +6361,7 @@ func TestFullConfig(t *testing.T) {
DogstatsdTags: []string{"3N81zSUB", "Xtj8AnXZ"}, DogstatsdTags: []string{"3N81zSUB", "Xtj8AnXZ"},
FilterDefault: true, FilterDefault: true,
AllowedPrefixes: []string{"oJotS8XJ"}, AllowedPrefixes: []string{"oJotS8XJ"},
BlockedPrefixes: []string{"cazlEhGn"}, BlockedPrefixes: []string{"consul.api.http", "cazlEhGn"},
MetricsPrefix: "ftO6DySn", MetricsPrefix: "ftO6DySn",
PrometheusRetentionTime: 15 * time.Second, PrometheusRetentionTime: 15 * time.Second,
StatsdAddr: "drce87cy", StatsdAddr: "drce87cy",

2
agent/http.go
View File

@ -259,6 +259,8 @@ func (s *HTTPServer) handler(enableDebug bool) http.Handler {
start := time.Now() start := time.Now()
handler(resp, req) 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}} labels := []metrics.Label{{Name: "method", Value: req.Method}, {Name: "path", Value: path_label}}
metrics.MeasureSinceWithLabels([]string{"api", "http"}, start, labels) metrics.MeasureSinceWithLabels([]string{"api", "http"}, start, labels)