Add MetricsConfig to Deps

hashicorp · Apr 24, 2023 · 8852e8f · 8852e8f
1 parent 0e8dfe5
commit 8852e8f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/agent/consul/options.go b/agent/consul/options.go
@@ -16,10 +16,12 @@ import (
 	"github.com/hashicorp/consul/agent/router"
 	"github.com/hashicorp/consul/agent/rpc/middleware"
 	"github.com/hashicorp/consul/agent/token"
+	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/tlsutil"
 )
 
 type Deps struct {
+	MetricsConfig    *lib.MetricsConfig
 	EventPublisher   *stream.EventPublisher
 	Logger           hclog.InterceptLogger
 	TLSConfigurator  *tlsutil.Configurator

diff --git a/agent/setup.go b/agent/setup.go
@@ -51,7 +51,6 @@ type BaseDeps struct {
 	consul.Deps // TODO: un-embed
 
 	RuntimeConfig *config.RuntimeConfig
-	MetricsConfig *lib.MetricsConfig
 	AutoConfig    *autoconf.AutoConfig // TODO: use an interface
 	Cache         *cache.Cache
 	ViewStore     *submatview.Store

diff --git a/lib/telemetry.go b/lib/telemetry.go
@@ -216,6 +216,7 @@ type TelemetryConfig struct {
 type MetricsHandler interface {
 	DisplayMetrics(resp http.ResponseWriter, req *http.Request) (interface{}, error)
 	Stream(ctx context.Context, encoder metrics.Encoder)
+	Data() []*metrics.IntervalMetrics
 }
 
 type MetricsConfig struct {