ran lint

Author: daniel-sanche

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

@@ -86,8 +86,12 @@
 from google.cloud.bigtable.data.row_filters import CellsRowLimitFilter
 from google.cloud.bigtable.data.row_filters import RowFilterChain
 from google.cloud.bigtable.data._metrics import BigtableClientSideMetricsController
-from google.cloud.bigtable.data._metrics.handlers.gcp_exporter import BigtableMetricsExporter
-from google.cloud.bigtable.data._metrics.handlers.gcp_exporter import GoogleCloudMetricsHandler
+from google.cloud.bigtable.data._metrics.handlers.gcp_exporter import (
+    BigtableMetricsExporter,
+)
+from google.cloud.bigtable.data._metrics.handlers.gcp_exporter import (
+    GoogleCloudMetricsHandler,
+)
 from google.cloud.bigtable.data._metrics import OperationType
 
 from google.cloud.bigtable.data._cross_sync import CrossSync

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

@@ -99,7 +99,7 @@ class GoogleCloudMetricsHandler(OpenTelemetryMetricsHandler):
       - throttling_latencies: latency introduced by waiting when there are too many outstanding requests in a bulk operation.
 
     Args:
-      - exporter: The exporter object used to write metrics to Cloud Montitoring. 
+      - exporter: The exporter object used to write metrics to Cloud Montitoring.
             Should correspond 1:1 with a bigtable client, and share auth configuration
       - export_interval: The interval (in seconds) at which to export metrics to Cloud Monitoring.
       - *args: configuration positional arguments passed down to super class
@@ -112,7 +112,9 @@ def __init__(self, exporter, *args, export_interval=60, **kwargs):
             exporter, export_interval_millis=export_interval * 1000
         )
         # use private meter provider to store instruments and views
-        self.meter_provider = MeterProvider(metric_readers=[gcp_reader], views=VIEW_LIST)
+        self.meter_provider = MeterProvider(
+            metric_readers=[gcp_reader], views=VIEW_LIST
+        )
         otel = _OpenTelemetryInstruments(meter_provider=self.meter_provider)
         super().__init__(*args, instruments=otel, **kwargs)
 
@@ -266,4 +268,4 @@ def force_flush(self, timeout_millis: float = 10_000):
         Adapted from CloudMonitoringMetricsExporter
         https://github.com/GoogleCloudPlatform/opentelemetry-operations-python/blob/3668dfe7ce3b80dd01f42af72428de957b58b316/opentelemetry-exporter-gcp-monitoring/src/opentelemetry/exporter/cloud_monitoring/__init__.py#L82
         """
-        return True
+        return True

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

@@ -27,7 +27,8 @@
 from google.cloud.bigtable.data._metrics.data_model import CompletedOperationMetric
 
 # conversion factor for converting from nanoseconds to milliseconds
-NS_TO_MS= 1e6
+NS_TO_MS = 1e6
+
 
 class _OpenTelemetryInstruments:
     """
