From b2192006f859441e58d7f8f98a4da67bd87a05c7 Mon Sep 17 00:00:00 2001
From: Mattie Fu <mattiefu@google.com>
Date: Fri, 5 Aug 2022 11:25:41 -0400
Subject: [PATCH] update undefined cluster to global

---
 google-cloud-bigtable-stats/pom.xml           |  6 +++---
 .../stats/BigtableStackdriverExportUtils.java | 12 ++---------
 .../BigtableStackdriverStatsExporter.java     |  2 +-
 google-cloud-bigtable/pom.xml                 | 20 +++++++++----------
 .../v2/stub/metrics/BuiltinMetricsTracer.java |  4 ++--
 .../metrics/BuiltinMetricsTracerTest.java     |  4 ++--
 6 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/google-cloud-bigtable-stats/pom.xml b/google-cloud-bigtable-stats/pom.xml
index 4ea560fde7..10b64dc466 100644
--- a/google-cloud-bigtable-stats/pom.xml
+++ b/google-cloud-bigtable-stats/pom.xml
@@ -68,15 +68,14 @@
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-monitoring</artifactId>
-            <!-- exclude these dependencies since they are not used and are causing conflict in google-cloud-bigtable -->
             <exclusions>
                 <exclusion>
                     <groupId>com.google.http-client</groupId>
-                    <artifactId>google-http-client</artifactId>
+                    <artifactId>google-http-client-gson</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>com.google.http-client</groupId>
-                    <artifactId>google-http-client-gson</artifactId>
+                    <artifactId>google-http-client</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -132,6 +131,7 @@
             <artifactId>jsr305</artifactId>
         </dependency>
 
+        <!-- runtime dependency for native image integration test -->
         <dependency>
             <groupId>com.google.http-client</groupId>
             <artifactId>google-http-client</artifactId>
diff --git a/google-cloud-bigtable-stats/src/main/java/com/google/cloud/bigtable/stats/BigtableStackdriverExportUtils.java b/google-cloud-bigtable-stats/src/main/java/com/google/cloud/bigtable/stats/BigtableStackdriverExportUtils.java
index 1d36adbf70..20fe21c5c2 100644
--- a/google-cloud-bigtable-stats/src/main/java/com/google/cloud/bigtable/stats/BigtableStackdriverExportUtils.java
+++ b/google-cloud-bigtable-stats/src/main/java/com/google/cloud/bigtable/stats/BigtableStackdriverExportUtils.java
@@ -133,16 +133,8 @@ static TimeSeries convertTimeSeries(
     List<LabelValue> labelValues = timeSeries.getLabelValues();
     for (int i = 0; i < labelValues.size(); i++) {
       if (PROMOTED_RESOURCE_LABELS.contains(labelKeys.get(i).getKey())) {
-        if (labelKeys.get(i).getKey().equals(BuiltinMeasureConstants.CLUSTER.getName())
-            && labelValues.get(i).getValue().equals("undefined")) {
-          monitoredResourceBuilder.putLabels(labelKeys.get(i).getKey(), "global");
-        } else if (labelKeys.get(i).getKey().equals(BuiltinMeasureConstants.ZONE.getName())
-            && labelValues.get(i).getValue().equals("undefined")) {
-          monitoredResourceBuilder.putLabels(labelKeys.get(i).getKey(), "global");
-        } else {
-          monitoredResourceBuilder.putLabels(
-              labelKeys.get(i).getKey(), labelValues.get(i).getValue());
-        }
+        monitoredResourceBuilder.putLabels(
+            labelKeys.get(i).getKey(), labelValues.get(i).getValue());
       } else {
         metricTagKeys.add(labelKeys.get(i));
         metricTagValues.add(labelValues.get(i));
diff --git a/google-cloud-bigtable-stats/src/main/java/com/google/cloud/bigtable/stats/BigtableStackdriverStatsExporter.java b/google-cloud-bigtable-stats/src/main/java/com/google/cloud/bigtable/stats/BigtableStackdriverStatsExporter.java
index 199cf7936e..6cb24505b5 100644
--- a/google-cloud-bigtable-stats/src/main/java/com/google/cloud/bigtable/stats/BigtableStackdriverStatsExporter.java
+++ b/google-cloud-bigtable-stats/src/main/java/com/google/cloud/bigtable/stats/BigtableStackdriverStatsExporter.java
@@ -40,7 +40,7 @@ public class BigtableStackdriverStatsExporter {
   @GuardedBy("monitor")
   private static BigtableStackdriverStatsExporter instance = null;
 
-  private static final Duration EXPORT_INTERVAL = Duration.create(60, 0);
+  private static final Duration EXPORT_INTERVAL = Duration.create(600, 0);
   private static final String RESOURCE_TYPE = "bigtable_client_raw";
 
   private final IntervalMetricReader intervalMetricReader;
diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
index c672d2f347..4872466846 100644
--- a/google-cloud-bigtable/pom.xml
+++ b/google-cloud-bigtable/pom.xml
@@ -146,6 +146,16 @@
       <artifactId>grpc-alts</artifactId>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.http-client</groupId>
+      <artifactId>google-http-client</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.http-client</groupId>
+      <artifactId>google-http-client-gson</artifactId>
+      <scope>runtime</scope>
+    </dependency>
     <!--
       grpc-stub is needed directly by our tests and transitively by grpc-alts at runtime.
       So it has to be declared as a direct dependency and to avoid overriding grpc-alts'
@@ -269,16 +279,6 @@
       <artifactId>opencensus-impl</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.http-client</groupId>
-      <artifactId>google-http-client</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.http-client</groupId>
-      <artifactId>google-http-client-gson</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BuiltinMetricsTracer.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BuiltinMetricsTracer.java
index 6289951ded..1c77a9c323 100644
--- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BuiltinMetricsTracer.java
+++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BuiltinMetricsTracer.java
@@ -67,8 +67,8 @@ class BuiltinMetricsTracer extends BigtableTracer {
 
   // Monitored resource labels
   private String tableId = "undefined";
-  private String zone = "undefined";
-  private String cluster = "undefined";
+  private String zone = "global";
+  private String cluster = "global";
 
   // gfe stats
   private AtomicLong gfeMissingHeaders = new AtomicLong(0);
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/BuiltinMetricsTracerTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/BuiltinMetricsTracerTest.java
index 9ea222d012..2989e5c84a 100644
--- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/BuiltinMetricsTracerTest.java
+++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/BuiltinMetricsTracerTest.java
@@ -339,8 +339,8 @@ public void testMutateRowAttempts() {
     // and when the record() is called in onOperationCompletion().
     verify(statsRecorderWrapper, timeout(50).times(fakeService.getAttemptCounter().get() + 1))
         .record(status.capture(), tableId.capture(), zone.capture(), cluster.capture());
-    assertThat(zone.getAllValues()).containsExactly("undefined", "undefined", ZONE, ZONE);
-    assertThat(cluster.getAllValues()).containsExactly("undefined", "undefined", CLUSTER, CLUSTER);
+    assertThat(zone.getAllValues()).containsExactly("global", "global", ZONE, ZONE);
+    assertThat(cluster.getAllValues()).containsExactly("global", "global", CLUSTER, CLUSTER);
     assertThat(status.getAllValues()).containsExactly("UNAVAILABLE", "UNAVAILABLE", "OK", "OK");
   }