Use concrete telemetry.OtelSink type

hashicorp · Apr 26, 2023 · 37fe2a0 · 37fe2a0
1 parent 2ace716
commit 37fe2a0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/agent/hcp/deps.go b/agent/hcp/deps.go
@@ -9,7 +9,6 @@ import (
 	"net/url"
 	"time"
 
-	gometrics "github.com/armon/go-metrics"
 	hcpclient "github.com/hashicorp/consul/agent/hcp/client"
 	"github.com/hashicorp/consul/agent/hcp/config"
 	"github.com/hashicorp/consul/agent/hcp/scada"
@@ -21,7 +20,7 @@ import (
 type Deps struct {
 	Client   hcpclient.Client
 	Provider scada.Provider
-	Sink     gometrics.MetricSink
+	Sink     *telemetry.OTELSink
 }
 
 func NewDeps(cfg config.CloudConfig, logger hclog.Logger) (d Deps, err error) {
@@ -84,7 +83,7 @@ func verifyCCMRegistration(ctx context.Context, client hcpclient.Client) (string
 	return url.String(), nil
 }
 
-func initHCPSink(sinkOpts *telemetry.OTELSinkOpts, clientCfg *hcpclient.TelemetryClientCfg, url string) (gometrics.MetricSink, error) {
+func initHCPSink(sinkOpts *telemetry.OTELSinkOpts, clientCfg *hcpclient.TelemetryClientCfg, url string) (*telemetry.OTELSink, error) {
 	// If the above succeeds, the server is registered with CCM, init metrics sink.
 	metricsClient, err := hcpclient.NewMetricsClient(clientCfg)
 	if err != nil {

diff --git a/lib/telemetry.go b/lib/telemetry.go
@@ -19,6 +19,7 @@ import (
 	"github.com/hashicorp/go-multierror"
 	prometheuscore "github.com/prometheus/client_golang/prometheus"
 
+	"github.com/hashicorp/consul/agent/hcp/telemetry"
 	"github.com/hashicorp/consul/lib/retry"
 )
 
@@ -213,7 +214,7 @@ type TelemetryConfig struct {
 
 	// HCPSink provides an intialized OpenTelemetry sink that aggregates Consul metrics.
 	// The aggregated metrics are periodically exported to HCP.
-	HCPSink metrics.MetricSink
+	HCPSink *telemetry.OTELSink
 }
 
 // MetricsHandler provides an http.Handler for displaying metrics.