From d2463d76aeec0b1e0f62dce680e44a1886c9fc54 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Sat, 29 Aug 2020 17:23:31 -0700 Subject: [PATCH] Rename getters for oneof and metricdata types Signed-off-by: Bogdan Drutu --- consumer/pdata/generated_metrics.go | 3 + consumer/pdata/generated_metrics_test.go | 5 + consumer/pdata/metric.go | 92 ++++++------ internal/data/metrics.go | 24 +-- internal/data/metrics_test.go | 32 ++-- internal/data/testdata/metric.go | 140 +++++++++--------- translator/internaldata/metrics_to_oc.go | 68 ++++----- translator/internaldata/oc_to_metrics.go | 44 +++--- translator/internaldata/oc_to_metrics_test.go | 4 +- 9 files changed, 210 insertions(+), 202 deletions(-) diff --git a/consumer/pdata/generated_metrics.go b/consumer/pdata/generated_metrics.go index ee4752a77be..af44471d9c3 100644 --- a/consumer/pdata/generated_metrics.go +++ b/consumer/pdata/generated_metrics.go @@ -607,6 +607,8 @@ func (ms Metric) SetUnit(v string) { (*ms.orig).Unit = v } + + // CopyTo copies all properties from the current struct to the dest. func (ms Metric) CopyTo(dest Metric) { if ms.IsNil() { @@ -619,6 +621,7 @@ func (ms Metric) CopyTo(dest Metric) { dest.SetName(ms.Name()) dest.SetDescription(ms.Description()) dest.SetUnit(ms.Unit()) + copyData((*ms.orig).Data, (*dest.orig).Data) } // IntGauge represents the type of a int scalar metric that always exports the "current value" for every data point. diff --git a/consumer/pdata/generated_metrics_test.go b/consumer/pdata/generated_metrics_test.go index 74699e51581..2addd2adeea 100644 --- a/consumer/pdata/generated_metrics_test.go +++ b/consumer/pdata/generated_metrics_test.go @@ -489,6 +489,8 @@ func TestMetric_Unit(t *testing.T) { assert.EqualValues(t, testValUnit, ms.Unit()) } + + func TestIntGauge_InitEmpty(t *testing.T) { ms := NewIntGauge() assert.True(t, ms.IsNil()) @@ -1849,6 +1851,9 @@ func fillTestMetric(tv Metric) { tv.SetName("test_name") tv.SetDescription("test_description") tv.SetUnit("1") + (*tv.orig).Data = &otlpmetrics.Metric_IntGauge{} + tv.IntGauge().InitEmpty() + fillTestIntGauge(tv.IntGauge()) } func generateTestIntGauge() IntGauge { diff --git a/consumer/pdata/metric.go b/consumer/pdata/metric.go index 8bb83c83b97..34c917bb460 100644 --- a/consumer/pdata/metric.go +++ b/consumer/pdata/metric.go @@ -47,30 +47,30 @@ type Metrics struct { type MetricDataType int const ( - MetricDataNone MetricDataType = iota - MetricDataIntGauge - MetricDataDoubleGauge - MetricDataIntSum - MetricDataDoubleSum - MetricDataIntHistogram - MetricDataDoubleHistogram + MetricDataTypeNone MetricDataType = iota + MetricDataTypeIntGauge + MetricDataTypeDoubleGauge + MetricDataTypeIntSum + MetricDataTypeDoubleSum + MetricDataTypeIntHistogram + MetricDataTypeDoubleHistogram ) func (mdt MetricDataType) String() string { switch mdt { - case MetricDataNone: + case MetricDataTypeNone: return "None" - case MetricDataIntGauge: + case MetricDataTypeIntGauge: return "IntGauge" - case MetricDataDoubleGauge: + case MetricDataTypeDoubleGauge: return "DoubleGauge" - case MetricDataIntSum: + case MetricDataTypeIntSum: return "IntSum" - case MetricDataDoubleSum: + case MetricDataTypeDoubleSum: return "DoubleSum" - case MetricDataIntHistogram: + case MetricDataTypeIntHistogram: return "IntHistogram" - case MetricDataDoubleHistogram: + case MetricDataTypeDoubleHistogram: return "DoubleHistogram" } return "" @@ -80,122 +80,122 @@ func (mdt MetricDataType) String() string { // Calling this function on zero-initialized Metric will cause a panic. func (ms Metric) DataType() MetricDataType { if *ms.orig == nil || (*ms.orig).Data == nil { - return MetricDataNone + return MetricDataTypeNone } switch (*ms.orig).Data.(type) { case *otlpmetrics.Metric_IntGauge: - return MetricDataIntGauge + return MetricDataTypeIntGauge case *otlpmetrics.Metric_DoubleGauge: - return MetricDataDoubleGauge + return MetricDataTypeDoubleGauge case *otlpmetrics.Metric_IntSum: - return MetricDataIntSum + return MetricDataTypeIntSum case *otlpmetrics.Metric_DoubleSum: - return MetricDataDoubleSum + return MetricDataTypeDoubleSum case *otlpmetrics.Metric_IntHistogram: - return MetricDataIntHistogram + return MetricDataTypeIntHistogram case *otlpmetrics.Metric_DoubleHistogram: - return MetricDataDoubleHistogram + return MetricDataTypeDoubleHistogram } - return MetricDataNone + return MetricDataTypeNone } -// IntGaugeData returns the data as IntGauge. This should be called iff DataType() == MetricDataIntGauge. +// IntGauge returns the data as IntGauge. This should be called iff DataType() == MetricDataTypeIntGauge. // Calling this function on zero-initialized Metric will cause a panic. -func (ms Metric) IntGaugeData() IntGauge { +func (ms Metric) IntGauge() IntGauge { if orig, ok := (*ms.orig).Data.(*otlpmetrics.Metric_IntGauge); ok { return newIntGauge(&orig.IntGauge) } return NewIntGauge() } -// DoubleGaugeData returns the data as DoubleGauge. This should be called iff DataType() == MetricDataDoubleGauge. +// DoubleGauge returns the data as DoubleGauge. This should be called iff DataType() == MetricDataTypeDoubleGauge. // Calling this function on zero-initialized Metric will cause a panic. -func (ms Metric) DoubleGaugeData() DoubleGauge { +func (ms Metric) DoubleGauge() DoubleGauge { if orig, ok := (*ms.orig).Data.(*otlpmetrics.Metric_DoubleGauge); ok { return newDoubleGauge(&orig.DoubleGauge) } return NewDoubleGauge() } -// IntSumData returns the data as IntSum. This should be called iff DataType() == MetricDataIntSum. +// IntSum returns the data as IntSum. This should be called iff DataType() == MetricDataTypeIntSum. // Calling this function on zero-initialized Metric will cause a panic. -func (ms Metric) IntSumData() IntSum { +func (ms Metric) IntSum() IntSum { if orig, ok := (*ms.orig).Data.(*otlpmetrics.Metric_IntSum); ok { return newIntSum(&orig.IntSum) } return NewIntSum() } -// DoubleSumData returns the data as DoubleSum. This should be called iff DataType() == MetricDataDoubleSum. +// DoubleSum returns the data as DoubleSum. This should be called iff DataType() == MetricDataTypeDoubleSum. // Calling this function on zero-initialized Metric will cause a panic. -func (ms Metric) DoubleSumData() DoubleSum { +func (ms Metric) DoubleSum() DoubleSum { if orig, ok := (*ms.orig).Data.(*otlpmetrics.Metric_DoubleSum); ok { return newDoubleSum(&orig.DoubleSum) } return NewDoubleSum() } -// IntHistogramData returns the data as IntHistogram. This should be called iff DataType() == MetricDataIntHistogram. +// IntHistogram returns the data as IntHistogram. This should be called iff DataType() == MetricDataTypeIntHistogram. // Calling this function on zero-initialized Metric will cause a panic. -func (ms Metric) IntHistogramData() IntHistogram { +func (ms Metric) IntHistogram() IntHistogram { if orig, ok := (*ms.orig).Data.(*otlpmetrics.Metric_IntHistogram); ok { return newIntHistogram(&orig.IntHistogram) } return NewIntHistogram() } -// DoubleHistogramData returns the data as DoubleHistogram. This should be called iff DataType() == MetricDataDoubleHistogram. +// DoubleHistogram returns the data as DoubleHistogram. This should be called iff DataType() == MetricDataTypeDoubleHistogram. // Calling this function on zero-initialized Metric will cause a panic. -func (ms Metric) DoubleHistogramData() DoubleHistogram { +func (ms Metric) DoubleHistogram() DoubleHistogram { if orig, ok := (*ms.orig).Data.(*otlpmetrics.Metric_DoubleHistogram); ok { return newDoubleHistogram(&orig.DoubleHistogram) } return NewDoubleHistogram() } -// SetIntGaugeData replaces the metric data with the given IntGauge. +// SetIntGauge replaces the metric data with the given IntGauge. // Calling this function on zero-initialized Metric will cause a panic. -func (ms Metric) SetIntGaugeData(data IntGauge) { +func (ms Metric) SetIntGauge(data IntGauge) { (*ms.orig).Data = &otlpmetrics.Metric_IntGauge{ IntGauge: *data.orig, } } -// SetDoubleGaugeData replaces the metric data with the given DoubleGauge. +// SetDoubleGauge replaces the metric data with the given DoubleGauge. // Calling this function on zero-initialized Metric will cause a panic. -func (ms Metric) SetDoubleGaugeData(data DoubleGauge) { +func (ms Metric) SetDoubleGauge(data DoubleGauge) { (*ms.orig).Data = &otlpmetrics.Metric_DoubleGauge{ DoubleGauge: *data.orig, } } -// SetIntSumData replaces the metric data with the given IntSum. +// SetIntSum replaces the metric data with the given IntSum. // Calling this function on zero-initialized Metric will cause a panic. -func (ms Metric) SetIntSumData(data IntSum) { +func (ms Metric) SetIntSum(data IntSum) { (*ms.orig).Data = &otlpmetrics.Metric_IntSum{ IntSum: *data.orig, } } -// SetDoubleSumData replaces the metric data with the given DoubleSum. +// SetDoubleSum replaces the metric data with the given DoubleSum. // Calling this function on zero-initialized Metric will cause a panic. -func (ms Metric) SetDoubleSumData(data DoubleSum) { +func (ms Metric) SetDoubleSum(data DoubleSum) { (*ms.orig).Data = &otlpmetrics.Metric_DoubleSum{ DoubleSum: *data.orig, } } -// SetIntHistogramData replaces the metric data with the given IntHistogram. +// SetIntHistogram replaces the metric data with the given IntHistogram. // Calling this function on zero-initialized Metric will cause a panic. -func (ms Metric) SetIntHistogramData(data IntHistogram) { +func (ms Metric) SetIntHistogram(data IntHistogram) { (*ms.orig).Data = &otlpmetrics.Metric_IntHistogram{ IntHistogram: *data.orig, } } -// SetDoubleHistogramData replaces the metric data with the given DoubleHistogram. +// SetDoubleHistogram replaces the metric data with the given DoubleHistogram. // Calling this function on zero-initialized Metric will cause a panic. -func (ms Metric) SetDoubleHistogramData(data DoubleHistogram) { +func (ms Metric) SetDoubleHistogram(data DoubleHistogram) { (*ms.orig).Data = &otlpmetrics.Metric_DoubleHistogram{ DoubleHistogram: *data.orig, } diff --git a/internal/data/metrics.go b/internal/data/metrics.go index 5258b40ee3d..08cb4a1163c 100644 --- a/internal/data/metrics.go +++ b/internal/data/metrics.go @@ -123,18 +123,18 @@ func (md MetricData) MetricAndDataPointCount() (metricCount int, dataPointCount continue } switch m.DataType() { - case pdata.MetricDataIntGauge: - dataPointCount += m.IntGaugeData().DataPoints().Len() - case pdata.MetricDataDoubleGauge: - dataPointCount += m.DoubleGaugeData().DataPoints().Len() - case pdata.MetricDataIntSum: - dataPointCount += m.IntSumData().DataPoints().Len() - case pdata.MetricDataDoubleSum: - dataPointCount += m.DoubleSumData().DataPoints().Len() - case pdata.MetricDataIntHistogram: - dataPointCount += m.IntHistogramData().DataPoints().Len() - case pdata.MetricDataDoubleHistogram: - dataPointCount += m.DoubleHistogramData().DataPoints().Len() + case pdata.MetricDataTypeIntGauge: + dataPointCount += m.IntGauge().DataPoints().Len() + case pdata.MetricDataTypeDoubleGauge: + dataPointCount += m.DoubleGauge().DataPoints().Len() + case pdata.MetricDataTypeIntSum: + dataPointCount += m.IntSum().DataPoints().Len() + case pdata.MetricDataTypeDoubleSum: + dataPointCount += m.DoubleSum().DataPoints().Len() + case pdata.MetricDataTypeIntHistogram: + dataPointCount += m.IntHistogram().DataPoints().Len() + case pdata.MetricDataTypeDoubleHistogram: + dataPointCount += m.DoubleHistogram().DataPoints().Len() } } } diff --git a/internal/data/metrics_test.go b/internal/data/metrics_test.go index 7ff1f3537a2..630664cb5f0 100644 --- a/internal/data/metrics_test.go +++ b/internal/data/metrics_test.go @@ -66,7 +66,7 @@ func TestMetricSize(t *testing.T) { doubleHistogram.DataPoints().Resize(1) doubleHistogram.DataPoints().At(0).SetCount(123) doubleHistogram.DataPoints().At(0).SetSum(123) - rms.At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0).SetDoubleHistogramData(doubleHistogram) + rms.At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0).SetDoubleHistogram(doubleHistogram) otlp := MetricDataToOtlp(md) size := 0 sizeBytes := 0 @@ -127,7 +127,7 @@ func TestMetricAndDataPointCount(t *testing.T) { intSum := pdata.NewIntSum() intSum.InitEmpty() intSum.DataPoints().Resize(3) - ilms.At(0).Metrics().At(0).SetIntSumData(intSum) + ilms.At(0).Metrics().At(0).SetIntSum(intSum) _, dps = md.MetricAndDataPointCount() assert.EqualValues(t, 3, dps) @@ -147,11 +147,11 @@ func TestMetricAndDataPointCount(t *testing.T) { doubleGauge := pdata.NewDoubleGauge() doubleGauge.InitEmpty() doubleGauge.DataPoints().Resize(1) - ilms.At(0).Metrics().At(1).SetDoubleGaugeData(doubleGauge) + ilms.At(0).Metrics().At(1).SetDoubleGauge(doubleGauge) intHistogram := pdata.NewIntHistogram() intHistogram.InitEmpty() intHistogram.DataPoints().Resize(3) - ilms.At(0).Metrics().At(3).SetIntHistogramData(intHistogram) + ilms.At(0).Metrics().At(3).SetIntHistogram(intHistogram) ms, dps = md.MetricAndDataPointCount() assert.EqualValues(t, 6, ms) assert.EqualValues(t, 4, dps) @@ -231,8 +231,8 @@ func TestOtlpToInternalReadOnly(t *testing.T) { assert.EqualValues(t, "my_metric_int", metricInt.Name()) assert.EqualValues(t, "My metric", metricInt.Description()) assert.EqualValues(t, "ms", metricInt.Unit()) - assert.EqualValues(t, pdata.MetricDataIntGauge, metricInt.DataType()) - int64DataPoints := metricInt.IntGaugeData().DataPoints() + assert.EqualValues(t, pdata.MetricDataTypeIntGauge, metricInt.DataType()) + int64DataPoints := metricInt.IntGauge().DataPoints() assert.EqualValues(t, 2, int64DataPoints.Len()) // First point assert.EqualValues(t, startTime, int64DataPoints.At(0).StartTime()) @@ -250,8 +250,8 @@ func TestOtlpToInternalReadOnly(t *testing.T) { assert.EqualValues(t, "my_metric_double", metricDouble.Name()) assert.EqualValues(t, "My metric", metricDouble.Description()) assert.EqualValues(t, "ms", metricDouble.Unit()) - assert.EqualValues(t, pdata.MetricDataDoubleSum, metricDouble.DataType()) - dsd := metricDouble.DoubleSumData() + assert.EqualValues(t, pdata.MetricDataTypeDoubleSum, metricDouble.DataType()) + dsd := metricDouble.DoubleSum() assert.EqualValues(t, pdata.AggregationTemporalityCumulative, dsd.AggregationTemporality()) doubleDataPoints := dsd.DataPoints() assert.EqualValues(t, 2, doubleDataPoints.Len()) @@ -271,8 +271,8 @@ func TestOtlpToInternalReadOnly(t *testing.T) { assert.EqualValues(t, "my_metric_histogram", metricHistogram.Name()) assert.EqualValues(t, "My metric", metricHistogram.Description()) assert.EqualValues(t, "ms", metricHistogram.Unit()) - assert.EqualValues(t, pdata.MetricDataDoubleHistogram, metricHistogram.DataType()) - dhd := metricHistogram.DoubleHistogramData() + assert.EqualValues(t, pdata.MetricDataTypeDoubleHistogram, metricHistogram.DataType()) + dhd := metricHistogram.DoubleHistogram() assert.EqualValues(t, pdata.AggregationTemporalityDelta, dhd.AggregationTemporality()) histogramDataPoints := dhd.DataPoints() assert.EqualValues(t, 2, histogramDataPoints.Len()) @@ -340,7 +340,7 @@ func TestOtlpToFromInternalIntGaugeMutating(t *testing.T) { metric.SetUnit("1") assert.EqualValues(t, "1", metric.Unit()) // Mutate DataPoints - igd := metric.IntGaugeData() + igd := metric.IntGauge() assert.EqualValues(t, 2, igd.DataPoints().Len()) igd.DataPoints().Resize(1) assert.EqualValues(t, 1, igd.DataPoints().Len()) @@ -416,7 +416,7 @@ func TestOtlpToFromInternalDoubleSumMutating(t *testing.T) { metric.SetUnit("1") assert.EqualValues(t, "1", metric.Unit()) // Mutate DataPoints - dsd := metric.DoubleSumData() + dsd := metric.DoubleSum() assert.EqualValues(t, 2, dsd.DataPoints().Len()) dsd.DataPoints().Resize(1) assert.EqualValues(t, 1, dsd.DataPoints().Len()) @@ -493,7 +493,7 @@ func TestOtlpToFromInternalHistogramMutating(t *testing.T) { metric.SetUnit("1") assert.EqualValues(t, "1", metric.Unit()) // Mutate DataPoints - dhd := metric.DoubleHistogramData() + dhd := metric.DoubleHistogram() assert.EqualValues(t, 2, dhd.DataPoints().Len()) dhd.DataPoints().Resize(1) assert.EqualValues(t, 1, dhd.DataPoints().Len()) @@ -583,7 +583,7 @@ func BenchmarkOtlpToFromInternal_IntGauge_MutateOneLabel(b *testing.B) { b.ResetTimer() for n := 0; n < b.N; n++ { md := MetricDataFromOtlp(resourceMetricsList) - md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0).IntGaugeData().DataPoints().At(0).LabelsMap().Upsert("key0", "value2") + md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0).IntGauge().DataPoints().At(0).LabelsMap().Upsert("key0", "value2") MetricDataToOtlp(md) } } @@ -604,7 +604,7 @@ func BenchmarkOtlpToFromInternal_DoubleSum_MutateOneLabel(b *testing.B) { b.ResetTimer() for n := 0; n < b.N; n++ { md := MetricDataFromOtlp(resourceMetricsList) - md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0).DoubleSumData().DataPoints().At(0).LabelsMap().Upsert("key0", "value2") + md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0).DoubleSum().DataPoints().At(0).LabelsMap().Upsert("key0", "value2") MetricDataToOtlp(md) } } @@ -625,7 +625,7 @@ func BenchmarkOtlpToFromInternal_HistogramPoints_MutateOneLabel(b *testing.B) { b.ResetTimer() for n := 0; n < b.N; n++ { md := MetricDataFromOtlp(resourceMetricsList) - md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0).DoubleHistogramData().DataPoints().At(0).LabelsMap().Upsert("key0", "value2") + md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0).DoubleHistogram().DataPoints().At(0).LabelsMap().Upsert("key0", "value2") MetricDataToOtlp(md) } } diff --git a/internal/data/testdata/metric.go b/internal/data/testdata/metric.go index 6c5605810b2..b181c3c2c9d 100644 --- a/internal/data/testdata/metric.go +++ b/internal/data/testdata/metric.go @@ -226,7 +226,7 @@ func generateMetricsOtlpOneMetricOneNil() []*otlpmetrics.ResourceMetrics { func GenerateMetricsOneMetricNoLabels() data.MetricData { md := GenerateMetricsOneMetric() - dps := md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0).IntSumData().DataPoints() + dps := md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0).IntSum().DataPoints() dps.At(0).LabelsMap().InitFromMap(map[string]string{}) dps.At(1).LabelsMap().InitFromMap(map[string]string{}) return md @@ -256,12 +256,12 @@ func GenerateMetricsAllTypesNoDataPoints() data.MetricData { ilm0 := md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0) ms := ilm0.Metrics() ms.Resize(6) - initMetric(ms.At(0), TestGaugeDoubleMetricName, pdata.MetricDataDoubleGauge) - initMetric(ms.At(1), TestGaugeIntMetricName, pdata.MetricDataIntGauge) - initMetric(ms.At(2), TestCounterDoubleMetricName, pdata.MetricDataDoubleSum) - initMetric(ms.At(3), TestCounterIntMetricName, pdata.MetricDataIntSum) - initMetric(ms.At(4), TestDoubleHistogramMetricName, pdata.MetricDataDoubleHistogram) - initMetric(ms.At(5), TestIntHistogramMetricName, pdata.MetricDataIntHistogram) + initMetric(ms.At(0), TestGaugeDoubleMetricName, pdata.MetricDataTypeDoubleGauge) + initMetric(ms.At(1), TestGaugeIntMetricName, pdata.MetricDataTypeIntGauge) + initMetric(ms.At(2), TestCounterDoubleMetricName, pdata.MetricDataTypeDoubleSum) + initMetric(ms.At(3), TestCounterIntMetricName, pdata.MetricDataTypeIntSum) + initMetric(ms.At(4), TestDoubleHistogramMetricName, pdata.MetricDataTypeDoubleHistogram) + initMetric(ms.At(5), TestIntHistogramMetricName, pdata.MetricDataTypeIntHistogram) return md } @@ -276,18 +276,18 @@ func GenerateMetricsAllTypesNilDataPoint() data.MetricData { nilDoubleHistogram := pdata.NewDoubleHistogramDataPoint() nilIntHistogram := pdata.NewIntHistogramDataPoint() - initMetric(ms.At(0), TestGaugeDoubleMetricName, pdata.MetricDataDoubleGauge) - ms.At(0).DoubleGaugeData().DataPoints().Append(&nilDouble) - initMetric(ms.At(1), TestGaugeIntMetricName, pdata.MetricDataIntGauge) - ms.At(1).IntGaugeData().DataPoints().Append(&nilInt) - initMetric(ms.At(2), TestCounterDoubleMetricName, pdata.MetricDataDoubleSum) - ms.At(2).DoubleSumData().DataPoints().Append(&nilDouble) - initMetric(ms.At(3), TestCounterIntMetricName, pdata.MetricDataIntSum) - ms.At(3).IntSumData().DataPoints().Append(&nilInt) - initMetric(ms.At(4), TestDoubleHistogramMetricName, pdata.MetricDataDoubleHistogram) - ms.At(4).DoubleHistogramData().DataPoints().Append(&nilDoubleHistogram) - initMetric(ms.At(5), TestIntHistogramMetricName, pdata.MetricDataIntHistogram) - ms.At(5).IntHistogramData().DataPoints().Append(&nilIntHistogram) + initMetric(ms.At(0), TestGaugeDoubleMetricName, pdata.MetricDataTypeDoubleGauge) + ms.At(0).DoubleGauge().DataPoints().Append(&nilDouble) + initMetric(ms.At(1), TestGaugeIntMetricName, pdata.MetricDataTypeIntGauge) + ms.At(1).IntGauge().DataPoints().Append(&nilInt) + initMetric(ms.At(2), TestCounterDoubleMetricName, pdata.MetricDataTypeDoubleSum) + ms.At(2).DoubleSum().DataPoints().Append(&nilDouble) + initMetric(ms.At(3), TestCounterIntMetricName, pdata.MetricDataTypeIntSum) + ms.At(3).IntSum().DataPoints().Append(&nilInt) + initMetric(ms.At(4), TestDoubleHistogramMetricName, pdata.MetricDataTypeDoubleHistogram) + ms.At(4).DoubleHistogram().DataPoints().Append(&nilDoubleHistogram) + initMetric(ms.At(5), TestIntHistogramMetricName, pdata.MetricDataTypeIntHistogram) + ms.At(5).IntHistogram().DataPoints().Append(&nilIntHistogram) return md } @@ -307,18 +307,18 @@ func GenerateMetricsAllTypesEmptyDataPoint() data.MetricData { emptyIntHistogram := pdata.NewIntHistogramDataPoint() emptyIntHistogram.InitEmpty() - initMetric(ms.At(0), TestGaugeDoubleMetricName, pdata.MetricDataDoubleGauge) - ms.At(0).DoubleGaugeData().DataPoints().Append(&emptyDouble) - initMetric(ms.At(1), TestGaugeIntMetricName, pdata.MetricDataIntGauge) - ms.At(1).IntGaugeData().DataPoints().Append(&emptyInt) - initMetric(ms.At(2), TestCounterDoubleMetricName, pdata.MetricDataDoubleSum) - ms.At(2).DoubleSumData().DataPoints().Append(&emptyDouble) - initMetric(ms.At(3), TestCounterIntMetricName, pdata.MetricDataIntSum) - ms.At(3).IntSumData().DataPoints().Append(&emptyInt) - initMetric(ms.At(4), TestDoubleHistogramMetricName, pdata.MetricDataDoubleHistogram) - ms.At(4).DoubleHistogramData().DataPoints().Append(&emptyDoubleHistogram) - initMetric(ms.At(5), TestIntHistogramMetricName, pdata.MetricDataIntHistogram) - ms.At(5).IntHistogramData().DataPoints().Append(&emptyIntHistogram) + initMetric(ms.At(0), TestGaugeDoubleMetricName, pdata.MetricDataTypeDoubleGauge) + ms.At(0).DoubleGauge().DataPoints().Append(&emptyDouble) + initMetric(ms.At(1), TestGaugeIntMetricName, pdata.MetricDataTypeIntGauge) + ms.At(1).IntGauge().DataPoints().Append(&emptyInt) + initMetric(ms.At(2), TestCounterDoubleMetricName, pdata.MetricDataTypeDoubleSum) + ms.At(2).DoubleSum().DataPoints().Append(&emptyDouble) + initMetric(ms.At(3), TestCounterIntMetricName, pdata.MetricDataTypeIntSum) + ms.At(3).IntSum().DataPoints().Append(&emptyInt) + initMetric(ms.At(4), TestDoubleHistogramMetricName, pdata.MetricDataTypeDoubleHistogram) + ms.At(4).DoubleHistogram().DataPoints().Append(&emptyDoubleHistogram) + initMetric(ms.At(5), TestIntHistogramMetricName, pdata.MetricDataTypeIntHistogram) + ms.At(5).IntHistogram().DataPoints().Append(&emptyIntHistogram) return md } @@ -328,7 +328,7 @@ func GenerateMetricsMetricTypeInvalid() data.MetricData { ms := ilm0.Metrics() ms.Resize(1) - initMetric(ms.At(0), TestCounterIntMetricName, pdata.MetricDataNone) + initMetric(ms.At(0), TestCounterIntMetricName, pdata.MetricDataTypeNone) return md } @@ -339,12 +339,12 @@ func generateMetricsOtlpAllTypesNoDataPoints() []*otlpmetrics.ResourceMetrics { InstrumentationLibraryMetrics: []*otlpmetrics.InstrumentationLibraryMetrics{ { Metrics: []*otlpmetrics.Metric{ - generateOtlpMetric(TestGaugeDoubleMetricName, pdata.MetricDataDoubleGauge), - generateOtlpMetric(TestGaugeIntMetricName, pdata.MetricDataIntGauge), - generateOtlpMetric(TestCounterDoubleMetricName, pdata.MetricDataDoubleSum), - generateOtlpMetric(TestCounterIntMetricName, pdata.MetricDataIntSum), - generateOtlpMetric(TestDoubleHistogramMetricName, pdata.MetricDataDoubleHistogram), - generateOtlpMetric(TestIntHistogramMetricName, pdata.MetricDataIntHistogram), + generateOtlpMetric(TestGaugeDoubleMetricName, pdata.MetricDataTypeDoubleGauge), + generateOtlpMetric(TestGaugeIntMetricName, pdata.MetricDataTypeIntGauge), + generateOtlpMetric(TestCounterDoubleMetricName, pdata.MetricDataTypeDoubleSum), + generateOtlpMetric(TestCounterIntMetricName, pdata.MetricDataTypeIntSum), + generateOtlpMetric(TestDoubleHistogramMetricName, pdata.MetricDataTypeDoubleHistogram), + generateOtlpMetric(TestIntHistogramMetricName, pdata.MetricDataTypeIntHistogram), }, }, }, @@ -390,9 +390,9 @@ func generateMetricsOtlpWithCountersHistograms() []*otlpmetrics.ResourceMetrics } func initCounterIntMetric(im pdata.Metric) { - initMetric(im, TestCounterIntMetricName, pdata.MetricDataIntSum) + initMetric(im, TestCounterIntMetricName, pdata.MetricDataTypeIntSum) - idps := im.IntSumData().DataPoints() + idps := im.IntSum().DataPoints() idps.Resize(2) idp0 := idps.At(0) initMetricLabels1(idp0.LabelsMap()) @@ -407,9 +407,9 @@ func initCounterIntMetric(im pdata.Metric) { } func initGaugeIntMetricOneDataPoint(im pdata.Metric) { - initMetric(im, TestGaugeIntMetricName, pdata.MetricDataIntGauge) + initMetric(im, TestGaugeIntMetricName, pdata.MetricDataTypeIntGauge) - idps := im.IntGaugeData().DataPoints() + idps := im.IntGauge().DataPoints() idps.Resize(1) idp0 := idps.At(0) initMetricLabels1(idp0.LabelsMap()) @@ -419,7 +419,7 @@ func initGaugeIntMetricOneDataPoint(im pdata.Metric) { } func generateOtlpCounterIntMetric() *otlpmetrics.Metric { - m := generateOtlpMetric(TestCounterIntMetricName, pdata.MetricDataIntSum) + m := generateOtlpMetric(TestCounterIntMetricName, pdata.MetricDataTypeIntSum) m.Data.(*otlpmetrics.Metric_IntSum).IntSum.DataPoints = []*otlpmetrics.IntDataPoint{ { @@ -439,9 +439,9 @@ func generateOtlpCounterIntMetric() *otlpmetrics.Metric { } func initSumDoubleMetric(dm pdata.Metric) { - initMetric(dm, TestCounterDoubleMetricName, pdata.MetricDataDoubleSum) + initMetric(dm, TestCounterDoubleMetricName, pdata.MetricDataTypeDoubleSum) - ddps := dm.DoubleSumData().DataPoints() + ddps := dm.DoubleSum().DataPoints() ddps.Resize(2) ddp0 := ddps.At(0) initMetricLabels12(ddp0.LabelsMap()) @@ -457,7 +457,7 @@ func initSumDoubleMetric(dm pdata.Metric) { } func generateOtlpSumDoubleMetric() *otlpmetrics.Metric { - m := generateOtlpMetric(TestCounterDoubleMetricName, pdata.MetricDataDoubleSum) + m := generateOtlpMetric(TestCounterDoubleMetricName, pdata.MetricDataTypeDoubleSum) m.Data.(*otlpmetrics.Metric_DoubleSum).DoubleSum.DataPoints = []*otlpmetrics.DoubleDataPoint{ { @@ -477,9 +477,9 @@ func generateOtlpSumDoubleMetric() *otlpmetrics.Metric { } func initDoubleHistogramMetric(hm pdata.Metric) { - initMetric(hm, TestDoubleHistogramMetricName, pdata.MetricDataDoubleHistogram) + initMetric(hm, TestDoubleHistogramMetricName, pdata.MetricDataTypeDoubleHistogram) - hdps := hm.DoubleHistogramData().DataPoints() + hdps := hm.DoubleHistogram().DataPoints() hdps.Resize(2) hdp0 := hdps.At(0) initMetricLabels13(hdp0.LabelsMap()) @@ -504,7 +504,7 @@ func initDoubleHistogramMetric(hm pdata.Metric) { } func generateOtlpDoubleHistogramMetric() *otlpmetrics.Metric { - m := generateOtlpMetric(TestDoubleHistogramMetricName, pdata.MetricDataDoubleHistogram) + m := generateOtlpMetric(TestDoubleHistogramMetricName, pdata.MetricDataTypeDoubleHistogram) m.Data.(*otlpmetrics.Metric_DoubleHistogram).DoubleHistogram.DataPoints = []*otlpmetrics.DoubleHistogramDataPoint{ { @@ -535,9 +535,9 @@ func generateOtlpDoubleHistogramMetric() *otlpmetrics.Metric { } func initIntHistogramMetric(hm pdata.Metric) { - initMetric(hm, TestIntHistogramMetricName, pdata.MetricDataIntHistogram) + initMetric(hm, TestIntHistogramMetricName, pdata.MetricDataTypeIntHistogram) - hdps := hm.IntHistogramData().DataPoints() + hdps := hm.IntHistogram().DataPoints() hdps.Resize(2) hdp0 := hdps.At(0) initMetricLabels13(hdp0.LabelsMap()) @@ -562,7 +562,7 @@ func initIntHistogramMetric(hm pdata.Metric) { } func generateOtlpIntHistogramMetric() *otlpmetrics.Metric { - m := generateOtlpMetric(TestIntHistogramMetricName, pdata.MetricDataIntHistogram) + m := generateOtlpMetric(TestIntHistogramMetricName, pdata.MetricDataTypeIntHistogram) m.Data.(*otlpmetrics.Metric_IntHistogram).IntHistogram.DataPoints = []*otlpmetrics.IntHistogramDataPoint{ { @@ -598,36 +598,36 @@ func initMetric(m pdata.Metric, name string, ty pdata.MetricDataType) { m.SetDescription("") m.SetUnit("1") switch ty { - case pdata.MetricDataIntGauge: + case pdata.MetricDataTypeIntGauge: md := pdata.NewIntGauge() md.InitEmpty() - m.SetIntGaugeData(md) - case pdata.MetricDataDoubleGauge: + m.SetIntGauge(md) + case pdata.MetricDataTypeDoubleGauge: md := pdata.NewDoubleGauge() md.InitEmpty() - m.SetDoubleGaugeData(md) - case pdata.MetricDataIntSum: + m.SetDoubleGauge(md) + case pdata.MetricDataTypeIntSum: md := pdata.NewIntSum() md.InitEmpty() md.SetIsMonotonic(true) md.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) - m.SetIntSumData(md) - case pdata.MetricDataDoubleSum: + m.SetIntSum(md) + case pdata.MetricDataTypeDoubleSum: md := pdata.NewDoubleSum() md.InitEmpty() md.SetIsMonotonic(true) md.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) - m.SetDoubleSumData(md) - case pdata.MetricDataIntHistogram: + m.SetDoubleSum(md) + case pdata.MetricDataTypeIntHistogram: md := pdata.NewIntHistogram() md.InitEmpty() md.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) - m.SetIntHistogramData(md) - case pdata.MetricDataDoubleHistogram: + m.SetIntHistogram(md) + case pdata.MetricDataTypeDoubleHistogram: md := pdata.NewDoubleHistogram() md.InitEmpty() md.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) - m.SetDoubleHistogramData(md) + m.SetDoubleHistogram(md) } } @@ -638,25 +638,25 @@ func generateOtlpMetric(name string, ty pdata.MetricDataType) *otlpmetrics.Metri Unit: "1", } switch ty { - case pdata.MetricDataIntGauge: + case pdata.MetricDataTypeIntGauge: m.Data = &otlpmetrics.Metric_IntGauge{IntGauge: &otlpmetrics.IntGauge{}} - case pdata.MetricDataDoubleGauge: + case pdata.MetricDataTypeDoubleGauge: m.Data = &otlpmetrics.Metric_DoubleGauge{DoubleGauge: &otlpmetrics.DoubleGauge{}} - case pdata.MetricDataIntSum: + case pdata.MetricDataTypeIntSum: m.Data = &otlpmetrics.Metric_IntSum{IntSum: &otlpmetrics.IntSum{ IsMonotonic: true, AggregationTemporality: otlpmetrics.AggregationTemporality_AGGREGATION_TEMPORALITY_CUMULATIVE, }} - case pdata.MetricDataDoubleSum: + case pdata.MetricDataTypeDoubleSum: m.Data = &otlpmetrics.Metric_DoubleSum{DoubleSum: &otlpmetrics.DoubleSum{ IsMonotonic: true, AggregationTemporality: otlpmetrics.AggregationTemporality_AGGREGATION_TEMPORALITY_CUMULATIVE, }} - case pdata.MetricDataIntHistogram: + case pdata.MetricDataTypeIntHistogram: m.Data = &otlpmetrics.Metric_IntHistogram{IntHistogram: &otlpmetrics.IntHistogram{ AggregationTemporality: otlpmetrics.AggregationTemporality_AGGREGATION_TEMPORALITY_CUMULATIVE, }} - case pdata.MetricDataDoubleHistogram: + case pdata.MetricDataTypeDoubleHistogram: m.Data = &otlpmetrics.Metric_DoubleHistogram{DoubleHistogram: &otlpmetrics.DoubleHistogram{ AggregationTemporality: otlpmetrics.AggregationTemporality_AGGREGATION_TEMPORALITY_CUMULATIVE, }} diff --git a/translator/internaldata/metrics_to_oc.go b/translator/internaldata/metrics_to_oc.go index 7adfa4edb7e..f4da10f1dbc 100644 --- a/translator/internaldata/metrics_to_oc.go +++ b/translator/internaldata/metrics_to_oc.go @@ -110,18 +110,18 @@ func collectLabelKeys(metric pdata.Metric) *labelKeys { keySet := make(map[string]struct{}) switch metric.DataType() { - case pdata.MetricDataIntGauge: - collectLabelKeysIntDataPoints(metric.IntGaugeData().DataPoints(), keySet) - case pdata.MetricDataDoubleGauge: - collectLabelKeysDoubleDataPoints(metric.DoubleGaugeData().DataPoints(), keySet) - case pdata.MetricDataIntSum: - collectLabelKeysIntDataPoints(metric.IntSumData().DataPoints(), keySet) - case pdata.MetricDataDoubleSum: - collectLabelKeysDoubleDataPoints(metric.DoubleSumData().DataPoints(), keySet) - case pdata.MetricDataIntHistogram: - collectLabelKeysIntHistogramDataPoints(metric.IntHistogramData().DataPoints(), keySet) - case pdata.MetricDataDoubleHistogram: - collectLabelKeysDoubleHistogramDataPoints(metric.DoubleHistogramData().DataPoints(), keySet) + case pdata.MetricDataTypeIntGauge: + collectLabelKeysIntDataPoints(metric.IntGauge().DataPoints(), keySet) + case pdata.MetricDataTypeDoubleGauge: + collectLabelKeysDoubleDataPoints(metric.DoubleGauge().DataPoints(), keySet) + case pdata.MetricDataTypeIntSum: + collectLabelKeysIntDataPoints(metric.IntSum().DataPoints(), keySet) + case pdata.MetricDataTypeDoubleSum: + collectLabelKeysDoubleDataPoints(metric.DoubleSum().DataPoints(), keySet) + case pdata.MetricDataTypeIntHistogram: + collectLabelKeysIntHistogramDataPoints(metric.IntHistogram().DataPoints(), keySet) + case pdata.MetricDataTypeDoubleHistogram: + collectLabelKeysDoubleHistogramDataPoints(metric.DoubleHistogram().DataPoints(), keySet) } if len(keySet) == 0 { @@ -217,30 +217,30 @@ func descriptorToOC(metric pdata.Metric, labelKeys *labelKeys) *ocmetrics.Metric func descriptorTypeToOC(metric pdata.Metric) ocmetrics.MetricDescriptor_Type { switch metric.DataType() { - case pdata.MetricDataIntGauge: + case pdata.MetricDataTypeIntGauge: return ocmetrics.MetricDescriptor_GAUGE_INT64 - case pdata.MetricDataDoubleGauge: + case pdata.MetricDataTypeDoubleGauge: return ocmetrics.MetricDescriptor_GAUGE_DOUBLE - case pdata.MetricDataIntSum: - sd := metric.IntSumData() + case pdata.MetricDataTypeIntSum: + sd := metric.IntSum() if sd.IsMonotonic() || sd.AggregationTemporality() == pdata.AggregationTemporalityCumulative { return ocmetrics.MetricDescriptor_CUMULATIVE_INT64 } return ocmetrics.MetricDescriptor_GAUGE_INT64 - case pdata.MetricDataDoubleSum: - sd := metric.DoubleSumData() + case pdata.MetricDataTypeDoubleSum: + sd := metric.DoubleSum() if sd.IsMonotonic() || sd.AggregationTemporality() == pdata.AggregationTemporalityCumulative { return ocmetrics.MetricDescriptor_CUMULATIVE_DOUBLE } return ocmetrics.MetricDescriptor_GAUGE_DOUBLE - case pdata.MetricDataDoubleHistogram: - hd := metric.DoubleHistogramData() + case pdata.MetricDataTypeDoubleHistogram: + hd := metric.DoubleHistogram() if hd.AggregationTemporality() == pdata.AggregationTemporalityCumulative { return ocmetrics.MetricDescriptor_CUMULATIVE_DISTRIBUTION } return ocmetrics.MetricDescriptor_GAUGE_DISTRIBUTION - case pdata.MetricDataIntHistogram: - hd := metric.IntHistogramData() + case pdata.MetricDataTypeIntHistogram: + hd := metric.IntHistogram() if hd.AggregationTemporality() == pdata.AggregationTemporalityCumulative { return ocmetrics.MetricDescriptor_CUMULATIVE_DISTRIBUTION } @@ -251,18 +251,18 @@ func descriptorTypeToOC(metric pdata.Metric) ocmetrics.MetricDescriptor_Type { func dataPointsToTimeseries(metric pdata.Metric, labelKeys *labelKeys) []*ocmetrics.TimeSeries { switch metric.DataType() { - case pdata.MetricDataIntGauge: - return intPointsToOC(metric.IntGaugeData().DataPoints(), labelKeys) - case pdata.MetricDataDoubleGauge: - return doublePointToOC(metric.DoubleGaugeData().DataPoints(), labelKeys) - case pdata.MetricDataIntSum: - return intPointsToOC(metric.IntSumData().DataPoints(), labelKeys) - case pdata.MetricDataDoubleSum: - return doublePointToOC(metric.DoubleSumData().DataPoints(), labelKeys) - case pdata.MetricDataIntHistogram: - return intHistogramPointToOC(metric.IntHistogramData().DataPoints(), labelKeys) - case pdata.MetricDataDoubleHistogram: - return doubleHistogramPointToOC(metric.DoubleHistogramData().DataPoints(), labelKeys) + case pdata.MetricDataTypeIntGauge: + return intPointsToOC(metric.IntGauge().DataPoints(), labelKeys) + case pdata.MetricDataTypeDoubleGauge: + return doublePointToOC(metric.DoubleGauge().DataPoints(), labelKeys) + case pdata.MetricDataTypeIntSum: + return intPointsToOC(metric.IntSum().DataPoints(), labelKeys) + case pdata.MetricDataTypeDoubleSum: + return doublePointToOC(metric.DoubleSum().DataPoints(), labelKeys) + case pdata.MetricDataTypeIntHistogram: + return intHistogramPointToOC(metric.IntHistogram().DataPoints(), labelKeys) + case pdata.MetricDataTypeDoubleHistogram: + return doubleHistogramPointToOC(metric.DoubleHistogram().DataPoints(), labelKeys) } return nil diff --git a/translator/internaldata/oc_to_metrics.go b/translator/internaldata/oc_to_metrics.go index a8227cb1528..1daae0fffb0 100644 --- a/translator/internaldata/oc_to_metrics.go +++ b/translator/internaldata/oc_to_metrics.go @@ -149,7 +149,7 @@ func ocMetricToMetrics(ocMetric *ocmetrics.Metric, metric pdata.Metric) { } descriptorType := descriptorTypeToMetrics(ocDescriptor.Type, metric) - if descriptorType == pdata.MetricDataNone { + if descriptorType == pdata.MetricDataTypeNone { pdata.NewMetric().CopyTo(metric) return } @@ -167,55 +167,55 @@ func descriptorTypeToMetrics(t ocmetrics.MetricDescriptor_Type, metric pdata.Met metric.InitEmpty() md := pdata.NewIntGauge() md.InitEmpty() - metric.SetIntGaugeData(md) - return pdata.MetricDataIntGauge + metric.SetIntGauge(md) + return pdata.MetricDataTypeIntGauge case ocmetrics.MetricDescriptor_GAUGE_DOUBLE: metric.InitEmpty() md := pdata.NewDoubleGauge() md.InitEmpty() - metric.SetDoubleGaugeData(md) - return pdata.MetricDataDoubleGauge + metric.SetDoubleGauge(md) + return pdata.MetricDataTypeDoubleGauge case ocmetrics.MetricDescriptor_CUMULATIVE_INT64: metric.InitEmpty() md := pdata.NewIntSum() md.InitEmpty() md.SetIsMonotonic(true) md.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) - metric.SetIntSumData(md) - return pdata.MetricDataIntSum + metric.SetIntSum(md) + return pdata.MetricDataTypeIntSum case ocmetrics.MetricDescriptor_CUMULATIVE_DOUBLE: metric.InitEmpty() md := pdata.NewDoubleSum() md.InitEmpty() md.SetIsMonotonic(true) md.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) - metric.SetDoubleSumData(md) - return pdata.MetricDataDoubleSum + metric.SetDoubleSum(md) + return pdata.MetricDataTypeDoubleSum case ocmetrics.MetricDescriptor_CUMULATIVE_DISTRIBUTION: metric.InitEmpty() md := pdata.NewDoubleHistogram() md.InitEmpty() md.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) - metric.SetDoubleHistogramData(md) - return pdata.MetricDataDoubleHistogram + metric.SetDoubleHistogram(md) + return pdata.MetricDataTypeDoubleHistogram } // For the moment MetricDescriptor_SUMMARY is not supported - return pdata.MetricDataNone + return pdata.MetricDataTypeNone } // setDataPoints converts OC timeseries to internal datapoints based on metric type func setDataPoints(ocMetric *ocmetrics.Metric, metric pdata.Metric) { switch metric.DataType() { - case pdata.MetricDataIntGauge: - fillIntDataPoint(ocMetric, metric.IntGaugeData().DataPoints()) - case pdata.MetricDataDoubleGauge: - fillDoubleDataPoint(ocMetric, metric.DoubleGaugeData().DataPoints()) - case pdata.MetricDataIntSum: - fillIntDataPoint(ocMetric, metric.IntSumData().DataPoints()) - case pdata.MetricDataDoubleSum: - fillDoubleDataPoint(ocMetric, metric.DoubleSumData().DataPoints()) - case pdata.MetricDataDoubleHistogram: - fillDoubleHistogramDataPoint(ocMetric, metric.DoubleHistogramData().DataPoints()) + case pdata.MetricDataTypeIntGauge: + fillIntDataPoint(ocMetric, metric.IntGauge().DataPoints()) + case pdata.MetricDataTypeDoubleGauge: + fillDoubleDataPoint(ocMetric, metric.DoubleGauge().DataPoints()) + case pdata.MetricDataTypeIntSum: + fillIntDataPoint(ocMetric, metric.IntSum().DataPoints()) + case pdata.MetricDataTypeDoubleSum: + fillDoubleDataPoint(ocMetric, metric.DoubleSum().DataPoints()) + case pdata.MetricDataTypeDoubleHistogram: + fillDoubleHistogramDataPoint(ocMetric, metric.DoubleHistogram().DataPoints()) } } diff --git a/translator/internaldata/oc_to_metrics_test.go b/translator/internaldata/oc_to_metrics_test.go index eb1872602b6..d24f1c92914 100644 --- a/translator/internaldata/oc_to_metrics_test.go +++ b/translator/internaldata/oc_to_metrics_test.go @@ -32,12 +32,12 @@ func TestOCToMetrics(t *testing.T) { allTypesNoDataPoints := testdata.GenerateMetricsAllTypesNoDataPoints() dh := allTypesNoDataPoints.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(4) ih := allTypesNoDataPoints.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(5) - ih.SetDoubleHistogramData(dh.DoubleHistogramData()) + ih.SetDoubleHistogram(dh.DoubleHistogram()) sampleMetricData := testdata.GenerateMetricsWithCountersHistograms() dh = sampleMetricData.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(2) ih = sampleMetricData.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(3) - ih.SetDoubleHistogramData(dh.DoubleHistogramData()) + ih.SetDoubleHistogram(dh.DoubleHistogram()) tests := []struct { name string