Skip to content

refactor(bigtable): move clone method from Metric to TableSchemaMetric #16359

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

Merged
scotthart merged 2 commits into from
Aug 20, 2026
Merged

refactor(bigtable): move clone method from Metric to TableSchemaMetric #16359

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
102f2ba
refactor(bigtable): move clone method from Metric to TableSchemaMetric
scotthart Aug 19, 2026
595d9c0
address review comments
scotthart Aug 19, 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
3 changes: 3 additions & 0 deletions google/cloud/bigtable/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,8 @@ add_library(
internal/rpc_policy_parameters.inc
internal/stub_manager.cc
internal/stub_manager.h
internal/table_schema_metrics.cc
internal/table_schema_metrics.h
internal/traced_row_reader.cc
internal/traced_row_reader.h
internal/tuple_utils.h
Expand Down Expand Up @@ -485,6 +487,7 @@ if (BUILD_TESTING)
internal/rate_limiter_test.cc
internal/retry_traits_test.cc
internal/stub_manager_test.cc
internal/table_schema_metrics_test.cc
internal/traced_row_reader_test.cc
internal/tuple_utils_test.cc
mocks/mock_row_reader_test.cc
Expand Down
1 change: 1 addition & 0 deletions google/cloud/bigtable/bigtable_client_unit_tests.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ bigtable_client_unit_tests = [
"internal/rate_limiter_test.cc",
"internal/retry_traits_test.cc",
"internal/stub_manager_test.cc",
"internal/table_schema_metrics_test.cc",
"internal/traced_row_reader_test.cc",
"internal/tuple_utils_test.cc",
"mocks/mock_row_reader_test.cc",
Expand Down
2 changes: 2 additions & 0 deletions google/cloud/bigtable/google_cloud_cpp_bigtable.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ google_cloud_cpp_bigtable_hdrs = [
"internal/rpc_policy_parameters.h",
"internal/rpc_policy_parameters.inc",
"internal/stub_manager.h",
"internal/table_schema_metrics.h",
"internal/traced_row_reader.h",
"internal/tuple_utils.h",
"internal/unary_client_utils.h",
Expand Down Expand Up @@ -221,6 +222,7 @@ google_cloud_cpp_bigtable_srcs = [
"internal/readrowsparser.cc",
"internal/retry_traits.cc",
"internal/stub_manager.cc",
"internal/table_schema_metrics.cc",
"internal/traced_row_reader.cc",
"mutation_batcher.cc",
"mutations.cc",
Expand Down
5 changes: 3 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 @@ -21,6 +21,7 @@
#include "google/cloud/internal/background_threads_impl.h"
#ifdef GOOGLE_CLOUD_CPP_BIGTABLE_WITH_OTEL_METRICS
#include "google/cloud/bigtable/internal/metrics.h"
#include "google/cloud/bigtable/internal/table_schema_metrics.h"
#include "google/cloud/testing_util/fake_clock.h"
#endif
#include "google/cloud/internal/opentelemetry.h"
Expand Down Expand Up @@ -142,7 +143,7 @@ TEST_F(AsyncBulkApplyTest, NoMutations) {

#ifdef GOOGLE_CLOUD_CPP_BIGTABLE_WITH_OTEL_METRICS

class MockMetric : public Metric {
class MockMetric : public TableSchemaMetric {
public:
MOCK_METHOD(void, PreCall,
(opentelemetry::context::Context const&, PreCallParams const&),
Expand All @@ -162,7 +163,7 @@ class MockMetric : public Metric {
(opentelemetry::context::Context const&,
ElementDeliveryParams const&),
(override));
MOCK_METHOD(std::unique_ptr<Metric>, clone,
MOCK_METHOD(std::unique_ptr<TableSchemaMetric>, clone,
(TableResourceLabels const& resource_labels,
TableDataLabels const& data_labels),
(const, override));
Expand Down
5 changes: 3 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 @@ -21,6 +21,7 @@
#include "google/cloud/internal/opentelemetry.h"
#ifdef GOOGLE_CLOUD_CPP_BIGTABLE_WITH_OTEL_METRICS
#include "google/cloud/bigtable/internal/metrics.h"
#include "google/cloud/bigtable/internal/table_schema_metrics.h"
#include "google/cloud/testing_util/fake_clock.h"
#endif
#include "google/cloud/testing_util/mock_backoff_policy.h"
Expand Down Expand Up @@ -94,7 +95,7 @@ class AsyncRowReaderTest : public ::testing::Test {

#ifdef GOOGLE_CLOUD_CPP_BIGTABLE_WITH_OTEL_METRICS

class MockMetric : public Metric {
class MockMetric : public TableSchemaMetric {
public:
MOCK_METHOD(void, PreCall,
(opentelemetry::context::Context const&, PreCallParams const&),
Expand All @@ -114,7 +115,7 @@ class MockMetric : public Metric {
(opentelemetry::context::Context const&,
ElementDeliveryParams const&),
(override));
MOCK_METHOD(std::unique_ptr<Metric>, clone,
MOCK_METHOD(std::unique_ptr<TableSchemaMetric>, clone,
(TableResourceLabels const& resource_labels,
TableDataLabels const& data_labels),
(const, override));
Expand Down
5 changes: 3 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 @@ -20,6 +20,7 @@
#include "google/cloud/internal/make_status.h"
#ifdef GOOGLE_CLOUD_CPP_BIGTABLE_WITH_OTEL_METRICS
#include "google/cloud/bigtable/internal/metrics.h"
#include "google/cloud/bigtable/internal/table_schema_metrics.h"
#include "google/cloud/testing_util/fake_clock.h"
#endif
#include "google/cloud/internal/opentelemetry.h"
Expand Down Expand Up @@ -82,7 +83,7 @@ std::optional<v2::SampleRowKeysResponse> MakeResponse(std::string row_key,

#ifdef GOOGLE_CLOUD_CPP_BIGTABLE_WITH_OTEL_METRICS

class MockMetric : public Metric {
class MockMetric : public TableSchemaMetric {
public:
MOCK_METHOD(void, PreCall,
(opentelemetry::context::Context const&, PreCallParams const&),
Expand All @@ -102,7 +103,7 @@ class MockMetric : public Metric {
(opentelemetry::context::Context const&,
ElementDeliveryParams const&),
(override));
MOCK_METHOD(std::unique_ptr<Metric>, clone,
MOCK_METHOD(std::unique_ptr<TableSchemaMetric>, clone,
(TableResourceLabels const& resource_labels,
TableDataLabels const& data_labels),
(const, override));
Expand Down
5 changes: 3 additions & 2 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 @@ -17,6 +17,7 @@
#include "google/cloud/grpc_options.h"
#ifdef GOOGLE_CLOUD_CPP_BIGTABLE_WITH_OTEL_METRICS
#include "google/cloud/bigtable/internal/metrics.h"
#include "google/cloud/bigtable/internal/table_schema_metrics.h"
#include "google/cloud/testing_util/fake_clock.h"
#endif
#include "google/cloud/bigtable/testing/mock_bigtable_stub.h"
Expand Down Expand Up @@ -83,7 +84,7 @@ v2::MutateRowsResponse MakeResponse(

#ifdef GOOGLE_CLOUD_CPP_BIGTABLE_WITH_OTEL_METRICS

class MockMetric : public bigtable_internal::Metric {
class MockMetric : public bigtable_internal::TableSchemaMetric {
public:
MOCK_METHOD(void, PreCall,
(opentelemetry::context::Context const&,
Expand All @@ -106,7 +107,7 @@ class MockMetric : public bigtable_internal::Metric {
(opentelemetry::context::Context const&,
bigtable_internal::ElementDeliveryParams const&),
(override));
MOCK_METHOD(std::unique_ptr<Metric>, clone,
MOCK_METHOD(std::unique_ptr<bigtable_internal::TableSchemaMetric>, clone,
(bigtable_internal::TableResourceLabels const& resource_labels,
bigtable_internal::TableDataLabels const& data_labels),
(const, override));
Expand Down
Loading
Loading