Rename peerdas getBlobsV2 metrics

src/Nethermind/Nethermind.Merge.Plugin/Handlers/GetBlobsHandlerV2.cs

@@ -24,10 +24,13 @@ public Task<ResultWrapper<IEnumerable<BlobAndProofV2>>> HandleAsync(byte[][] req
             return ResultWrapper<IEnumerable<BlobAndProofV2>>.Fail(error, MergeErrorCodes.TooLargeRequest);
         }
 
-        Metrics.NumberOfRequestedBlobs += request.Length;
+        Metrics.GetBlobsRequestsTotal += request.Length;
+
+        var count = txPool.GetBlobCounts(request);
+        Metrics.GetBlobsRequestsInBlobpoolTotal += count;
 
         // quick fail if we don't have some blob
-        if (!txPool.AreBlobsAvailable(request))
+        if (count != request.Length)
         {
             return ReturnEmptyArray();
         }
@@ -46,14 +49,13 @@ public Task<ResultWrapper<IEnumerable<BlobAndProofV2>>> HandleAsync(byte[][] req
             }
         }
 
-        Metrics.NumberOfSentBlobs += request.Length;
-        Metrics.NumberOfGetBlobsSuccesses++;
+        Metrics.GetBlobsRequestsSuccessTotal++;
         return ResultWrapper<IEnumerable<BlobAndProofV2>>.Success(response.ToList());
     }
 
     private ResultWrapper<IEnumerable<BlobAndProofV2>> ReturnEmptyArray()
     {
-        Metrics.NumberOfGetBlobsFailures++;
+        Metrics.GetBlobsRequestsFailureTotal++;
         return ResultWrapper<IEnumerable<BlobAndProofV2>>.Success([]);
     }
 }

src/Nethermind/Nethermind.Merge.Plugin/Metrics.cs

@@ -34,10 +34,22 @@ public static class Metrics
 
         [GaugeMetric]
         [Description("Number of responses to engine_getBlobsV1 and engine_getBlobsV2 with all requested blobs")]
-        public static int NumberOfGetBlobsSuccesses { get; set; }
+        public static int GetBlobsRequestsSuccessTotal { get; set; }
 
         [GaugeMetric]
         [Description("Number of responses to engine_getBlobsV1 and engine_getBlobsV2 without all requested blobs")]
-        public static int NumberOfGetBlobsFailures { get; set; }
+        public static int GetBlobsRequestsFailureTotal { get; set; }
+
+        [CounterMetric]
+        [Description("Number of Blobs requested by engine_getBlobsV2")]
+        public static int GetBlobsRequestsTotal { get; set; }
+
+        [CounterMetric]
+        [Description("Number of Blobs requested by engine_getBlobsV2 that are present in the blobpool")]
+        public static int GetBlobsRequestsInBlobpoolTotal { get; set; }
+
+        [GaugeMetric]
+        [Description("Time taken to return the blobs from engine_getBlobsV2 request")]
+        public static long GetBlobsRequestDurationSeconds { get; set; }
     }
 }

src/Nethermind/Nethermind.TxPool/Collections/BlobTxDistinctSortedPool.cs

@@ -94,19 +94,20 @@ public bool TryGetBlobAndProofV2(byte[] requestedBlobVersionedHash,
         return false;
     }
 
-    public bool AreBlobsAvailable(byte[][] requestedBlobVersionedHashes)
+    public int GetBlobCounts(byte[][] requestedBlobVersionedHashes)
     {
         using var lockRelease = Lock.Acquire();
+        int count = 0;
 
         foreach (byte[] requestedBlobVersionedHash in requestedBlobVersionedHashes)
         {
-            if (!BlobIndex.TryGetValue(requestedBlobVersionedHash, out _))
+            if (BlobIndex.ContainsKey(requestedBlobVersionedHash))
             {
-                return false;
+                count += 1;
             }
         }
 
-        return true;
+        return count;
     }
 
     protected override bool InsertCore(ValueHash256 key, Transaction value, AddressAsKey groupKey)

src/Nethermind/Nethermind.TxPool/ITxPool.cs

@@ -51,7 +51,7 @@ bool TryGetBlobAndProof(byte[] blobVersionedHash,
         bool TryGetBlobAndProofV2(byte[] blobVersionedHash,
             [NotNullWhen(true)] out byte[]? blob,
             [NotNullWhen(true)] out byte[][]? cellProofs);
-        bool AreBlobsAvailable(byte[][] blobVersionedHashes);
+        int GetBlobCounts(byte[][] blobVersionedHashes);
         UInt256 GetLatestPendingNonce(Address address);
         event EventHandler<TxEventArgs> NewDiscovered;
         event EventHandler<TxEventArgs> NewPending;

src/Nethermind/Nethermind.TxPool/NullTxPool.cs

@@ -81,7 +81,7 @@ public bool TryGetBlobAndProofV2(byte[] blobVersionedHash,
             return false;
         }
 
-        public bool AreBlobsAvailable(byte[][] blobVersionedHashes) => false;
+        public int GetBlobCounts(byte[][] blobVersionedHashes) => 0;
 
         public UInt256 GetLatestPendingNonce(Address address) => 0;
 

src/Nethermind/Nethermind.TxPool/TxPool.cs

@@ -212,8 +212,8 @@ public bool TryGetBlobAndProofV2(byte[] blobVersionedHash,
             [NotNullWhen(true)] out byte[][]? cellProofs)
             => _blobTransactions.TryGetBlobAndProofV2(blobVersionedHash, out blob, out cellProofs);
 
-        public bool AreBlobsAvailable(byte[][] blobVersionedHashes)
-            => _blobTransactions.AreBlobsAvailable(blobVersionedHashes);
+        public int GetBlobCounts(byte[][] blobVersionedHashes)
+            => _blobTransactions.GetBlobCounts(blobVersionedHashes);
 
         private void OnRemovedTx(object? sender, SortedPool<ValueHash256, Transaction, AddressAsKey>.SortedPoolRemovedEventArgs args)
         {