Skip to content

Move implementation from SDK header files to SDK cc #3887

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

Open
perhapsmaple wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Move implementation from SDK header files to SDK cc #3887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0dd2fc6
Move implementation from SDK header files to SDK cc
perhapsmaple Feb 23, 2026
44547f1
Fix empty_attributes bazel build
perhapsmaple Mar 3, 2026
5a90668
Move view_registry and drop_aggregation to cc files
perhapsmaple Mar 3, 2026
67b20a1
Move multi_recordable and span_data to cc files
perhapsmaple Mar 3, 2026
9cde07e
Fix CMake build
perhapsmaple Mar 3, 2026
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
13 changes: 2 additions & 11 deletions sdk/include/opentelemetry/sdk/common/empty_attributes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include <utility>

#include "opentelemetry/common/key_value_iterable_view.h"
#include "opentelemetry/common/macros.h"
#include "opentelemetry/version.h"

OPENTELEMETRY_BEGIN_NAMESPACE
Expand All @@ -20,17 +19,9 @@ namespace sdk
* This helps to avoid constructing a new empty container every time a call is made
* with default attributes.
*/
static const opentelemetry::common::KeyValueIterableView<
const opentelemetry::common::KeyValueIterableView<
std::array<std::pair<std::string, int32_t>, 0>> &
GetEmptyAttributes() noexcept
{
static const std::array<std::pair<std::string, int32_t>, 0> array{};
static const opentelemetry::common::KeyValueIterableView<
std::array<std::pair<std::string, int32_t>, 0>>
kEmptyAttributes(array);

return kEmptyAttributes;
}
GetEmptyAttributes() noexcept;

} // namespace sdk
OPENTELEMETRY_END_NAMESPACE
22 changes: 6 additions & 16 deletions sdk/include/opentelemetry/sdk/metrics/aggregation/drop_aggregation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,17 @@ class DropAggregation : public Aggregation
public:
DropAggregation() = default;

DropAggregation(const DropPointData &) {}
DropAggregation(const DropPointData &);

void Aggregate(int64_t /* value */, const PointAttributes & /* attributes */) noexcept override {}

void Aggregate(double /* value */, const PointAttributes & /* attributes */) noexcept override {}

std::unique_ptr<Aggregation> Merge(const Aggregation &) const noexcept override
{
return std::unique_ptr<Aggregation>(new DropAggregation());
}

std::unique_ptr<Aggregation> Diff(const Aggregation &) const noexcept override
{
return std::unique_ptr<Aggregation>(new DropAggregation());
}

PointType ToPoint() const noexcept override
{
static DropPointData point_data;
return point_data;
}
std::unique_ptr<Aggregation> Merge(const Aggregation &) const noexcept override;

std::unique_ptr<Aggregation> Diff(const Aggregation &) const noexcept override;

PointType ToPoint() const noexcept override;
};
} // namespace metrics
} // namespace sdk
Expand Down
127 changes: 10 additions & 117 deletions sdk/include/opentelemetry/sdk/metrics/view/view_registry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,14 @@

#pragma once

#include <algorithm>
#include <cassert>
#include <memory>
#include <string>
#include <utility>
#include <vector>

#include "opentelemetry/nostd/function_ref.h"
#include "opentelemetry/sdk/common/global_log_handler.h"
#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
#include "opentelemetry/sdk/metrics/aggregation/default_aggregation.h"
#include "opentelemetry/sdk/metrics/instruments.h"
#include "opentelemetry/sdk/metrics/view/instrument_selector.h"
#include "opentelemetry/sdk/metrics/view/meter_selector.h"
#include "opentelemetry/sdk/metrics/view/predicate.h"
#include "opentelemetry/sdk/metrics/view/view.h"
#include "opentelemetry/version.h"

Expand All @@ -31,11 +24,8 @@ struct RegisteredView
RegisteredView(
std::unique_ptr<opentelemetry::sdk::metrics::InstrumentSelector> instrument_selector,
std::unique_ptr<opentelemetry::sdk::metrics::MeterSelector> meter_selector,
std::unique_ptr<opentelemetry::sdk::metrics::View> view)
: instrument_selector_{std::move(instrument_selector)},
meter_selector_{std::move(meter_selector)},
view_{std::move(view)}
{}
std::unique_ptr<opentelemetry::sdk::metrics::View> view);

