fix: ensure that multiple instances of a client in the same process dont clobber each other (#2590)

igorbernstein2 · cloud-java-bot · web-flow · commit 8d3dca432241 · 2025-05-29T14:29:11.000-04:00
* fix: ensure that multiple instances of a client in the same process dont clobber each other

Change-Id: I2087777f1f2d37c62f33c63a7ecb67f7a93712b8

* chore: generate libraries at Wed May 28 14:16:03 UTC 2025

---------

Co-authored-by: cloud-java-bot &lt;cloud-java-bot@google.com&gt;
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BigtableCloudMonitoringExporter.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BigtableCloudMonitoringExporter.java
@@ -66,6 +66,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -302,10 +303,14 @@ static class PublicTimeSeriesConverter implements TimeSeriesConverter {
             .map(m -> METER_NAME + m)
             .collect(ImmutableList.toImmutableList());
 
+    private static final AtomicLong nextTaskIdSuffix = new AtomicLong();
     private final String taskId;
 
     PublicTimeSeriesConverter() {
-      this(BigtableExporterUtils.DEFAULT_TASK_VALUE.get());
+      this(
+          BigtableExporterUtils.DEFAULT_TASK_VALUE.get()
+              + "-"
+              + nextTaskIdSuffix.getAndIncrement());
     }
 
     PublicTimeSeriesConverter(String taskId) {
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BigtableExporterUtils.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BigtableExporterUtils.java
@@ -79,6 +79,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -102,6 +103,8 @@ class BigtableExporterUtils {
           GCPPlatformDetector.SupportedPlatform.GOOGLE_COMPUTE_ENGINE, "gcp_compute_engine",
           GCPPlatformDetector.SupportedPlatform.GOOGLE_KUBERNETES_ENGINE, "gcp_kubernetes_engine");
 
+  private static final AtomicLong nextUuidSuffix = new AtomicLong();
+
   private BigtableExporterUtils() {}
 
   /**
@@ -249,7 +252,7 @@ private static MonitoredResource detectResource(EnhancedBigtableStubSettings set
         .putLabels("host_id", attrs.get(AttributeKeys.GKE_HOST_ID))
         .putLabels("host_name", hostname)
         .putLabels("client_name", CLIENT_NAME)
-        .putLabels("uuid", DEFAULT_TASK_VALUE.get())
+        .putLabels("uuid", DEFAULT_TASK_VALUE.get() + "-" + nextUuidSuffix.getAndIncrement())
         .build();
   }
 
