add replacements to owlbot.py

Author: parthea

google/cloud/spanner_v1/services/spanner/client.py

@@ -68,6 +68,7 @@
 from google.cloud.spanner_v1.types import result_set
 from google.cloud.spanner_v1.types import spanner
 from google.cloud.spanner_v1.types import transaction
+from google.cloud.spanner_v1.metrics.metrics_interceptor import MetricsInterceptor
 from google.protobuf import struct_pb2  # type: ignore
 from google.protobuf import timestamp_pb2  # type: ignore
 from google.rpc import status_pb2  # type: ignore
@@ -715,6 +716,7 @@ def __init__(
                 client_info=client_info,
                 always_use_jwt_access=True,
                 api_audience=self._client_options.api_audience,
+                metrics_interceptor=MetricsInterceptor(),
             )
 
         if "async" not in str(self._transport):

google/cloud/spanner_v1/services/spanner/transports/base.py

@@ -31,6 +31,7 @@
 from google.cloud.spanner_v1.types import result_set
 from google.cloud.spanner_v1.types import spanner
 from google.cloud.spanner_v1.types import transaction
+from google.cloud.spanner_v1.metrics.metrics_interceptor import MetricsInterceptor
 from google.protobuf import empty_pb2  # type: ignore
 
 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
@@ -62,6 +63,7 @@ def __init__(
         client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
         always_use_jwt_access: Optional[bool] = False,
         api_audience: Optional[str] = None,
+        metrics_interceptor: Optional[MetricsInterceptor] = None,
         **kwargs,
     ) -> None:
         """Instantiate the transport.

google/cloud/spanner_v1/services/spanner/transports/grpc.py

@@ -34,6 +34,7 @@
 from google.cloud.spanner_v1.types import result_set
 from google.cloud.spanner_v1.types import spanner
 from google.cloud.spanner_v1.types import transaction
+from google.cloud.spanner_v1.metrics.metrics_interceptor import MetricsInterceptor
 from google.protobuf import empty_pb2  # type: ignore
 from .base import SpannerTransport, DEFAULT_CLIENT_INFO
 
@@ -146,6 +147,7 @@ def __init__(
         client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
         always_use_jwt_access: Optional[bool] = False,
         api_audience: Optional[str] = None,
+        metrics_interceptor: Optional[MetricsInterceptor] = None,
     ) -> None:
         """Instantiate the transport.
 
@@ -201,6 +203,7 @@ def __init__(
         self._grpc_channel = None
         self._ssl_channel_credentials = ssl_channel_credentials
         self._stubs: Dict[str, Callable] = {}
+        self._metrics_interceptor = None
 
         if api_mtls_endpoint:
             warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)
@@ -267,6 +270,13 @@ def __init__(
                 ],
             )
 
