Merge branch 'csm_3_handlers' into csm_3_handlers->instrumentation

Author: daniel-sanche

setup.py

@@ -39,12 +39,16 @@
 dependencies = [
     "google-api-core[grpc] >= 2.17.0, <3.0.0",
     "google-cloud-core >= 1.4.4, <3.0.0",
+    "google-cloud-monitoring >= 2.0.0, <3.0.0dev",
     "google-auth >= 2.23.0, <3.0.0,!=2.24.0,!=2.25.0",
     "grpc-google-iam-v1 >= 0.12.4, <1.0.0",
     "proto-plus >= 1.22.3, <2.0.0",
     "proto-plus >= 1.25.0, <2.0.0; python_version>='3.13'",
     "protobuf>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
     "google-crc32c>=1.5.0, <2.0.0dev",
+    "googleapis-common-protos[grpc] >= 1.57.0, <2.0.0dev",
+    "opentelemetry-api >= 1.0.0, <2.0.0dev",
+    "opentelemetry-sdk >= 1.0.0, <2.0.0dev",
 ]
 extras = {"libcst": "libcst >= 0.2.5"}
 

tests/system/data/test_metrics_async.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -2187,3 +2187,72 @@ async def test_check_and_mutate_row_failure_unauthorized(
             attempt.gfe_latency_ns >= 0
             and attempt.gfe_latency_ns < operation.duration_ns
         )
+
+
+@CrossSync.convert_class(sync_name="TestExportedMetrics")
+class TestExportedExportedMetricsAsync(SystemTestRunner):
+
+    @CrossSync.drop
+    @pytest.fixture(scope="session")
+    def event_loop(self):
+        loop = asyncio.get_event_loop()
+        yield loop
+        loop.stop()
+        loop.close()
+
+    def _make_client(self):
+        project = os.getenv("GOOGLE_CLOUD_PROJECT") or None
+        return CrossSync.DataClient(project=project)
+
+    @CrossSync.convert
+    @CrossSync.pytest_fixture(scope="session")
+    async def client(self):
+        async with self._make_client() as client:
+            yield client
+
+    @pytest.fixture(scope="session")
+    def metrics_client(self, client):
+        yield client._gcp_metrics_exporter.client
+
+
+    @CrossSync.convert
+    @CrossSync.pytest_fixture(scope="function")
+    async def temp_rows(self, table):
+        builder = CrossSync.TempRowBuilder(table)
+        yield builder
+        await builder.delete_rows()
+
+    @CrossSync.convert
+    @CrossSync.pytest_fixture(scope="session")
+    async def table(self, client, table_id, instance_id):
+        async with client.get_table(instance_id, table_id) as table:
+            yield table
+
+    @CrossSync.pytest
+    async def test_read_rows(self, table, temp_rows, metrics_client):
+        from datetime import datetime, timedelta, timezone
+        from google.cloud import monitoring_v3
+
+        await temp_rows.add_row(b"row_key_1")
+        await temp_rows.add_row(b"row_key_2")
+        row_list = await table.read_rows(ReadRowsQuery())
+        # read back metrics
+
+        # 1. Define the Time Interval
+        now = datetime.now(timezone.utc)
+        # The end time is inclusive
+        end_time = now
+        # The start time is exclusive, for an interval (startTime, endTime]
+        start_time = now - timedelta(minutes=5)
+
+        interval = {"start_time": start_time, "end_time": end_time}
+        metric_filter = (
+            'metric.type = "bigtable.googleapis.com/client/attempt_latencies" AND metric.labels.client_name != "go-bigtable/1.40.0"'
+        )
+        results = metrics_client.list_time_series(
+            name=f"projects/{table.client.project}",
+            filter=metric_filter,
+            interval=interval,
+            view=monitoring_v3.ListTimeSeriesRequest.TimeSeriesView.FULL,
+        )
+        print(results)