remove exporter attribute con client

Author: daniel-sanche

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

@@ -270,27 +270,23 @@ def __init__(
             )
         self._is_closed = CrossSync.Event()
         if os.getenv("BIGTABLE_EMULATOR_HOST"):
-            self._gcp_metrics_exporter = None
             self._metrics_handler = OpenTelemetryMetricsHandler(
                 client_version=self._client_version(),
             )
-            self._metrics = BigtableClientSideMetricsController(
-                handlers=[self._metrics_handler]
-            )
         else:
             # create a metrics exporter using the same client configuration
-            self._gcp_metrics_exporter = BigtableMetricsExporter(
+            exporter = BigtableMetricsExporter(
                 project_id=self.project,
                 credentials=credentials,
                 client_options=client_options,
             )
             self._metrics_handler = GoogleCloudMetricsHandler(
-                exporter=self._gcp_metrics_exporter,
+                exporter=exporter,
                 client_version=self._client_version(),
             )
-            self._metrics = BigtableClientSideMetricsController(
-                handlers=[self._metrics_handler]
-            )
+        self._metrics = BigtableClientSideMetricsController(
+            handlers=[self._metrics_handler]
+        )
         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

@@ -112,6 +112,7 @@ class GoogleCloudMetricsHandler(OpenTelemetryMetricsHandler):
     """
 
     def __init__(self, exporter, *args, export_interval=60, **kwargs):
+        self._exporter = exporter
         # periodically executes exporter
         gcp_reader = PeriodicExportingMetricReader(
             exporter, export_interval_millis=export_interval * 1000

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

@@ -201,26 +201,22 @@ def __init__(
             )
         self._is_closed = CrossSync._Sync_Impl.Event()
         if os.getenv("BIGTABLE_EMULATOR_HOST"):
-            self._gcp_metrics_exporter = None
             self._metrics_handler = OpenTelemetryMetricsHandler(
                 client_version=self._client_version()
             )
-            self._metrics = BigtableClientSideMetricsController(
-                handlers=[self._metrics_handler]
-            )
         else:
-            self._gcp_metrics_exporter = BigtableMetricsExporter(
+            exporter = BigtableMetricsExporter(
                 project_id=self.project,
                 credentials=credentials,
                 client_options=client_options,
             )
             self._metrics_handler = GoogleCloudMetricsHandler(
-                exporter=self._gcp_metrics_exporter,
+                exporter=exporter,
                 client_version=self._client_version(),
             )
-            self._metrics = BigtableClientSideMetricsController(
-                handlers=[self._metrics_handler]
-            )
+        self._metrics = BigtableClientSideMetricsController(
+            handlers=[self._metrics_handler]
+        )
         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/system/data/test_system_async.py

@@ -1420,7 +1420,7 @@ async def test_execute_metadata_on_empty_response(
 
     @pytest.fixture(scope="session")
     def metrics_client(self, client):
-        yield client._gcp_metrics_exporter.client
+        yield client._metrics.handlers[0]._exporter.client
 
     @pytest.mark.order("last")
     @pytest.mark.parametrize(

packages/google-cloud-bigtable/tests/system/data/test_system_autogen.py

@@ -1153,7 +1153,7 @@ def test_execute_metadata_on_empty_response(
 
     @pytest.fixture(scope="session")
     def metrics_client(self, client):
-        yield client._gcp_metrics_exporter.client
+        yield client._metrics.handlers[0]._exporter.client
 
     @pytest.mark.order("last")
     @pytest.mark.parametrize(

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

@@ -154,8 +154,10 @@ async def test_ctor(self):
         assert client._channel_refresh_task is not None
         assert client.transport._credentials == expected_credentials
         assert isinstance(client._metrics_interceptor, CrossSync.MetricsInterceptor)
-        assert client._gcp_metrics_exporter is not None
-        assert isinstance(client._gcp_metrics_exporter, BigtableMetricsExporter)
+        assert getattr(client._metrics.handlers[0], "_exporter", None) is not None
+        assert isinstance(
+            client._metrics.handlers[0]._exporter, BigtableMetricsExporter
+        )
         await client.close()
 
     @CrossSync.pytest
@@ -253,7 +255,9 @@ async def test_metrics_exporter_init_shares_arguments(
     @CrossSync.pytest
     async def test_metrics_exporter_init_implicit_project(self):
         async with self._make_client(use_emulator=False) as client:
-            assert client._gcp_metrics_exporter.project_id == client.project
+            assert (
+                client._metrics.handlers[0]._exporter.project_id == client.project
+            )
 
     @CrossSync.pytest
     @mock.patch("google.cloud.bigtable.data._async.client.BigtableMetricsExporter")
@@ -1333,10 +1337,12 @@ async def test_ctor(self, use_emulator):
         assert len(client._metrics.handlers) == 1
         if use_emulator:
             assert isinstance(client._metrics.handlers[0], OpenTelemetryMetricsHandler)
-            assert client._gcp_metrics_exporter is None
+            assert getattr(client._metrics.handlers[0], "_exporter", None) is None
         else:
             assert isinstance(client._metrics.handlers[0], GoogleCloudMetricsHandler)
-            assert isinstance(client._gcp_metrics_exporter, BigtableMetricsExporter)
+            assert isinstance(
+                client._metrics.handlers[0]._exporter, BigtableMetricsExporter
+            )
         assert table.default_operation_timeout == expected_operation_timeout
         assert table.default_attempt_timeout == expected_attempt_timeout
         assert (
@@ -1716,10 +1722,12 @@ async def test_ctor(self, use_emulator):
         assert len(client._metrics.handlers) == 1
         if use_emulator:
             assert isinstance(client._metrics.handlers[0], OpenTelemetryMetricsHandler)
-            assert client._gcp_metrics_exporter is None
+            assert getattr(client._metrics.handlers[0], "_exporter", None) is None
         else:
             assert isinstance(client._metrics.handlers[0], GoogleCloudMetricsHandler)
-            assert isinstance(client._gcp_metrics_exporter, BigtableMetricsExporter)
+            assert isinstance(
+                client._metrics.handlers[0]._exporter, BigtableMetricsExporter
+            )
         assert view.default_operation_timeout == expected_operation_timeout
         assert view.default_attempt_timeout == expected_attempt_timeout
         assert (
@@ -1831,10 +1839,12 @@ async def test_ctor(self, use_emulator):
         assert len(client._metrics.handlers) == 1
         if use_emulator:
             assert isinstance(client._metrics.handlers[0], OpenTelemetryMetricsHandler)
-            assert client._gcp_metrics_exporter is None
+            assert getattr(client._metrics.handlers[0], "_exporter", None) is None
         else:
             assert isinstance(client._metrics.handlers[0], GoogleCloudMetricsHandler)
-            assert isinstance(client._gcp_metrics_exporter, BigtableMetricsExporter)
+            assert isinstance(
+                client._metrics.handlers[0]._exporter, BigtableMetricsExporter
+            )
         assert view.default_operation_timeout == expected_operation_timeout
         assert view.default_attempt_timeout == expected_attempt_timeout
         assert (
@@ -2002,7 +2012,6 @@ def _make_table(self, *args, **kwargs):
         )
         client_mock._gapic_client.table_path.return_value = kwargs["table_id"]
         client_mock._gapic_client.instance_path.return_value = kwargs["instance_id"]
-        client_mock._gcp_metrics_exporter = BigtableMetricsExporter("project")
         return CrossSync.TestTable._get_target_class()(client_mock, *args, **kwargs)
 
     def _make_stats(self):

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

@@ -1211,7 +1211,6 @@ async def test_customizable_retryable_errors(
 
         mock_client = mock.Mock()
         mock_client._metrics = BigtableClientSideMetricsController(handlers=[])
-        mock_client._gcp_metrics_exporter = BigtableMetricsExporter("project")
 
         with mock.patch.object(
             google.api_core.retry, "if_exception_type"

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

@@ -128,8 +128,10 @@ def test_ctor(self):
         assert isinstance(
             client._metrics_interceptor, CrossSync._Sync_Impl.MetricsInterceptor
         )
-        assert client._gcp_metrics_exporter is not None
-        assert isinstance(client._gcp_metrics_exporter, BigtableMetricsExporter)
+        assert getattr(client._metrics.handlers[0], "_exporter", None) is not None
+        assert isinstance(
+            client._metrics.handlers[0]._exporter, BigtableMetricsExporter
+        )
         client.close()
 
     def test_ctor_super_inits(self):
@@ -223,7 +225,9 @@ def test_metrics_exporter_init_shares_arguments(
 
     def test_metrics_exporter_init_implicit_project(self):
         with self._make_client(use_emulator=False) as client:
-            assert client._gcp_metrics_exporter.project_id == client.project
+            assert (
+                client._metrics.handlers[0]._exporter.project_id == client.project
+            )
 
     @mock.patch("google.cloud.bigtable.data._async.client.BigtableMetricsExporter")
     @mock.patch(
@@ -1115,10 +1119,12 @@ def test_ctor(self, use_emulator):
         assert len(client._metrics.handlers) == 1
         if use_emulator:
             assert isinstance(client._metrics.handlers[0], OpenTelemetryMetricsHandler)
-            assert client._gcp_metrics_exporter is None
+            assert getattr(client._metrics.handlers[0], "_exporter", None) is None
         else:
             assert isinstance(client._metrics.handlers[0], GoogleCloudMetricsHandler)
-            assert isinstance(client._gcp_metrics_exporter, BigtableMetricsExporter)
+            assert isinstance(
+                client._metrics.handlers[0]._exporter, BigtableMetricsExporter
+            )
         assert table.default_operation_timeout == expected_operation_timeout
         assert table.default_attempt_timeout == expected_attempt_timeout
         assert (
@@ -1423,10 +1429,12 @@ def test_ctor(self, use_emulator):
         assert len(client._metrics.handlers) == 1
         if use_emulator:
             assert isinstance(client._metrics.handlers[0], OpenTelemetryMetricsHandler)
-            assert client._gcp_metrics_exporter is None
+            assert getattr(client._metrics.handlers[0], "_exporter", None) is None
         else:
             assert isinstance(client._metrics.handlers[0], GoogleCloudMetricsHandler)
-            assert isinstance(client._gcp_metrics_exporter, BigtableMetricsExporter)
+            assert isinstance(
+                client._metrics.handlers[0]._exporter, BigtableMetricsExporter
+            )
         assert view.default_operation_timeout == expected_operation_timeout
         assert view.default_attempt_timeout == expected_attempt_timeout
         assert (
@@ -1533,10 +1541,12 @@ def test_ctor(self, use_emulator):
         assert len(client._metrics.handlers) == 1
         if use_emulator:
             assert isinstance(client._metrics.handlers[0], OpenTelemetryMetricsHandler)
-            assert client._gcp_metrics_exporter is None
+            assert getattr(client._metrics.handlers[0], "_exporter", None) is None
         else:
             assert isinstance(client._metrics.handlers[0], GoogleCloudMetricsHandler)
-            assert isinstance(client._gcp_metrics_exporter, BigtableMetricsExporter)
+            assert isinstance(
+                client._metrics.handlers[0]._exporter, BigtableMetricsExporter
+            )
         assert view.default_operation_timeout == expected_operation_timeout
         assert view.default_attempt_timeout == expected_attempt_timeout
         assert (
@@ -1676,7 +1686,6 @@ def _make_table(self, *args, **kwargs):
         )
         client_mock._gapic_client.table_path.return_value = kwargs["table_id"]
         client_mock._gapic_client.instance_path.return_value = kwargs["instance_id"]
-        client_mock._gcp_metrics_exporter = BigtableMetricsExporter("project")
         return CrossSync._Sync_Impl.TestTable._get_target_class()(
             client_mock, *args, **kwargs
         )

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

@@ -1056,7 +1056,6 @@ def test_customizable_retryable_errors(self, input_retryables, expected_retryabl
 
         mock_client = mock.Mock()
         mock_client._metrics = BigtableClientSideMetricsController(handlers=[])
-        mock_client._gcp_metrics_exporter = BigtableMetricsExporter("project")
         with mock.patch.object(
             google.api_core.retry, "if_exception_type"
         ) as predicate_builder_mock: