Add NonPreferredEndpointCount

Author: eerhardt

src/StackExchange.Redis/PhysicalBridge.cs

@@ -348,9 +348,8 @@ internal string GetStormLog()
         internal void IncrementOpCount()
         {
             Interlocked.Increment(ref operationCount);
-
 #if NET6_0_OR_GREATER
-            RedisMetrics.Instance.IncrementOpCount(Name);
+            RedisMetrics.Instance.IncrementOperationCount(Name);
 #endif
         }
 
@@ -1406,12 +1405,22 @@ private void LogNonPreferred(CommandFlags flags, bool isReplica)
                 if (isReplica)
                 {
                     if (Message.GetPrimaryReplicaFlags(flags) == CommandFlags.PreferMaster)
+                    {
                         Interlocked.Increment(ref nonPreferredEndpointCount);
+#if NET6_0_OR_GREATER
+                        RedisMetrics.Instance.IncrementNonPreferredEndpointCount(Name);
+#endif
+                    }
                 }
                 else
                 {
                     if (Message.GetPrimaryReplicaFlags(flags) == CommandFlags.PreferReplica)
+                    {
                         Interlocked.Increment(ref nonPreferredEndpointCount);
+#if NET6_0_OR_GREATER
+                        RedisMetrics.Instance.IncrementNonPreferredEndpointCount(Name);
+#endif
+                    }
                 }
             }
         }

src/StackExchange.Redis/RedisMetrics.cs

@@ -12,6 +12,7 @@ internal sealed class RedisMetrics
     //private readonly Counter<long> _completedAsynchronously;
     //private readonly Counter<long> _completedSynchronously;
     //private readonly Counter<long> _failedSynchronously;
+    private readonly Counter<long> _nonPreferredEndpointCount;
 
     public static readonly RedisMetrics Instance = new RedisMetrics();
 
@@ -20,28 +21,41 @@ public RedisMetrics()
         _meter = new Meter("StackExchange.Redis");
 
         _operationCount = _meter.CreateCounter<long>(
-            "operation-count",
+            "redis-operation-count",
             description: "The number of operations performed.");
 
         //_completedAsynchronously = _meter.CreateCounter<long>(
-        //    "completed-asynchronously",
+        //    "redis-completed-asynchronously",
         //    description: "The number of operations that have been completed asynchronously.");
 
         //_completedSynchronously = _meter.CreateCounter<long>(
-        //    "completed-synchronously",
+        //    "redis-completed-synchronously",
         //    description: "The number of operations that have been completed synchronously.");
 
         //_failedSynchronously = _meter.CreateCounter<long>(
-        //    "failed-synchronously",
+        //    "redis-failed-synchronously",
         //    description: "The number of operations that failed to complete asynchronously.");
+
+        _nonPreferredEndpointCount = _meter.CreateCounter<long>(
+            "redis-non-preferred-endpoint-count",
+            description: "Indicates the total number of messages dispatched to a non-preferred endpoint, for example sent to a primary when the caller stated a preference of replica.");
     }
 
-    public void IncrementOpCount(string connectionName)
+    public void IncrementOperationCount(string endpoint)
     {
         if (_operationCount.Enabled)
         {
             _operationCount.Add(1,
-                new KeyValuePair<string, object?>("connection-name", connectionName));
+                new KeyValuePair<string, object?>("endpoint", endpoint));
+        }
+    }
+
+    public void IncrementNonPreferredEndpointCount(string endpoint)
+    {
+        if (_nonPreferredEndpointCount.Enabled)
+        {
+            _nonPreferredEndpointCount.Add(1,
+                new KeyValuePair<string, object?>("endpoint", endpoint));
         }
     }
 }