test

Author: surbhigarg92

google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerCloudMonitoringExporterUtils.java

@@ -25,6 +25,7 @@
 import static com.google.cloud.spanner.BuiltInMetricsConstant.GAX_METER_NAME;
 import static com.google.cloud.spanner.BuiltInMetricsConstant.INSTANCE_ID_KEY;
 import static com.google.cloud.spanner.BuiltInMetricsConstant.PROJECT_ID_KEY;
+import static com.google.cloud.spanner.BuiltInMetricsConstant.SPANNER_METER_NAME;
 import static com.google.cloud.spanner.BuiltInMetricsConstant.SPANNER_PROMOTED_RESOURCE_LABELS;
 import static com.google.cloud.spanner.BuiltInMetricsConstant.SPANNER_RESOURCE_TYPE;
 
@@ -75,8 +76,8 @@ static List<TimeSeries> convertToSpannerTimeSeries(List<MetricData> collection)
     List<TimeSeries> allTimeSeries = new ArrayList<>();
 
     for (MetricData metricData : collection) {
-      // Get common metrics data from GAX library
-      if (!metricData.getInstrumentationScopeInfo().getName().equals(GAX_METER_NAME)) {
+      // Get metrics data from GAX library and Spanner library
+      if (!(metricData.getInstrumentationScopeInfo().getName().equals(GAX_METER_NAME) || metricData.getInstrumentationScopeInfo().getName().equals(SPANNER_METER_NAME))) {
         // Filter out metric data for instruments that are not part of the spanner metrics list
         continue;
       }

google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBuiltInMetricsTest.java

@@ -44,7 +44,7 @@
 
 @Category(ParallelIntegrationTest.class)
 @RunWith(JUnit4.class)
-@Ignore("Built-in Metrics are not GA'ed yet. Enable this test once the metrics are released")
+// @Ignore("Built-in Metrics are not GA'ed yet. Enable this test once the metrics are released")
 public class ITBuiltInMetricsTest {
 
   private static Database db;
@@ -82,10 +82,12 @@ public void testBuiltinMetricsWithDefaultOTEL() throws Exception {
 
     String metricFilter =
         String.format(
-            "metric.type=\"spanner.googleapis.com/client/%s\" "
-                + "AND resource.labels.instance=\"%s\" AND metric.labels.method=\"Spanner.ExecuteStreamingSql\""
+            "metric.type=\"spanner.googleapis.com/client/%s\""
+                + " AND resource.type=\"spanner_instance\""
+                + " AND metric.labels.method=\"Spanner.Commit\""
+                + " AND resource.labels.instance_id=\"%s\""
                 + " AND metric.labels.database=\"%s\"",
-            "operation_latencies", env.getTestHelper().getInstanceId(), db.getId());
+            "operation_latencies", db.getId().getInstanceId().getInstance(), db.getId().getDatabase());
 
     ListTimeSeriesRequest.Builder requestBuilder =
         ListTimeSeriesRequest.newBuilder()