Skip to content

[pull] main from open-telemetry:main #402

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
merged 1 commit into from
May 20, 2025
Merged

[pull] main from open-telemetry:main #402

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
8 changes: 1 addition & 7 deletions sdk/include/opentelemetry/sdk/metrics/export/metric_producer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,11 @@ struct ResourceMetrics
class MetricProducer
{
public:
MetricProducer(std::unique_ptr<MetricFilter> metric_filter = nullptr)
: metric_filter_(std::move(metric_filter))
{}
MetricProducer() = default;
virtual ~MetricProducer() = default;

MetricProducer(const MetricProducer &) = delete;
MetricProducer(const MetricProducer &&) = delete;
void operator=(const MetricProducer &) = delete;
void operator=(const MetricProducer &&) = delete;

enum class Status
{
Expand All @@ -111,8 +107,6 @@ class MetricProducer
* partial failure.
*/
virtual Result Produce() noexcept = 0;

std::unique_ptr<MetricFilter> metric_filter_;
};

} // namespace metrics
Expand Down
6 changes: 3 additions & 3 deletions sdk/src/metrics/state/metric_collector.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ MetricProducer::Result MetricCollector::Produce() noexcept
ScopeMetrics scope_metrics;
scope_metrics.metric_data_ = std::move(metric_data);
scope_metrics.scope_ = meter->GetInstrumentationScope();
if (!this->metric_filter_)
if (!metric_filter_)
{
resource_metrics.scope_metric_data_.emplace_back(std::move(scope_metrics));
return true;
Expand All @@ -93,7 +93,7 @@ MetricProducer::Result MetricCollector::Produce() noexcept
opentelemetry::nostd::string_view unit = metric.instrument_descriptor.unit_;

MetricFilter::MetricFilterResult metric_filter_result =
this->metric_filter_->TestMetric(scope, name, type, unit);
metric_filter_->TestMetric(scope, name, type, unit);
if (metric_filter_result == MetricFilter::MetricFilterResult::kAccept)
{
filtered_scope_metrics.metric_data_.emplace_back(std::move(metric));
Expand All @@ -109,7 +109,7 @@ MetricProducer::Result MetricCollector::Produce() noexcept
{
const PointAttributes &attributes = point_data_attr.attributes;
MetricFilter::AttributesFilterResult attributes_filter_result =
this->metric_filter_->TestAttributes(scope, name, type, unit, attributes);
metric_filter_->TestAttributes(scope, name, type, unit, attributes);
if (attributes_filter_result == MetricFilter::AttributesFilterResult::kAccept)
{
filtered_point_data_attrs.emplace_back(std::move(point_data_attr));
Expand Down
Loading