Skip to content

Commit ec2f2bb

Browse files
owentowent
committed
Update the usage of instrumentation_library of prometheus exporter.
Signed-off-by: owentou <[email protected]>
1 parent 45bc9ea commit ec2f2bb

File tree

2 files changed

+44
-48
lines changed

2 files changed

+44
-48
lines changed

‎exporters/prometheus/test/collector_test.cc

+24-28
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,13 @@ TEST(PrometheusCollector, AddMetricDataWithCounterRecordsSuccessfully)
4747
ASSERT_EQ(collector_data.at(0)->resource_, data.resource_);
4848
for (auto &collector_d : collector_data)
4949
{
50-
for (uint32_t instrument_idx = 0;
51-
instrument_idx < collector_d->instrumentation_info_metric_data_.size(); ++instrument_idx)
50+
for (uint32_t instrument_idx = 0; instrument_idx < collector_d->scope_metric_data_.size();
51+
++instrument_idx)
5252
{
53-
ASSERT_EQ(collector_d->instrumentation_info_metric_data_.at(instrument_idx)
54-
.instrumentation_library_,
55-
data.instrumentation_info_metric_data_.at(instrument_idx).instrumentation_library_);
56-
ASSERT_EQ(collector_d->instrumentation_info_metric_data_.at(instrument_idx).metric_data_,
57-
data.instrumentation_info_metric_data_.at(instrument_idx).metric_data_);
53+
ASSERT_EQ(collector_d->scope_metric_data_.at(instrument_idx).scope_,
54+
data.scope_metric_data_.at(instrument_idx).scope_);
55+
ASSERT_EQ(collector_d->scope_metric_data_.at(instrument_idx).metric_data_,
56+
data.scope_metric_data_.at(instrument_idx).metric_data_);
5857
}
5958
}
6059
}
@@ -86,14 +85,13 @@ TEST(PrometheusCollector, AddMetricDataWithHistogramSuccessfully)
8685
ASSERT_EQ(collector_data.at(0)->resource_, data.resource_);
8786
for (auto &collector_d : collector_data)
8887
{
89-
for (uint32_t instrument_idx = 0;
90-
instrument_idx < collector_d->instrumentation_info_metric_data_.size(); ++instrument_idx)
88+
for (uint32_t instrument_idx = 0; instrument_idx < collector_d->scope_metric_data_.size();
89+
++instrument_idx)
9190
{
92-
ASSERT_EQ(collector_d->instrumentation_info_metric_data_.at(instrument_idx)
93-
.instrumentation_library_,
94-
data.instrumentation_info_metric_data_.at(instrument_idx).instrumentation_library_);
95-
ASSERT_EQ(collector_d->instrumentation_info_metric_data_.at(instrument_idx).metric_data_,
96-
data.instrumentation_info_metric_data_.at(instrument_idx).metric_data_);
91+
ASSERT_EQ(collector_d->scope_metric_data_.at(instrument_idx).scope_,
92+
data.scope_metric_data_.at(instrument_idx).scope_);
93+
ASSERT_EQ(collector_d->scope_metric_data_.at(instrument_idx).metric_data_,
94+
data.scope_metric_data_.at(instrument_idx).metric_data_);
9795
}
9896
}
9997
}
@@ -125,14 +123,13 @@ TEST(PrometheusCollector, AddMetricDataWithLastValueSuccessfully)
125123
ASSERT_EQ(collector_data.at(0)->resource_, data.resource_);
126124
for (auto &collector_d : collector_data)
127125
{
128-
for (uint32_t instrument_idx = 0;
129-
instrument_idx < collector_d->instrumentation_info_metric_data_.size(); ++instrument_idx)
126+
for (uint32_t instrument_idx = 0; instrument_idx < collector_d->scope_metric_data_.size();
127+
++instrument_idx)
130128
{
131-
ASSERT_EQ(collector_d->instrumentation_info_metric_data_.at(instrument_idx)
132-
.instrumentation_library_,
133-
data.instrumentation_info_metric_data_.at(instrument_idx).instrumentation_library_);
134-
ASSERT_EQ(collector_d->instrumentation_info_metric_data_.at(instrument_idx).metric_data_,
135-
data.instrumentation_info_metric_data_.at(instrument_idx).metric_data_);
129+
ASSERT_EQ(collector_d->scope_metric_data_.at(instrument_idx).scope_,
130+
data.scope_metric_data_.at(instrument_idx).scope_);
131+
ASSERT_EQ(collector_d->scope_metric_data_.at(instrument_idx).metric_data_,
132+
data.scope_metric_data_.at(instrument_idx).metric_data_);
136133
}
137134
}
138135
}
@@ -164,14 +161,13 @@ TEST(PrometheusCollector, AddMetricDataWithDropSuccessfully)
164161
ASSERT_EQ(collector_data.at(0)->resource_, data.resource_);
165162
for (auto &collector_d : collector_data)
166163
{
167-
for (uint32_t instrument_idx = 0;
168-
instrument_idx < collector_d->instrumentation_info_metric_data_.size(); ++instrument_idx)
164+
for (uint32_t instrument_idx = 0; instrument_idx < collector_d->scope_metric_data_.size();
165+
++instrument_idx)
169166
{
170-
ASSERT_EQ(collector_d->instrumentation_info_metric_data_.at(instrument_idx)
171-
.instrumentation_library_,
172-
data.instrumentation_info_metric_data_.at(instrument_idx).instrumentation_library_);
173-
ASSERT_EQ(collector_d->instrumentation_info_metric_data_.at(instrument_idx).metric_data_,
174-
data.instrumentation_info_metric_data_.at(instrument_idx).metric_data_);
167+
ASSERT_EQ(collector_d->scope_metric_data_.at(instrument_idx).scope_,
168+
data.scope_metric_data_.at(instrument_idx).scope_);
169+
ASSERT_EQ(collector_d->scope_metric_data_.at(instrument_idx).metric_data_,
170+
data.scope_metric_data_.at(instrument_idx).metric_data_);
175171
}
176172
}
177173
}

