fixed tests

Author: daniel-sanche

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

@@ -970,13 +970,7 @@ def __init__(
             default_retryable_errors or ()
         )
 
-        self._metrics = BigtableClientSideMetricsController(
-            client._metrics_interceptor,
-            project_id=self.client.project,
-            instance_id=instance_id,
-            table_id=table_id,
-            app_profile_id=app_profile_id,
-        )
+        self._metrics = BigtableClientSideMetricsController()
 
         try:
             self._register_instance_future = CrossSync.create_task(

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

@@ -757,13 +757,7 @@ def __init__(
         self.default_retryable_errors: Sequence[type[Exception]] = (
             default_retryable_errors or ()
         )
-        self._metrics = BigtableClientSideMetricsController(
-            client._metrics_interceptor,
-            project_id=self.client.project,
-            instance_id=instance_id,
-            table_id=table_id,
-            app_profile_id=app_profile_id,
-        )
+        self._metrics = BigtableClientSideMetricsController()
         try:
             self._register_instance_future = CrossSync._Sync_Impl.create_task(
                 self.client._register_instance,

tests/unit/data/_async/test_client.py

@@ -1205,7 +1205,6 @@ async def test_ctor(self):
         assert instance_key in client._active_instances
         assert client._instance_owners[instance_key] == {id(table)}
         assert isinstance(table._metrics, BigtableClientSideMetricsController)
-        assert table._metrics.interceptor == client._metrics_interceptor
         assert table.default_operation_timeout == expected_operation_timeout
         assert table.default_attempt_timeout == expected_attempt_timeout
         assert (
@@ -1547,7 +1546,6 @@ async def test_ctor(self):
         assert instance_key in client._active_instances
         assert client._instance_owners[instance_key] == {id(view)}
         assert isinstance(view._metrics, BigtableClientSideMetricsController)
-        assert view._metrics.interceptor == client._metrics_interceptor
         assert view.default_operation_timeout == expected_operation_timeout
         assert view.default_attempt_timeout == expected_attempt_timeout
         assert (

tests/unit/data/_async/test_metrics_interceptor.py

@@ -535,27 +535,6 @@ def test_end_with_status_w_exception(self):
             final_op = handlers[0].on_operation_complete.call_args[0][0]
             assert final_op.final_status == expected_status
 
-    def test_interceptor_metadata(self):
-        from google.cloud.bigtable.data._metrics.data_model import (
-            OPERATION_INTERCEPTOR_METADATA_KEY,
-        )
-
-        metric = self._make_one(mock.Mock())
-        key, value = metric.interceptor_metadata
-        assert key == OPERATION_INTERCEPTOR_METADATA_KEY
-        assert value == metric.uuid
-
-    def test_cancel(self):
-        """
-        cancel should call on_operation_cancelled on handlers
-        """
-        handlers = [mock.Mock(), mock.Mock()]
-        metric = self._make_one(mock.Mock(), handlers=handlers)
-        metric.cancel()
-        for h in handlers:
-            assert h.on_operation_cancelled.call_count == 1
-            assert h.on_operation_cancelled.call_args[0][0] == metric
-
     def test_end_with_status_with_default_cluster_zone(self):
         """
         ending the operation should use default cluster and zone if not set

tests/unit/data/_metrics/test_data_model.py

@@ -21,19 +21,13 @@ def _make_one(self, *args, **kwargs):
             BigtableClientSideMetricsController,
         )
 
-        # add mock interceptor if called with no arguments
-        if not args and "interceptor" not in kwargs:
-            args = [mock.Mock()]
-
         return BigtableClientSideMetricsController(*args, **kwargs)
 
     def test_ctor_defaults(self):
         """
         should create instance with GCP Exporter handler by default
         """
-        expected_interceptor = object()
-        instance = self._make_one(expected_interceptor)
-        assert instance.interceptor == expected_interceptor
+        instance = self._make_one()
         assert len(instance.handlers) == 0
 
     def ctor_custom_handlers(self):
@@ -92,22 +86,4 @@ def test_create_operation(self):
         assert op.is_streaming is expected_is_streaming
         assert op.zone is expected_zone
         assert len(op.handlers) == 1
-        assert op.handlers[0] is handler
-
-    def test_create_operation_registers_interceptor(self):
-        """
-        creating an operation should link the operation with the controller's interceptor,
-        and add the interceptor as a handler to the operation
-        """
-        from google.cloud.bigtable.data._sync_autogen.metrics_interceptor import (
-            BigtableMetricsInterceptor,
-        )
-
-        custom_handler = object()
-        controller = self._make_one(
-            BigtableMetricsInterceptor(), handlers=[custom_handler]
-        )
-        op = controller.create_operation(object())
-        assert custom_handler in op.handlers
-        assert op.uuid in controller.interceptor.operation_map
-        assert controller.interceptor.operation_map[op.uuid] == op
+        assert op.handlers[0] is handler

tests/unit/data/_metrics/test_metrics_controller.py

@@ -982,7 +982,6 @@ def test_ctor(self):
         assert instance_key in client._active_instances
         assert client._instance_owners[instance_key] == {id(table)}
         assert isinstance(table._metrics, BigtableClientSideMetricsController)
-        assert table._metrics.interceptor == client._metrics_interceptor
         assert table.default_operation_timeout == expected_operation_timeout
         assert table.default_attempt_timeout == expected_attempt_timeout
         assert (
@@ -1251,7 +1250,6 @@ def test_ctor(self):
         assert instance_key in client._active_instances
         assert client._instance_owners[instance_key] == {id(view)}
         assert isinstance(view._metrics, BigtableClientSideMetricsController)
-        assert view._metrics.interceptor == client._metrics_interceptor
         assert view.default_operation_timeout == expected_operation_timeout
         assert view.default_attempt_timeout == expected_attempt_timeout
         assert (