Skip to content

Commit a385928

Browse files
committed
Fix Doxygen warning and clang-format alignment
1 parent 2ae97c0 commit a385928

3 files changed

Lines changed: 23 additions & 20 deletions

File tree

sdk/include/opentelemetry/sdk/metrics/metric_reader.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ namespace metrics
2222
*/
2323
struct CardinalityLimitOptions
2424
{
25-
size_t default_limit = 0; // 0 means use SDK default (2000)
26-
size_t counter = 0;
27-
size_t gauge = 0;
28-
size_t histogram = 0;
29-
size_t observable_counter = 0;
30-
size_t observable_gauge = 0;
25+
size_t default_limit = 0; // 0 means use SDK default (2000)
26+
size_t counter = 0;
27+
size_t gauge = 0;
28+
size_t histogram = 0;
29+
size_t observable_counter = 0;
30+
size_t observable_gauge = 0;
3131
size_t observable_up_down_counter = 0;
32-
size_t up_down_counter = 0;
32+
size_t up_down_counter = 0;
3333
};
3434

3535
/**

sdk/include/opentelemetry/sdk/metrics/state/metric_collector.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@ class CollectorHandle
4444
* @param instrument_type The instrument type to get the limit for
4545
* @return The cardinality limit, or 0 if not configured
4646
*/
47-
virtual size_t GetCardinalityLimit(InstrumentType /* instrument_type */) noexcept
47+
virtual size_t GetCardinalityLimit(InstrumentType instrument_type) noexcept
4848
{
49+
(void)instrument_type;
4950
return 0;
5051
}
5152
};

sdk/src/configuration/sdk_builder.cc

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1477,13 +1477,14 @@ std::unique_ptr<opentelemetry::sdk::metrics::MetricReader> SdkBuilder::CreatePer
14771477
if (model->cardinality_limits != nullptr)
14781478
{
14791479
opentelemetry::sdk::metrics::CardinalityLimitOptions cardinality_options;
1480-
cardinality_options.default_limit = model->cardinality_limits->default_limit;
1481-
cardinality_options.counter = model->cardinality_limits->counter;
1482-
cardinality_options.gauge = model->cardinality_limits->gauge;
1483-
cardinality_options.histogram = model->cardinality_limits->histogram;
1480+
cardinality_options.default_limit = model->cardinality_limits->default_limit;
1481+
cardinality_options.counter = model->cardinality_limits->counter;
1482+
cardinality_options.gauge = model->cardinality_limits->gauge;
1483+
cardinality_options.histogram = model->cardinality_limits->histogram;
14841484
cardinality_options.observable_counter = model->cardinality_limits->observable_counter;
1485-
cardinality_options.observable_gauge = model->cardinality_limits->observable_gauge;
1486-
cardinality_options.observable_up_down_counter = model->cardinality_limits->observable_up_down_counter;
1485+
cardinality_options.observable_gauge = model->cardinality_limits->observable_gauge;
1486+
cardinality_options.observable_up_down_counter =
1487+
model->cardinality_limits->observable_up_down_counter;
14871488
cardinality_options.up_down_counter = model->cardinality_limits->up_down_counter;
14881489
sdk->SetCardinalityLimitOptions(cardinality_options);
14891490
}
@@ -1506,13 +1507,14 @@ std::unique_ptr<opentelemetry::sdk::metrics::MetricReader> SdkBuilder::CreatePul
15061507
if (model->cardinality_limits != nullptr)
15071508
{
15081509
opentelemetry::sdk::metrics::CardinalityLimitOptions cardinality_options;
1509-
cardinality_options.default_limit = model->cardinality_limits->default_limit;
1510-
cardinality_options.counter = model->cardinality_limits->counter;
1511-
cardinality_options.gauge = model->cardinality_limits->gauge;
1512-
cardinality_options.histogram = model->cardinality_limits->histogram;
1510+
cardinality_options.default_limit = model->cardinality_limits->default_limit;
1511+
cardinality_options.counter = model->cardinality_limits->counter;
1512+
cardinality_options.gauge = model->cardinality_limits->gauge;
1513+
cardinality_options.histogram = model->cardinality_limits->histogram;
15131514
cardinality_options.observable_counter = model->cardinality_limits->observable_counter;
1514-
cardinality_options.observable_gauge = model->cardinality_limits->observable_gauge;
1515-
cardinality_options.observable_up_down_counter = model->cardinality_limits->observable_up_down_counter;
1515+
cardinality_options.observable_gauge = model->cardinality_limits->observable_gauge;
1516+
cardinality_options.observable_up_down_counter =
1517+
model->cardinality_limits->observable_up_down_counter;
15161518
cardinality_options.up_down_counter = model->cardinality_limits->up_down_counter;
15171519
sdk->SetCardinalityLimitOptions(cardinality_options);
15181520
}

0 commit comments

Comments
 (0)