@@ -211,15 +212,22 @@ def on_attempt_complete(
         is_streaming = str(op.is_streaming)
 
         self.otel.attempt_latencies.record(
-            attempt.duration_ns / NS_TO_MS, {"streaming": is_streaming, "status": status, **labels}
+            attempt.duration_ns / NS_TO_MS,
+            {"streaming": is_streaming, "status": status, **labels},
         )
         combined_throttling = attempt.grpc_throttling_time_ns / NS_TO_MS
         if not op.completed_attempts:
             # add flow control latency to first attempt's throttling latency
-            combined_throttling += (op.flow_throttling_time_ns / NS_TO_MS if op.flow_throttling_time_ns else 0)
+            combined_throttling += (
+                op.flow_throttling_time_ns / NS_TO_MS
+                if op.flow_throttling_time_ns
+                else 0
+            )
         self.otel.throttling_latencies.record(combined_throttling, labels)
         self.otel.application_latencies.record(
-            (attempt.application_blocking_time_ns + attempt.backoff_before_attempt_ns) / NS_TO_MS, labels
+            (attempt.application_blocking_time_ns + attempt.backoff_before_attempt_ns)
+            / NS_TO_MS,
+            labels,
         )
         if attempt.gfe_latency_ns is not None:
             self.otel.server_latencies.record(
@@ -229,6 +237,4 @@ def on_attempt_complete(
         else:
             # gfe headers not attached. Record a connectivity error.
             # TODO: this should not be recorded as an error when direct path is enabled
-            self.otel.connectivity_error_count.add(
-                1, {"status": status, **labels}
-            )
+            self.otel.connectivity_error_count.add(1, {"status": status, **labels})

tests/system/data/__init__.py

@@ -196,4 +196,4 @@ def authorized_view_id(
             try:
                 admin_client.table_admin_client.delete_authorized_view(name=new_path)
             except exceptions.NotFound:
-                print(f"View {new_view_id} not found, skipping deletion")
+                print(f"View {new_view_id} not found, skipping deletion")

tests/system/data/test_metrics_async.py

@@ -2197,4 +2197,4 @@ async def test_check_and_mutate_row_failure_unauthorized(
         assert (
             attempt.gfe_latency_ns >= 0
             and attempt.gfe_latency_ns < operation.duration_ns
-        )
+        )

tests/system/data/test_system_async.py

@@ -174,7 +174,6 @@ def init_table_id(self):
             base_id = f"{base_id}-async"
         return base_id
 
-
     def _make_client(self):
         project = os.getenv("GOOGLE_CLOUD_PROJECT") or None
         return CrossSync.DataClient(project=project)
@@ -1338,7 +1337,7 @@ async def test_execute_metadata_on_empty_response(
             SqlType.Bytes(), SqlType.Int64()
         )
 
-    @pytest.mark.order('last')
+    @pytest.mark.order("last")
     class TestExportedMetrics(SystemTestRunner):
         """
         Checks to make sure metrics were exported by tests
@@ -1361,36 +1360,42 @@ def time_interval(self, start_timestamp):
             LOOKBACK_MINUTES = os.getenv("LOOKBACK_MINUTES")
             if LOOKBACK_MINUTES is not None:
                 print(f"running with LOOKBACK_MINUTES={LOOKBACK_MINUTES}")
-                start_timestamp = start_timestamp - datetime.timedelta(minutes=int(LOOKBACK_MINUTES))
+                start_timestamp = start_timestamp - datetime.timedelta(
+                    minutes=int(LOOKBACK_MINUTES)
+                )
             return {"start_time": start_timestamp, "end_time": end_time}
 
-
-        @pytest.mark.parametrize("metric,methods", [
-            ("attempt_latencies", [m.value for m in OperationType]),
-            ("operation_latencies", [m.value for m in OperationType]),
-            ("retry_count", [m.value for m in OperationType]),
-            ("first_response_latencies", [OperationType.READ_ROWS]),
-            ("server_latencies", [m.value for m in OperationType]),
-            ("connectivity_error_count", [m.value for m in OperationType]),
-            ("application_blocking_latencies", [OperationType.READ_ROWS]),
-        ])
-        @retry.Retry(
-            predicate=retry.if_exception_type(AssertionError)
+        @pytest.mark.parametrize(
+            "metric,methods",
+            [
+                ("attempt_latencies", [m.value for m in OperationType]),
+                ("operation_latencies", [m.value for m in OperationType]),
+                ("retry_count", [m.value for m in OperationType]),
+                ("first_response_latencies", [OperationType.READ_ROWS]),
+                ("server_latencies", [m.value for m in OperationType]),
+                ("connectivity_error_count", [m.value for m in OperationType]),
+                ("application_blocking_latencies", [OperationType.READ_ROWS]),
+            ],
         )
-        def test_metric_existence(self, client, table_id, metrics_client, time_interval, metric, methods):
+        @retry.Retry(predicate=retry.if_exception_type(AssertionError))
+        def test_metric_existence(
+            self, client, table_id, metrics_client, time_interval, metric, methods
+        ):
             """
             Checks existence of each metric in Cloud Monitoring
             """
             for m in methods:
                 metric_filter = (
-                    f'metric.type = "bigtable.googleapis.com/client/{metric}" ' +
-                    f'AND metric.labels.client_name = "python-bigtable/{client._client_version()}" ' +
-                    f'AND resource.labels.table = "{table_id}" '
+                    f'metric.type = "bigtable.googleapis.com/client/{metric}" '
+                    + f'AND metric.labels.client_name = "python-bigtable/{client._client_version()}" '
+                    + f'AND resource.labels.table = "{table_id}" '
+                )
+                results = list(
+                    metrics_client.list_time_series(
+                        name=f"projects/{client.project}",
+                        filter=metric_filter,
+                        interval=time_interval,
+                        view=0,
+                    )
                 )
-                results = list(metrics_client.list_time_series(
-                    name=f"projects/{client.project}",
-                    filter=metric_filter,
-                    interval=time_interval,
-                    view=0,
-                ))
-                assert len(results) > 0, f"No data found for {metric} {m}"
+                assert len(results) > 0, f"No data found for {metric} {m}"

tests/unit/data/_async/test_client.py

@@ -202,9 +202,20 @@ async def test_metrics_exporter_init_shares_arguments(self):
         expected_options = client_options.ClientOptions()
         expected_options.credentials_file = None
         expected_options.quota_project_id = None
-        with mock.patch("google.cloud.bigtable.data._metrics.handlers.gcp_exporter.BigtableMetricsExporter.__init__", return_value=None) as exporter_mock:
-            async with self._make_client(project=expected_project, credentials=expected_credentials, client_options=expected_options):
-                exporter_mock.assert_called_once_with(project_id=expected_project, credentials=expected_credentials, client_options=expected_options)
+        with mock.patch(
+            "google.cloud.bigtable.data._metrics.handlers.gcp_exporter.BigtableMetricsExporter.__init__",
+            return_value=None,
+        ) as exporter_mock:
+            async with self._make_client(
+                project=expected_project,
+                credentials=expected_credentials,
+                client_options=expected_options,
+            ):
+                exporter_mock.assert_called_once_with(
+                    project_id=expected_project,
+                    credentials=expected_credentials,
+                    client_options=expected_options,
+                )
 
     @CrossSync.pytest
     async def test_metrics_exporter_init_implicit_project(self):
@@ -1185,9 +1196,7 @@ async def test_ctor(self):
         from google.cloud.bigtable.data._metrics import (
             BigtableClientSideMetricsController,
         )
-        from google.cloud.bigtable.data._metrics import (
-            GoogleCloudMetricsHandler
-        )
+        from google.cloud.bigtable.data._metrics import GoogleCloudMetricsHandler
 
         expected_table_id = "table-id"
         expected_instance_id = "instance-id"
@@ -1522,7 +1531,8 @@ def _make_one(
     async def test_ctor(self):
         from google.cloud.bigtable.data._helpers import _WarmedInstanceKey
         from google.cloud.bigtable.data._metrics import (
-            BigtableClientSideMetricsController, GoogleCloudMetricsHandler
+            BigtableClientSideMetricsController,
+            GoogleCloudMetricsHandler,
         )
 
         expected_table_id = "table-id"