From 2a70e0434956622f7f4f9e7bc96999760a494885 Mon Sep 17 00:00:00 2001 From: Matt Franklin Date: Fri, 22 Sep 2023 16:05:38 -0600 Subject: [PATCH 1/3] Fixed histogram type --- .../metrics_transform_processor_otlp.go | 2 +- ...etrics_transform_processor_testcases_test.go | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/processor/metricstransformprocessor/metrics_transform_processor_otlp.go b/processor/metricstransformprocessor/metrics_transform_processor_otlp.go index 3a6e11166398..c102cc9c9048 100644 --- a/processor/metricstransformprocessor/metrics_transform_processor_otlp.go +++ b/processor/metricstransformprocessor/metrics_transform_processor_otlp.go @@ -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() } diff --git a/processor/metricstransformprocessor/metrics_transform_processor_testcases_test.go b/processor/metricstransformprocessor/metrics_transform_processor_testcases_test.go index 9363541420b9..84f324170aab 100644 --- a/processor/metricstransformprocessor/metrics_transform_processor_testcases_test.go +++ b/processor/metricstransformprocessor/metrics_transform_processor_testcases_test.go @@ -1161,6 +1161,23 @@ var ( addIntDatapoint(1, 1, 3, "metric", "new_label_value").build(), }, }, + { + name: "combine_exponential_histogram", + transforms: []internalTransform{ + { + MetricIncludeFilter: internalFilterRegexp{include: regexp.MustCompile("^metric(?P[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{ From 62327929328356f8b5de071c74cb506e955591d4 Mon Sep 17 00:00:00 2001 From: Matt Franklin Date: Tue, 3 Oct 2023 11:08:57 -0600 Subject: [PATCH 2/3] Updated formatting --- .../metrics_transform_processor_testcases_test.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/processor/metricstransformprocessor/metrics_transform_processor_testcases_test.go b/processor/metricstransformprocessor/metrics_transform_processor_testcases_test.go index 84f324170aab..0c7861732169 100644 --- a/processor/metricstransformprocessor/metrics_transform_processor_testcases_test.go +++ b/processor/metricstransformprocessor/metrics_transform_processor_testcases_test.go @@ -1165,9 +1165,11 @@ var ( name: "combine_exponential_histogram", transforms: []internalTransform{ { - MetricIncludeFilter: internalFilterRegexp{include: regexp.MustCompile("^metric(?P[12])$")}, - Action: Combine, - NewName: "new", + MetricIncludeFilter: internalFilterRegexp{ + include: regexp.MustCompile("^metric(?P[12])$"), + }, + Action: Combine, + NewName: "new", }, }, in: []pmetric.Metric{ From f5c59868d4b965baa3d0e268486795306ff678a0 Mon Sep 17 00:00:00 2001 From: Matt Franklin Date: Thu, 5 Oct 2023 11:54:50 -0600 Subject: [PATCH 3/3] Added changelog entry --- ...mprocessor-copy-exponential-histogram.yaml | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100755 .chloggen/fix-metricstransformprocessor-copy-exponential-histogram.yaml diff --git a/.chloggen/fix-metricstransformprocessor-copy-exponential-histogram.yaml b/.chloggen/fix-metricstransformprocessor-copy-exponential-histogram.yaml new file mode 100755 index 000000000000..4c24a0af5814 --- /dev/null +++ b/.chloggen/fix-metricstransformprocessor-copy-exponential-histogram.yaml @@ -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]