From db4ec8d15aa6ec13b2217c66235757baf9f63bc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Benkovsk=C3=BD?= Date: Sun, 26 Nov 2023 23:42:02 +0100 Subject: [PATCH] improve error grouping --- cmd/report.go | 23 ++++++++++++++++++++--- cmd/report_test.go | 42 ++++++++++++++++++++++++++++++------------ cmd/result.go | 11 +++++++++-- 3 files changed, 59 insertions(+), 17 deletions(-) diff --git a/cmd/report.go b/cmd/report.go index eca2076..aa6c559 100644 --- a/cmd/report.go +++ b/cmd/report.go @@ -1,8 +1,10 @@ package cmd import ( + "errors" "fmt" "io" + "net" "os" "sort" "time" @@ -51,10 +53,12 @@ func (b *Benchmark) PrintReport(w io.Writer, stats []*ResultStats, benchmarkDura for _, s := range stats { for _, err := range s.Errors { - if v, ok := errs[err.Error()]; ok { - errs[err.Error()] = v + 1 + errorString := errString(err) + + if v, ok := errs[errorString]; ok { + errs[errorString] = v + 1 } else { - errs[err.Error()] = 1 + errs[errorString] = 1 } } @@ -166,6 +170,19 @@ func (b *Benchmark) PrintReport(w io.Writer, stats []*ResultStats, benchmarkDura return s.print(params) } +func errString(err ErrorDatapoint) string { + var errorString string + var netOpErr *net.OpError + + switch { + case errors.As(err.Err, &netOpErr): + errorString = netOpErr.Op + " " + netOpErr.Net + " " + netOpErr.Addr.String() + default: + errorString = err.Err.Error() + } + return errorString +} + func (b *Benchmark) fileName(dir, name string) string { return dir + "/" + name + "." + b.PlotFormat } diff --git a/cmd/report_test.go b/cmd/report_test.go index 0022f38..b2fa0bc 100644 --- a/cmd/report_test.go +++ b/cmd/report_test.go @@ -2,6 +2,7 @@ package cmd import ( "errors" + "net" "os" "time" @@ -39,10 +40,11 @@ func ExampleBenchmark_PrintReport() { // p75: 10ns // p50: 5ns // - // Total Errors: 3 + // Total Errors: 6 // Top errors: - // test 2 (66.67)% - // test2 1 (33.33)% + // test2 3 (50.00)% + // read udp 8.8.8.8:53 2 (33.33)% + // test 1 (16.67)% } func ExampleBenchmark_PrintReport_dnssec() { @@ -79,10 +81,11 @@ func ExampleBenchmark_PrintReport_dnssec() { // p75: 10ns // p50: 5ns // - // Total Errors: 3 + // Total Errors: 6 // Top errors: - // test 2 (66.67)% - // test2 1 (33.33)% + // test2 3 (50.00)% + // read udp 8.8.8.8:53 2 (33.33)% + // test 1 (16.67)% } func ExampleBenchmark_PrintReport_json() { @@ -93,7 +96,7 @@ func ExampleBenchmark_PrintReport_json() { b.PrintReport(os.Stdout, []*ResultStats{&rs}, time.Second) - // Output: {"totalRequests":1,"totalSuccessCodes":4,"totalErrors":3,"TotalIDmismatch":6,"totalTruncatedResponses":7,"responseRcodes":{"NOERROR":2},"questionTypes":{"A":2},"queriesPerSecond":1,"benchmarkDurationSeconds":1,"latencyStats":{"minMs":0,"meanMs":0,"stdMs":0,"maxMs":0,"p99Ms":0,"p95Ms":0,"p90Ms":0,"p75Ms":0,"p50Ms":0},"latencyDistribution":[{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":1},{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":1}]} + // Output: {"totalRequests":1,"totalSuccessCodes":4,"totalErrors":6,"TotalIDmismatch":6,"totalTruncatedResponses":7,"responseRcodes":{"NOERROR":2},"questionTypes":{"A":2},"queriesPerSecond":1,"benchmarkDurationSeconds":1,"latencyStats":{"minMs":0,"meanMs":0,"stdMs":0,"maxMs":0,"p99Ms":0,"p95Ms":0,"p90Ms":0,"p75Ms":0,"p50Ms":0},"latencyDistribution":[{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":1},{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":1}]} } func ExampleBenchmark_PrintReport_json_dnssec() { @@ -106,7 +109,7 @@ func ExampleBenchmark_PrintReport_json_dnssec() { b.PrintReport(os.Stdout, []*ResultStats{&rs}, time.Second) - // Output: {"totalRequests":1,"totalSuccessCodes":4,"totalErrors":3,"TotalIDmismatch":6,"totalTruncatedResponses":7,"responseRcodes":{"NOERROR":2},"questionTypes":{"A":2},"queriesPerSecond":1,"benchmarkDurationSeconds":1,"latencyStats":{"minMs":0,"meanMs":0,"stdMs":0,"maxMs":0,"p99Ms":0,"p95Ms":0,"p90Ms":0,"p75Ms":0,"p50Ms":0},"latencyDistribution":[{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":1},{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":1}],"totalDNSSECSecuredDomains":1} + // Output: {"totalRequests":1,"totalSuccessCodes":4,"totalErrors":6,"TotalIDmismatch":6,"totalTruncatedResponses":7,"responseRcodes":{"NOERROR":2},"questionTypes":{"A":2},"queriesPerSecond":1,"benchmarkDurationSeconds":1,"latencyStats":{"minMs":0,"meanMs":0,"stdMs":0,"maxMs":0,"p99Ms":0,"p95Ms":0,"p90Ms":0,"p75Ms":0,"p50Ms":0},"latencyDistribution":[{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":1},{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":0},{"latencyMs":0,"count":1}],"totalDNSSECSecuredDomains":1} } func testData() (Benchmark, ResultStats) { @@ -119,6 +122,18 @@ func testData() (Benchmark, ResultStats) { h.RecordValue(10) d1 := Datapoint{5, time.Unix(0, 0)} d2 := Datapoint{10, time.Unix(0, 0)} + addr, err := net.ResolveUDPAddr("udp", "8.8.8.8:53") + if err != nil { + panic(err) + } + saddr1, err := net.ResolveUDPAddr("udp", "127.0.0.1:65359") + if err != nil { + panic(err) + } + saddr2, err := net.ResolveUDPAddr("udp", "127.0.0.1:65360") + if err != nil { + panic(err) + } rs := ResultStats{ Codes: map[int]int64{ dns.RcodeSuccess: 2, @@ -135,10 +150,13 @@ func testData() (Benchmark, ResultStats) { IDmismatch: 6, Truncated: 7, }, - Errors: []error{ - errors.New("test"), - errors.New("test2"), - errors.New("test"), + Errors: []ErrorDatapoint{ + {Start: time.Unix(0, 0), Err: errors.New("test2")}, + {Start: time.Unix(0, 0), Err: errors.New("test")}, + {Start: time.Unix(0, 0), Err: &net.OpError{Op: "read", Net: udpNetwork, Addr: addr, Source: saddr1}}, + {Start: time.Unix(0, 0), Err: &net.OpError{Op: "read", Net: udpNetwork, Addr: addr, Source: saddr2}}, + {Start: time.Unix(0, 0), Err: errors.New("test2")}, + {Start: time.Unix(0, 0), Err: errors.New("test2")}, }, } return b, rs diff --git a/cmd/result.go b/cmd/result.go index 243a3c1..44dfaf6 100644 --- a/cmd/result.go +++ b/cmd/result.go @@ -22,6 +22,13 @@ type Datapoint struct { Start time.Time } +// ErrorDatapoint one datapoint representing single IO error of benchmark. +// Datapoint one datapoint of benchmark (single DNS request). +type ErrorDatapoint struct { + Start time.Time + Err error +} + // ResultStats is a representation of benchmark results of single concurrent thread. type ResultStats struct { Codes map[int]int64 @@ -29,14 +36,14 @@ type ResultStats struct { Hist *hdrhistogram.Histogram Timings []Datapoint Counters *Counters - Errors []error + Errors []ErrorDatapoint AuthenticatedDomains map[string]struct{} } func (rs *ResultStats) record(req *dns.Msg, resp *dns.Msg, err error, time time.Time, timing time.Duration) { if err != nil { rs.Counters.IOError++ - rs.Errors = append(rs.Errors, err) + rs.Errors = append(rs.Errors, ErrorDatapoint{time, err}) return }