added assertions for table_id

Author: daniel-sanche

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

@@ -249,6 +249,9 @@ async def test_read_rows(self, table, temp_rows, handler, cluster_config):
         assert operation.op_type.value == "ReadRows"
         assert len(operation.completed_attempts) == 1
         assert operation.completed_attempts[0] == handler.completed_attempts[0]
+        assert operation.project_id == table.client.project
+        assert operation.instance_id == table.instance_id
+        assert operation.table_id == table.table_id
         assert operation.cluster_id == next(iter(cluster_config.keys()))
         assert (
             operation.zone

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

@@ -206,6 +206,9 @@ def test_read_rows(self, table, temp_rows, handler, cluster_config):
         assert operation.op_type.value == "ReadRows"
         assert len(operation.completed_attempts) == 1
         assert operation.completed_attempts[0] == handler.completed_attempts[0]
+        assert operation.project_id == table.client.project
+        assert operation.instance_id == table.instance_id
+        assert operation.table_id == table.table_id
         assert operation.cluster_id == next(iter(cluster_config.keys()))
         assert (
             operation.zone

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

@@ -1460,3 +1460,7 @@ def test_metric_existence(
                 )
             )
             assert len(results) > 0, f"No data found for {metric} {m}"
+            for series in results:
+                assert series.resource.labels.get("table") == table_id
+                if "table_id" in series.metric.labels:
+                    assert series.metric.labels["table_id"] == table_id

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

@@ -1191,3 +1191,7 @@ def test_metric_existence(
                 )
             )
             assert len(results) > 0, f"No data found for {metric} {m}"
+            for series in results:
+                assert series.resource.labels.get("table") == table_id
+                if "table_id" in series.metric.labels:
+                    assert series.metric.labels["table_id"] == table_id

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

@@ -1370,6 +1370,16 @@ async def test_ctor(self, use_emulator):
             table._register_instance_future.cancel()
         await client.close()
 
+    @CrossSync.pytest
+    async def test_create_operation_table_id(self):
+        from google.cloud.bigtable.data._metrics.data_model import OperationType
+
+        client = self._make_client()
+        table = self._make_one(client, table_id="my-table")
+        op = table._create_operation(OperationType.READ_ROWS)
+        assert op.table_id == "my-table"
+        await client.close()
+
     @CrossSync.pytest
     async def test_ctor_defaults(self):
         """
@@ -1754,6 +1764,18 @@ async def test_ctor(self, use_emulator):
             view._register_instance_future.cancel()
         await client.close()
 
+    @CrossSync.pytest
+    async def test_create_operation_table_id(self):
+        from google.cloud.bigtable.data._metrics.data_model import OperationType
+
+        client = self._make_client()
+        view = self._make_one(
+            client, table_id="underlying-table", view_id="my-view"
+        )
+        op = view._create_operation(OperationType.READ_ROWS)
+        assert op.table_id == "underlying-table"
+        await client.close()
+
 
 @CrossSync.convert_class(
     "TestMaterializedView", add_mapping_for_name="TestMaterializedView"
@@ -1871,6 +1893,16 @@ async def test_ctor(self, use_emulator):
             view._register_instance_future.cancel()
         await client.close()
 
+    @CrossSync.pytest
+    async def test_create_operation_table_id(self):
+        from google.cloud.bigtable.data._metrics.data_model import OperationType
+
+        client = self._make_client()
+        view = self._make_one(client, view_id="my-materialized-view")
+        op = view._create_operation(OperationType.READ_ROWS)
+        assert op.table_id == "my-materialized-view"
+        await client.close()
+
     @pytest.mark.parametrize(
         "fn_name,fn_args,gapic_fn",
         [

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

@@ -1152,6 +1152,15 @@ def test_ctor(self, use_emulator):
             table._register_instance_future.cancel()
         client.close()
 
+    def test_create_operation_table_id(self):
+        from google.cloud.bigtable.data._metrics.data_model import OperationType
+
+        client = self._make_client()
+        table = self._make_one(client, table_id="my-table")
+        op = table._create_operation(OperationType.READ_ROWS)
+        assert op.table_id == "my-table"
+        client.close()
+
     def test_ctor_defaults(self):
         """should provide default timeout values and app_profile_id"""
         client = self._make_client()
@@ -1461,6 +1470,17 @@ def test_ctor(self, use_emulator):
             view._register_instance_future.cancel()
         client.close()
 
+    def test_create_operation_table_id(self):
+        from google.cloud.bigtable.data._metrics.data_model import OperationType
+
+        client = self._make_client()
+        view = self._make_one(
+            client, table_id="underlying-table", view_id="my-view"
+        )
+        op = view._create_operation(OperationType.READ_ROWS)
+        assert op.table_id == "underlying-table"
+        client.close()
+
 
 @CrossSync._Sync_Impl.add_mapping_decorator("TestMaterializedView")
 class TestMaterializedView(CrossSync._Sync_Impl.TestTable):
@@ -1573,6 +1593,15 @@ def test_ctor(self, use_emulator):
             view._register_instance_future.cancel()
         client.close()
 
+    def test_create_operation_table_id(self):
+        from google.cloud.bigtable.data._metrics.data_model import OperationType
+
+        client = self._make_client()
+        view = self._make_one(client, view_id="my-materialized-view")
+        op = view._create_operation(OperationType.READ_ROWS)
+        assert op.table_id == "my-materialized-view"
+        client.close()
+
     @pytest.mark.parametrize(
         "fn_name,fn_args,gapic_fn",
         [