Rename AddMetrics to Add

lahsivjar · lahsivjar · commit e9aec943157c · 2024-07-04T12:35:33.000+01:00
diff --git a/remappers/hostmetrics/cpu.go b/remappers/hostmetrics/cpu.go
@@ -88,7 +88,7 @@ func remapCPUMetrics(
 	}
 
 	// Add all metrics that are independent of cpu logical count.
-	remappedmetric.AddMetrics(out, dataset, remappedmetric.EmptyMutator,
+	remappedmetric.Add(out, dataset, remappedmetric.EmptyMutator,
 		remappedmetric.Metric{
 			DataType:    pmetric.MetricTypeGauge,
 			Name:        "system.cpu.total.pct",
@@ -159,7 +159,7 @@ func remapCPUMetrics(
 	irqNorm := irqPercent / float64(numCores)
 	softirqNorm := softirqPercent / float64(numCores)
 
-	remappedmetric.AddMetrics(out, dataset, remappedmetric.EmptyMutator,
+	remappedmetric.Add(out, dataset, remappedmetric.EmptyMutator,
 		remappedmetric.Metric{
 			DataType:  pmetric.MetricTypeSum,
 			Name:      "system.cpu.cores",
diff --git a/remappers/hostmetrics/disk.go b/remappers/hostmetrics/disk.go
@@ -78,7 +78,7 @@ func addDiskMetric(metric pmetric.Metric, out pmetric.MetricSlice, dataset strin
 				v := dp.DoubleValue() * float64(multiplier)
 				newM.DoubleValue = &v
 			}
-			remappedmetric.AddMetrics(out, dataset, func(dp pmetric.NumberDataPoint) {
+			remappedmetric.Add(out, dataset, func(dp pmetric.NumberDataPoint) {
 				dp.Attributes().PutStr("system.diskio.name", device.Str())
 			}, newM)
 		}
diff --git a/remappers/hostmetrics/filesystem.go b/remappers/hostmetrics/filesystem.go
@@ -117,7 +117,7 @@ func addFileSystemMetrics[T number](out pmetric.MetricSlice,
 		doubleValue = &d
 	}
 
-	remappedmetric.AddMetrics(out, dataset,
+	remappedmetric.Add(out, dataset,
 		func(dp pmetric.NumberDataPoint) {
 			dp.Attributes().PutStr("system.filesystem.device_name", device)
 			dp.Attributes().PutStr("system.filesystem.mount_point", mpoint)
diff --git a/remappers/hostmetrics/load.go b/remappers/hostmetrics/load.go
@@ -57,7 +57,7 @@ func remapLoadMetrics(
 		}
 	}
 
-	remappedmetric.AddMetrics(out, dataset, remappedmetric.EmptyMutator,
+	remappedmetric.Add(out, dataset, remappedmetric.EmptyMutator,
 		remappedmetric.Metric{
 			DataType:    pmetric.MetricTypeGauge,
 			Name:        "system.load.1",
diff --git a/remappers/hostmetrics/memory.go b/remappers/hostmetrics/memory.go
@@ -96,7 +96,7 @@ func remapMemoryMetrics(
 	usedBytes += total
 	actualFree = total - actualUsedBytes
 
-	remappedmetric.AddMetrics(out, dataset, remappedmetric.EmptyMutator,
+	remappedmetric.Add(out, dataset, remappedmetric.EmptyMutator,
 		remappedmetric.Metric{
 			DataType:  pmetric.MetricTypeSum,
 			Name:      "system.memory.total",
diff --git a/remappers/hostmetrics/network.go b/remappers/hostmetrics/network.go
@@ -79,7 +79,7 @@ func addDeviceMetric(
 		return
 	}
 
-	remappedmetric.AddMetrics(out, dataset,
+	remappedmetric.Add(out, dataset,
 		func(dp pmetric.NumberDataPoint) {
 			dp.Attributes().PutStr("system.network.name", device)
 		},
diff --git a/remappers/hostmetrics/process.go b/remappers/hostmetrics/process.go
@@ -160,7 +160,7 @@ func remapProcessMetrics(
 	processRuntime := timestamp.AsTime().UnixMilli() - startTimeMillis
 	cpuPct := cpuTimeValue / float64(processRuntime)
 
-	remappedmetric.AddMetrics(out, dataset, addProcessResources(resource, startTime.UTC()),
+	remappedmetric.Add(out, dataset, addProcessResources(resource, startTime.UTC()),
 		// The timestamp metrics get converted from Int to Timestamp in Kibana
 		// since these are mapped to timestamp datatype
 		remappedmetric.Metric{
diff --git a/remappers/hostmetrics/processes.go b/remappers/hostmetrics/processes.go
@@ -67,7 +67,7 @@ func remapProcessesMetrics(
 
 	}
 
-	remappedmetric.AddMetrics(out, dataset,
+	remappedmetric.Add(out, dataset,
 		func(dp pmetric.NumberDataPoint) {
 			// Processes tab in the Kibana curated UI requires the event.dataset
 			// to work. This is a hard dependency.
diff --git a/remappers/internal/remappedmetric/metric.go b/remappers/internal/remappedmetric/metric.go
@@ -38,8 +38,8 @@ type Metric struct {
 	DataType       pmetric.MetricType
 }
 
-// AddMetrics adds a list of remapped OTel metric to the give MetricSlice.
-func AddMetrics(
+// Add adds a list of remapped OTel metric to the give MetricSlice.
+func Add(
 	ms pmetric.MetricSlice,
 	dataset string,
 	mutator func(dp pmetric.NumberDataPoint),
diff --git a/remappers/kubernetesmetrics/clustermetrics.go b/remappers/kubernetesmetrics/clustermetrics.go
@@ -50,7 +50,7 @@ func addClusterMetrics(
 		}
 	}
 
-	remappedmetric.AddMetrics(out, dataset, remappedmetric.EmptyMutator,
+	remappedmetric.Add(out, dataset, remappedmetric.EmptyMutator,
 		remappedmetric.Metric{
 			DataType:  pmetric.MetricTypeGauge,
 			Name:      "kubernetes.node.cpu.allocatable.cores",
diff --git a/remappers/kubernetesmetrics/kubelet.go b/remappers/kubernetesmetrics/kubelet.go
@@ -104,7 +104,7 @@ func addKubeletMetrics(
 
 	}
 
-	remappedmetric.AddMetrics(out, dataset, func(dp pmetric.NumberDataPoint) {
+	remappedmetric.Add(out, dataset, func(dp pmetric.NumberDataPoint) {
 		dp.Attributes().PutStr("service.type", "kubernetes")
 	},
 		remappedmetric.Metric{

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ func addDiskMetric(metric pmetric.Metric, out pmetric.MetricSlice, dataset strin`
`78`	`78`	`v := dp.DoubleValue() * float64(multiplier)`
`79`	`79`	`newM.DoubleValue = &v`
`80`	`80`	`}`
`81`		`- remappedmetric.AddMetrics(out, dataset, func(dp pmetric.NumberDataPoint) {`
	`81`	`+ remappedmetric.Add(out, dataset, func(dp pmetric.NumberDataPoint) {`
`82`	`82`	`dp.Attributes().PutStr("system.diskio.name", device.Str())`
`83`	`83`	`}, newM)`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ func addFileSystemMetrics[T number](out pmetric.MetricSlice,`
`117`	`117`	`doubleValue = &d`
`118`	`118`	`}`
`119`	`119`
`120`		`- remappedmetric.AddMetrics(out, dataset,`
	`120`	`+ remappedmetric.Add(out, dataset,`
`121`	`121`	`func(dp pmetric.NumberDataPoint) {`
`122`	`122`	`dp.Attributes().PutStr("system.filesystem.device_name", device)`
`123`	`123`	`dp.Attributes().PutStr("system.filesystem.mount_point", mpoint)`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ func remapLoadMetrics(`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`60`		`- remappedmetric.AddMetrics(out, dataset, remappedmetric.EmptyMutator,`
	`60`	`+ remappedmetric.Add(out, dataset, remappedmetric.EmptyMutator,`
`61`	`61`	`remappedmetric.Metric{`
`62`	`62`	`DataType: pmetric.MetricTypeGauge,`
`63`	`63`	`Name: "system.load.1",`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ func addDeviceMetric(`
`79`	`79`	`return`
`80`	`80`	`}`
`81`	`81`
`82`		`- remappedmetric.AddMetrics(out, dataset,`
	`82`	`+ remappedmetric.Add(out, dataset,`
`83`	`83`	`func(dp pmetric.NumberDataPoint) {`
`84`	`84`	`dp.Attributes().PutStr("system.network.name", device)`
`85`	`85`	`},`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ func remapProcessesMetrics(`
`67`	`67`
`68`	`68`	`}`
`69`	`69`
`70`		`- remappedmetric.AddMetrics(out, dataset,`
	`70`	`+ remappedmetric.Add(out, dataset,`
`71`	`71`	`func(dp pmetric.NumberDataPoint) {`
`72`	`72`	`// Processes tab in the Kibana curated UI requires the event.dataset`
`73`	`73`	`// to work. This is a hard dependency.`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ func addClusterMetrics(`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`53`		`- remappedmetric.AddMetrics(out, dataset, remappedmetric.EmptyMutator,`
	`53`	`+ remappedmetric.Add(out, dataset, remappedmetric.EmptyMutator,`
`54`	`54`	`remappedmetric.Metric{`
`55`	`55`	`DataType: pmetric.MetricTypeGauge,`
`56`	`56`	`Name: "kubernetes.node.cpu.allocatable.cores",`