Skip to content

refactor(bigtable): rename metric Labels types to indicate Table schema #16337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
scotthart wants to merge 2 commits into
base: main
Choose a base branch
from
Open

refactor(bigtable): rename metric Labels types to indicate Table schema #16337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc515d5
refactor(bigtable): rename metric Labels types to indicate Table schema
scotthart Aug 9, 2026
570a1a6
address review comments
scotthart Aug 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions google/cloud/bigtable/internal/async_bulk_apply_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,8 @@ class MockMetric : public Metric {
ElementDeliveryParams const&),
(override));
MOCK_METHOD(std::unique_ptr<Metric>, clone,
(ResourceLabels resource_labels, DataLabels data_labels),
(TableResourceLabels const& resource_labels,
TableDataLabels const& data_labels),
(const, override));
};

Expand All @@ -172,7 +173,8 @@ class CloningMetric : public Metric {
public:
explicit CloningMetric(std::unique_ptr<MockMetric> metric)
: metric_(std::move(metric)) {}
std::unique_ptr<Metric> clone(ResourceLabels, DataLabels) const override {
std::unique_ptr<Metric> clone(TableResourceLabels const&,
TableDataLabels const&) const override {
return std::move(metric_);
}

Expand Down
6 changes: 4 additions & 2 deletions google/cloud/bigtable/internal/async_row_reader_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ class MockMetric : public Metric {
ElementDeliveryParams const&),
(override));
MOCK_METHOD(std::unique_ptr<Metric>, clone,
(ResourceLabels resource_labels, DataLabels data_labels),
(TableResourceLabels const& resource_labels,
TableDataLabels const& data_labels),
(const, override));
};

Expand All @@ -124,7 +125,8 @@ class CloningMetric : public Metric {
public:
explicit CloningMetric(std::unique_ptr<MockMetric> metric)
: metric_(std::move(metric)) {}
std::unique_ptr<Metric> clone(ResourceLabels, DataLabels) const override {
std::unique_ptr<Metric> clone(TableResourceLabels const&,
TableDataLabels const&) const override {
return std::move(metric_);
}

Expand Down
6 changes: 4 additions & 2 deletions google/cloud/bigtable/internal/async_row_sampler_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ class MockMetric : public Metric {
ElementDeliveryParams const&),
(override));
MOCK_METHOD(std::unique_ptr<Metric>, clone,
(ResourceLabels resource_labels, DataLabels data_labels),
(TableResourceLabels const& resource_labels,
TableDataLabels const& data_labels),
(const, override));
};

Expand All @@ -112,7 +113,8 @@ class CloningMetric : public Metric {
public:
explicit CloningMetric(std::unique_ptr<MockMetric> metric)
: metric_(std::move(metric)) {}
std::unique_ptr<Metric> clone(ResourceLabels, DataLabels) const override {
std::unique_ptr<Metric> clone(TableResourceLabels const&,
TableDataLabels const&) const override {
return std::move(metric_);
}

Expand Down
8 changes: 4 additions & 4 deletions google/cloud/bigtable/internal/bulk_mutator_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ class MockMetric : public bigtable_internal::Metric {
bigtable_internal::ElementDeliveryParams const&),
(override));
MOCK_METHOD(std::unique_ptr<Metric>, clone,
(bigtable_internal::ResourceLabels resource_labels,
bigtable_internal::DataLabels data_labels),
(bigtable_internal::TableResourceLabels const& resource_labels,
bigtable_internal::TableDataLabels const& data_labels),
(const, override));
};

Expand All @@ -118,8 +118,8 @@ class CloningMetric : public bigtable_internal::Metric {
explicit CloningMetric(std::unique_ptr<MockMetric> metric)
: metric_(std::move(metric)) {}
std::unique_ptr<bigtable_internal::Metric> clone(
bigtable_internal::ResourceLabels,
bigtable_internal::DataLabels) const override {
bigtable_internal::TableResourceLabels const&,
bigtable_internal::TableDataLabels const&) const override {
return std::move(metric_);
}

Expand Down
124 changes: 65 additions & 59 deletions google/cloud/bigtable/internal/data_connection_impl_test.cc
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions google/cloud/bigtable/internal/default_row_reader_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ class MockMetric : public Metric {
ElementDeliveryParams const&),
(override));
MOCK_METHOD(std::unique_ptr<Metric>, clone,
(ResourceLabels resource_labels, DataLabels data_labels),
(TableResourceLabels const& resource_labels,
TableDataLabels const& data_labels),
(const, override));
};

