Skip to content

Commit

Permalink
[processor/metricstransformprocessor] fix copy exponential histogram (o…
Browse files Browse the repository at this point in the history
…pen-telemetry#27410)

Fixes a bug where the wrong function was called for the exponential
histogram type during the copy operation.

Fixes open-telemetry#27409

Added a test for `combine` that covers the failing code path.
  • Loading branch information
mfranklin authored and jmsnll committed Nov 12, 2023
1 parent fc7b3ce commit e14f31b
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: 'bug_fix'

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: 'metricstransformprocessor'

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: 'Fixes a nil pointer dereference when copying an exponential histogram'

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [27409]

# (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:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [user]
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ func copyMetricDetails(from, to pmetric.Metric) {
case pmetric.MetricTypeHistogram:
to.SetEmptyHistogram().SetAggregationTemporality(from.Histogram().AggregationTemporality())
case pmetric.MetricTypeExponentialHistogram:
to.SetEmptyExponentialHistogram().SetAggregationTemporality(from.Histogram().AggregationTemporality())
to.SetEmptyExponentialHistogram().SetAggregationTemporality(from.ExponentialHistogram().AggregationTemporality())
case pmetric.MetricTypeSummary:
to.SetEmptySummary()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1161,6 +1161,25 @@ var (
addIntDatapoint(1, 1, 3, "metric", "new_label_value").build(),
},
},
{
name: "combine_exponential_histogram",
transforms: []internalTransform{
{
MetricIncludeFilter: internalFilterRegexp{
include: regexp.MustCompile("^metric(?P<namedsubmatch>[12])$"),
},
Action: Combine,
NewName: "new",
},
},
in: []pmetric.Metric{
metricBuilder(pmetric.MetricTypeExponentialHistogram, "metric1").build(),
metricBuilder(pmetric.MetricTypeExponentialHistogram, "metric2").build(),
},
out: []pmetric.Metric{
metricBuilder(pmetric.MetricTypeExponentialHistogram, "new", "namedsubmatch").build(),
},
},
{
name: "combine_error_type",
transforms: []internalTransform{
Expand Down

0 comments on commit e14f31b

Please sign in to comment.