Skip to content

Commit 541ced3

Browse files
julienrbrtjulienrbrt
committed
Merge branch 'main' into julien/post-v1
2 parents ffcfb7f + dea4af1 commit 541ced3

12 files changed

Lines changed: 112 additions & 184 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 75 additions & 157 deletions
Large diffs are not rendered by default.

‎apps/evm/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ replace (
99

1010
require (
1111
github.com/ethereum/go-ethereum v1.17.2
12-
github.com/evstack/ev-node v1.1.0-rc.2
12+
github.com/evstack/ev-node v1.1.0
1313
github.com/evstack/ev-node/core v1.0.0
1414
github.com/evstack/ev-node/execution/evm v1.0.1
1515
github.com/ipfs/go-datastore v0.9.1

‎apps/grpc/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ replace (
88
)
99

1010
require (
11-
github.com/evstack/ev-node v1.1.0-rc.2
11+
github.com/evstack/ev-node v1.1.0
1212
github.com/evstack/ev-node/core v1.0.0
1313
github.com/evstack/ev-node/execution/grpc v1.0.0-rc.1
1414
github.com/ipfs/go-datastore v0.9.1

‎apps/testapp/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.25.7
55
replace github.com/evstack/ev-node => ../../.
66

77
require (
8-
github.com/evstack/ev-node v1.1.0-rc.2
8+
github.com/evstack/ev-node v1.1.0
99
github.com/evstack/ev-node/core v1.0.0
1010
github.com/ipfs/go-datastore v0.9.1
1111
github.com/rs/zerolog v1.35.0

‎test/docker-e2e/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,19 +89,19 @@ require (
8989
github.com/Microsoft/go-winio v0.6.2 // indirect
9090
github.com/avast/retry-go/v4 v4.6.1 // indirect
9191
github.com/aws/aws-sdk-go-v2 v1.41.5 // indirect
92-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 // indirect
92+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8 // indirect
9393
github.com/aws/aws-sdk-go-v2/config v1.32.14 // indirect
9494
github.com/aws/aws-sdk-go-v2/credentials v1.19.14 // indirect
9595
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.21 // indirect
9696
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.21 // indirect
9797
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.21 // indirect
9898
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.6 // indirect
99-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.4 // indirect
99+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.22 // indirect
100100
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7 // indirect
101-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.4 // indirect
101+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.13 // indirect
102102
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.21 // indirect
103-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.4 // indirect
104-
github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1 // indirect
103+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.21 // indirect
104+
github.com/aws/aws-sdk-go-v2/service/s3 v1.99.0 // indirect
105105
github.com/aws/aws-sdk-go-v2/service/sso v1.30.15 // indirect
106106
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.19 // indirect
107107
github.com/aws/aws-sdk-go-v2/service/sts v1.41.10 // indirect

‎test/docker-e2e/go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN
7474
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
7575
github.com/aws/aws-sdk-go-v2 v1.41.5 h1:dj5kopbwUsVUVFgO4Fi5BIT3t4WyqIDjGKCangnV/yY=
7676
github.com/aws/aws-sdk-go-v2 v1.41.5/go.mod h1:mwsPRE8ceUUpiTgF7QmQIJ7lgsKUPQOUl3o72QBrE1o=
77-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 h1:6GMWV6CNpA/6fbFHnoAjrv4+LGfyTqZz2LtCHnspgDg=
78-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0/go.mod h1:/mXlTIVG9jbxkqDnr5UQNQxW1HRYxeGklkM9vAFeabg=
77+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8 h1:eBMB84YGghSocM7PsjmmPffTa+1FBUeNvGvFou6V/4o=
78+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8/go.mod h1:lyw7GFp3qENLh7kwzf7iMzAxDn+NzjXEAGjKS2UOKqI=
7979
github.com/aws/aws-sdk-go-v2/config v1.32.14 h1:opVIRo/ZbbI8OIqSOKmpFaY7IwfFUOCCXBsUpJOwDdI=
8080
github.com/aws/aws-sdk-go-v2/config v1.32.14/go.mod h1:U4/V0uKxh0Tl5sxmCBZ3AecYny4UNlVmObYjKuuaiOo=
8181
github.com/aws/aws-sdk-go-v2/credentials v1.19.14 h1:n+UcGWAIZHkXzYt87uMFBv/l8THYELoX6gVcUvgl6fI=
@@ -88,18 +88,18 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.21 h1:PEgGVtPoB6NTpPrBgq
8888
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.21/go.mod h1:p+hz+PRAYlY3zcpJhPwXlLC4C+kqn70WIHwnzAfs6ps=
8989
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.6 h1:qYQ4pzQ2Oz6WpQ8T3HvGHnZydA72MnLuFK9tJwmrbHw=
9090
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.6/go.mod h1:O3h0IK87yXci+kg6flUKzJnWeziQUKciKrLjcatSNcY=
91-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.4 h1:BE/MNQ86yzTINrfxPPFS86QCBNQeLKY2A0KhDh47+wI=
92-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.4/go.mod h1:SPBBhkJxjcrzJBc+qY85e83MQ2q3qdra8fghhkkyrJg=
91+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.22 h1:rWyie/PxDRIdhNf4DzRk0lvjVOqFJuNnO8WwaIRVxzQ=
92+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.22/go.mod h1:zd/JsJ4P7oGfUhXn1VyLqaRZwPmZwg44Jf2dS84Dm3Y=
9393
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7 h1:5EniKhLZe4xzL7a+fU3C2tfUN4nWIqlLesfrjkuPFTY=
9494
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7/go.mod h1:x0nZssQ3qZSnIcePWLvcoFisRXJzcTVvYpAAdYX8+GI=
95-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.4 h1:Beh9oVgtQnBgR4sKKzkUBRQpf1GnL4wt0l4s8h2VCJ0=
96-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.4/go.mod h1:b17At0o8inygF+c6FOD3rNyYZufPw62o9XJbSfQPgbo=
95+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.13 h1:JRaIgADQS/U6uXDqlPiefP32yXTda7Kqfx+LgspooZM=
96+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.13/go.mod h1:CEuVn5WqOMilYl+tbccq8+N2ieCy0gVn3OtRb0vBNNM=
9797
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.21 h1:c31//R3xgIJMSC8S6hEVq+38DcvUlgFY0FM6mSI5oto=
9898
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.21/go.mod h1:r6+pf23ouCB718FUxaqzZdbpYFyDtehyZcmP5KL9FkA=
99-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.4 h1:HVSeukL40rHclNcUqVcBwE1YoZhOkoLeBfhUqR3tjIU=
100-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.4/go.mod h1:DnbBOv4FlIXHj2/xmrUQYtawRFC9L9ZmQPz+DBc6X5I=
101-
github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1 h1:2n6Pd67eJwAb/5KCX62/8RTU0aFAAW7V5XIGSghiHrw=
102-
github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1/go.mod h1:w5PC+6GHLkvMJKasYGVloB3TduOtROEMqm15HSuIbw4=
99+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.21 h1:ZlvrNcHSFFWURB8avufQq9gFsheUgjVD9536obIknfM=
100+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.21/go.mod h1:cv3TNhVrssKR0O/xxLJVRfd2oazSnZnkUeTf6ctUwfQ=
101+
github.com/aws/aws-sdk-go-v2/service/s3 v1.99.0 h1:hlSuz394kV0vhv9drL5lhuEFbEOEP1VyQpy15qWh1Pk=
102+
github.com/aws/aws-sdk-go-v2/service/s3 v1.99.0/go.mod h1:uoA43SdFwacedBfSgfFSjjCvYe8aYBS7EnU5GZ/YKMM=
103103
github.com/aws/aws-sdk-go-v2/service/signin v1.0.9 h1:QKZH0S178gCmFEgst8hN0mCX1KxLgHBKKY/CLqwP8lg=
104104
github.com/aws/aws-sdk-go-v2/service/signin v1.0.9/go.mod h1:7yuQJoT+OoH8aqIxw9vwF+8KpvLZ8AWmvmUWHsGQZvI=
105105
github.com/aws/aws-sdk-go-v2/service/sso v1.30.15 h1:lFd1+ZSEYJZYvv9d6kXzhkZu07si3f+GQ1AaYwa2LUM=

‎test/e2e/benchmark/result.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ type traceResult struct {
2424
// resource attributes extracted from trace spans (OTEL_RESOURCE_ATTRIBUTES).
2525
evNodeAttrs *resourceAttrs
2626
evRethAttrs *resourceAttrs
27+
28+
// tracesURL is a link to the trace UI for the ev-node service.
29+
tracesURL string
2730
}
2831

2932
// displayFlowcharts renders ASCII flowcharts from rich spans. Falls back to

‎test/e2e/benchmark/run_result.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ type runResult struct {
2727
Metrics runMetrics `json:"metrics"`
2828
BlockRange runBlockRange `json:"block_range"`
2929
Spamoor *runSpamoorStats `json:"spamoor,omitempty"`
30+
TracesURL string `json:"traces_url,omitempty"`
3031
FieldDescriptions map[string]string `json:"field_descriptions"`
3132
}
3233

@@ -195,6 +196,7 @@ func buildRunResult(cfg benchConfig, br *benchmarkResult, wallClock time.Duratio
195196
NonEmpty: br.bm.BlockCount,
196197
},
197198
Spamoor: spamoor,
199+
TracesURL: br.traces.tracesURL,
198200
FieldDescriptions: fieldDescriptions(),
199201
}
200202
}
@@ -306,5 +308,7 @@ func fieldDescriptions() map[string]string {
306308

307309
"spamoor.sent": "total txs successfully sent by spamoor",
308310
"spamoor.failed": "total txs that failed",
311+
312+
"traces_url": "VMUI link to view ev-node traces for this benchmark run",
309313
}
310314
}

‎test/e2e/benchmark/suite_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,9 @@ func (s *SpamoorSuite) collectTraces(e *env) *traceResult {
230230
evReth: e.traces.tryCollectSpans(ctx, e.evRethServiceName),
231231
}
232232

233-
if link := e.traces.uiURL(e.evNodeServiceName); link != "" {
233+
if link := e.traces.uiURL(e.evNodeServiceName, time.Now()); link != "" {
234234
t.Logf("traces UI: %s", link)
235+
tr.tracesURL = link
235236
}
236237

237238
if rc, ok := e.traces.(richSpanCollector); ok {

‎test/e2e/benchmark/traces.go‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ type traceProvider interface {
3535
collectSpans(ctx context.Context, serviceName string) ([]e2e.TraceSpan, error)
3636
tryCollectSpans(ctx context.Context, serviceName string) []e2e.TraceSpan
3737
// uiURL returns a link to view traces for the given service, or empty string if not available.
38-
uiURL(serviceName string) string
38+
uiURL(serviceName string, end time.Time) string
3939
// resetStartTime sets the trace collection window start to now.
4040
resetStartTime()
4141
}
@@ -64,13 +64,15 @@ func (v *victoriaTraceProvider) resetStartTime() {
6464
v.startTime = time.Now()
6565
}
6666

67-
func (v *victoriaTraceProvider) uiURL(serviceName string) string {
67+
func (v *victoriaTraceProvider) uiURL(serviceName string, end time.Time) string {
6868
query := fmt.Sprintf(`_stream:{resource_attr:service.name="%s"}`, serviceName)
69-
return fmt.Sprintf("%s/select/vmui/#/query?query=%s&start=%s&end=%s",
69+
rangeInput := end.Sub(v.startTime).Round(time.Second).String()
70+
endInput := end.UTC().Format("2006-01-02T15:04:05")
71+
return fmt.Sprintf("%s/select/vmui/?#/?g0.expr=%s&g0.range_input=%s&g0.end_input=%s",
7072
strings.TrimRight(v.queryURL, "/"),
7173
neturl.QueryEscape(query),
72-
v.startTime.Format(time.RFC3339),
73-
time.Now().Format(time.RFC3339))
74+
rangeInput,
75+
endInput)
7476
}
7577

7678
func (v *victoriaTraceProvider) collectSpans(ctx context.Context, serviceName string) ([]e2e.TraceSpan, error) {

0 commit comments

Comments
 (0)