Expand All @@ -135,7 +136,8 @@ class CloningMetric : public Metric {
public:
explicit CloningMetric(std::unique_ptr<MockMetric> metric)
: metric_(std::move(metric)) {}
std::unique_ptr<Metric> clone(ResourceLabels, DataLabels) const override {
std::unique_ptr<Metric> clone(TableResourceLabels const&,
TableDataLabels const&) const override {
return std::move(metric_);
}

Expand Down
74 changes: 41 additions & 33 deletions google/cloud/bigtable/internal/metrics.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ auto constexpr kMeterInstrumentationScopeVersion = "v1";
} // namespace

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

std::unique_ptr<Metric> OperationLatency::clone(ResourceLabels resource_labels,
DataLabels data_labels) const {
std::unique_ptr<Metric> OperationLatency::clone(
TableResourceLabels const& resource_labels,
TableDataLabels const& data_labels) const {
auto m = std::make_unique<OperationLatency>(*this);
m->resource_labels_ = std::move(resource_labels);
m->data_labels_ = std::move(data_labels);
m->resource_labels_ = resource_labels;
m->data_labels_ = data_labels;
return m;
}

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

std::unique_ptr<Metric> AttemptLatency::clone(ResourceLabels resource_labels,
DataLabels data_labels) const {
std::unique_ptr<Metric> AttemptLatency::clone(
TableResourceLabels const& resource_labels,
TableDataLabels const& data_labels) const {
auto m = std::make_unique<AttemptLatency>(*this);
m->resource_labels_ = std::move(resource_labels);
m->data_labels_ = std::move(data_labels);
m->resource_labels_ = resource_labels;
m->data_labels_ = data_labels;
return m;
}

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

std::unique_ptr<Metric> AttemptLatency2::clone(ResourceLabels resource_labels,
DataLabels data_labels) const {
std::unique_ptr<Metric> AttemptLatency2::clone(
TableResourceLabels const& resource_labels,
TableDataLabels const& data_labels) const {
auto m = std::make_unique<AttemptLatency2>(*this);
m->resource_labels_ = std::move(resource_labels);
m->data_labels_ = std::move(data_labels);
m->resource_labels_ = resource_labels;
m->data_labels_ = data_labels;
return m;
}

Expand Down Expand Up @@ -350,11 +353,12 @@ void RetryCount::OnDone(opentelemetry::context::Context const& context,
context);
}

std::unique_ptr<Metric> RetryCount::clone(ResourceLabels resource_labels,
DataLabels data_labels) const {
std::unique_ptr<Metric> RetryCount::clone(
TableResourceLabels const& resource_labels,
TableDataLabels const& data_labels) const {
auto m = std::make_unique<RetryCount>(*this);
m->resource_labels_ = std::move(resource_labels);
m->data_labels_ = std::move(data_labels);
m->resource_labels_ = resource_labels;
m->data_labels_ = data_labels;
return m;
}

Expand Down Expand Up @@ -405,10 +409,11 @@ void FirstResponseLatency::OnDone(
}

std::unique_ptr<Metric> FirstResponseLatency::clone(
ResourceLabels resource_labels, DataLabels data_labels) const {
TableResourceLabels const& resource_labels,
TableDataLabels const& data_labels) const {
auto m = std::make_unique<FirstResponseLatency>(*this);
m->resource_labels_ = std::move(resource_labels);
m->data_labels_ = std::move(data_labels);
m->resource_labels_ = resource_labels;
m->data_labels_ = data_labels;
return m;
}

Expand Down Expand Up @@ -437,11 +442,12 @@ void ServerLatency::PostCall(opentelemetry::context::Context const& context,
}
}

std::unique_ptr<Metric> ServerLatency::clone(ResourceLabels resource_labels,
DataLabels data_labels) const {
std::unique_ptr<Metric> ServerLatency::clone(
TableResourceLabels const& resource_labels,
TableDataLabels const& data_labels) const {
auto m = std::make_unique<ServerLatency>(*this);
m->resource_labels_ = std::move(resource_labels);
m->data_labels_ = std::move(data_labels);
m->resource_labels_ = resource_labels;
m->data_labels_ = data_labels;
return m;
}

Expand Down Expand Up @@ -480,10 +486,11 @@ void ConnectivityErrorCount::OnDone(
}

std::unique_ptr<Metric> ConnectivityErrorCount::clone(
ResourceLabels resource_labels, DataLabels data_labels) const {
TableResourceLabels const& resource_labels,
TableDataLabels const& data_labels) const {
auto m = std::make_unique<ConnectivityErrorCount>(*this);
m->resource_labels_ = std::move(resource_labels);
m->data_labels_ = std::move(data_labels);
m->resource_labels_ = resource_labels;
m->data_labels_ = data_labels;
return m;
}

Expand Down Expand Up @@ -530,10 +537,11 @@ void ApplicationBlockingLatency::OnDone(
}

std::unique_ptr<Metric> ApplicationBlockingLatency::clone(
ResourceLabels resource_labels, DataLabels data_labels) const {
TableResourceLabels const& resource_labels,
TableDataLabels const& data_labels) const {
Comment thread
scotthart marked this conversation as resolved.
auto m = std::make_unique<ApplicationBlockingLatency>(*this);
m->resource_labels_ = std::move(resource_labels);
m->data_labels_ = std::move(data_labels);
m->resource_labels_ = resource_labels;
m->data_labels_ = data_labels;
return m;
}

Expand Down
Loading
Loading