‎exporters/prometheus/test/prometheus_test_helper.h

+20-20
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ inline metric_sdk::ResourceMetrics CreateSumPointData()
2626
auto resource = opentelemetry::sdk::resource::Resource::Create(
2727
opentelemetry::sdk::resource::ResourceAttributes{});
2828
data.resource_ = &resource;
29-
auto instrumentation_library =
30-
opentelemetry::sdk::instrumentationlibrary::InstrumentationLibrary::Create("library_name",
31-
"1.2.0");
29+
auto instrumentation_scope =
30+
opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create("library_name",
31+
"1.2.0");
3232
metric_sdk::MetricData metric_data{
3333
metric_sdk::InstrumentDescriptor{"library_name", "description", "unit",
3434
metric_sdk::InstrumentType::kCounter,
@@ -38,8 +38,8 @@ inline metric_sdk::ResourceMetrics CreateSumPointData()
3838
std::vector<metric_sdk::PointDataAttributes>{
3939
{metric_sdk::PointAttributes{{"a1", "b1"}}, sum_point_data},
4040
{metric_sdk::PointAttributes{{"a2", "b2"}}, sum_point_data2}}};
41-
data.instrumentation_info_metric_data_ = std::vector<metric_sdk::InstrumentationInfoMetrics>{
42-
{instrumentation_library.get(), std::vector<metric_sdk::MetricData>{metric_data}}};
41+
data.scope_metric_data_ = std::vector<metric_sdk::ScopeMetrics>{
42+
{instrumentation_scope.get(), std::vector<metric_sdk::MetricData>{metric_data}}};
4343
return data;
4444
}
4545

