From 574001ddd9d9c61cf028a2d4a23694e2a316657b Mon Sep 17 00:00:00 2001 From: Brandon-Kimberly Date: Sat, 22 Aug 2020 17:11:20 -0400 Subject: [PATCH 01/12] Add logic to refrain from creating records from unupdated aggs --- .../sdk/metrics/aggregator/aggregator.h | 9 ++++++ .../metrics/aggregator/counter_aggregator.h | 2 ++ .../sdk/metrics/aggregator/exact_aggregator.h | 2 ++ .../sdk/metrics/aggregator/gauge_aggregator.h | 2 ++ .../metrics/aggregator/histogram_aggregator.h | 4 ++- .../aggregator/min_max_sum_count_aggregator.h | 2 ++ .../metrics/aggregator/sketch_aggregator.h | 2 ++ .../sdk/metrics/sync_instruments.h | 21 +++++++++---- sdk/test/metrics/metric_instrument_test.cc | 30 +++++++++++++++++++ 9 files changed, 67 insertions(+), 7 deletions(-) diff --git a/sdk/include/opentelemetry/sdk/metrics/aggregator/aggregator.h b/sdk/include/opentelemetry/sdk/metrics/aggregator/aggregator.h index b997514208..8c487a090b 100644 --- a/sdk/include/opentelemetry/sdk/metrics/aggregator/aggregator.h +++ b/sdk/include/opentelemetry/sdk/metrics/aggregator/aggregator.h @@ -97,6 +97,14 @@ class Aggregator */ virtual AggregatorKind get_aggregator_kind() final { return agg_kind_; } + /** + * Getter function for updated_ protected var + * + * @return A bool indicating wether or not this aggregator has been updated + * in the most recent collection interval. + */ + bool is_updated() final { return updated_; } + // virtual function to be overriden for the Histogram Aggregator virtual std::vector get_boundaries() { return std::vector(); } @@ -134,6 +142,7 @@ class Aggregator opentelemetry::metrics::InstrumentKind kind_; std::mutex mu_; AggregatorKind agg_kind_; + bool updated_; }; } // namespace metrics diff --git a/sdk/include/opentelemetry/sdk/metrics/aggregator/counter_aggregator.h b/sdk/include/opentelemetry/sdk/metrics/aggregator/counter_aggregator.h index ebd0201ef0..a82cf40766 100644 --- a/sdk/include/opentelemetry/sdk/metrics/aggregator/counter_aggregator.h +++ b/sdk/include/opentelemetry/sdk/metrics/aggregator/counter_aggregator.h @@ -36,6 +36,7 @@ class CounterAggregator final : public Aggregator void update(T val) override { this->mu_.lock(); + this->updated_ = true; this->values_[0] += val; // atomic operation this->mu_.unlock(); } @@ -50,6 +51,7 @@ class CounterAggregator final : public Aggregator void checkpoint() override { this->mu_.lock(); + this->updated_ = false; this->checkpoint_ = this->values_; this->values_[0] = 0; this->mu_.unlock(); diff --git a/sdk/include/opentelemetry/sdk/metrics/aggregator/exact_aggregator.h b/sdk/include/opentelemetry/sdk/metrics/aggregator/exact_aggregator.h index 00ec1ae12d..f1a5242c48 100644 --- a/sdk/include/opentelemetry/sdk/metrics/aggregator/exact_aggregator.h +++ b/sdk/include/opentelemetry/sdk/metrics/aggregator/exact_aggregator.h @@ -62,6 +62,7 @@ class ExactAggregator : public Aggregator void update(T val) override { this->mu_.lock(); + this->updated_ = true; this->values_.push_back(val); this->mu_.unlock(); } @@ -74,6 +75,7 @@ class ExactAggregator : public Aggregator void checkpoint() override { this->mu_.lock(); + this->updated_ = false; if (quant_estimation_) { std::sort(this->values_.begin(), this->values_.end()); diff --git a/sdk/include/opentelemetry/sdk/metrics/aggregator/gauge_aggregator.h b/sdk/include/opentelemetry/sdk/metrics/aggregator/gauge_aggregator.h index 7925f5e205..e921a73808 100644 --- a/sdk/include/opentelemetry/sdk/metrics/aggregator/gauge_aggregator.h +++ b/sdk/include/opentelemetry/sdk/metrics/aggregator/gauge_aggregator.h @@ -59,6 +59,7 @@ class GaugeAggregator : public Aggregator void update(T val) override { this->mu_.lock(); + this->updated_ = true; this->values_[0] = val; current_timestamp_ = core::SystemTimestamp(std::chrono::system_clock::now()); this->mu_.unlock(); @@ -75,6 +76,7 @@ class GaugeAggregator : public Aggregator { this->mu_.lock(); + this->updated_ = false; this->checkpoint_ = this->values_; // Reset the values to default diff --git a/sdk/include/opentelemetry/sdk/metrics/aggregator/histogram_aggregator.h b/sdk/include/opentelemetry/sdk/metrics/aggregator/histogram_aggregator.h index 9d5aafa127..07b05c247c 100644 --- a/sdk/include/opentelemetry/sdk/metrics/aggregator/histogram_aggregator.h +++ b/sdk/include/opentelemetry/sdk/metrics/aggregator/histogram_aggregator.h @@ -63,7 +63,8 @@ class HistogramAggregator final : public Aggregator void update(T val) override { this->mu_.lock(); - int bucketID = boundaries_.size(); + this->updated_ = true; + int bucketID = boundaries_.size(); for (size_t i = 0; i < boundaries_.size(); i++) { if (val < boundaries_[i]) // concurrent read is thread-safe @@ -93,6 +94,7 @@ class HistogramAggregator final : public Aggregator void checkpoint() override { this->mu_.lock(); + this->updated_ = false; this->checkpoint_ = this->values_; this->values_[0] = 0; this->values_[1] = 0; diff --git a/sdk/include/opentelemetry/sdk/metrics/aggregator/min_max_sum_count_aggregator.h b/sdk/include/opentelemetry/sdk/metrics/aggregator/min_max_sum_count_aggregator.h index b47cf0df06..08c57c998d 100644 --- a/sdk/include/opentelemetry/sdk/metrics/aggregator/min_max_sum_count_aggregator.h +++ b/sdk/include/opentelemetry/sdk/metrics/aggregator/min_max_sum_count_aggregator.h @@ -60,6 +60,7 @@ class MinMaxSumCountAggregator : public Aggregator void update(T val) override { this->mu_.lock(); + this->updated_ = true; if (this->values_[CountValueIndex] == 0 || val < this->values_[MinValueIndex]) // set min this->values_[MinValueIndex] = val; @@ -80,6 +81,7 @@ class MinMaxSumCountAggregator : public Aggregator void checkpoint() override { this->mu_.lock(); + this->updated_ = false; this->checkpoint_ = this->values_; // Reset the values this->values_[MinValueIndex] = 0; diff --git a/sdk/include/opentelemetry/sdk/metrics/aggregator/sketch_aggregator.h b/sdk/include/opentelemetry/sdk/metrics/aggregator/sketch_aggregator.h index fe0b4737ec..bc29868320 100644 --- a/sdk/include/opentelemetry/sdk/metrics/aggregator/sketch_aggregator.h +++ b/sdk/include/opentelemetry/sdk/metrics/aggregator/sketch_aggregator.h @@ -64,6 +64,7 @@ class SketchAggregator final : public Aggregator void update(T val) override { this->mu_.lock(); + this->updated_ = true; int idx; if (val == 0) { @@ -130,6 +131,7 @@ class SketchAggregator final : public Aggregator void checkpoint() override { this->mu_.lock(); + this->updated_ = false; this->checkpoint_ = this->values_; checkpoint_raw_ = raw_; this->values_[0] = 0; diff --git a/sdk/include/opentelemetry/sdk/metrics/sync_instruments.h b/sdk/include/opentelemetry/sdk/metrics/sync_instruments.h index 2c0931eeb2..1800dbbcbf 100644 --- a/sdk/include/opentelemetry/sdk/metrics/sync_instruments.h +++ b/sdk/include/opentelemetry/sdk/metrics/sync_instruments.h @@ -149,8 +149,11 @@ class Counter final : public SynchronousInstrument, public metrics_api::Count toDelete.push_back(x.first); } auto agg_ptr = dynamic_cast *>(x.second.get())->GetAggregator(); - agg_ptr->checkpoint(); - ret.push_back(Record(x.second->GetName(), x.second->GetDescription(), x.first, agg_ptr)); + if (x.second->is_updated()) + { + agg_ptr->checkpoint(); + ret.push_back(Record(x.second->GetName(), x.second->GetDescription(), x.first, agg_ptr)); + } } for (const auto &x : toDelete) { @@ -273,8 +276,11 @@ class UpDownCounter final : public SynchronousInstrument, public metrics_api: toDelete.push_back(x.first); } auto agg_ptr = dynamic_cast *>(x.second.get())->GetAggregator(); - agg_ptr->checkpoint(); - ret.push_back(Record(x.second->GetName(), x.second->GetDescription(), x.first, agg_ptr)); + if (x.second->is_updated()) + { + agg_ptr->checkpoint(); + ret.push_back(Record(x.second->GetName(), x.second->GetDescription(), x.first, agg_ptr)); + } } for (const auto &x : toDelete) { @@ -396,8 +402,11 @@ class ValueRecorder final : public SynchronousInstrument, public metrics_api: toDelete.push_back(x.first); } auto agg_ptr = dynamic_cast *>(x.second.get())->GetAggregator(); - agg_ptr->checkpoint(); - ret.push_back(Record(x.second->GetName(), x.second->GetDescription(), x.first, agg_ptr)); + if (x.second->is_updated()) + { + agg_ptr->checkpoint(); + ret.push_back(Record(x.second->GetName(), x.second->GetDescription(), x.first, agg_ptr)); + } } for (const auto &x : toDelete) { diff --git a/sdk/test/metrics/metric_instrument_test.cc b/sdk/test/metrics/metric_instrument_test.cc index 3518c54604..acf972122e 100644 --- a/sdk/test/metrics/metric_instrument_test.cc +++ b/sdk/test/metrics/metric_instrument_test.cc @@ -435,6 +435,36 @@ TEST(IntValueRecorder, StressRecord) 125); // count } +TEST(Instruments, NoUpdateNoRecord) +{ + // This test verifies that instruments that have received no updates + // in the last collection period are not made into records for export. + + Counter alpha("alpha", "no description", "unitless", true); + std::map labels = {{"key", "value"}}; + auto labelkv = trace::KeyValueIterableView{labels}; + + EXPECT_EQ(alpha->GetRecords().size(), 0); + alpha->add(1, labelkv); + EXPECT_EQ(alpha->GetRecords().size(), 1); + + UpDownCounter beta("beta", "no description", "unitless", true); + std::map labels = {{"key", "value"}}; + auto labelkv = trace::KeyValueIterableView{labels}; + + EXPECT_EQ(alpha->GetRecords().size(), 0); + beta->add(1, labelkv); + EXPECT_EQ(alpha->GetRecords().size(), 1); + + ValueRecorder gamma("gamma", "no description", "unitless", true); + std::map labels = {{"key", "value"}}; + auto labelkv = trace::KeyValueIterableView{labels}; + + EXPECT_EQ(alpha->GetRecords().size(), 0); + beta->record(1, labelkv); + EXPECT_EQ(alpha->GetRecords().size(), 1); +} + } // namespace metrics } // namespace sdk From a61328a19fad17f87417c6f57b9b93f1414eafa5 Mon Sep 17 00:00:00 2001 From: Brandon-Kimberly Date: Sat, 22 Aug 2020 17:11:53 -0400 Subject: [PATCH 02/12] Typo --- sdk/test/metrics/metric_instrument_test.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk/test/metrics/metric_instrument_test.cc b/sdk/test/metrics/metric_instrument_test.cc index acf972122e..0388d3b32e 100644 --- a/sdk/test/metrics/metric_instrument_test.cc +++ b/sdk/test/metrics/metric_instrument_test.cc @@ -467,5 +467,4 @@ TEST(Instruments, NoUpdateNoRecord) } // namespace metrics } // namespace sdk - OPENTELEMETRY_END_NAMESPACE From 8171312959542555610fe47e27f0f5ad93d1d751 Mon Sep 17 00:00:00 2001 From: Brandon-Kimberly Date: Sat, 22 Aug 2020 17:14:06 -0400 Subject: [PATCH 03/12] Make is_updated() virtual --- sdk/include/opentelemetry/sdk/metrics/aggregator/aggregator.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/opentelemetry/sdk/metrics/aggregator/aggregator.h b/sdk/include/opentelemetry/sdk/metrics/aggregator/aggregator.h index 8c487a090b..769c560ffc 100644 --- a/sdk/include/opentelemetry/sdk/metrics/aggregator/aggregator.h +++ b/sdk/include/opentelemetry/sdk/metrics/aggregator/aggregator.h @@ -103,7 +103,7 @@ class Aggregator * @return A bool indicating wether or not this aggregator has been updated * in the most recent collection interval. */ - bool is_updated() final { return updated_; } + virtual bool is_updated() final { return updated_; } // virtual function to be overriden for the Histogram Aggregator virtual std::vector get_boundaries() { return std::vector(); } From 4d63d876c04f2404248ba766d2b5820accbe1573 Mon Sep 17 00:00:00 2001 From: Brandon-Kimberly Date: Sat, 22 Aug 2020 17:20:54 -0400 Subject: [PATCH 04/12] Replace GetRecords exemption logic pointer --- sdk/include/opentelemetry/sdk/metrics/sync_instruments.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/include/opentelemetry/sdk/metrics/sync_instruments.h b/sdk/include/opentelemetry/sdk/metrics/sync_instruments.h index 1800dbbcbf..aab0c4e86f 100644 --- a/sdk/include/opentelemetry/sdk/metrics/sync_instruments.h +++ b/sdk/include/opentelemetry/sdk/metrics/sync_instruments.h @@ -149,7 +149,7 @@ class Counter final : public SynchronousInstrument, public metrics_api::Count toDelete.push_back(x.first); } auto agg_ptr = dynamic_cast *>(x.second.get())->GetAggregator(); - if (x.second->is_updated()) + if (agg_ptr->is_updated()) { agg_ptr->checkpoint(); ret.push_back(Record(x.second->GetName(), x.second->GetDescription(), x.first, agg_ptr)); @@ -276,7 +276,7 @@ class UpDownCounter final : public SynchronousInstrument, public metrics_api: toDelete.push_back(x.first); } auto agg_ptr = dynamic_cast *>(x.second.get())->GetAggregator(); - if (x.second->is_updated()) + if (agg_ptr->is_updated()) { agg_ptr->checkpoint(); ret.push_back(Record(x.second->GetName(), x.second->GetDescription(), x.first, agg_ptr)); @@ -402,7 +402,7 @@ class ValueRecorder final : public SynchronousInstrument, public metrics_api: toDelete.push_back(x.first); } auto agg_ptr = dynamic_cast *>(x.second.get())->GetAggregator(); - if (x.second->is_updated()) + if (agg_ptr->is_updated()) { agg_ptr->checkpoint(); ret.push_back(Record(x.second->GetName(), x.second->GetDescription(), x.first, agg_ptr)); From f3824bf269208db7fd3a18809b5f5e8f44ee6dd3 Mon Sep 17 00:00:00 2001 From: Brandon-Kimberly Date: Sat, 22 Aug 2020 17:24:05 -0400 Subject: [PATCH 05/12] Fix typo --- sdk/test/metrics/metric_instrument_test.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sdk/test/metrics/metric_instrument_test.cc b/sdk/test/metrics/metric_instrument_test.cc index 0388d3b32e..2eec2ccaca 100644 --- a/sdk/test/metrics/metric_instrument_test.cc +++ b/sdk/test/metrics/metric_instrument_test.cc @@ -444,25 +444,25 @@ TEST(Instruments, NoUpdateNoRecord) std::map labels = {{"key", "value"}}; auto labelkv = trace::KeyValueIterableView{labels}; - EXPECT_EQ(alpha->GetRecords().size(), 0); - alpha->add(1, labelkv); - EXPECT_EQ(alpha->GetRecords().size(), 1); + EXPECT_EQ(alpha.GetRecords().size(), 0); + alpha.add(1, labelkv); + EXPECT_EQ(alpha.GetRecords().size(), 1); UpDownCounter beta("beta", "no description", "unitless", true); std::map labels = {{"key", "value"}}; auto labelkv = trace::KeyValueIterableView{labels}; - EXPECT_EQ(alpha->GetRecords().size(), 0); - beta->add(1, labelkv); - EXPECT_EQ(alpha->GetRecords().size(), 1); + EXPECT_EQ(alpha.GetRecords().size(), 0); + beta.add(1, labelkv); + EXPECT_EQ(alpha.GetRecords().size(), 1); ValueRecorder gamma("gamma", "no description", "unitless", true); std::map labels = {{"key", "value"}}; auto labelkv = trace::KeyValueIterableView{labels}; - EXPECT_EQ(alpha->GetRecords().size(), 0); - beta->record(1, labelkv); - EXPECT_EQ(alpha->GetRecords().size(), 1); + EXPECT_EQ(alpha.GetRecords().size(), 0); + beta.record(1, labelkv); + EXPECT_EQ(alpha.GetRecords().size(), 1); } } // namespace metrics From fd87a6a8eaae10142c39910e6ff40522ea7c4afd Mon Sep 17 00:00:00 2001 From: Brandon-Kimberly Date: Sat, 22 Aug 2020 17:27:25 -0400 Subject: [PATCH 06/12] Fix typo --- sdk/test/metrics/metric_instrument_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/test/metrics/metric_instrument_test.cc b/sdk/test/metrics/metric_instrument_test.cc index 2eec2ccaca..b40decd967 100644 --- a/sdk/test/metrics/metric_instrument_test.cc +++ b/sdk/test/metrics/metric_instrument_test.cc @@ -461,7 +461,7 @@ TEST(Instruments, NoUpdateNoRecord) auto labelkv = trace::KeyValueIterableView{labels}; EXPECT_EQ(alpha.GetRecords().size(), 0); - beta.record(1, labelkv); + gamma.record(1, labelkv); EXPECT_EQ(alpha.GetRecords().size(), 1); } From 8894dc1ff623d7f9c99589d02f36705aa28e5de8 Mon Sep 17 00:00:00 2001 From: Brandon-Kimberly Date: Sat, 22 Aug 2020 17:34:22 -0400 Subject: [PATCH 07/12] Remove extraneous initializations in test --- sdk/test/metrics/metric_instrument_test.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sdk/test/metrics/metric_instrument_test.cc b/sdk/test/metrics/metric_instrument_test.cc index b40decd967..008ca384d3 100644 --- a/sdk/test/metrics/metric_instrument_test.cc +++ b/sdk/test/metrics/metric_instrument_test.cc @@ -449,16 +449,12 @@ TEST(Instruments, NoUpdateNoRecord) EXPECT_EQ(alpha.GetRecords().size(), 1); UpDownCounter beta("beta", "no description", "unitless", true); - std::map labels = {{"key", "value"}}; - auto labelkv = trace::KeyValueIterableView{labels}; EXPECT_EQ(alpha.GetRecords().size(), 0); beta.add(1, labelkv); EXPECT_EQ(alpha.GetRecords().size(), 1); ValueRecorder gamma("gamma", "no description", "unitless", true); - std::map labels = {{"key", "value"}}; - auto labelkv = trace::KeyValueIterableView{labels}; EXPECT_EQ(alpha.GetRecords().size(), 0); gamma.record(1, labelkv); From 12832c07c1194bfc8bd971dc07bb64477c84d970 Mon Sep 17 00:00:00 2001 From: Brandon-Kimberly Date: Sat, 22 Aug 2020 17:54:09 -0400 Subject: [PATCH 08/12] Fix test name typos --- sdk/test/metrics/metric_instrument_test.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk/test/metrics/metric_instrument_test.cc b/sdk/test/metrics/metric_instrument_test.cc index 008ca384d3..20efd5e0c9 100644 --- a/sdk/test/metrics/metric_instrument_test.cc +++ b/sdk/test/metrics/metric_instrument_test.cc @@ -450,15 +450,15 @@ TEST(Instruments, NoUpdateNoRecord) UpDownCounter beta("beta", "no description", "unitless", true); - EXPECT_EQ(alpha.GetRecords().size(), 0); + EXPECT_EQ(beta.GetRecords().size(), 0); beta.add(1, labelkv); - EXPECT_EQ(alpha.GetRecords().size(), 1); + EXPECT_EQ(beta.GetRecords().size(), 1); ValueRecorder gamma("gamma", "no description", "unitless", true); - EXPECT_EQ(alpha.GetRecords().size(), 0); + EXPECT_EQ(gamma.GetRecords().size(), 0); gamma.record(1, labelkv); - EXPECT_EQ(alpha.GetRecords().size(), 1); + EXPECT_EQ(gamma.GetRecords().size(), 1); } } // namespace metrics From 8436220b90812e273223b230e0950abaaa008bff Mon Sep 17 00:00:00 2001 From: Brandon-Kimberly Date: Sat, 22 Aug 2020 18:04:44 -0400 Subject: [PATCH 09/12] Update test with new behavior --- sdk/test/metrics/metric_instrument_test.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/test/metrics/metric_instrument_test.cc b/sdk/test/metrics/metric_instrument_test.cc index 20efd5e0c9..af17871373 100644 --- a/sdk/test/metrics/metric_instrument_test.cc +++ b/sdk/test/metrics/metric_instrument_test.cc @@ -248,6 +248,7 @@ TEST(Counter, getAggsandnewupdate) auto labelkv = trace::KeyValueIterableView{labels}; auto beta = alpha.bindCounter(labelkv); + beta->add(1, labelkv) beta->unbind(); EXPECT_EQ(alpha.boundInstruments_[KvToString(labelkv)]->get_ref(), 0); From d78156e06c66f8cd3cf286b117ef03938b0f8df2 Mon Sep 17 00:00:00 2001 From: Brandon-Kimberly Date: Sat, 22 Aug 2020 18:08:19 -0400 Subject: [PATCH 10/12] Remove labels from bound instrument update call --- sdk/test/metrics/metric_instrument_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/test/metrics/metric_instrument_test.cc b/sdk/test/metrics/metric_instrument_test.cc index af17871373..9c480a253f 100644 --- a/sdk/test/metrics/metric_instrument_test.cc +++ b/sdk/test/metrics/metric_instrument_test.cc @@ -248,7 +248,7 @@ TEST(Counter, getAggsandnewupdate) auto labelkv = trace::KeyValueIterableView{labels}; auto beta = alpha.bindCounter(labelkv); - beta->add(1, labelkv) + beta->add(1) beta->unbind(); EXPECT_EQ(alpha.boundInstruments_[KvToString(labelkv)]->get_ref(), 0); From ea0ffada673eaa3eab3fd0fdd87e67e6164e2cca Mon Sep 17 00:00:00 2001 From: Brandon-Kimberly Date: Sat, 22 Aug 2020 18:10:54 -0400 Subject: [PATCH 11/12] Fix typo --- sdk/test/metrics/metric_instrument_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/test/metrics/metric_instrument_test.cc b/sdk/test/metrics/metric_instrument_test.cc index 9c480a253f..599b307617 100644 --- a/sdk/test/metrics/metric_instrument_test.cc +++ b/sdk/test/metrics/metric_instrument_test.cc @@ -248,7 +248,7 @@ TEST(Counter, getAggsandnewupdate) auto labelkv = trace::KeyValueIterableView{labels}; auto beta = alpha.bindCounter(labelkv); - beta->add(1) + beta->add(1); beta->unbind(); EXPECT_EQ(alpha.boundInstruments_[KvToString(labelkv)]->get_ref(), 0); From 3b4d97502bcee735288fabdba2dbf904cfea3749 Mon Sep 17 00:00:00 2001 From: Brandon-Kimberly Date: Sun, 23 Aug 2020 11:38:03 -0400 Subject: [PATCH 12/12] Fprmat --- .../opentelemetry/sdk/metrics/aggregator/aggregator.h | 2 +- .../opentelemetry/sdk/metrics/aggregator/gauge_aggregator.h | 2 +- sdk/test/metrics/metric_instrument_test.cc | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sdk/include/opentelemetry/sdk/metrics/aggregator/aggregator.h b/sdk/include/opentelemetry/sdk/metrics/aggregator/aggregator.h index 769c560ffc..77c167cc57 100644 --- a/sdk/include/opentelemetry/sdk/metrics/aggregator/aggregator.h +++ b/sdk/include/opentelemetry/sdk/metrics/aggregator/aggregator.h @@ -103,7 +103,7 @@ class Aggregator * @return A bool indicating wether or not this aggregator has been updated * in the most recent collection interval. */ - virtual bool is_updated() final { return updated_; } + virtual bool is_updated() final { return updated_; } // virtual function to be overriden for the Histogram Aggregator virtual std::vector get_boundaries() { return std::vector(); } diff --git a/sdk/include/opentelemetry/sdk/metrics/aggregator/gauge_aggregator.h b/sdk/include/opentelemetry/sdk/metrics/aggregator/gauge_aggregator.h index e921a73808..5046928bac 100644 --- a/sdk/include/opentelemetry/sdk/metrics/aggregator/gauge_aggregator.h +++ b/sdk/include/opentelemetry/sdk/metrics/aggregator/gauge_aggregator.h @@ -59,7 +59,7 @@ class GaugeAggregator : public Aggregator void update(T val) override { this->mu_.lock(); - this->updated_ = true; + this->updated_ = true; this->values_[0] = val; current_timestamp_ = core::SystemTimestamp(std::chrono::system_clock::now()); this->mu_.unlock(); diff --git a/sdk/test/metrics/metric_instrument_test.cc b/sdk/test/metrics/metric_instrument_test.cc index 599b307617..3caf526010 100644 --- a/sdk/test/metrics/metric_instrument_test.cc +++ b/sdk/test/metrics/metric_instrument_test.cc @@ -442,8 +442,10 @@ TEST(Instruments, NoUpdateNoRecord) // in the last collection period are not made into records for export. Counter alpha("alpha", "no description", "unitless", true); - std::map labels = {{"key", "value"}}; - auto labelkv = trace::KeyValueIterableView{labels}; + + std::map labels = {{"key", "value"}}; + + auto labelkv = trace::KeyValueIterableView{labels}; EXPECT_EQ(alpha.GetRecords().size(), 0); alpha.add(1, labelkv);