Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename getters for oneof and metricdata types #1675

Merged
merged 1 commit into from
Aug 30, 2020
Merged

Rename getters for oneof and metricdata types #1675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 46 additions & 46 deletions consumer/pdata/metric.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
Expand All @@ -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,
}
Expand Down
24 changes: 12 additions & 12 deletions internal/data/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
}
}
Expand Down
32 changes: 16 additions & 16 deletions internal/data/metrics_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)

Expand All @@ -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)
Expand Down Expand Up @@ -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())
Expand All @@ -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())
Expand All @@ -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())
Expand Down Expand Up @@ -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())
Expand Down Expand Up @@ -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())
Expand Down Expand Up @@ -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())
Expand Down Expand Up @@ -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)
}
}
Expand All @@ -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)
}
}
Expand All @@ -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)
}
}
Expand Down
Loading