+        # Wrap the gRPC channel with the metric interceptor
+        if metrics_interceptor is not None:
+            self._metrics_interceptor = metrics_interceptor
+            self._grpc_channel = grpc.intercept_channel(
+                self._grpc_channel, metrics_interceptor
+            )
+
         self._interceptor = _LoggingClientInterceptor()
         self._logged_channel = grpc.intercept_channel(
             self._grpc_channel, self._interceptor

google/cloud/spanner_v1/services/spanner/transports/grpc_asyncio.py

@@ -37,6 +37,7 @@
 from google.cloud.spanner_v1.types import result_set
 from google.cloud.spanner_v1.types import spanner
 from google.cloud.spanner_v1.types import transaction
+from google.cloud.spanner_v1.metrics.metrics_interceptor import MetricsInterceptor
 from google.protobuf import empty_pb2  # type: ignore
 from .base import SpannerTransport, DEFAULT_CLIENT_INFO
 from .grpc import SpannerGrpcTransport
@@ -195,6 +196,7 @@ def __init__(
         client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
         always_use_jwt_access: Optional[bool] = False,
         api_audience: Optional[str] = None,
+        metrics_interceptor: Optional[MetricsInterceptor] = None,
     ) -> None:
         """Instantiate the transport.
 

google/cloud/spanner_v1/services/spanner/transports/rest.py

@@ -37,6 +37,7 @@
 from google.cloud.spanner_v1.types import result_set
 from google.cloud.spanner_v1.types import spanner
 from google.cloud.spanner_v1.types import transaction
+from google.cloud.spanner_v1.metrics.metrics_interceptor import MetricsInterceptor
 from google.protobuf import empty_pb2  # type: ignore
 
 
@@ -919,6 +920,7 @@ def __init__(
         url_scheme: str = "https",
         interceptor: Optional[SpannerRestInterceptor] = None,
         api_audience: Optional[str] = None,
+        metrics_interceptor: Optional[MetricsInterceptor] = None,
     ) -> None:
         """Instantiate the transport.
 

google/cloud/spanner_v1/services/spanner/transports/rest_base.py

@@ -28,6 +28,7 @@
 from google.cloud.spanner_v1.types import result_set
 from google.cloud.spanner_v1.types import spanner
 from google.cloud.spanner_v1.types import transaction
+from google.cloud.spanner_v1.metrics.metrics_interceptor import MetricsInterceptor
 from google.protobuf import empty_pb2  # type: ignore
 
 
@@ -53,6 +54,7 @@ def __init__(
         always_use_jwt_access: Optional[bool] = False,
         url_scheme: str = "https",
         api_audience: Optional[str] = None,
+        metrics_interceptor: Optional[MetricsInterceptor] = None,
     ) -> None:
         """Instantiate the transport.
         Args:

owlbot.py

@@ -80,6 +80,96 @@ def get_staging_dirs(
         shutil.rmtree("samples/generated_samples", ignore_errors=True)
         clean_up_generated_samples = False
 
+    # Customization for MetricsInterceptor
+
+    assert 6 == s.replace(
+        [
+            library / "google/cloud/spanner_v1/services/spanner/transports/*.py",
+            library / "google/cloud/spanner_v1/services/spanner/client.py",
+        ],
+        """from google.cloud.spanner_v1.types import transaction""",
+        """from google.cloud.spanner_v1.types import transaction
+from google.cloud.spanner_v1.metrics.metrics_interceptor import MetricsInterceptor""",
+    )
+
+    assert 1 == s.replace(
+        library / "google/cloud/spanner_v1/services/spanner/transports/*.py",
+        """api_audience: Optional\[str\] = None,
+            \*\*kwargs,
+            \) -> None:
+        \"\"\"Instantiate the transport.""",
+"""api_audience: Optional[str] = None,
+            metrics_interceptor: Optional[MetricsInterceptor] = None,
+            **kwargs,
+    ) -> None:
+        \"\"\"Instantiate the transport."""
+    )
+
+    assert 4 == s.replace(
+        library / "google/cloud/spanner_v1/services/spanner/transports/*.py",
+        """api_audience: Optional\[str\] = None,
+            \) -> None:
+        \"\"\"Instantiate the transport.""",
+"""api_audience: Optional[str] = None,
+            metrics_interceptor: Optional[MetricsInterceptor] = None,
+    ) -> None:
+        \"\"\"Instantiate the transport."""
+    )
+
+    assert 1 == s.replace(
+        library / "google/cloud/spanner_v1/services/spanner/transports/grpc.py",
+        """\)\n\n        self._interceptor = _LoggingClientInterceptor\(\)""",
+        """)
+
+        # Wrap the gRPC channel with the metric interceptor
+        if metrics_interceptor is not None:
+            self._metrics_interceptor = metrics_interceptor
+            self._grpc_channel = grpc.intercept_channel(
+                self._grpc_channel, metrics_interceptor
+            )
+
+        self._interceptor = _LoggingClientInterceptor()"""
+    )
+
+    assert 1 == s.replace(
+        library / "google/cloud/spanner_v1/services/spanner/transports/grpc.py",
+        """self._stubs: Dict\[str, Callable\] = \{\}\n\n        if api_mtls_endpoint:""",
+        """self._stubs: Dict[str, Callable] = {}
+        self._metrics_interceptor = None
+
+        if api_mtls_endpoint:"""
+    )
+
+    assert 1 == s.replace(
+        library / "google/cloud/spanner_v1/services/spanner/client.py",
+        """# initialize with the provided callable or the passed in class
+            self._transport = transport_init\(
+                credentials=credentials,
+                credentials_file=self._client_options.credentials_file,
+                host=self._api_endpoint,
+                scopes=self._client_options.scopes,
+                client_cert_source_for_mtls=self._client_cert_source,
+                quota_project_id=self._client_options.quota_project_id,
+                client_info=client_info,
+                always_use_jwt_access=True,
+                api_audience=self._client_options.api_audience,
+            \)""",
+            """# initialize with the provided callable or the passed in class
+            self._transport = transport_init(
+                credentials=credentials,
+                credentials_file=self._client_options.credentials_file,
+                host=self._api_endpoint,
+                scopes=self._client_options.scopes,
+                client_cert_source_for_mtls=self._client_cert_source,
+                quota_project_id=self._client_options.quota_project_id,
+                client_info=client_info,
+                always_use_jwt_access=True,
+                api_audience=self._client_options.api_audience,
+                metrics_interceptor=MetricsInterceptor(),
+            )""",
+    )
+
+
     s.move(
         library,
         excludes=[
@@ -96,11 +186,6 @@ def get_staging_dirs(
 for library in get_staging_dirs(
     spanner_admin_instance_default_version, "spanner_admin_instance"
 ):
-    s.replace(
-        library / "google/cloud/spanner_admin_instance_v*/__init__.py",
-        "from google.cloud.spanner_admin_instance import gapic_version as package_version",
-        f"from google.cloud.spanner_admin_instance_{library.name} import gapic_version as package_version",
-    )
     s.move(
         library,
         excludes=["google/cloud/spanner_admin_instance/**", "*.*", "docs/index.rst", "noxfile.py", "**/gapic_version.py", "testing/constraints-3.7.txt",],
@@ -109,11 +194,6 @@ def get_staging_dirs(
 for library in get_staging_dirs(
     spanner_admin_database_default_version, "spanner_admin_database"
 ):
-    s.replace(
-        library / "google/cloud/spanner_admin_database_v*/__init__.py",
-        "from google.cloud.spanner_admin_database import gapic_version as package_version",
-        f"from google.cloud.spanner_admin_database_{library.name} import gapic_version as package_version",
-    )
     s.move(
         library,
         excludes=["google/cloud/spanner_admin_database/**", "*.*", "docs/index.rst", "noxfile.py", "**/gapic_version.py", "testing/constraints-3.7.txt",],