From b5f24a21cb91e8b137d021b1856ae258edf5aedd Mon Sep 17 00:00:00 2001 From: Paul Banks Date: Wed, 20 Jun 2018 12:58:08 +0100 Subject: [PATCH] Fix test broken by final telemetry PR change! --- agent/agent_endpoint_test.go | 3 +-- api/agent_test.go | 4 ---- connect/proxy/config_test.go | 5 ----- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/agent/agent_endpoint_test.go b/agent/agent_endpoint_test.go index 8e0685e6c8..1aa7205407 100644 --- a/agent/agent_endpoint_test.go +++ b/agent/agent_endpoint_test.go @@ -2904,14 +2904,13 @@ func TestAgentConnectProxyConfig_Blocking(t *testing.T) { "local_service_address": "127.0.0.1:8000", "bind_port": float64(1234), "connect_timeout_ms": float64(500), - "telemetry": makeTelemetryDefaults("test"), }, } ur, err := copystructure.Copy(expectedResponse) require.NoError(t, err) updatedResponse := ur.(*api.ConnectProxyConfig) - updatedResponse.ContentHash = "8f2f6b5f2496acd8" + updatedResponse.ContentHash = "23b5b6b3767601e1" upstreams := updatedResponse.Config["upstreams"].([]interface{}) upstreams = append(upstreams, map[string]interface{}{ diff --git a/api/agent_test.go b/api/agent_test.go index 78f83cdaf6..c5871a091d 100644 --- a/api/agent_test.go +++ b/api/agent_test.go @@ -1161,10 +1161,6 @@ func TestAPI_AgentConnectProxyConfig(t *testing.T) { "bind_port": float64(20000), "foo": "bar", "local_service_address": "127.0.0.1:8000", - "telemetry": map[string]interface{}{ - "filter_default": true, - "metrics_prefix": "consul.proxy.foo", - }, }, } require.Equal(t, expectConfig, config) diff --git a/connect/proxy/config_test.go b/connect/proxy/config_test.go index e4e0d7bbd5..b7856d65a2 100644 --- a/connect/proxy/config_test.go +++ b/connect/proxy/config_test.go @@ -11,7 +11,6 @@ import ( "github.com/hashicorp/consul/agent" "github.com/hashicorp/consul/api" "github.com/hashicorp/consul/connect" - "github.com/hashicorp/consul/lib" "github.com/stretchr/testify/require" ) @@ -183,10 +182,6 @@ func TestAgentConfigWatcher(t *testing.T) { ConnectTimeoutMs: 10000, // from applyDefaults }, }, - Telemetry: lib.TelemetryConfig{ - FilterDefault: true, - MetricsPrefix: "consul.proxy.web", - }, } assert.Equal(t, expectCfg, cfg)