moved interceptor into _metrics

Author: daniel-sanche

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

@@ -103,7 +103,7 @@
     from google.cloud.bigtable.data._async._swappable_channel import (
         AsyncSwappableChannel as SwappableChannelType,
     )
-    from google.cloud.bigtable.data._async.metrics_interceptor import (
+    from google.cloud.bigtable.data._metrics._async.metrics_interceptor import (
         AsyncBigtableMetricsInterceptor as MetricsInterceptorType,
     )
 else:
@@ -116,7 +116,7 @@
     from google.cloud.bigtable.data._sync_autogen._swappable_channel import (  # noqa: F401
         SwappableChannel as SwappableChannelType,
     )
-    from google.cloud.bigtable.data._sync_autogen.metrics_interceptor import (  # noqa: F401
+    from google.cloud.bigtable.data._metrics._sync_autogen.metrics_interceptor import (  # noqa: F401
         BigtableMetricsInterceptor as MetricsInterceptorType,
     )
 

google/cloud/bigtable/data/_async/metrics_interceptor.py renamed to google/cloud/bigtable/data/_metrics/_async/metrics_interceptor.py

@@ -33,7 +33,7 @@
     from grpc import UnaryStreamClientInterceptor
 
 
-__CROSS_SYNC_OUTPUT__ = "google.cloud.bigtable.data._sync_autogen.metrics_interceptor"
+__CROSS_SYNC_OUTPUT__ = "google.cloud.bigtable.data._metrics._sync_autogen.metrics_interceptor"
 
 
 def _with_active_operation(func):

google/cloud/bigtable/data/_sync_autogen/metrics_interceptor.py renamed to google/cloud/bigtable/data/_metrics/_sync_autogen/metrics_interceptor.py

@@ -87,7 +87,7 @@
 from google.cloud.bigtable.data._sync_autogen._swappable_channel import (
     SwappableChannel as SwappableChannelType,
 )
-from google.cloud.bigtable.data._sync_autogen.metrics_interceptor import (
+from google.cloud.bigtable.data._metrics._sync_autogen.metrics_interceptor import (
     BigtableMetricsInterceptor as MetricsInterceptorType,
 )
 

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

@@ -55,7 +55,7 @@
     from google.cloud.bigtable.data._async._swappable_channel import (
         AsyncSwappableChannel,
     )
-    from google.cloud.bigtable.data._async.metrics_interceptor import (
+    from google.cloud.bigtable.data._metrics._async.metrics_interceptor import (
         AsyncBigtableMetricsInterceptor,
     )
 
@@ -68,7 +68,7 @@
     from google.cloud.bigtable.data._sync_autogen._swappable_channel import (
         SwappableChannel,
     )
-    from google.cloud.bigtable.data._sync_autogen.metrics_interceptor import (
+    from google.cloud.bigtable.data._metrics._sync_autogen.metrics_interceptor import (
         BigtableMetricsInterceptor,
     )
 

tests/unit/data/_async/test_client.py

@@ -27,11 +27,11 @@
     import mock  # type: ignore
 
 if CrossSync.is_async:
-    from google.cloud.bigtable.data._async.metrics_interceptor import (
+    from google.cloud.bigtable.data._metrics._async.metrics_interceptor import (
         AsyncBigtableMetricsInterceptor,
     )
 else:
-    from google.cloud.bigtable.data._sync_autogen.metrics_interceptor import (  # noqa: F401
+    from google.cloud.bigtable.data._metrics._sync_autogen.metrics_interceptor import (  # noqa: F401
         BigtableMetricsInterceptor,
     )
 

tests/unit/data/_async/test_metrics_interceptor.py

@@ -47,7 +47,7 @@
 )
 from google.api_core import grpc_helpers
 from google.cloud.bigtable.data._sync_autogen._swappable_channel import SwappableChannel
-from google.cloud.bigtable.data._sync_autogen.metrics_interceptor import (
+from google.cloud.bigtable.data._metrics._sync_autogen.metrics_interceptor import (
     BigtableMetricsInterceptor,
 )
 

tests/unit/data/_sync_autogen/test_client.py

@@ -26,7 +26,7 @@
     from unittest import mock
 except ImportError:
     import mock
-from google.cloud.bigtable.data._sync_autogen.metrics_interceptor import (
+from google.cloud.bigtable.data._metrics._sync_autogen.metrics_interceptor import (
     BigtableMetricsInterceptor,
 )