JVMCBC-1560: Add cluster UUID and name to metrics and spans (6/6)

Adding cluster UUID and name attributes for transactional
metrics.

Change-Id: Ic195c68a884d1b6b52eabb04c16b50c0da206fc9
Reviewed-on: https://review.couchbase.org/c/couchbase-jvm-clients/+/217018
Tested-by: Build Bot <[email protected]>
Reviewed-by: Graham Pople <[email protected]>

Author: programmatix

core-io/src/main/java/com/couchbase/client/core/Core.java

@@ -94,6 +94,7 @@
 import com.couchbase.client.core.service.ServiceState;
 import com.couchbase.client.core.service.ServiceType;
 import com.couchbase.client.core.topology.ClusterIdentifier;
+import com.couchbase.client.core.topology.ClusterIdentifierUtil;
 import com.couchbase.client.core.topology.ClusterTopology;
 import com.couchbase.client.core.topology.ClusterTopologyWithBucket;
 import com.couchbase.client.core.topology.NodeIdentifier;
@@ -348,7 +349,7 @@ public RequestTracer requestTracer() {
     );
 
     this.transactionsCleanup = new CoreTransactionsCleanup(this, environment.transactionsConfig());
-    this.transactionsContext = new CoreTransactionsContext(environment.meter());
+    this.transactionsContext = new CoreTransactionsContext(this, environment.meter());
     context().environment().eventBus().publish(new TransactionsStartedEvent(environment.transactionsConfig().cleanupConfig().runLostAttemptsCleanupThread(),
             environment.transactionsConfig().cleanupConfig().runRegularAttemptsCleanupThread()));
   }
@@ -629,7 +630,7 @@ public ValueRecorder responseMetric(final Request<?> request, @Nullable Throwabl
       }
     }
     final String finalExceptionSimpleName = exceptionSimpleName;
