fix: use deployment-level service names for trace queries in external mode

In external mode the sequencer reports spans as "ev-node" (not the
test-specific name like "ev-node-erc20"), so trace queries returned
zero spans. Store service names on env: local mode uses the
test-specific name, external mode defaults to "ev-node"/"ev-reth"
with BENCH_EVNODE_SERVICE_NAME/BENCH_EVRETH_SERVICE_NAME overrides.

Author: chatton

test/e2e/benchmark/gasburner_test.go

@@ -103,7 +103,7 @@ func (s *SpamoorSuite) TestGasBurner() {
 	bm, err := collectBlockMetrics(ctx, e.ethClient, startBlock, endBlock)
 	s.Require().NoError(err, "failed to collect block metrics")
 
-	traces := s.collectTraces(e, cfg.ServiceName)
+	traces := s.collectTraces(e)
 
 	result = newBenchmarkResult("GasBurner", bm, traces)
 	s.Require().Greater(result.summary.SteadyState, time.Duration(0), "expected non-zero steady-state duration")

test/e2e/benchmark/spamoor_defi_test.go

@@ -113,7 +113,7 @@ func (s *SpamoorSuite) TestDeFiSimulation() {
 	bm, err := collectBlockMetrics(ctx, e.ethClient, startBlock, endBlock)
 	s.Require().NoError(err, "failed to collect block metrics")
 
-	traces := s.collectTraces(e, cfg.ServiceName)
+	traces := s.collectTraces(e)
 
 	result = newBenchmarkResult("DeFiSimulation", bm, traces)
 	s.Require().Greater(result.summary.SteadyState, time.Duration(0), "expected non-zero steady-state duration")

test/e2e/benchmark/spamoor_erc20_test.go

@@ -87,7 +87,7 @@ func (s *SpamoorSuite) TestERC20Throughput() {
 	bm, err := collectBlockMetrics(ctx, e.ethClient, startBlock, endBlock)
 	s.Require().NoError(err, "failed to collect block metrics")
 
-	traces := s.collectTraces(e, cfg.ServiceName)
+	traces := s.collectTraces(e)
 
 	result = newBenchmarkResult("ERC20Throughput", bm, traces)
 	s.Require().Greater(result.summary.SteadyState, time.Duration(0), "expected non-zero steady-state duration")

test/e2e/benchmark/spamoor_smoke_test.go

@@ -74,7 +74,7 @@ func (s *SpamoorSuite) TestSpamoorSmoke() {
 	fail := sumCounter(metrics["spamoor_transactions_failed_total"])
 
 	// collect traces
-	traces := s.collectTraces(e, "ev-node-smoke")
+	traces := s.collectTraces(e)
 	w.addSpans(traces.allSpans())
 
 	s.Require().Greater(sent, float64(0), "at least one transaction should have been sent")

test/e2e/benchmark/spamoor_state_pressure_test.go

@@ -106,7 +106,7 @@ func (s *SpamoorSuite) TestStatePressure() {
 	bm, err := collectBlockMetrics(ctx, e.ethClient, startBlock, endBlock)
 	s.Require().NoError(err, "failed to collect block metrics")
 
-	traces := s.collectTraces(e, cfg.ServiceName)
+	traces := s.collectTraces(e)
 
 	result = newBenchmarkResult("StatePressure", bm, traces)
 	s.Require().Greater(result.summary.SteadyState, time.Duration(0), "expected non-zero steady-state duration")

test/e2e/benchmark/suite_test.go

@@ -40,9 +40,11 @@ func (s *SpamoorSuite) SetupTest() {
 
 // env holds a fully-wired environment created by setupEnv.
 type env struct {
-	traces     traceProvider
-	spamoorAPI *spamoor.API
-	ethClient  *ethclient.Client
+	traces             traceProvider
+	spamoorAPI         *spamoor.API
+	ethClient          *ethclient.Client
+	evNodeServiceName  string
+	evRethServiceName  string
 }
 
 // TODO: temporary hardcoded tag, will be replaced with a proper release tag
@@ -151,8 +153,10 @@ func (s *SpamoorSuite) setupLocalEnv(cfg benchConfig) *env {
 			t:         t,
 			startTime: time.Now(),
 		},
-		spamoorAPI: spNode.API(),
-		ethClient:  ethClient,
+		spamoorAPI:        spNode.API(),
+		ethClient:         ethClient,
+		evNodeServiceName: cfg.ServiceName,
+		evRethServiceName: "ev-reth",
 	}
 }
 
@@ -205,44 +209,46 @@ func (s *SpamoorSuite) setupExternalEnv(cfg benchConfig, rpcURL string) *env {
 			t:         t,
 			startTime: time.Now(),
 		},
-		spamoorAPI: spNode.API(),
-		ethClient:  ethClient,
+		spamoorAPI:        spNode.API(),
+		ethClient:         ethClient,
+		evNodeServiceName: envOrDefault("BENCH_EVNODE_SERVICE_NAME", "ev-node"),
+		evRethServiceName: envOrDefault("BENCH_EVRETH_SERVICE_NAME", "ev-reth"),
 	}
 }
 
 // collectTraces fetches ev-node traces (required) and ev-reth traces (optional)
 // from the configured trace provider, then displays flowcharts.
-func (s *SpamoorSuite) collectTraces(e *env, serviceName string) *traceResult {
+func (s *SpamoorSuite) collectTraces(e *env) *traceResult {
 	t := s.T()
 	ctx := t.Context()
 
-	evNodeSpans, err := e.traces.collectSpans(ctx, serviceName)
-	s.Require().NoError(err, "failed to collect %s traces", serviceName)
+	evNodeSpans, err := e.traces.collectSpans(ctx, e.evNodeServiceName)
+	s.Require().NoError(err, "failed to collect %s traces", e.evNodeServiceName)
 
 	tr := &traceResult{
 		evNode: evNodeSpans,
-		evReth: e.traces.tryCollectSpans(ctx, "ev-reth"),
+		evReth: e.traces.tryCollectSpans(ctx, e.evRethServiceName),
 	}
 
-	if link := e.traces.uiURL(serviceName); link != "" {
+	if link := e.traces.uiURL(e.evNodeServiceName); link != "" {
 		t.Logf("traces UI: %s", link)
 	}
 
 	if rc, ok := e.traces.(richSpanCollector); ok {
-		if spans, err := rc.collectRichSpans(ctx, serviceName); err == nil {
+		if spans, err := rc.collectRichSpans(ctx, e.evNodeServiceName); err == nil {
 			tr.evNodeRich = spans
 		}
-		if spans, err := rc.collectRichSpans(ctx, "ev-reth"); err == nil {
+		if spans, err := rc.collectRichSpans(ctx, e.evRethServiceName); err == nil {
 			tr.evRethRich = spans
 		}
 	}
 
 	if rac, ok := e.traces.(resourceAttrCollector); ok {
-		tr.evNodeAttrs = rac.fetchResourceAttrs(ctx, serviceName)
-		tr.evRethAttrs = rac.fetchResourceAttrs(ctx, "ev-reth")
+		tr.evNodeAttrs = rac.fetchResourceAttrs(ctx, e.evNodeServiceName)
+		tr.evRethAttrs = rac.fetchResourceAttrs(ctx, e.evRethServiceName)
 	}
 
-	tr.displayFlowcharts(t, serviceName)
+	tr.displayFlowcharts(t, e.evNodeServiceName)
 	return tr
 }