Skip to content

Commit e61bec7

Browse files
scotthartscotthart
authored
refactor(bigtable): rename metric Labels types to indicate Table schema (#16337)
1 parent 443e254 commit e61bec7

15 files changed

Lines changed: 442 additions & 371 deletions

‎google/cloud/bigtable/internal/async_bulk_apply_test.cc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,8 @@ class MockMetric : public Metric {
163163
ElementDeliveryParams const&),
164164
(override));
165165
MOCK_METHOD(std::unique_ptr<Metric>, clone,
166-
(ResourceLabels resource_labels, DataLabels data_labels),
166+
(TableResourceLabels const& resource_labels,
167+
TableDataLabels const& data_labels),
167168
(const, override));
168169
};
169170

@@ -172,7 +173,8 @@ class CloningMetric : public Metric {
172173
public:
173174
explicit CloningMetric(std::unique_ptr<MockMetric> metric)
174175
: metric_(std::move(metric)) {}
175-
std::unique_ptr<Metric> clone(ResourceLabels, DataLabels) const override {
176+
std::unique_ptr<Metric> clone(TableResourceLabels const&,
177+
TableDataLabels const&) const override {
176178
return std::move(metric_);
177179
}
178180

‎google/cloud/bigtable/internal/async_row_reader_test.cc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ class MockMetric : public Metric {
115115
ElementDeliveryParams const&),
116116
(override));
117117
MOCK_METHOD(std::unique_ptr<Metric>, clone,
118-
(ResourceLabels resource_labels, DataLabels data_labels),
118+
(TableResourceLabels const& resource_labels,
119+
TableDataLabels const& data_labels),
119120
(const, override));
120121
};
121122

@@ -124,7 +125,8 @@ class CloningMetric : public Metric {
124125
public:
125126
explicit CloningMetric(std::unique_ptr<MockMetric> metric)
126127
: metric_(std::move(metric)) {}
127-
std::unique_ptr<Metric> clone(ResourceLabels, DataLabels) const override {
128+
std::unique_ptr<Metric> clone(TableResourceLabels const&,
129+
TableDataLabels const&) const override {
128130
return std::move(metric_);
129131
}
130132

‎google/cloud/bigtable/internal/async_row_sampler_test.cc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ class MockMetric : public Metric {
103103
ElementDeliveryParams const&),
104104
(override));
105105
MOCK_METHOD(std::unique_ptr<Metric>, clone,
106-
(ResourceLabels resource_labels, DataLabels data_labels),
106+
(TableResourceLabels const& resource_labels,
107+
TableDataLabels const& data_labels),
107108
(const, override));
108109
};
109110

@@ -112,7 +113,8 @@ class CloningMetric : public Metric {
112113
public:
113114
explicit CloningMetric(std::unique_ptr<MockMetric> metric)
114115
: metric_(std::move(metric)) {}
115-
std::unique_ptr<Metric> clone(ResourceLabels, DataLabels) const override {
116+
std::unique_ptr<Metric> clone(TableResourceLabels const&,
117+
TableDataLabels const&) const override {
116118
return std::move(metric_);
117119
}
118120

‎google/cloud/bigtable/internal/bulk_mutator_test.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ class MockMetric : public bigtable_internal::Metric {
107107
bigtable_internal::ElementDeliveryParams const&),
108108
(override));
109109
MOCK_METHOD(std::unique_ptr<Metric>, clone,
110-
(bigtable_internal::ResourceLabels resource_labels,
111-
bigtable_internal::DataLabels data_labels),
110+
(bigtable_internal::TableResourceLabels const& resource_labels,
111+
bigtable_internal::TableDataLabels const& data_labels),
112112
(const, override));
113113
};
114114

