Skip to content

Simplify SDK Configuration: Use View with default aggregation if no matching View is configured #1358

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
ThomsonTan merged 3 commits into from
Apr 30, 2022
Merged

Simplify SDK Configuration: Use View with default aggregation if no matching View is configured #1358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb7700a
default aggregation
lalitb Apr 28, 2022
babaeb2
Merge branch 'main' into default-view
lalitb Apr 28, 2022
a89fdc2
Merge branch 'main' into default-view
ThomsonTan Apr 29, 2022
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
2 changes: 1 addition & 1 deletion sdk/include/opentelemetry/sdk/metrics/view/view.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class View
public:
View(const std::string &name,
const std::string &description = "",
AggregationType aggregation_type = AggregationType::kDrop,
AggregationType aggregation_type = AggregationType::kDefault,
std::unique_ptr<opentelemetry::sdk::metrics::AttributesProcessor> attributes_processor =
std::unique_ptr<opentelemetry::sdk::metrics::AttributesProcessor>(
new opentelemetry::sdk::metrics::DefaultAttributesProcessor()))
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -64,7 +64,7 @@ class ViewRegistry
// return default view if none found;
if (!found)
{
static View view("");
static View view("otel-default-view");
if (!callback(view))
{
return false;
Expand Down
16 changes: 9 additions & 7 deletions sdk/test/metrics/view_registry_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,15 @@ TEST(ViewRegistry, FindViewsEmptyRegistry)
InstrumentationLibrary::Create("default", "1.0.0", "https://opentelemetry.io/schemas/1.7.0");
int count = 0;
ViewRegistry registry;
auto status = registry.FindViews(default_instrument_descriptor,
*default_instrumentation_lib.get(), [&count](const View &view) {
count++;
EXPECT_EQ(view.GetName(), "");
EXPECT_EQ(view.GetDescription(), "");
return true;
});
auto status =
registry.FindViews(default_instrument_descriptor, *default_instrumentation_lib.get(),
[&count](const View &view) {
count++;
EXPECT_EQ(view.GetName(), "otel-default-view");
EXPECT_EQ(view.GetDescription(), "");
EXPECT_EQ(view.GetAggregationType(), AggregationType::kDefault);
return true;
});
EXPECT_EQ(count, 1);
EXPECT_EQ(status, true);
}
Expand Down