Skip to content

Commit 88ffead

Browse files
kisielandkisieland
committed
Remove public API introduction
1 parent 1d18b73 commit 88ffead

File tree

3 files changed

+59
-40
lines changed

3 files changed

+59
-40
lines changed

‎consumer/pdata/metric.go‎

Lines changed: 20 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -127,41 +127,31 @@ func (md Metrics) MetricAndDataPointCount() (metricCount int, dataPointCount int
127127
ilm := ilms.At(j)
128128
metrics := ilm.Metrics()
129129
metricCount += metrics.Len()
130-
dataPointCount += ilm.Metrics().DataPointCount()
130+
ms := ilm.Metrics()
131+
for k := 0; k < ms.Len(); k++ {
132+
m := ms.At(k)
133+
switch m.DataType() {
134+
case MetricDataTypeIntGauge:
135+
dataPointCount += m.IntGauge().DataPoints().Len()
136+
case MetricDataTypeDoubleGauge:
137+
dataPointCount += m.DoubleGauge().DataPoints().Len()
138+
case MetricDataTypeIntSum:
139+
dataPointCount += m.IntSum().DataPoints().Len()
140+
case MetricDataTypeDoubleSum:
141+
dataPointCount += m.DoubleSum().DataPoints().Len()
142+
case MetricDataTypeIntHistogram:
143+
dataPointCount += m.IntHistogram().DataPoints().Len()
144+
case MetricDataTypeHistogram:
145+
dataPointCount += m.Histogram().DataPoints().Len()
146+
case MetricDataTypeSummary:
147+
dataPointCount += m.Summary().DataPoints().Len()
148+
}
149+
}
131150
}
132151
}
133152
return
134153
}
135154

136-
// DataPointCount calculates the total number of data points.
137-
func (ms MetricSlice) DataPointCount() (dataPointCount int) {
138-
for k := 0; k < ms.Len(); k++ {
139-
dataPointCount += ms.At(k).DataPointCount()
140-
}
141-
return
142-
}
143-
144-
// DataPointCount calculates the total number of data points.
145-
func (ms Metric) DataPointCount() (dataPointCount int) {
146-
switch ms.DataType() {
147-
case MetricDataTypeIntGauge:
148-
dataPointCount = ms.IntGauge().DataPoints().Len()
149-
case MetricDataTypeDoubleGauge:
150-
dataPointCount = ms.DoubleGauge().DataPoints().Len()
151-
case MetricDataTypeIntSum:
152-
dataPointCount = ms.IntSum().DataPoints().Len()
153-
case MetricDataTypeDoubleSum:
154-
dataPointCount = ms.DoubleSum().DataPoints().Len()
155-
case MetricDataTypeIntHistogram:
156-
dataPointCount = ms.IntHistogram().DataPoints().Len()
157-
case MetricDataTypeHistogram:
158-
dataPointCount = ms.Histogram().DataPoints().Len()
159-
case MetricDataTypeSummary:
160-
dataPointCount = ms.Summary().DataPoints().Len()
161-
}
162-
return
163-
}
164-
165155
// MetricDataType specifies the type of data in a Metric.
166156
type MetricDataType int32
167157

