Skip to content

Fix oc to pdata translation for sum non-monotonic cumulative #3272

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

Merged
tigrannajaryan merged 1 commit into from
May 25, 2021
Merged

Fix oc to pdata translation for sum non-monotonic cumulative #3272

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
4 changes: 2 additions & 2 deletions translator/internaldata/metrics_to_oc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,13 +189,13 @@ func descriptorTypeToOC(metric pdata.Metric) ocmetrics.MetricDescriptor_Type {
return ocmetrics.MetricDescriptor_GAUGE_DOUBLE
case pdata.MetricDataTypeIntSum:
sd := metric.IntSum()
if sd.IsMonotonic() || sd.AggregationTemporality() == pdata.AggregationTemporalityCumulative {
if sd.IsMonotonic() && sd.AggregationTemporality() == pdata.AggregationTemporalityCumulative {
return ocmetrics.MetricDescriptor_CUMULATIVE_INT64
}
return ocmetrics.MetricDescriptor_GAUGE_INT64
case pdata.MetricDataTypeDoubleSum:
sd := metric.DoubleSum()
if sd.IsMonotonic() || sd.AggregationTemporality() == pdata.AggregationTemporalityCumulative {
if sd.IsMonotonic() && sd.AggregationTemporality() == pdata.AggregationTemporalityCumulative {
return ocmetrics.MetricDescriptor_CUMULATIVE_DOUBLE
}
return ocmetrics.MetricDescriptor_GAUGE_DOUBLE
Expand Down
121 changes: 121 additions & 0 deletions translator/internaldata/metrics_to_oc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,3 +163,124 @@ func generateOCTestData() *agentmetricspb.ExportMetricsServiceRequest {
},
}
}

func TestMetricsType(t *testing.T) {
tests := []struct {
name string
internal func() pdata.Metric
descType ocmetrics.MetricDescriptor_Type
}{
{
name: "int-gauge",
internal: func() pdata.Metric {
m := pdata.NewMetric()
m.SetDataType(pdata.MetricDataTypeIntGauge)
return m
},
descType: ocmetrics.MetricDescriptor_GAUGE_INT64,
},
{
name: "double-gauge",
internal: func() pdata.Metric {
m := pdata.NewMetric()
m.SetDataType(pdata.MetricDataTypeDoubleGauge)
return m
},
descType: ocmetrics.MetricDescriptor_GAUGE_DOUBLE,
},
{
name: "int-non-monotonic-delta-sum",
internal: func() pdata.Metric {
m := pdata.NewMetric()
m.SetDataType(pdata.MetricDataTypeIntSum)
m.IntSum().SetIsMonotonic(false)
m.IntSum().SetAggregationTemporality(pdata.AggregationTemporalityDelta)
return m
},
descType: ocmetrics.MetricDescriptor_GAUGE_INT64,
},
{
name: "int-non-monotonic-cumulative-sum",
internal: func() pdata.Metric {
m := pdata.NewMetric()
m.SetDataType(pdata.MetricDataTypeIntSum)
m.IntSum().SetIsMonotonic(false)
m.IntSum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative)
return m
},
descType: ocmetrics.MetricDescriptor_GAUGE_INT64,
},
{
name: "int-monotonic-delta-sum",
internal: func() pdata.Metric {
m := pdata.NewMetric()
m.SetDataType(pdata.MetricDataTypeIntSum)
m.IntSum().SetIsMonotonic(true)
m.IntSum().SetAggregationTemporality(pdata.AggregationTemporalityDelta)
return m
},
descType: ocmetrics.MetricDescriptor_GAUGE_INT64,
},
{
name: "int-monotonic-cumulative-sum",
internal: func() pdata.Metric {
m := pdata.NewMetric()
m.SetDataType(pdata.MetricDataTypeIntSum)
m.IntSum().SetIsMonotonic(true)
m.IntSum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative)
return m
},
descType: ocmetrics.MetricDescriptor_CUMULATIVE_INT64,
},
{
name: "double-non-monotonic-delta-sum",
internal: func() pdata.Metric {
m := pdata.NewMetric()
m.SetDataType(pdata.MetricDataTypeDoubleSum)
m.DoubleSum().SetIsMonotonic(false)
m.DoubleSum().SetAggregationTemporality(pdata.AggregationTemporalityDelta)
return m
},
descType: ocmetrics.MetricDescriptor_GAUGE_DOUBLE,
},
{
name: "double-non-monotonic-cumulative-sum",
internal: func() pdata.Metric {
m := pdata.NewMetric()
m.SetDataType(pdata.MetricDataTypeDoubleSum)
m.DoubleSum().SetIsMonotonic(false)
m.DoubleSum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative)
return m
},
descType: ocmetrics.MetricDescriptor_GAUGE_DOUBLE,
},
{
name: "double-monotonic-delta-sum",
internal: func() pdata.Metric {
m := pdata.NewMetric()
m.SetDataType(pdata.MetricDataTypeDoubleSum)
m.DoubleSum().SetIsMonotonic(true)
m.DoubleSum().SetAggregationTemporality(pdata.AggregationTemporalityDelta)
return m
},
descType: ocmetrics.MetricDescriptor_GAUGE_DOUBLE,
},
{
name: "double-monotonic-cumulative-sum",
internal: func() pdata.Metric {
m := pdata.NewMetric()
m.SetDataType(pdata.MetricDataTypeDoubleSum)
m.DoubleSum().SetIsMonotonic(true)
m.DoubleSum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative)
return m
},
descType: ocmetrics.MetricDescriptor_CUMULATIVE_DOUBLE,
},
}

for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
assert.Equal(t, test.descType, descriptorTypeToOC(test.internal()))
})
}
}