Skip to content

Commit 7f55be0

Browse files
lahsivjarlahsivjar
authored
Separate test utils into a different package (#38)
* Separate test utils into a different package * Rename AddMetrics to Add
1 parent 6d438c0 commit 7f55be0

File tree

14 files changed

+340
-344
lines changed

14 files changed

+340
-344
lines changed

‎remappers/hostmetrics/cpu.go‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"go.opentelemetry.io/collector/pdata/pcommon"
2424
"go.opentelemetry.io/collector/pdata/pmetric"
2525

26-
remappers "github.com/elastic/opentelemetry-lib/remappers/internal"
26+
"github.com/elastic/opentelemetry-lib/remappers/internal/remappedmetric"
2727
)
2828

2929
func remapCPUMetrics(
@@ -88,56 +88,56 @@ func remapCPUMetrics(
8888
}
8989

9090
// Add all metrics that are independent of cpu logical count.
91-
remappers.AddMetrics(out, dataset, remappers.EmptyMutator,
92-
remappers.Metric{
91+
remappedmetric.Add(out, dataset, remappedmetric.EmptyMutator,
92+
remappedmetric.Metric{
9393
DataType: pmetric.MetricTypeGauge,
9494
Name: "system.cpu.total.pct",
9595
Timestamp: timestamp,
9696
DoubleValue: &totalPercent,
9797
},
98-
remappers.Metric{
98+
remappedmetric.Metric{
9999
DataType: pmetric.MetricTypeGauge,
100100
Name: "system.cpu.idle.pct",
101101
Timestamp: timestamp,
102102
DoubleValue: &idlePercent,
103103
},
104-
remappers.Metric{
104+
remappedmetric.Metric{
105105
DataType: pmetric.MetricTypeGauge,
106106
Name: "system.cpu.system.pct",
107107
Timestamp: timestamp,
108108
DoubleValue: &systemPercent,
109109
},
110-
remappers.Metric{
110+
remappedmetric.Metric{
111111
DataType: pmetric.MetricTypeGauge,
112112
Name: "system.cpu.user.pct",
113113
Timestamp: timestamp,
114114
DoubleValue: &userPercent,
115115
},
116-
remappers.Metric{
116+
remappedmetric.Metric{
117117
DataType: pmetric.MetricTypeGauge,
118118
Name: "system.cpu.steal.pct",
119119
Timestamp: timestamp,
120120
DoubleValue: &stealPercent,
121121
},
122-
remappers.Metric{
122+
remappedmetric.Metric{
123123
DataType: pmetric.MetricTypeGauge,
124124
Name: "system.cpu.iowait.pct",
125125
Timestamp: timestamp,
126126
DoubleValue: &iowaitPercent,
127127
},
128-
remappers.Metric{
128+
remappedmetric.Metric{
129129
DataType: pmetric.MetricTypeGauge,
130130
Name: "system.cpu.nice.pct",
131131
Timestamp: timestamp,
132132
DoubleValue: &nicePercent,
133133
},
134-
remappers.Metric{
134+
remappedmetric.Metric{
135135
DataType: pmetric.MetricTypeGauge,
136136
Name: "system.cpu.irq.pct",
137137
Timestamp: timestamp,
138138
DoubleValue: &irqPercent,
139139
},
140-
remappers.Metric{
140+
remappedmetric.Metric{
141141
DataType: pmetric.MetricTypeGauge,
142142
Name: "system.cpu.softirq.pct",
143143
Timestamp: timestamp,
@@ -159,68 +159,68 @@ func remapCPUMetrics(
159159
irqNorm := irqPercent / float64(numCores)
160160
softirqNorm := softirqPercent / float64(numCores)
161161

162-
remappers.AddMetrics(out, dataset, remappers.EmptyMutator,
163-
remappers.Metric{
162+
remappedmetric.Add(out, dataset, remappedmetric.EmptyMutator,
163+
remappedmetric.Metric{
164164
DataType: pmetric.MetricTypeSum,
165165
Name: "system.cpu.cores",
166166
Timestamp: timestamp,
167167
IntValue: &numCores,
168168
},
169-
remappers.Metric{
169+
remappedmetric.Metric{
170170
DataType: pmetric.MetricTypeSum,
171171
Name: "system.load.cores",
172172
Timestamp: timestamp,
173173
IntValue: &numCores,
174174
},
175-
remappers.Metric{
175+
remappedmetric.Metric{
176176
DataType: pmetric.MetricTypeGauge,
177177
Name: "system.cpu.total.norm.pct",
178178
Timestamp: timestamp,
179179
DoubleValue: &totalNorm,
180180
},
181-
remappers.Metric{
181+
remappedmetric.Metric{
182182
DataType: pmetric.MetricTypeGauge,
183183
Name: "system.cpu.idle.norm.pct",
184184
Timestamp: timestamp,
185185
DoubleValue: &idleNorm,
186186
},
187-
remappers.Metric{
187+
remappedmetric.Metric{
188188
DataType: pmetric.MetricTypeGauge,
189189
Name: "system.cpu.system.norm.pct",
190190
Timestamp: timestamp,
191191
DoubleValue: &systemNorm,
192192
},
193-
remappers.Metric{
193+
remappedmetric.Metric{
194194
DataType: pmetric.MetricTypeGauge,
195195
Name: "system.cpu.user.norm.pct",
196196
Timestamp: timestamp,
197197
DoubleValue: &userNorm,
198198
},
199-
remappers.Metric{
199+
remappedmetric.Metric{
200200
DataType: pmetric.MetricTypeGauge,
201201
Name: "system.cpu.steal.norm.pct",
202202
Timestamp: timestamp,
203203
DoubleValue: &stealNorm,
204204
},
205-
remappers.Metric{
205+
remappedmetric.Metric{
206206
DataType: pmetric.MetricTypeGauge,
207207
Name: "system.cpu.iowait.norm.pct",
208208
Timestamp: timestamp,
209209
DoubleValue: &iowaitNorm,
210210
},
211-
remappers.Metric{
211+
remappedmetric.Metric{
212212
DataType: pmetric.MetricTypeGauge,
213213
Name: "system.cpu.nice.norm.pct",
214214
Timestamp: timestamp,
215215
DoubleValue: &niceNorm,
216216
},
217-
remappers.Metric{
217+
remappedmetric.Metric{
218218
DataType: pmetric.MetricTypeGauge,
219219
Name: "system.cpu.irq.norm.pct",
220220
Timestamp: timestamp,
221221
DoubleValue: &irqNorm,
222222
},
223-
remappers.Metric{
223+
remappedmetric.Metric{
224224
DataType: pmetric.MetricTypeGauge,
225225
Name: "system.cpu.softirq.norm.pct",
226226
Timestamp: timestamp,

‎remappers/hostmetrics/disk.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ import (
2121
"errors"
2222
"fmt"
2323

24-
remappers "github.com/elastic/opentelemetry-lib/remappers/internal"
2524
"go.opentelemetry.io/collector/pdata/pcommon"
2625
"go.opentelemetry.io/collector/pdata/pmetric"
26+
27+
"github.com/elastic/opentelemetry-lib/remappers/internal/remappedmetric"
2728
)
2829

2930
var metricsToAdd = map[string]string{
@@ -64,22 +65,22 @@ func addDiskMetric(metric pmetric.Metric, out pmetric.MetricSlice, dataset strin
6465
dp := dps.At(i)
6566
if device, ok := dp.Attributes().Get("device"); ok {
6667
direction, _ := dp.Attributes().Get("direction")
67-
remappedMetric := remappers.Metric{
68+
newM := remappedmetric.Metric{
6869
DataType: pmetric.MetricTypeSum,
6970
Name: fmt.Sprintf(metricDiskES, direction.Str()),
7071
Timestamp: dp.Timestamp(),
7172
}
7273
switch dp.ValueType() {
7374
case pmetric.NumberDataPointValueTypeInt:
7475
v := dp.IntValue() * multiplier
75-
remappedMetric.IntValue = &v
76+
newM.IntValue = &v
7677
case pmetric.NumberDataPointValueTypeDouble:
7778
v := dp.DoubleValue() * float64(multiplier)
78-
remappedMetric.DoubleValue = &v
79+
newM.DoubleValue = &v
7980
}
80-
remappers.AddMetrics(out, dataset, func(dp pmetric.NumberDataPoint) {
81+
remappedmetric.Add(out, dataset, func(dp pmetric.NumberDataPoint) {
8182
dp.Attributes().PutStr("system.diskio.name", device.Str())
82-
}, remappedMetric)
83+
}, newM)
8384
}
8485
}
8586
return nil

‎remappers/hostmetrics/filesystem.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package hostmetrics
1919

2020
import (
21-
remappers "github.com/elastic/opentelemetry-lib/remappers/internal"
21+
"github.com/elastic/opentelemetry-lib/remappers/internal/remappedmetric"
2222
"go.opentelemetry.io/collector/pdata/pcommon"
2323
"go.opentelemetry.io/collector/pdata/pmetric"
2424
)
@@ -117,13 +117,13 @@ func addFileSystemMetrics[T number](out pmetric.MetricSlice,
117117
doubleValue = &d
118118
}
119119

120-
remappers.AddMetrics(out, dataset,
120+
remappedmetric.Add(out, dataset,
121121
func(dp pmetric.NumberDataPoint) {
122122
dp.Attributes().PutStr("system.filesystem.device_name", device)
123123
dp.Attributes().PutStr("system.filesystem.mount_point", mpoint)
124124
dp.Attributes().PutStr("system.filesystem.type", fstype)
125125
},
126-
remappers.Metric{
126+
remappedmetric.Metric{
127127
DataType: pmetric.MetricTypeSum,
128128
Name: name,
129129
Timestamp: timestamp,

0 commit comments

Comments
 (0)