‎processor/batchprocessor/splitmetrics.go‎

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func splitMetrics(size int, src pdata.Metrics) pdata.Metrics {
4747
srcIlm.InstrumentationLibrary().CopyTo(destIlm.InstrumentationLibrary())
4848

4949
// If possible to move all metrics do that.
50-
srcDataPointCount := srcIlm.Metrics().DataPointCount()
50+
srcDataPointCount := metricSliceDataPointCount(srcIlm.Metrics())
5151
if size-totalCopiedDataPoints >= srcDataPointCount {
5252
totalCopiedDataPoints += srcDataPointCount
5353
srcIlm.Metrics().MoveAndAppendTo(destIlm.Metrics())
@@ -56,12 +56,12 @@ func splitMetrics(size int, src pdata.Metrics) pdata.Metrics {
5656

5757
srcIlm.Metrics().RemoveIf(func(srcMetric pdata.Metric) bool {
5858
// If we are done skip everything else.
59-
if srcMetric.DataPointCount()+totalCopiedDataPoints > size {
59+
if metricDataPointCount(srcMetric)+totalCopiedDataPoints > size {
6060
shouldSend = true
6161
return false
6262
}
6363
srcMetric.CopyTo(destIlm.Metrics().AppendEmpty())
64-
totalCopiedDataPoints += srcMetric.DataPointCount()
64+
totalCopiedDataPoints += metricDataPointCount(srcMetric)
6565
return true
6666
})
6767
return false
@@ -71,3 +71,32 @@ func splitMetrics(size int, src pdata.Metrics) pdata.Metrics {
7171

7272
return dest
7373
}
74+
75+
// metricSliceDataPointCount calculates the total number of data points.
76+
func metricSliceDataPointCount(ms pdata.MetricSlice) (dataPointCount int) {
77+
for k := 0; k < ms.Len(); k++ {
78+
dataPointCount += metricDataPointCount(ms.At(k))
79+
}
80+
return
81+
}
82+
83+
// metricDataPointCount calculates the total number of data points.
84+
func metricDataPointCount(ms pdata.Metric) (dataPointCount int) {
85+
switch ms.DataType() {
86+
case pdata.MetricDataTypeIntGauge:
87+
dataPointCount = ms.IntGauge().DataPoints().Len()
88+
case pdata.MetricDataTypeDoubleGauge:
89+
dataPointCount = ms.DoubleGauge().DataPoints().Len()
90+
case pdata.MetricDataTypeIntSum:
91+
dataPointCount = ms.IntSum().DataPoints().Len()
92+
case pdata.MetricDataTypeDoubleSum:
93+
dataPointCount = ms.DoubleSum().DataPoints().Len()
94+
case pdata.MetricDataTypeIntHistogram:
95+
dataPointCount = ms.IntHistogram().DataPoints().Len()
96+
case pdata.MetricDataTypeHistogram:
97+
dataPointCount = ms.Histogram().DataPoints().Len()
98+
case pdata.MetricDataTypeSummary:
99+
dataPointCount = ms.Summary().DataPoints().Len()
100+
}
101+
return
102+
}

‎processor/batchprocessor/splitmetrics_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ func TestSplitMetrics_noop(t *testing.T) {
3636
func TestSplitMetrics(t *testing.T) {
3737
md := testdata.GenerateMetricsManyMetricsSameResource(20)
3838
metrics := md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics()
39-
dataPointCount := metrics.At(0).DataPointCount()
39+
dataPointCount := metricDataPointCount(metrics.At(0))
4040
for i := 0; i < metrics.Len(); i++ {
4141
metrics.At(i).SetName(getTestMetricName(0, i))
42-
assert.Equal(t, dataPointCount, metrics.At(i).DataPointCount())
42+
assert.Equal(t, dataPointCount, metricDataPointCount(metrics.At(i)))
4343
}
4444
cp := pdata.NewMetrics()
4545
cpMetrics := cp.ResourceMetrics().AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty().Metrics()
@@ -82,10 +82,10 @@ func TestSplitMetrics(t *testing.T) {
8282
func TestSplitMetricsMultipleResourceSpans(t *testing.T) {
8383
md := testdata.GenerateMetricsManyMetricsSameResource(20)
8484
metrics := md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics()
85-
dataPointCount := metrics.At(0).DataPointCount()
85+
dataPointCount := metricDataPointCount(metrics.At(0))
8686
for i := 0; i < metrics.Len(); i++ {
8787
metrics.At(i).SetName(getTestMetricName(0, i))
88-
assert.Equal(t, dataPointCount, metrics.At(i).DataPointCount())
88+
assert.Equal(t, dataPointCount, metricDataPointCount(metrics.At(i)))
8989
}
9090
// add second index to resource metrics
9191
testdata.GenerateMetricsManyMetricsSameResource(20).
@@ -107,10 +107,10 @@ func TestSplitMetricsMultipleResourceSpans(t *testing.T) {
107107
func TestSplitMetricsMultipleResourceSpans_SplitSizeGreaterThanMetricSize(t *testing.T) {
108108
td := testdata.GenerateMetricsManyMetricsSameResource(20)
109109
metrics := td.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics()
110-
dataPointCount := metrics.At(0).DataPointCount()
110+
dataPointCount := metricDataPointCount(metrics.At(0))
111111
for i := 0; i < metrics.Len(); i++ {
112112
metrics.At(i).SetName(getTestMetricName(0, i))
113-
assert.Equal(t, dataPointCount, metrics.At(i).DataPointCount())
113+
assert.Equal(t, dataPointCount, metricDataPointCount(metrics.At(i)))
114114
}
115115
td.ResourceMetrics().Resize(2)
116116
// add second index to resource metrics
@@ -182,7 +182,7 @@ func TestSplitMetricsNotFull(t *testing.T) {
182182
dataPointCount := 2
183183
for i := 0; i < metrics.Len(); i++ {
184184
metrics.At(i).SetName(getTestMetricName(0, i))
185-
assert.Equal(t, dataPointCount, metrics.At(i).DataPointCount())
185+
assert.Equal(t, dataPointCount, metricDataPointCount(metrics.At(i)))
186186
}
187187

188188
splitSize := 9

0 commit comments

Comments
 (0)