Skip to content
This repository was archived by the owner on Apr 1, 2026. It is now read-only.

Commit 231f38b

Browse files
committed
Merge branch 'csm_1_data_model' into csm_2_instrumentation
2 parents 911a299 + c1cc24d commit 231f38b

5 files changed

Lines changed: 4 additions & 8 deletions

File tree

google/cloud/bigtable/data/_async/client.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -971,9 +971,7 @@ def __init__(
971971
default_retryable_errors or ()
972972
)
973973

974-
self._metrics = BigtableClientSideMetricsController(
975-
handlers=[],
976-
)
974+
self._metrics = BigtableClientSideMetricsController()
977975

978976
try:
979977
self._register_instance_future = CrossSync.create_task(

google/cloud/bigtable/data/_metrics/metrics_controller.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ def __init__(
3434
Initializes the metrics controller.
3535
3636
Args:
37-
- interceptor: A metrics interceptor to use for triggering Operation lifecycle events
3837
- handlers: A list of MetricsHandler objects to subscribe to metrics events.
39-
- **kwargs: Optional arguments to pass to the metrics handlers.
4038
"""
4139
self.handlers: list[MetricsHandler] = handlers or []
4240

google/cloud/bigtable/data/_sync_autogen/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,7 @@ def __init__(
758758
self.default_retryable_errors: Sequence[type[Exception]] = (
759759
default_retryable_errors or ()
760760
)
761-
self._metrics = BigtableClientSideMetricsController(handlers=[])
761+
self._metrics = BigtableClientSideMetricsController()
762762
try:
763763
self._register_instance_future = CrossSync._Sync_Impl.create_task(
764764
self.client._register_instance,

tests/unit/data/_metrics/test_metrics_controller.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,4 @@ def test_create_operation(self):
8686
assert op.is_streaming is expected_is_streaming
8787
assert op.zone is expected_zone
8888
assert len(op.handlers) == 1
89-
assert op.handlers[0] is handler
89+
assert op.handlers[0] is handler

tests/unit/data/test_sync_up_to_date.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def test_verify_headers(sync_file):
9090
\#\ distributed\ under\ the\ License\ is\ distributed\ on\ an\ \"AS\ IS\"\ BASIS,\n
9191
\#\ WITHOUT\ WARRANTIES\ OR\ CONDITIONS\ OF\ ANY\ KIND,\ either\ express\ or\ implied\.\n
9292
\#\ See\ the\ License\ for\ the\ specific\ language\ governing\ permissions\ and\n
93-
\#\ limitations\ under\ the\ License\.
93+
\#\ limitations\ under\ the\ License
9494
"""
9595
pattern = re.compile(license_regex, re.VERBOSE)
9696

0 commit comments

Comments
 (0)