Skip to content

Commit 5f153a2

Browse files
ThomsonTanThomsonTan
committed
Fix format
1 parent 14aa407 commit 5f153a2

File tree

6 files changed

+61
-35
lines changed

6 files changed

+61
-35
lines changed

‎sdk/include/opentelemetry/sdk/metrics/aggregation/aggregation_config.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#include <vector>
77

8-
#include "opentelemetry/version.h"
98
#include "opentelemetry/sdk/metrics/state/attributes_hashmap.h"
9+
#include "opentelemetry/version.h"
1010

1111
OPENTELEMETRY_BEGIN_NAMESPACE
1212
namespace sdk
@@ -16,7 +16,9 @@ namespace metrics
1616
class AggregationConfig
1717
{
1818
public:
19-
AggregationConfig(size_t cardinality_limit = kAggregationCardinalityLimit) : cardinality_limit_(cardinality_limit) {}
19+
AggregationConfig(size_t cardinality_limit = kAggregationCardinalityLimit)
20+
: cardinality_limit_(cardinality_limit)
21+
{}
2022
size_t cardinality_limit_;
2123
virtual ~AggregationConfig() = default;
2224
};

‎sdk/include/opentelemetry/sdk/metrics/state/async_metric_storage.h‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,12 @@ class AsyncMetricStorage : public MetricStorage, public AsyncWritableMetricStora
4343
: instrument_descriptor_(instrument_descriptor),
4444
aggregation_type_{aggregation_type},
4545
aggregation_config_{aggregation_config},
46-
cumulative_hash_map_(new AttributesHashMap(aggregation_config ? aggregation_config->cardinality_limit_ : kAggregationCardinalityLimit)),
47-
delta_hash_map_(new AttributesHashMap(aggregation_config ? aggregation_config->cardinality_limit_ : kAggregationCardinalityLimit)),
46+
cumulative_hash_map_(new AttributesHashMap(aggregation_config
47+
? aggregation_config->cardinality_limit_
48+
: kAggregationCardinalityLimit)),
49+
delta_hash_map_(new AttributesHashMap(aggregation_config
50+
? aggregation_config->cardinality_limit_
51+
: kAggregationCardinalityLimit)),
4852
#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
4953
exemplar_filter_type_(exempler_filter_type),
5054
exemplar_reservoir_(exemplar_reservoir),
@@ -125,7 +129,9 @@ class AsyncMetricStorage : public MetricStorage, public AsyncWritableMetricStora
125129
{
126130
std::lock_guard<opentelemetry::common::SpinLockMutex> guard(hashmap_lock_);
127131
delta_metrics = std::move(delta_hash_map_);
128-
delta_hash_map_.reset(new AttributesHashMap(aggregation_config_ ? aggregation_config_->cardinality_limit_ : kAggregationCardinalityLimit));
132+
delta_hash_map_.reset(new AttributesHashMap(aggregation_config_
133+
? aggregation_config_->cardinality_limit_
134+
: kAggregationCardinalityLimit));
129135
}
130136

131137
auto status =

‎sdk/include/opentelemetry/sdk/metrics/state/sync_metric_storage.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,9 @@ class SyncMetricStorage : public MetricStorage, public SyncWritableMetricStorage
6666
const AggregationConfig *aggregation_config)
6767
: instrument_descriptor_(instrument_descriptor),
6868
aggregation_config_(aggregation_config),
69-
attributes_hashmap_(new AttributesHashMap(
70-
aggregation_config ? aggregation_config->cardinality_limit_ : kAggregationCardinalityLimit)),
69+
attributes_hashmap_(new AttributesHashMap(aggregation_config
70+
? aggregation_config->cardinality_limit_
71+
: kAggregationCardinalityLimit)),
7172
attributes_processor_(std::move(attributes_processor)),
7273
#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
7374
exemplar_filter_type_(exempler_filter_type),

