Skip to content

Commit b2dee01

Browse files
ethandmdethandmd
committed
run tools/format.sh
1 parent a9737bf commit b2dee01

File tree

12 files changed

+111
-92
lines changed

12 files changed

+111
-92
lines changed

‎examples/common/metrics_foo_library/foo_library.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
#include <stdlib.h>
66
#include <chrono>
77
#include <cmath>
8+
#include <iostream>
89
#include <map>
910
#include <thread>
10-
#include <iostream>
1111
#include <utility>
1212
#include <vector>
1313

@@ -22,10 +22,10 @@
2222
#include "opentelemetry/metrics/sync_instruments.h"
2323
#include "opentelemetry/nostd/shared_ptr.h"
2424
#include "opentelemetry/nostd/variant.h"
25+
#include "opentelemetry/sdk/metrics/view/view_factory.h"
2526
#include "opentelemetry/semconv/http_metrics.h"
2627
#include "opentelemetry/semconv/incubating/container_metrics.h"
2728
#include "opentelemetry/semconv/incubating/system_metrics.h"
28-
#include "opentelemetry/sdk/metrics/view/view_factory.h"
2929

3030
namespace metrics_api = opentelemetry::metrics;
3131

‎examples/metrics_simple/metrics_ostream.cc‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_factory.h"
1616
#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_options.h"
1717
#include "opentelemetry/sdk/metrics/instruments.h"
18+
#include "opentelemetry/sdk/metrics/meter_context_factory.h"
1819
#include "opentelemetry/sdk/metrics/meter_provider.h"
1920
#include "opentelemetry/sdk/metrics/meter_provider_factory.h"
20-
#include "opentelemetry/sdk/metrics/meter_context_factory.h"
2121
#include "opentelemetry/sdk/metrics/metric_reader.h"
2222
#include "opentelemetry/sdk/metrics/provider.h"
2323
#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
@@ -114,17 +114,18 @@ void InitMetrics(const std::string &name)
114114
std::move(histogram_view));
115115

116116
// hisogram view with base2 exponential aggregation
117-
std::string histogram_base2_name = name + "_exponential_histogram";
118-
unit = "histogram-unit";
117+
std::string histogram_base2_name = name + "_exponential_histogram";
118+
unit = "histogram-unit";
119119
auto histogram_base2_instrument_selector = metrics_sdk::InstrumentSelectorFactory::Create(
120120
metrics_sdk::InstrumentType::kHistogram, histogram_base2_name, unit);
121-
auto histogram_base2_meter_selector = metrics_sdk::MeterSelectorFactory::Create(name, version,
122-
schema);
123-
auto histogram_base2_aggregation_config = std::unique_ptr<metrics_sdk::Base2ExponentialHistogramAggregationConfig>(
124-
new metrics_sdk::Base2ExponentialHistogramAggregationConfig);
125-
histogram_base2_aggregation_config->max_scale_ = 3;
121+
auto histogram_base2_meter_selector =
122+
metrics_sdk::MeterSelectorFactory::Create(name, version, schema);
123+
auto histogram_base2_aggregation_config =
124+
std::unique_ptr<metrics_sdk::Base2ExponentialHistogramAggregationConfig>(
125+
new metrics_sdk::Base2ExponentialHistogramAggregationConfig);
126+
histogram_base2_aggregation_config->max_scale_ = 3;
126127
histogram_base2_aggregation_config->record_min_max_ = true;
127-
histogram_base2_aggregation_config->max_buckets_ = 100;
128+
histogram_base2_aggregation_config->max_buckets_ = 100;
128129

129130
std::shared_ptr<metrics_sdk::AggregationConfig> base2_aggregation_config(
130131
std::move(histogram_base2_aggregation_config));
@@ -133,7 +134,8 @@ void InitMetrics(const std::string &name)
133134
name, "description", unit, metrics_sdk::AggregationType::kBase2ExponentialHistogram,
134135
base2_aggregation_config);
135136

136-
provider->AddView(std::move(histogram_base2_instrument_selector), std::move(histogram_base2_meter_selector), std::move(histogram_base2_view));
137+
provider->AddView(std::move(histogram_base2_instrument_selector),
138+
std::move(histogram_base2_meter_selector), std::move(histogram_base2_view));
137139

138140
std::shared_ptr<opentelemetry::metrics::MeterProvider> api_provider(std::move(provider));
139141

