Make MetricsConfig.Clone a nonpointer receiver.

DataDog · Jan 27, 2025 · 4b927e9 · 4b927e9
1 parent e463ed7
commit 4b927e9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/pkg/networkdevice/profile/profiledefinition/metrics.go b/pkg/networkdevice/profile/profiledefinition/metrics.go
@@ -179,11 +179,8 @@ type MetricsConfig struct {
 }
 
 // Clone duplicates this MetricsConfig
-func (m *MetricsConfig) Clone() *MetricsConfig {
-	if m == nil {
-		return nil
-	}
-	return &MetricsConfig{
+func (m MetricsConfig) Clone() MetricsConfig {
+	return MetricsConfig{
 		MIB:        m.MIB,
 		Table:      m.Table.Clone(),
 		Symbol:     m.Symbol.Clone(),

diff --git a/pkg/networkdevice/profile/profiledefinition/metrics_test.go b/pkg/networkdevice/profile/profiledefinition/metrics_test.go
@@ -117,8 +117,8 @@ func TestCloneMetricTagConfig(t *testing.T) {
 }
 
 func TestCloneMetricsConfig(t *testing.T) {
-	buildConf := func() *MetricsConfig {
-		return &MetricsConfig{
+	buildConf := func() MetricsConfig {
+		return MetricsConfig{
 			MIB: "FOO-MIB",
 			Table: SymbolConfig{
 				OID:                  "1.2.3.4",
@@ -171,7 +171,7 @@ func TestCloneMetricsConfig(t *testing.T) {
 
 func TestCloneEmpty(t *testing.T) {
 	mc := MetricsConfig{}
-	assert.Equal(t, &mc, mc.Clone())
+	assert.Equal(t, mc, mc.Clone())
 	sym := SymbolConfig{}
 	assert.Equal(t, sym, sym.Clone())
 	tag := MetricTagConfig{}

diff --git a/pkg/networkdevice/profile/profiledefinition/profile_definition.go b/pkg/networkdevice/profile/profiledefinition/profile_definition.go
@@ -83,7 +83,7 @@ func (p *ProfileDefinition) Clone() *ProfileDefinition {
 		Metadata:     CloneMap(p.Metadata),
 		MetricTags:   CloneSlice(p.MetricTags),
 		StaticTags:   slices.Clone(p.StaticTags),
-		Metrics:      slices.Clone(p.Metrics),
+		Metrics:      CloneSlice(p.Metrics),
 		Device: DeviceMeta{
 			Vendor: p.Device.Vendor,
 		},