added operation cancelled to interceptor

Author: daniel-sanche

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

@@ -19,6 +19,7 @@
 )
 from google.cloud.bigtable.data._metrics.data_model import ActiveOperationMetric
 from google.cloud.bigtable.data._metrics.data_model import OperationState
+from google.cloud.bigtable.data._metrics.handlers._base import MetricsHandler
 
 from google.cloud.bigtable.data._cross_sync import CrossSync
 
@@ -65,7 +66,7 @@ def wrapper(self, continuation, client_call_details, request):
 
 @CrossSync.convert_class(sync_name="BigtableMetricsInterceptor")
 class AsyncBigtableMetricsInterceptor(
-    UnaryUnaryClientInterceptor, UnaryStreamClientInterceptor
+    UnaryUnaryClientInterceptor, UnaryStreamClientInterceptor, MetricsHandler
 ):
     """
     An async gRPC interceptor to add client metadata and print server metadata.
@@ -93,8 +94,8 @@ def register_operation(self, operation):
     def on_operation_complete(self, op):
         del self.operation_map[op.uuid]
 
-    def on_attempt_complete(self, attempt, operation):
-        pass
+    def on_operation_cancelled(self, op):
+        self.on_operation_complete(op)
 
     @CrossSync.convert
     @_with_operation_from_metadata

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

@@ -370,7 +370,7 @@ def cancel(self):
         Called to cancel an operation without processing emitting it.
         """
         for handler in self.handlers:
-            handler.on_operation_canceled(self)
+            handler.on_operation_cancelled(self)
 
     @staticmethod
     def _exc_to_status(exc: Exception) -> StatusCode:

google/cloud/bigtable/data/_metrics/handlers/_base.py

@@ -29,7 +29,7 @@ def __init__(self, **kwargs):
     def on_operation_complete(self, op: CompletedOperationMetric) -> None:
         pass
 
-    def on_operation_canceled(self, op: ActiveOperationMetric) -> None:
+    def on_operation_cancelled(self, op: ActiveOperationMetric) -> None:
         pass
 
     def on_attempt_complete(

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

@@ -21,6 +21,7 @@
 )
 from google.cloud.bigtable.data._metrics.data_model import ActiveOperationMetric
 from google.cloud.bigtable.data._metrics.data_model import OperationState
+from google.cloud.bigtable.data._metrics.handlers._base import MetricsHandler
 from grpc import UnaryUnaryClientInterceptor
 from grpc import UnaryStreamClientInterceptor
 
@@ -51,7 +52,7 @@ def wrapper(self, continuation, client_call_details, request):
 
 
 class BigtableMetricsInterceptor(
-    UnaryUnaryClientInterceptor, UnaryStreamClientInterceptor
+    UnaryUnaryClientInterceptor, UnaryStreamClientInterceptor, MetricsHandler
 ):
     """
     An async gRPC interceptor to add client metadata and print server metadata.
@@ -77,8 +78,8 @@ def register_operation(self, operation):
     def on_operation_complete(self, op):
         del self.operation_map[op.uuid]
 
-    def on_attempt_complete(self, attempt, operation):
-        pass
+    def on_operation_cancelled(self, op):
+        self.on_operation_complete(op)
 
     @_with_operation_from_metadata
     def intercept_unary_unary(