‎examples/otlp/grpc_metric_main.cc‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#include "opentelemetry/sdk/metrics/meter_provider_factory.h"
1616
#include "opentelemetry/sdk/metrics/provider.h"
1717
#include "opentelemetry/sdk/metrics/view/instrument_selector_factory.h"
18-
#include "opentelemetry/sdk/metrics/view/view_factory.h"
1918
#include "opentelemetry/sdk/metrics/view/meter_selector_factory.h"
19+
#include "opentelemetry/sdk/metrics/view/view_factory.h"
2020

2121
#include <memory>
2222
#include <thread>
@@ -87,15 +87,16 @@ void InitMetrics(std::string &name)
8787

8888
// histogram view
8989
std::string histogram_name = name + "_histogram";
90-
std::string unit = "unit";
90+
std::string unit = "unit";
9191

9292
auto histogram_instrument_selector = metric_sdk::InstrumentSelectorFactory::Create(
93-
metric_sdk::InstrumentType::kHistogram, histogram_name, unit);
93+
metric_sdk::InstrumentType::kHistogram, histogram_name, unit);
9494

9595
auto histogram_meter_selector = metric_sdk::MeterSelectorFactory::Create(name, version, schema);
9696

97-
auto histogram_aggregation_config = std::unique_ptr<metric_sdk::Base2ExponentialHistogramAggregationConfig>(
98-
new metric_sdk::Base2ExponentialHistogramAggregationConfig);
97+
auto histogram_aggregation_config =
98+
std::unique_ptr<metric_sdk::Base2ExponentialHistogramAggregationConfig>(
99+
new metric_sdk::Base2ExponentialHistogramAggregationConfig);
99100

100101
histogram_aggregation_config->max_scale_ = 3;
101102

@@ -106,7 +107,8 @@ void InitMetrics(std::string &name)
106107
std::move(histogram_aggregation_config));
107108

108109
auto histogram_view = metric_sdk::ViewFactory::Create(
109-
name, "description", unit, metric_sdk::AggregationType::kBase2ExponentialHistogram, aggregation_config);
110+
name, "description", unit, metric_sdk::AggregationType::kBase2ExponentialHistogram,
111+
aggregation_config);
110112

111113
provider->AddView(std::move(histogram_instrument_selector), std::move(histogram_meter_selector),
112114
std::move(histogram_view));
@@ -150,7 +152,7 @@ int main(int argc, char *argv[])
150152

151153
InitMetrics(name);
152154

153-
//InitMetrics();
155+
// InitMetrics();
154156