std::unique_ptr<opentelemetry::sdk::metrics::InstrumentSelector> instrument_selector_;
std::unique_ptr<opentelemetry::sdk::metrics::MeterSelector> meter_selector_;
std::unique_ptr<opentelemetry::sdk::metrics::View> view_;
Expand All @@ -44,125 +34,28 @@ struct RegisteredView
class ViewRegistry
{
public:
ViewRegistry() = default;
~ViewRegistry() = default;

void AddView(std::unique_ptr<opentelemetry::sdk::metrics::InstrumentSelector> instrument_selector,
std::unique_ptr<opentelemetry::sdk::metrics::MeterSelector> meter_selector,
std::unique_ptr<opentelemetry::sdk::metrics::View> view)
{
// TBD - thread-safe ?

// Validate parameters
if (!instrument_selector || !meter_selector || !view)
{
OTEL_INTERNAL_LOG_ERROR(
"[ViewRegistry::AddView] Invalid parameters: instrument_selector, meter_selector, and "
"view cannot be null. Ignoring AddView call.");
return;
}

auto aggregation_config = view->GetAggregationConfig();
if (aggregation_config)
{
bool valid = false;
auto aggregation_config_type = aggregation_config->GetType();
auto aggregation_type = view->GetAggregationType();

if (aggregation_type == AggregationType::kDefault)
{
bool is_monotonic;
aggregation_type = DefaultAggregation::GetDefaultAggregationType(
instrument_selector->GetInstrumentType(), is_monotonic);
}

switch (aggregation_type)
{
case AggregationType::kHistogram:
valid = (aggregation_config_type == AggregationType::kHistogram);
break;

case AggregationType::kBase2ExponentialHistogram:
valid = (aggregation_config_type == AggregationType::kBase2ExponentialHistogram);
break;

case AggregationType::kDrop:
case AggregationType::kLastValue:
case AggregationType::kSum:
valid = (aggregation_config_type == AggregationType::kDefault);
break;

default:
// Unreachable: all AggregationType enum values are handled above
assert(false && "Unreachable: unhandled AggregationType");
valid = false;
}

if (!valid)
{
OTEL_INTERNAL_LOG_ERROR(
"[ViewRegistry::AddView] AggregationType and AggregationConfig type mismatch. "
"Ignoring AddView call.");
return;
}
}

auto registered_view = std::unique_ptr<RegisteredView>(new RegisteredView{
std::move(instrument_selector), std::move(meter_selector), std::move(view)});
registered_views_.push_back(std::move(registered_view));
}
std::unique_ptr<opentelemetry::sdk::metrics::View> view);

bool FindViews(
const opentelemetry::sdk::metrics::InstrumentDescriptor &instrument_descriptor,
const opentelemetry::sdk::instrumentationscope::InstrumentationScope &instrumentation_scope,
nostd::function_ref<bool(const View &)> callback) const
{
bool found = false;
for (auto const &registered_view : registered_views_)
{
if (MatchMeter(registered_view->meter_selector_.get(), instrumentation_scope) &&
MatchInstrument(registered_view->instrument_selector_.get(), instrument_descriptor))
{
found = true;
if (!callback(*(registered_view->view_.get())))
{
return false;
}
}
}
// return default view if none found;
if (!found)
{
static const View view("");
if (!callback(view))
{
return false;
}
}
return true;
}

ViewRegistry() = default;
~ViewRegistry() = default;
nostd::function_ref<bool(const View &)> callback) const;

private:
std::vector<std::unique_ptr<RegisteredView>> registered_views_;

static bool MatchMeter(
opentelemetry::sdk::metrics::MeterSelector *selector,
const opentelemetry::sdk::instrumentationscope::InstrumentationScope &instrumentation_scope)
{
return selector->GetNameFilter()->Match(instrumentation_scope.GetName()) &&
(instrumentation_scope.GetVersion().size() == 0 ||
selector->GetVersionFilter()->Match(instrumentation_scope.GetVersion())) &&
(instrumentation_scope.GetSchemaURL().size() == 0 ||
selector->GetSchemaFilter()->Match(instrumentation_scope.GetSchemaURL()));
}
const opentelemetry::sdk::instrumentationscope::InstrumentationScope &instrumentation_scope);

static bool MatchInstrument(
opentelemetry::sdk::metrics::InstrumentSelector *selector,
const opentelemetry::sdk::metrics::InstrumentDescriptor &instrument_descriptor)
{
return selector->GetNameFilter()->Match(instrument_descriptor.name_) &&
selector->GetUnitFilter()->Match(instrument_descriptor.unit_) &&
(selector->GetInstrumentType() == instrument_descriptor.type_);
}
const opentelemetry::sdk::metrics::InstrumentDescriptor &instrument_descriptor);
};
} // namespace metrics
} // namespace sdk
Expand Down
Loading
Loading