@@ -59,9 +59,9 @@ inline metric_sdk::ResourceMetrics CreateHistogramPointData()
5959
auto resource = opentelemetry::sdk::resource::Resource::Create(
6060
opentelemetry::sdk::resource::ResourceAttributes{});
6161
data.resource_ = &resource;
62-
auto instrumentation_library =
63-
opentelemetry::sdk::instrumentationlibrary::InstrumentationLibrary::Create("library_name",
64-
"1.2.0");
62+
auto instrumentation_scope =
63+
opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create("library_name",
64+
"1.2.0");
6565
metric_sdk::MetricData metric_data{
6666
metric_sdk::InstrumentDescriptor{"library_name", "description", "unit",
6767
metric_sdk::InstrumentType::kHistogram,
@@ -71,8 +71,8 @@ inline metric_sdk::ResourceMetrics CreateHistogramPointData()
7171
std::vector<metric_sdk::PointDataAttributes>{
7272
{metric_sdk::PointAttributes{{"a1", "b1"}}, histogram_point_data},
7373
{metric_sdk::PointAttributes{{"a2", "b2"}}, histogram_point_data2}}};
74-
data.instrumentation_info_metric_data_ = std::vector<metric_sdk::InstrumentationInfoMetrics>{
75-
{instrumentation_library.get(), std::vector<metric_sdk::MetricData>{metric_data}}};
74+
data.scope_metric_data_ = std::vector<metric_sdk::ScopeMetrics>{
75+
{instrumentation_scope.get(), std::vector<metric_sdk::MetricData>{metric_data}}};
7676
return data;
7777
}
7878

@@ -82,9 +82,9 @@ inline metric_sdk::ResourceMetrics CreateLastValuePointData()
8282
auto resource = opentelemetry::sdk::resource::Resource::Create(
8383
opentelemetry::sdk::resource::ResourceAttributes{});
8484
data.resource_ = &resource;
85-
auto instrumentation_library =
86-
opentelemetry::sdk::instrumentationlibrary::InstrumentationLibrary::Create("library_name",
87-
"1.2.0");
85+
auto instrumentation_scope =
86+
opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create("library_name",
87+
"1.2.0");
8888
metric_sdk::LastValuePointData last_value_point_data{};
8989
last_value_point_data.value_ = 10.0;
9090
last_value_point_data.is_lastvalue_valid_ = true;
@@ -102,8 +102,8 @@ inline metric_sdk::ResourceMetrics CreateLastValuePointData()
102102
std::vector<metric_sdk::PointDataAttributes>{
103103
{metric_sdk::PointAttributes{{"a1", "b1"}}, last_value_point_data},
104104
{metric_sdk::PointAttributes{{"a2", "b2"}}, last_value_point_data2}}};
105-
data.instrumentation_info_metric_data_ = std::vector<metric_sdk::InstrumentationInfoMetrics>{
106-
{instrumentation_library.get(), std::vector<metric_sdk::MetricData>{metric_data}}};
105+
data.scope_metric_data_ = std::vector<metric_sdk::ScopeMetrics>{
106+
{instrumentation_scope.get(), std::vector<metric_sdk::MetricData>{metric_data}}};
107107
return data;
108108
}
109109

@@ -113,9 +113,9 @@ inline metric_sdk::ResourceMetrics CreateDropPointData()
113113
auto resource = opentelemetry::sdk::resource::Resource::Create(
114114
opentelemetry::sdk::resource::ResourceAttributes{});
115115
data.resource_ = &resource;
116-
auto instrumentation_library =
117-
opentelemetry::sdk::instrumentationlibrary::InstrumentationLibrary::Create("library_name",
118-
"1.2.0");
116+
auto instrumentation_scope =
117+
opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create("library_name",
118+
"1.2.0");
119119
metric_sdk::DropPointData drop_point_data{};
120120
metric_sdk::DropPointData drop_point_data2{};
121121
metric_sdk::MetricData metric_data{
@@ -127,8 +127,8 @@ inline metric_sdk::ResourceMetrics CreateDropPointData()
127127
std::vector<metric_sdk::PointDataAttributes>{
128128
{metric_sdk::PointAttributes{{"a1", "b1"}}, drop_point_data},
129129
{metric_sdk::PointAttributes{{"a2", "b2"}}, drop_point_data2}}};
130-
data.instrumentation_info_metric_data_ = std::vector<metric_sdk::InstrumentationInfoMetrics>{
131-
{instrumentation_library.get(), std::vector<metric_sdk::MetricData>{metric_data}}};
130+
data.scope_metric_data_ = std::vector<metric_sdk::ScopeMetrics>{
131+
{instrumentation_scope.get(), std::vector<metric_sdk::MetricData>{metric_data}}};
132132
return data;
133133
}
134134
} // namespace

0 commit comments

Comments
 (0)