Skip to content

Commit 29ac517

Browse files
authored
[SDK] Fix MetricProducer interface (#3413)
1 parent 2faa400 commit 29ac517

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

sdk/include/opentelemetry/sdk/metrics/export/metric_producer.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,11 @@ struct ResourceMetrics
8282
class MetricProducer
8383
{
8484
public:
85-
MetricProducer(std::unique_ptr<MetricFilter> metric_filter = nullptr)
86-
: metric_filter_(std::move(metric_filter))
87-
{}
85+
MetricProducer() = default;
8886
virtual ~MetricProducer() = default;
8987

9088
MetricProducer(const MetricProducer &) = delete;
9189
MetricProducer(const MetricProducer &&) = delete;
92-
void operator=(const MetricProducer &) = delete;
93-
void operator=(const MetricProducer &&) = delete;
9490

9591
enum class Status
9692
{
@@ -111,8 +107,6 @@ class MetricProducer
111107
* partial failure.
112108
*/
113109
virtual Result Produce() noexcept = 0;
114-
115-
std::unique_ptr<MetricFilter> metric_filter_;
116110
};
117111

118112
} // namespace metrics

sdk/src/metrics/state/metric_collector.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ MetricProducer::Result MetricCollector::Produce() noexcept
7676
ScopeMetrics scope_metrics;
7777
scope_metrics.metric_data_ = std::move(metric_data);
7878
scope_metrics.scope_ = meter->GetInstrumentationScope();
79-
if (!this->metric_filter_)
79+
if (!metric_filter_)
8080
{
8181
resource_metrics.scope_metric_data_.emplace_back(std::move(scope_metrics));
8282
return true;
@@ -93,7 +93,7 @@ MetricProducer::Result MetricCollector::Produce() noexcept
9393
opentelemetry::nostd::string_view unit = metric.instrument_descriptor.unit_;
9494

9595
MetricFilter::MetricFilterResult metric_filter_result =
96-
this->metric_filter_->TestMetric(scope, name, type, unit);
96+
metric_filter_->TestMetric(scope, name, type, unit);
9797
if (metric_filter_result == MetricFilter::MetricFilterResult::kAccept)
9898
{
9999
filtered_scope_metrics.metric_data_.emplace_back(std::move(metric));
@@ -109,7 +109,7 @@ MetricProducer::Result MetricCollector::Produce() noexcept
109109
{
110110
const PointAttributes &attributes = point_data_attr.attributes;
111111
MetricFilter::AttributesFilterResult attributes_filter_result =
112-
this->metric_filter_->TestAttributes(scope, name, type, unit, attributes);
112+
metric_filter_->TestAttributes(scope, name, type, unit, attributes);
113113
if (attributes_filter_result == MetricFilter::AttributesFilterResult::kAccept)
114114
{
115115
filtered_point_data_attrs.emplace_back(std::move(point_data_attr));

0 commit comments

Comments
 (0)