Merge remote-tracking branch 'origin/main' into cian/erc20-benchmark

# Conflicts: # test/e2e/benchmark/suite_test.go
chatton · Mar 18, 2026 · Feb 25, 2026 · Feb 25, 2026 · Feb 25, 2026 · Feb 25, 2026
commit 560974a1b0b5295e061269f97d76c87de6b195f0
diff --git a/test/e2e/benchmark/suite_test.go b/test/e2e/benchmark/suite_test.go
@@ -168,7 +168,6 @@ func (s *SpamoorSuite) tryCollectServiceTraces(e *env, serviceName string) []e2e
 				t.Logf("warning: failed to fetch %s traces: %v", serviceName, err)
 				return nil
 			}
-			// got some data before failing, use what we have
 			t.Logf("warning: %s trace fetch stopped after %d batches (%d spans): %v", serviceName, batch, len(allSpans), err)
 			break
 		}
@@ -178,7 +177,7 @@ func (s *SpamoorSuite) tryCollectServiceTraces(e *env, serviceName string) []e2e
 		}
 		allSpans = append(allSpans, spans...)
 		if len(traces) < batchSize {
-			break // got fewer traces than requested, no more available
+			break
 		}
 	}