fixed lint/mypy

Author: daniel-sanche

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

@@ -70,13 +70,11 @@
     OperationType,
     tracked_retry,
 )
+from google.cloud.bigtable.data._metrics.handlers._base import MetricsHandler
 from google.cloud.bigtable.data._metrics.handlers.gcp_exporter import (
     BigtableMetricsExporter,
     GoogleCloudMetricsHandler,
 )
-from google.cloud.bigtable.data._metrics.handlers.opentelemetry import (
-    OpenTelemetryMetricsHandler,
-)
 from google.cloud.bigtable.data.exceptions import (
     FailedQueryShardError,
     ShardedReadRowsExceptionGroup,
@@ -293,9 +291,7 @@ def __init__(
                     "Client-side metrics will be disabled.",
                     e,
                 )
-        self._metrics = BigtableClientSideMetricsController(
-            handlers=handlers
-        )
+        self._metrics = BigtableClientSideMetricsController(handlers=handlers)
         self.transport = cast(TransportType, self._gapic_client.transport)
         # keep track of active instances to for warmup on channel refresh
         self._active_instances: Set[_WarmedInstanceKey] = set()

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

@@ -14,10 +14,9 @@
 
 from __future__ import annotations
 
-from collections import defaultdict
 import logging
 import time
-from typing import Any, Mapping
+from collections import defaultdict
 
 from google.api.distribution_pb2 import Distribution
 from google.api.metric_pb2 import Metric as GMetric
@@ -102,16 +101,17 @@
 
 
 def _partition_attributes(
-    attributes: Attributes
+    attributes: Attributes,
 ) -> tuple[dict[str, str], dict[str, str]]:
     """Split data point attributes into monitored resource labels and metric labels."""
     resource_labels = {label_name: "" for label_name in _RESOURCE_KEY_MAP.values()}
     metric_labels = {}
-    for attr_key, attr_value in attributes.items():
-        if attr_key in _RESOURCE_KEY_MAP:
-            resource_labels[_RESOURCE_KEY_MAP[attr_key]] = str(attr_value)
-        elif not attr_key.startswith("resource_"):
-            metric_labels[attr_key] = str(attr_value)
+    if attributes:
+        for attr_key, attr_value in attributes.items():
+            if attr_key in _RESOURCE_KEY_MAP:
+                resource_labels[_RESOURCE_KEY_MAP[attr_key]] = str(attr_value)
+            elif not attr_key.startswith("resource_"):
+                metric_labels[attr_key] = str(attr_value)
     return resource_labels, metric_labels
 
 

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

@@ -64,13 +64,11 @@
     OperationType,
     tracked_retry,
 )
+from google.cloud.bigtable.data._metrics.handlers._base import MetricsHandler
 from google.cloud.bigtable.data._metrics.handlers.gcp_exporter import (
     BigtableMetricsExporter,
     GoogleCloudMetricsHandler,
 )
-from google.cloud.bigtable.data._metrics.handlers.opentelemetry import (
-    OpenTelemetryMetricsHandler,
-)
 from google.cloud.bigtable.data._sync_autogen._swappable_channel import (
     SwappableChannel as SwappableChannelType,
 )
@@ -223,9 +221,7 @@ def __init__(
                     "Client-side metrics will be disabled.",
                     e,
                 )
-        self._metrics = BigtableClientSideMetricsController(
-            handlers=handlers
-        )
+        self._metrics = BigtableClientSideMetricsController(handlers=handlers)
         self.transport = cast(TransportType, self._gapic_client.transport)
         self._active_instances: Set[_WarmedInstanceKey] = set()
         self._instance_owners: dict[_WarmedInstanceKey, Set[int]] = {}

packages/google-cloud-bigtable/tests/unit/data/_async/test_client.py

@@ -1292,9 +1292,6 @@ async def test_ctor(self, use_emulator):
         from google.cloud.bigtable.data._metrics.handlers.gcp_exporter import (
             BigtableMetricsExporter,
         )
-        from google.cloud.bigtable.data._metrics.handlers.opentelemetry import (
-            OpenTelemetryMetricsHandler,
-        )
 
         expected_table_id = "table-id"
         expected_instance_id = "instance-id"
@@ -1679,9 +1676,6 @@ async def test_ctor(self, use_emulator):
         from google.cloud.bigtable.data._metrics.handlers.gcp_exporter import (
             BigtableMetricsExporter,
         )
-        from google.cloud.bigtable.data._metrics.handlers.opentelemetry import (
-            OpenTelemetryMetricsHandler,
-        )
 
         expected_table_id = "table-id"
         expected_instance_id = "instance-id"
@@ -1812,9 +1806,6 @@ async def test_ctor(self, use_emulator):
         from google.cloud.bigtable.data._metrics.handlers.gcp_exporter import (
             BigtableMetricsExporter,
         )
-        from google.cloud.bigtable.data._metrics.handlers.opentelemetry import (
-            OpenTelemetryMetricsHandler,
-        )
 
         expected_instance_id = "instance-id"
         expected_view_id = "view_id"

packages/google-cloud-bigtable/tests/unit/data/_sync_autogen/test_client.py

@@ -1075,9 +1075,6 @@ def test_ctor(self, use_emulator):
         from google.cloud.bigtable.data._metrics.handlers.gcp_exporter import (
             BigtableMetricsExporter,
         )
-        from google.cloud.bigtable.data._metrics.handlers.opentelemetry import (
-            OpenTelemetryMetricsHandler,
-        )
 
         expected_table_id = "table-id"
         expected_instance_id = "instance-id"
@@ -1386,9 +1383,6 @@ def test_ctor(self, use_emulator):
         from google.cloud.bigtable.data._metrics.handlers.gcp_exporter import (
             BigtableMetricsExporter,
         )
-        from google.cloud.bigtable.data._metrics.handlers.opentelemetry import (
-            OpenTelemetryMetricsHandler,
-        )
 
         expected_table_id = "table-id"
         expected_instance_id = "instance-id"
@@ -1513,9 +1507,6 @@ def test_ctor(self, use_emulator):
         from google.cloud.bigtable.data._metrics.handlers.gcp_exporter import (
             BigtableMetricsExporter,
         )
-        from google.cloud.bigtable.data._metrics.handlers.opentelemetry import (
-            OpenTelemetryMetricsHandler,
-        )
 
         expected_instance_id = "instance-id"
         expected_view_id = "view_id"