-    final ClusterIdentifier clusterIdent = currentConfig == null ? null : currentConfig.globalConfig() == null ? null : currentConfig.globalConfig().clusterIdent();
+    final ClusterIdentifier clusterIdent = ClusterIdentifierUtil.fromConfig(currentConfig);
 
     return responseMetrics.computeIfAbsent(new ResponseMetricIdentifier(request, exceptionSimpleName, clusterIdent), key -> {
       Map<String, String> tags = new HashMap<>(9);

core-io/src/main/java/com/couchbase/client/core/topology/ClusterIdentifierUtil.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2024 Couchbase, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.couchbase.client.core.topology;
+
+import com.couchbase.client.core.config.ClusterConfig;
+import reactor.util.annotation.Nullable;
+
+public class ClusterIdentifierUtil {
+  private ClusterIdentifierUtil() {}
+
+  public static @Nullable ClusterIdentifier fromConfig(@Nullable ClusterConfig config) {
+    return config == null ? null : config.globalConfig() == null ? null : config.globalConfig().clusterIdent();
+  }
+}

core-io/src/main/java/com/couchbase/client/core/transaction/context/CoreTransactionsContext.java

@@ -15,6 +15,7 @@
  */
 package com.couchbase.client.core.transaction.context;
 
+import com.couchbase.client.core.Core;
 import com.couchbase.client.core.annotation.Stability;
 import com.couchbase.client.core.cnc.Meter;
 
@@ -27,8 +28,8 @@
 public class CoreTransactionsContext {
   private final CoreTransactionsCounters counters;
 
-  public CoreTransactionsContext(Meter meter) {
-    this.counters = new CoreTransactionsCounters(meter);
+  public CoreTransactionsContext(Core core, Meter meter) {
+    this.counters = new CoreTransactionsCounters(core, meter);
   }
 
   public CoreTransactionsCounters counters() {

core-io/src/main/java/com/couchbase/client/core/transaction/context/CoreTransactionsCounters.java

@@ -15,37 +15,85 @@
  */
 package com.couchbase.client.core.transaction.context;
 
+import com.couchbase.client.core.Core;
 import com.couchbase.client.core.annotation.Stability;
 import com.couchbase.client.core.cnc.Counter;
 import com.couchbase.client.core.cnc.Meter;
 import com.couchbase.client.core.cnc.TracingIdentifiers;
-import com.couchbase.client.core.cnc.ValueRecorder;
+import com.couchbase.client.core.config.ClusterConfig;
+import com.couchbase.client.core.topology.ClusterIdentifier;
+import com.couchbase.client.core.topology.ClusterIdentifierUtil;
 import com.couchbase.client.core.util.CbCollections;
+import reactor.util.annotation.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
 
 import static com.couchbase.client.core.cnc.TracingIdentifiers.METER_TRANSACTION_ATTEMPTS;
 import static com.couchbase.client.core.cnc.TracingIdentifiers.METER_TRANSACTION_TOTAL;
 import static com.couchbase.client.core.cnc.TracingIdentifiers.SERVICE_TRANSACTIONS;
 
 @Stability.Internal
 public class CoreTransactionsCounters {
-  private final Counter transactions;
-  private final Counter attempts;
-  // A histogram of transaction durations
-
-  public CoreTransactionsCounters(Meter meter) {
-    Map<String, String> tags = CbCollections.mapOf(TracingIdentifiers.ATTR_SERVICE, SERVICE_TRANSACTIONS);
-    transactions = meter.counter(METER_TRANSACTION_TOTAL, tags);
-    attempts = meter.counter(METER_TRANSACTION_ATTEMPTS, tags);
-  }
-
-  public Counter attempts() {
-    return attempts;
-  }
-
-  public Counter transactions() {
-    return transactions;
-  }
+    @Stability.Internal
+    public static class TransactionMetricIdentifier {
+
+        private final @Nullable String clusterName;
+        private final @Nullable String clusterUuid;
+
+        TransactionMetricIdentifier(@Nullable ClusterIdentifier clusterIdent) {
+            clusterName = clusterIdent == null ? null : clusterIdent.clusterName();
+            clusterUuid = clusterIdent == null ? null : clusterIdent.clusterUuid();
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            TransactionMetricIdentifier that = (TransactionMetricIdentifier) o;
+            return Objects.equals(clusterName, that.clusterName)
+                    && Objects.equals(clusterUuid, that.clusterUuid);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(clusterName, clusterUuid);
+        }
+    }
+
+    private final Map<TransactionMetricIdentifier, Counter> transactionsMetrics = new ConcurrentHashMap<>();
+    private final Map<TransactionMetricIdentifier, Counter> attemptMetrics = new ConcurrentHashMap<>();
+    private final Core core;
+    private final Meter meter;
+
+    public CoreTransactionsCounters(Core core, Meter meter) {
+        this.core = core;
+        this.meter = meter;
+    }
+
+    public Counter attempts() {
+        return genericCounter(METER_TRANSACTION_ATTEMPTS, attemptMetrics);
+    }
+
+    public Counter transactions() {
+        return genericCounter(METER_TRANSACTION_TOTAL, transactionsMetrics);
+    }
+
+    private Counter genericCounter(String name, Map<TransactionMetricIdentifier, Counter> metricsMap) {
+        ClusterConfig config = core.configurationProvider().config();
+        ClusterIdentifier clusterIdent = ClusterIdentifierUtil.fromConfig(config);
+        return metricsMap.computeIfAbsent(new TransactionMetricIdentifier(clusterIdent), id -> {
+            HashMap<String, String> tags = new HashMap<>();
+            tags.put(TracingIdentifiers.ATTR_SYSTEM, TracingIdentifiers.ATTR_SYSTEM_COUCHBASE);
+            if (id.clusterName != null) {
+                tags.put(TracingIdentifiers.ATTR_CLUSTER_NAME, id.clusterName);
+            }
+            if (id.clusterUuid != null) {
+                tags.put(TracingIdentifiers.ATTR_CLUSTER_UUID, id.clusterUuid);
+            }
+            return meter.counter(name, tags);
+        });
+    }
 }