155157
if (example_type == "counter")
156158
{
@@ -163,7 +165,9 @@ int main(int argc, char *argv[])
163165
else if (example_type == "histogram")
164166
{
165167
foo_library::histogram_example(name);
166-
} else if (example_type == "exponential_histogram") {
168+
}
169+
else if (example_type == "exponential_histogram")
170+
{
167171
foo_library::histogram_exp_example(name);
168172
}
169173
#if OPENTELEMETRY_ABI_VERSION_NO >= 2
@@ -174,8 +178,8 @@ int main(int argc, char *argv[])
174178
#endif
175179
else
176180
{
177-
//std::thread counter_example{&foo_library::counter_example, name};
178-
// std::thread observable_counter_example{&foo_library::observable_counter_example, name};
181+
// std::thread counter_example{&foo_library::counter_example, name};
182+
// std::thread observable_counter_example{&foo_library::observable_counter_example, name};
179183
std::thread histogram_example{&foo_library::histogram_example, name};
180184
#if OPENTELEMETRY_ABI_VERSION_NO >= 2
181185
std::thread gauge_example{&foo_library::gauge_example, name};

‎exporters/ostream/src/metric_exporter.cc‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -257,22 +257,24 @@ void OStreamMetricExporter::printPointData(const opentelemetry::sdk::metrics::Po
257257
sout_ << "\n zero_count: " << histogram_point_data.zero_count_;
258258
if (histogram_point_data.record_min_max_)
259259
{
260-
sout_ << "\n min: " << histogram_point_data.min_;
261-
sout_ << "\n max: " << histogram_point_data.max_;
260+
sout_ << "\n min: " << histogram_point_data.min_;
261+
sout_ << "\n max: " << histogram_point_data.max_;
262262
}
263263
sout_ << "\n scale: " << histogram_point_data.scale_;
264264
sout_ << "\n positive buckets: ";
265265
if (!histogram_point_data.positive_buckets_.Empty())
266266
{
267-
for (auto i = histogram_point_data.positive_buckets_.StartIndex(); i <= histogram_point_data.positive_buckets_.EndIndex(); ++i)
267+
for (auto i = histogram_point_data.positive_buckets_.StartIndex();
268+
i <= histogram_point_data.positive_buckets_.EndIndex(); ++i)
268269
{
269270
sout_ << "\n\t" << i << ": " << histogram_point_data.positive_buckets_.Get(i);
270271
}
271272
}
272273
sout_ << "\n negative buckets: ";
273274
if (!histogram_point_data.negative_buckets_.Empty())
274275
{
275-
for (auto i = histogram_point_data.negative_buckets_.StartIndex(); i <= histogram_point_data.negative_buckets_.EndIndex(); ++i)
276+
for (auto i = histogram_point_data.negative_buckets_.StartIndex();
277+
i <= histogram_point_data.negative_buckets_.EndIndex(); ++i)
276278
{
277279
sout_ << "\n\t" << i << ": " << histogram_point_data.negative_buckets_.Get(i);
278280
}

‎exporters/otlp/include/opentelemetry/exporters/otlp/otlp_metric_utils.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,9 @@ class OtlpMetricUtils
5555
static void ConvertHistogramMetric(const opentelemetry::sdk::metrics::MetricData &metric_data,
5656
proto::metrics::v1::Histogram *const histogram) noexcept;
5757

58-
static void ConvertExponentialHistogramMetric(const opentelemetry::sdk::metrics::MetricData &metric_data,
59-
proto::metrics::v1::ExponentialHistogram *const histogram) noexcept;
58+
static void ConvertExponentialHistogramMetric(
59+
const opentelemetry::sdk::metrics::MetricData &metric_data,
60+
proto::metrics::v1::ExponentialHistogram *const histogram) noexcept;
6061

6162
static void ConvertGaugeMetric(const opentelemetry::sdk::metrics::MetricData &metric_data,
6263
proto::metrics::v1::Gauge *const gauge) noexcept;

‎exporters/otlp/src/otlp_metric_utils.cc‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ metric_sdk::AggregationType OtlpMetricUtils::GetAggregationType(
6464
return metric_sdk::AggregationType::kHistogram;
6565
}
6666
else if (nostd::holds_alternative<sdk::metrics::Base2ExponentialHistogramPointData>(
67-
point_data_with_attributes.point_data))
67+
point_data_with_attributes.point_data))
6868
{
6969
return metric_sdk::AggregationType::kBase2ExponentialHistogram;
7070
}
@@ -183,8 +183,8 @@ void OtlpMetricUtils::ConvertHistogramMetric(
183183
}
184184

185185
void OtlpMetricUtils::ConvertExponentialHistogramMetric(
186-
const metric_sdk::MetricData &metric_data,
187-
proto::metrics::v1::ExponentialHistogram *const histogram) noexcept
186+
const metric_sdk::MetricData &metric_data,
187+
proto::metrics::v1::ExponentialHistogram *const histogram) noexcept
188188
{
189189
histogram->set_aggregation_temporality(
190190
GetProtoAggregationTemporality(metric_data.aggregation_temporality));
@@ -196,45 +196,43 @@ void OtlpMetricUtils::ConvertExponentialHistogramMetric(
196196
histogram->add_data_points();
197197
proto_histogram_point_data->set_start_time_unix_nano(start_ts);
198198
proto_histogram_point_data->set_time_unix_nano(ts);
199-
auto histogram_data =
200-
nostd::get<sdk::metrics::Base2ExponentialHistogramPointData>(point_data_with_attributes.point_data);
199+
auto histogram_data = nostd::get<sdk::metrics::Base2ExponentialHistogramPointData>(
200+
point_data_with_attributes.point_data);
201201
// sum
202202
proto_histogram_point_data->set_sum(histogram_data.sum_);
203203
proto_histogram_point_data->set_count(histogram_data.count_);
204204
if (histogram_data.record_min_max_)
205205
{
206-
proto_histogram_point_data->set_min(histogram_data.min_);
207-
proto_histogram_point_data->set_max(histogram_data.max_);
206+
proto_histogram_point_data->set_min(histogram_data.min_);
207+
proto_histogram_point_data->set_max(histogram_data.max_);
208208
}
209209
// negative buckets
210-
if(!histogram_data.negative_buckets_.Empty())
210+
if (!histogram_data.negative_buckets_.Empty())
211211
{
212212
auto negative_buckets = proto_histogram_point_data->mutable_negative();
213213
negative_buckets->set_offset(histogram_data.negative_buckets_.StartIndex());
214214

215-
for( auto index = histogram_data.negative_buckets_.StartIndex();
216-
index <= histogram_data.negative_buckets_.EndIndex(); ++index)
215+
for (auto index = histogram_data.negative_buckets_.StartIndex();
216+
index <= histogram_data.negative_buckets_.EndIndex(); ++index)
217217
{
218-
negative_buckets->add_bucket_counts(histogram_data.negative_buckets_.Get(index));
218+
negative_buckets->add_bucket_counts(histogram_data.negative_buckets_.Get(index));
219219
}
220220
}
221221
// positive buckets
222-
if(!histogram_data.positive_buckets_.Empty())
222+
if (!histogram_data.positive_buckets_.Empty())
223223
{
224224
auto positive_buckets = proto_histogram_point_data->mutable_positive();
225225
positive_buckets->set_offset(histogram_data.positive_buckets_.StartIndex());
226226

227-
for( auto index = histogram_data.positive_buckets_.StartIndex();
228-
index <= histogram_data.positive_buckets_.EndIndex(); ++index)
227+
for (auto index = histogram_data.positive_buckets_.StartIndex();
228+
index <= histogram_data.positive_buckets_.EndIndex(); ++index)
229229
{
230230
positive_buckets->add_bucket_counts(histogram_data.positive_buckets_.Get(index));
231231
}
232232
}
233233
proto_histogram_point_data->set_scale(histogram_data.scale_);
234234
proto_histogram_point_data->set_zero_count(histogram_data.zero_count_);
235235

236-
237-
238236
// attributes
239237
for (auto &kv_attr : point_data_with_attributes.attributes)
240238
{
@@ -244,7 +242,6 @@ void OtlpMetricUtils::ConvertExponentialHistogramMetric(
244242
}
245243
}
246244

247-
248245
void OtlpMetricUtils::ConvertGaugeMetric(const opentelemetry::sdk::metrics::MetricData &metric_data,
249246
proto::metrics::v1::Gauge *const gauge) noexcept
250247
{

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ class Base2ExponentialHistogramAggregation : public Aggregation
2424
Base2ExponentialHistogramAggregation(const Base2ExponentialHistogramPointData &point_data);
2525
Base2ExponentialHistogramAggregation(Base2ExponentialHistogramPointData &&point_data);
2626

27-
2827
void Aggregate(int64_t value, const PointAttributes &attributes = {}) noexcept override;
2928
void Aggregate(double value, const PointAttributes &attributes = {}) noexcept override;
3029

‎sdk/include/opentelemetry/sdk/metrics/data/metric_data.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ namespace metrics
1919

2020
using PointAttributes = opentelemetry::sdk::common::OrderedAttributeMap;
2121
using PointType = opentelemetry::nostd::variant<SumPointData,
22-
HistogramPointData,
23-
Base2ExponentialHistogramPointData,
24-
LastValuePointData,
25-
DropPointData>;
22+
HistogramPointData,
23+
Base2ExponentialHistogramPointData,
24+
LastValuePointData,
25+
DropPointData>;
2626

2727
struct PointDataAttributes
2828
{

‎sdk/include/opentelemetry/sdk/metrics/data/point_data.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ class Base2ExponentialHistogramPointData
7070
{
7171
public:
7272
// TODO: remove ctors and initializers when GCC<5 stops shipping on Ubuntu
73-
Base2ExponentialHistogramPointData(Base2ExponentialHistogramPointData &&) = default;
73+
Base2ExponentialHistogramPointData(Base2ExponentialHistogramPointData &&) = default;
7474
Base2ExponentialHistogramPointData &operator=(Base2ExponentialHistogramPointData &&) = default;
7575
Base2ExponentialHistogramPointData(const Base2ExponentialHistogramPointData &) = default;
76-
Base2ExponentialHistogramPointData() = default;
76+
Base2ExponentialHistogramPointData() = default;
7777

7878
uint64_t count_ = {};
7979
double sum_ = {};

0 commit comments

Comments
 (0)