‎sdk/src/metrics/state/sync_metric_storage.cc‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ bool SyncMetricStorage::Collect(CollectorHandle *collector,
3535
{
3636
std::lock_guard<opentelemetry::common::SpinLockMutex> guard(attribute_hashmap_lock_);
3737
delta_metrics = std::move(attributes_hashmap_);
38-
attributes_hashmap_.reset(new AttributesHashMap(aggregation_config_ ? aggregation_config_->cardinality_limit_ : kAggregationCardinalityLimit));
38+
attributes_hashmap_.reset(new AttributesHashMap(aggregation_config_
39+
? aggregation_config_->cardinality_limit_
40+
: kAggregationCardinalityLimit));
3941
}
4042

4143
return temporal_metric_storage_.buildMetrics(collector, collectors, sdk_start_ts, collection_ts,

‎sdk/src/metrics/state/temporal_metric_storage.cc‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,9 @@ bool TemporalMetricStorage::buildMetrics(CollectorHandle *collector,
9797
}
9898
auto unreported_list = std::move(present->second);
9999
// Iterate over the unreporter metrics for `collector` and store result in `merged_metrics`
100-
std::unique_ptr<AttributesHashMap> merged_metrics(new AttributesHashMap(aggregation_config_ ? aggregation_config_->cardinality_limit_ : kAggregationCardinalityLimit));
100+
std::unique_ptr<AttributesHashMap> merged_metrics(
101+
new AttributesHashMap(aggregation_config_ ? aggregation_config_->cardinality_limit_
102+
: kAggregationCardinalityLimit));
101103
for (auto &agg_hashmap : unreported_list)
102104
{
103105
agg_hashmap->GetAllEnteries(

‎sdk/test/metrics/sum_aggregation_test.cc‎

Lines changed: 39 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
#include "opentelemetry/sdk/metrics/meter_provider.h"
2727
#include "opentelemetry/sdk/metrics/metric_reader.h"
2828
#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
29+
#include "opentelemetry/sdk/metrics/state/attributes_hashmap.h"
2930
#include "opentelemetry/sdk/metrics/view/attributes_processor.h"
3031
#include "opentelemetry/sdk/metrics/view/instrument_selector.h"
3132
#include "opentelemetry/sdk/metrics/view/meter_selector.h"
3233
#include "opentelemetry/sdk/metrics/view/view.h"
33-
#include "opentelemetry/sdk/metrics/state/attributes_hashmap.h"
3434

3535
#if OPENTELEMETRY_HAVE_WORKING_REGEX
3636

@@ -150,7 +150,7 @@ TEST(HistogramToSumFilterAttributesWithCardinaityLimit, Double)
150150
std::string instrument_unit = "ms";
151151
std::string instrument_name = "historgram1";
152152
std::string instrument_desc = "histogram metrics";
153-
size_t cardinality_limit = 10000;
153+
size_t cardinality_limit = 10000;
154154

155155
std::unordered_map<std::string, bool> allowedattr;
156156
allowedattr["attr1"] = true;
@@ -163,9 +163,8 @@ TEST(HistogramToSumFilterAttributesWithCardinaityLimit, Double)
163163
std::shared_ptr<MetricReader> reader{new MockMetricReader(std::move(exporter))};
164164
mp.AddMetricReader(reader);
165165

166-
std::unique_ptr<View> view{new View("view1", "view1_description",
167-
AggregationType::kSum, dummy_aggregation_config,
168-
std::move(attrproc))};
166+
std::unique_ptr<View> view{new View("view1", "view1_description", AggregationType::kSum,
167+
dummy_aggregation_config, std::move(attrproc))};
169168
std::unique_ptr<InstrumentSelector> instrument_selector{
170169
new InstrumentSelector(InstrumentType::kHistogram, instrument_name, instrument_unit)};
171170
std::unique_ptr<MeterSelector> meter_selector{new MeterSelector("meter1", "version1", "schema1")};
@@ -182,7 +181,8 @@ TEST(HistogramToSumFilterAttributesWithCardinaityLimit, Double)
182181
{
183182
for (size_t i = 0; i < 2 * cardinality_limit; i++)
184183
{
185-
std::unordered_map<std::string, std::string> attr = {{"attr1", std::to_string(i)}, {"attr2", "val2"}};
184+
std::unordered_map<std::string, std::string> attr = {{"attr1", std::to_string(i)},
185+
{"attr2", "val2"}};
186186
h->Record(1, attr, opentelemetry::context::Context{});
187187
}
188188
}
@@ -192,20 +192,27 @@ TEST(HistogramToSumFilterAttributesWithCardinaityLimit, Double)
192192
{
193193
for (const MetricData &md : smd.metric_data_)
194194
{
195-
// Something weird about attributes hashmap. If cardinality is setup to n, it emits n-1 including overflow. Just making the logic generic here to succeed for n or n-1 total cardinality.
195+
// Something weird about attributes hashmap. If cardinality is setup to n, it emits n-1
196+
// including overflow. Just making the logic generic here to succeed for n or n-1 total
197+
// cardinality.
196198
EXPECT_GE(cardinality_limit, md.point_data_attr_.size());
197199
EXPECT_LT(cardinality_limit / 2, md.point_data_attr_.size());
198200
for (size_t i = 0; i < md.point_data_attr_.size(); i++)
199201
{
200202
EXPECT_EQ(1, md.point_data_attr_[i].attributes.size());
201-
if (md.point_data_attr_[i].attributes.end() != md.point_data_attr_[i].attributes.find("attr1"))
203+
if (md.point_data_attr_[i].attributes.end() !=
204+
md.point_data_attr_[i].attributes.find("attr1"))
205+
{
206+
EXPECT_EQ(total_metrics_times * (repeat + 1),
207+
opentelemetry::nostd::get<double>(opentelemetry::nostd::get<SumPointData>(
208+
md.point_data_attr_[i].point_data)
209+
.value_));
210+
}
211+
else
202212
{
203-
EXPECT_EQ(total_metrics_times * (repeat + 1), opentelemetry::nostd::get<double>(opentelemetry::nostd::get<SumPointData>(
204-
md.point_data_attr_[i].point_data)
205-
.value_));
206-
} else {
207213
EXPECT_NE(md.point_data_attr_[i].attributes.end(),
208-
md.point_data_attr_[i].attributes.find(sdk::metrics::kAttributesLimitOverflowKey));
214+
md.point_data_attr_[i].attributes.find(
215+
sdk::metrics::kAttributesLimitOverflowKey));
209216
}
210217
}
211218
}
@@ -324,7 +331,7 @@ TEST(CounterToSumFilterAttributesWithCardinalityLimit, Double)
324331
std::string instrument_unit = "ms";
325332
std::string instrument_name = "counter1";
326333
std::string instrument_desc = "counter metrics";
327-
size_t cardinality_limit = 10000;
334+
size_t cardinality_limit = 10000;
328335

329336
std::unordered_map<std::string, bool> allowedattr;
330337
allowedattr["attr1"] = true;
@@ -337,9 +344,8 @@ TEST(CounterToSumFilterAttributesWithCardinalityLimit, Double)
337344
std::shared_ptr<MetricReader> reader{new MockMetricReader(std::move(exporter))};
338345
mp.AddMetricReader(reader);
339346

340-
std::unique_ptr<View> view{new View("view1", "view1_description",
341-
AggregationType::kSum, dummy_aggregation_config,
342-
std::move(attrproc))};
347+
std::unique_ptr<View> view{new View("view1", "view1_description", AggregationType::kSum,
348+
dummy_aggregation_config, std::move(attrproc))};
343349
std::unique_ptr<InstrumentSelector> instrument_selector{
344350
new InstrumentSelector(InstrumentType::kCounter, instrument_name, instrument_unit)};
345351
std::unique_ptr<MeterSelector> meter_selector{new MeterSelector("meter1", "version1", "schema1")};
@@ -356,7 +362,8 @@ TEST(CounterToSumFilterAttributesWithCardinalityLimit, Double)
356362
{
357363
for (size_t i = 0; i < 2 * cardinality_limit; i++)
358364
{
359-
std::unordered_map<std::string, std::string> attr = {{"attr1", std::to_string(i)}, {"attr2", "val2"}};
365+
std::unordered_map<std::string, std::string> attr = {{"attr1", std::to_string(i)},
366+
{"attr2", "val2"}};
360367
c->Add(1, attr, opentelemetry::context::Context{});
361368
}
362369
}
@@ -366,20 +373,27 @@ TEST(CounterToSumFilterAttributesWithCardinalityLimit, Double)
366373
{
367374
for (const MetricData &md : smd.metric_data_)
368375
{
369-
// Something weird about attributes hashmap. If cardinality is setup to n, it emits n-1 including overflow. Just making the logic generic here to succeed for n or n-1 total cardinality.
376+
// Something weird about attributes hashmap. If cardinality is setup to n, it emits n-1
377+
// including overflow. Just making the logic generic here to succeed for n or n-1 total
378+
// cardinality.
370379
EXPECT_GE(cardinality_limit, md.point_data_attr_.size());
371380
EXPECT_LT(cardinality_limit / 2, md.point_data_attr_.size());
372381
for (size_t i = 0; i < md.point_data_attr_.size(); i++)
373382
{
374383
EXPECT_EQ(1, md.point_data_attr_[i].attributes.size());
375-
if (md.point_data_attr_[i].attributes.find("attr1") != md.point_data_attr_[i].attributes.end())
384+
if (md.point_data_attr_[i].attributes.find("attr1") !=
385+
md.point_data_attr_[i].attributes.end())
386+
{
387+
EXPECT_EQ(total_metrics_times * (repeat + 1),
388+
opentelemetry::nostd::get<double>(opentelemetry::nostd::get<SumPointData>(
389+
md.point_data_attr_[i].point_data)
390+
.value_));
391+
}
392+
else
376393
{
377-
EXPECT_EQ(total_metrics_times * (repeat + 1), opentelemetry::nostd::get<double>(opentelemetry::nostd::get<SumPointData>(
378-
md.point_data_attr_[i].point_data)
379-
.value_));
380-
} else {
381394
EXPECT_NE(md.point_data_attr_[i].attributes.end(),
382-
md.point_data_attr_[i].attributes.find(sdk::metrics::kAttributesLimitOverflowKey));
395+
md.point_data_attr_[i].attributes.find(
396+
sdk::metrics::kAttributesLimitOverflowKey));
383397
}
384398
}
385399
}
@@ -389,7 +403,6 @@ TEST(CounterToSumFilterAttributesWithCardinalityLimit, Double)
389403
}
390404
}
391405

392-
393406
class UpDownCounterToSumFixture : public ::testing::TestWithParam<bool>
394407
{};
395408

0 commit comments

Comments
 (0)