@@ -118,8 +118,8 @@ class CloningMetric : public bigtable_internal::Metric {
118118
explicit CloningMetric(std::unique_ptr<MockMetric> metric)
119119
: metric_(std::move(metric)) {}
120120
std::unique_ptr<bigtable_internal::Metric> clone(
121-
bigtable_internal::ResourceLabels,
122-
bigtable_internal::DataLabels) const override {
121+
bigtable_internal::TableResourceLabels const&,
122+
bigtable_internal::TableDataLabels const&) const override {
123123
return std::move(metric_);
124124
}
125125

‎google/cloud/bigtable/internal/data_connection_impl_test.cc‎

Lines changed: 65 additions & 59 deletions
Large diffs are not rendered by default.

‎google/cloud/bigtable/internal/default_row_reader_test.cc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ class MockMetric : public Metric {
126126
ElementDeliveryParams const&),
127127
(override));
128128
MOCK_METHOD(std::unique_ptr<Metric>, clone,
129-
(ResourceLabels resource_labels, DataLabels data_labels),
129+
(TableResourceLabels const& resource_labels,
130+
TableDataLabels const& data_labels),
130131
(const, override));
131132
};
132133

@@ -135,7 +136,8 @@ class CloningMetric : public Metric {
135136
public:
136137
explicit CloningMetric(std::unique_ptr<MockMetric> metric)
137138
: metric_(std::move(metric)) {}
138-
std::unique_ptr<Metric> clone(ResourceLabels, DataLabels) const override {
139+
std::unique_ptr<Metric> clone(TableResourceLabels const&,
140+
TableDataLabels const&) const override {
139141
return std::move(metric_);
140142
}
141143

‎google/cloud/bigtable/internal/metrics.cc‎

Lines changed: 41 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ auto constexpr kMeterInstrumentationScopeVersion = "v1";
3535
} // namespace
3636

3737
// TODO(#15329): Refactor how we're handling different data labels for
38-
// the various RPCs. Adding a function to each metric type to add its DataLabels
39-
// to the map should be more performant than performing a set_difference every
40-
// time.
41-
LabelMap IntoLabelMap(ResourceLabels const& r, DataLabels const& d,
38+
// the various RPCs. Adding a function to each metric type to add its
39+
// TableDataLabels to the map should be more performant than performing a
40+
// set_difference every time.
41+
LabelMap IntoLabelMap(TableResourceLabels const& r, TableDataLabels const& d,
4242
std::set<std::string> const& filtered_data_labels,
4343
std::optional<PeerInfoLabels> const& peer_info_labels) {
4444
LabelMap labels = {
@@ -219,11 +219,12 @@ void OperationLatency::OnDone(opentelemetry::context::Context const& context,
219219
context);
220220
}
221221

222-
std::unique_ptr<Metric> OperationLatency::clone(ResourceLabels resource_labels,
223-
DataLabels data_labels) const {
222+
std::unique_ptr<Metric> OperationLatency::clone(
223+
TableResourceLabels const& resource_labels,
224+
TableDataLabels const& data_labels) const {
224225
auto m = std::make_unique<OperationLatency>(*this);
225-
m->resource_labels_ = std::move(resource_labels);
226-
m->data_labels_ = std::move(data_labels);
226+
m->resource_labels_ = resource_labels;
227+
m->data_labels_ = data_labels;
227228
return m;
228229
}
229230

@@ -256,11 +257,12 @@ void AttemptLatency::PostCall(opentelemetry::context::Context const& context,
256257
attempt_latencies_->Record(attempt_elapsed.count(), std::move(m), context);
257258
}
258259

259-
std::unique_ptr<Metric> AttemptLatency::clone(ResourceLabels resource_labels,
260-
DataLabels data_labels) const {
260+
std::unique_ptr<Metric> AttemptLatency::clone(
261+
TableResourceLabels const& resource_labels,
262+
TableDataLabels const& data_labels) const {
261263
auto m = std::make_unique<AttemptLatency>(*this);
262-
m->resource_labels_ = std::move(resource_labels);
263-
m->data_labels_ = std::move(data_labels);
264+
m->resource_labels_ = resource_labels;
265+
m->data_labels_ = data_labels;
264266
return m;
265267
}
266268

@@ -306,11 +308,12 @@ void AttemptLatency2::PostCall(opentelemetry::context::Context const& context,
306308
attempt_latencies2_->Record(attempt_elapsed.count(), std::move(m), context);
307309
}
308310

309-
std::unique_ptr<Metric> AttemptLatency2::clone(ResourceLabels resource_labels,
310-
DataLabels data_labels) const {
311+
std::unique_ptr<Metric> AttemptLatency2::clone(
312+
TableResourceLabels const& resource_labels,
313+
TableDataLabels const& data_labels) const {
311314
auto m = std::make_unique<AttemptLatency2>(*this);
312-
m->resource_labels_ = std::move(resource_labels);
313-
m->data_labels_ = std::move(data_labels);
315+
m->resource_labels_ = resource_labels;
316+
m->data_labels_ = data_labels;
314317
return m;
315318
}
316319

@@ -350,11 +353,12 @@ void RetryCount::OnDone(opentelemetry::context::Context const& context,
350353
context);
351354
}
352355

353-
std::unique_ptr<Metric> RetryCount::clone(ResourceLabels resource_labels,
354-
DataLabels data_labels) const {
356+
std::unique_ptr<Metric> RetryCount::clone(
357+
TableResourceLabels const& resource_labels,
358+
TableDataLabels const& data_labels) const {
355359
auto m = std::make_unique<RetryCount>(*this);
356-
m->resource_labels_ = std::move(resource_labels);
357-
m->data_labels_ = std::move(data_labels);
360+
m->resource_labels_ = resource_labels;
361+
m->data_labels_ = data_labels;
358362
return m;
359363
}
360364

@@ -405,10 +409,11 @@ void FirstResponseLatency::OnDone(
405409
}
406410

407411
std::unique_ptr<Metric> FirstResponseLatency::clone(
408-
ResourceLabels resource_labels, DataLabels data_labels) const {
412+
TableResourceLabels const& resource_labels,
413+
TableDataLabels const& data_labels) const {
409414
auto m = std::make_unique<FirstResponseLatency>(*this);
410-
m->resource_labels_ = std::move(resource_labels);
411-
m->data_labels_ = std::move(data_labels);
415+
m->resource_labels_ = resource_labels;
416+
m->data_labels_ = data_labels;
412417
return m;
413418
}
414419

@@ -437,11 +442,12 @@ void ServerLatency::PostCall(opentelemetry::context::Context const& context,
437442
}
438443
}
439444

440-
std::unique_ptr<Metric> ServerLatency::clone(ResourceLabels resource_labels,
441-
DataLabels data_labels) const {
445+
std::unique_ptr<Metric> ServerLatency::clone(
446+
TableResourceLabels const& resource_labels,
447+
TableDataLabels const& data_labels) const {
442448
auto m = std::make_unique<ServerLatency>(*this);
443-
m->resource_labels_ = std::move(resource_labels);
444-
m->data_labels_ = std::move(data_labels);
449+
m->resource_labels_ = resource_labels;
450+
m->data_labels_ = data_labels;
445451
return m;
446452
}
447453

@@ -480,10 +486,11 @@ void ConnectivityErrorCount::OnDone(
480486
}
481487

482488
std::unique_ptr<Metric> ConnectivityErrorCount::clone(
483-
ResourceLabels resource_labels, DataLabels data_labels) const {
489+
TableResourceLabels const& resource_labels,
490+
TableDataLabels const& data_labels) const {
484491
auto m = std::make_unique<ConnectivityErrorCount>(*this);
485-
m->resource_labels_ = std::move(resource_labels);
486-
m->data_labels_ = std::move(data_labels);
492+
m->resource_labels_ = resource_labels;
493+
m->data_labels_ = data_labels;
487494
return m;
488495
}
489496

@@ -530,10 +537,11 @@ void ApplicationBlockingLatency::OnDone(
530537
}
531538

532539
std::unique_ptr<Metric> ApplicationBlockingLatency::clone(
533-
ResourceLabels resource_labels, DataLabels data_labels) const {
540+
TableResourceLabels const& resource_labels,
541+
TableDataLabels const& data_labels) const {
534542
auto m = std::make_unique<ApplicationBlockingLatency>(*this);
535-
m->resource_labels_ = std::move(resource_labels);
536-
m->data_labels_ = std::move(data_labels);
543+
m->resource_labels_ = resource_labels;
544+
m->data_labels_ = data_labels;
537545
return m;
538546
}
539547

0 commit comments

Comments
 (0)