Remove original impl of node meta fn

hashicorp · Jun 14, 2023 · 1d0b2dd · 1d0b2dd
1 parent 507286f
commit 1d0b2dd
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 14 deletions.
diff --git a/agent/hcp/client/client.go b/agent/hcp/client/client.go
@@ -315,13 +315,12 @@ func (t *TelemetryConfig) Enabled() (string, bool) {
 // DefaultLabels returns a set of <key, value> string pairs that must be added as attributes to all exported telemetry data.
 func (t *TelemetryConfig) DefaultLabels(cfg config.CloudConfig) map[string]string {
 	labels := make(map[string]string)
-	nID, nodeName := cfg.NodeMeta()
-	nodeID := string(nID)
+	nodeID := string(cfg.NodeID)
 	if nodeID != "" {
 		labels["node_id"] = nodeID
 	}
-	if nodeName != "" {
-		labels["node_name"] = nodeName
+	if cfg.NodeName != "" {
+		labels["node_name"] = cfg.NodeName
 	}
 
 	for k, v := range t.Labels {

diff --git a/agent/hcp/client/metrics_client.go b/agent/hcp/client/metrics_client.go
@@ -18,7 +18,6 @@ import (
 	"golang.org/x/oauth2"
 	"google.golang.org/protobuf/proto"
 
-	"github.com/hashicorp/consul/types"
 	"github.com/hashicorp/consul/version"
 )
 
@@ -44,7 +43,6 @@ type MetricsClient interface {
 type CloudConfig interface {
 	HCPConfig(opts ...hcpcfg.HCPConfigOption) (hcpcfg.HCPConfig, error)
 	Resource() (resource.Resource, error)
-	NodeMeta() (NodeID types.NodeID, NodeName string)
 }
 
 // otlpClient is an implementation of MetricsClient with a retryable http client for retries and to honor throttle.

diff --git a/agent/hcp/client/mock_CloudConfig.go b/agent/hcp/client/mock_CloudConfig.go
@@ -48,7 +48,3 @@ func (m MockCloudCfg) Resource() (resource.Resource, error) {
 func (m MockCloudCfg) HCPConfig(opts ...hcpcfg.HCPConfigOption) (hcpcfg.HCPConfig, error) {
 	return &mockHCPCfg{}, m.ConfigErr
 }
-
-func (m MockCloudCfg) NodeMeta() (types.NodeID, string) {
-	return m.NodeID, m.NodeName
-}
diff --git a/agent/hcp/config/config.go b/agent/hcp/config/config.go
@@ -39,10 +39,6 @@ func (c *CloudConfig) Resource() (resource.Resource, error) {
 	return resource.FromString(c.ResourceID)
 }
 
-func (c *CloudConfig) NodeMeta() (types.NodeID, string) {
-	return c.NodeID, c.NodeName
-}
-
 func (c *CloudConfig) HCPConfig(opts ...hcpcfg.HCPConfigOption) (hcpcfg.HCPConfig, error) {
 	if c.TLSConfig == nil {
 		c.TLSConfig = &tls.Config{}