From f31452286ce4742cb82a3059eaccb96ae8f1b0d2 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Sat, 30 Apr 2022 06:18:49 +0530 Subject: [PATCH 1/3] Simplify SDK Configuration: Use View with default aggregation if no matching View is configured (#1358) --- .../opentelemetry/sdk/metrics/view/view.h | 2 +- .../sdk/metrics/view/view_registry.h | 2 +- sdk/test/metrics/view_registry_test.cc | 16 +++++++++------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/sdk/include/opentelemetry/sdk/metrics/view/view.h b/sdk/include/opentelemetry/sdk/metrics/view/view.h index e88e7126c6..3cd9f850e1 100644 --- a/sdk/include/opentelemetry/sdk/metrics/view/view.h +++ b/sdk/include/opentelemetry/sdk/metrics/view/view.h @@ -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 attributes_processor = std::unique_ptr( new opentelemetry::sdk::metrics::DefaultAttributesProcessor())) diff --git a/sdk/include/opentelemetry/sdk/metrics/view/view_registry.h b/sdk/include/opentelemetry/sdk/metrics/view/view_registry.h index 87b842e46a..795049dd9a 100644 --- a/sdk/include/opentelemetry/sdk/metrics/view/view_registry.h +++ b/sdk/include/opentelemetry/sdk/metrics/view/view_registry.h @@ -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; diff --git a/sdk/test/metrics/view_registry_test.cc b/sdk/test/metrics/view_registry_test.cc index c3a9923c50..8151d37545 100644 --- a/sdk/test/metrics/view_registry_test.cc +++ b/sdk/test/metrics/view_registry_test.cc @@ -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); } From 8ef6764c2fa15e05f4eaf4f5c397f33740f520bf Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Sat, 30 Apr 2022 07:10:06 +0530 Subject: [PATCH 2/3] Fix class member initialization order (#1360) --- .../etw/include/opentelemetry/exporters/etw/etw_tracer.h | 4 ++-- sdk/src/metrics/meter.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer.h b/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer.h index 65fe2770f2..82bd6d726c 100644 --- a/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer.h +++ b/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer.h @@ -761,10 +761,10 @@ class Span : public opentelemetry::trace::Span const opentelemetry::trace::StartSpanOptions &options, Span *parent = nullptr) noexcept : opentelemetry::trace::Span(), + start_time_(std::chrono::system_clock::now()), owner_(owner), parent_(parent), - context_(CreateContext()), - start_time_(std::chrono::system_clock::now()) + context_(CreateContext()) { name_ = name; UNREFERENCED_PARAMETER(options); diff --git a/sdk/src/metrics/meter.cc b/sdk/src/metrics/meter.cc index d5af7f9ec9..c0b0ce7a57 100644 --- a/sdk/src/metrics/meter.cc +++ b/sdk/src/metrics/meter.cc @@ -28,7 +28,7 @@ namespace nostd = opentelemetry::nostd; Meter::Meter(std::shared_ptr meter_context, std::unique_ptr instrumentation_library) noexcept - : meter_context_{meter_context}, instrumentation_library_{std::move(instrumentation_library)} + : instrumentation_library_{std::move(instrumentation_library)}, meter_context_{meter_context} {} nostd::shared_ptr> Meter::CreateLongCounter(nostd::string_view name, From c8bd431be27c71145098a1888dc115ab34997523 Mon Sep 17 00:00:00 2001 From: Ehsan Saei <71217171+esigo@users.noreply.github.com> Date: Sat, 30 Apr 2022 19:29:13 +0200 Subject: [PATCH 3/3] codecov ignore (#1364) --- .github/.codecov.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/.codecov.yaml b/.github/.codecov.yaml index 2b3003ff57..62d96e70f1 100644 --- a/.github/.codecov.yaml +++ b/.github/.codecov.yaml @@ -33,3 +33,10 @@ comment: # to coverage report file paths. fixes: - "/home/runner/::" + +ignore: + - "docs/**/*" + - "docker/**/*" + - "examples/**/*" + - "**/test/**/*" + - "**.md" \ No newline at end of file