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.

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

[pkg/otlp/metrics] Fix empty exponential histogram mapping #158

Merged
merged 1 commit into from
Aug 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 16 additions & 0 deletions .chloggen/mx-psi_emptyexpohisto.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix

# The name of the component (e.g. pkg/quantile)
component: pkg/otlp/metrics

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Empty OTLP Exponential Histograms are now dropped instead of causing a crash

# The PR related to this change
issues: [158]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
1 change: 1 addition & 0 deletions pkg/otlp/metrics/exponential_histograms_translator.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ func (t *Translator) mapExponentialHistogramMetrics(
zap.String("metric name", dims.name),
zap.Error(err),
)
continue
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the actual fix, we were not skipping the point when the quantile package errored out

}

if histInfo.ok {
Expand Down
13 changes: 13 additions & 0 deletions pkg/otlp/metrics/histograms_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,19 @@ func TestExponentialHistogramTranslatorOptions(t *testing.T) {
expectedUnknownMetricType: 1,
expectedUnsupportedAggregationTemporality: 1,
},
{
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/26103
name: "empty-delta-issue-26103",
otlpfile: "testdata/otlpdata/histogram/empty-delta-exponential.json",
ddogfile: "testdata/datadogdata/histogram/empty-delta-exponential.json",
},
{
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/26103
name: "empty-cumulative-issue-26103",
otlpfile: "testdata/otlpdata/histogram/empty-cumulative-exponential.json",
ddogfile: "testdata/datadogdata/histogram/empty-cumulative-exponential.json",
expectedUnsupportedAggregationTemporality: 1,
},
{
name: "resource-attributes-as-tags",
otlpfile: "testdata/otlpdata/histogram/simple-exponential.json",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"resourceMetrics":[
{
"resource":{

},
"scopeMetrics":[
{
"scope":{

},
"metrics":[
{
"name": "empty.exponential.cumulative.histogram",
"exponentialHistogram":{
"dataPoints":[
{
"startTimeUnixNano":"1693305960229586125",
"timeUnixNano":"1693305970229586125",
"sum":0,
"scale":4,
"positive":{

},
"negative":{

}
}
],
"aggregationTemporality":2
}
}
]
}
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"resourceMetrics":[
{
"resource":{

},
"scopeMetrics":[
{
"scope":{

},
"metrics":[
{
"name": "empty.exponential.delta.histogram",
"exponentialHistogram":{
"dataPoints":[
{
"startTimeUnixNano":"1693305960229586125",
"timeUnixNano":"1693305970229586125",
"sum":0,
"scale":4,
"positive":{

},
"negative":{

}
}
],
"aggregationTemporality":1
}
}
]
}
]
}
]
}
Loading