fix(otelbench): properly handle lack of reports

go-faster · Dec 8, 2024 · f93e8f8 · f93e8f8
1 parent 8f5dbb3
commit f93e8f8
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/cmd/otelbench/chtracker/chtracker.go b/cmd/otelbench/chtracker/chtracker.go
@@ -3,7 +3,6 @@ package chtracker
 
 import (
 	"context"
-	"fmt"
 	"net/http"
 	"sync"
 	"time"
@@ -93,7 +92,7 @@ func (t *Tracker[Q]) Track(ctx context.Context, meta Q, cb func(context.Context,
 }
 
 // Report iterates over tracked queries.
-func (t *Tracker[Q]) Report(ctx context.Context, cb func(context.Context, TrackedQuery[Q], []QueryReport) error) error {
+func (t *Tracker[Q]) Report(ctx context.Context, cb func(context.Context, TrackedQuery[Q], []QueryReport, error) error) error {
 	if err := t.Flush(ctx); err != nil {
 		return err
 	}
@@ -125,11 +124,7 @@ func (t *Tracker[Q]) Report(ctx context.Context, cb func(context.Context, Tracke
 	for i, result := range queries {
 		tq := t.queries[i]
 
-		if result.Err != nil {
-			fmt.Printf("Failed to retrieve reports for %q: %s\n", tq.TraceID, result.Err)
-		}
-
-		if err := cb(ctx, tq, result.Reports); err != nil {
+		if err := cb(ctx, tq, result.Reports, result.Err); err != nil {
 			return errors.Wrap(err, "report callback")
 		}
 	}

diff --git a/cmd/otelbench/logqlbench/logqlbench.go b/cmd/otelbench/logqlbench/logqlbench.go
@@ -132,7 +132,16 @@ func (p *LogQLBenchmark) Run(ctx context.Context) error {
 
 	var reports []LogQLReportQuery
 	if err := p.tracker.Report(ctx,
-		func(ctx context.Context, tq chtracker.TrackedQuery[Query], queries []chtracker.QueryReport) error {
+		func(ctx context.Context, tq chtracker.TrackedQuery[Query], queries []chtracker.QueryReport, retriveErr error) error {
+			var errMsg string
+			if retriveErr != nil {
+				if errors.Is(retriveErr, context.DeadlineExceeded) {
+					errMsg = "no queries"
+				} else {
+					errMsg = retriveErr.Error()
+				}
+			}
+
 			header := tq.Meta.Header()
 			reports = append(reports, LogQLReportQuery{
 				ID:            header.ID,
@@ -144,6 +153,7 @@ func (p *LogQLBenchmark) Run(ctx context.Context) error {
 				DurationNanos: tq.Duration.Nanoseconds(),
 				Queries:       queries,
 				Timeout:       tq.Timeout,
+				ReportError:   errMsg,
 			})
 			return nil
 		},

diff --git a/cmd/otelbench/logqlbench/result.go b/cmd/otelbench/logqlbench/result.go
@@ -16,4 +16,5 @@ type LogQLReportQuery struct {
 	Matchers      []string                `yaml:"matchers,omitempty"`
 	Queries       []chtracker.QueryReport `yaml:"queries,omitempty"`
 	Timeout       bool                    `yaml:"timeout,omitempty"`
+	ReportError   string                  `yaml:"report_error,omitempty"`
 }
diff --git a/cmd/otelbench/promql_bench.go b/cmd/otelbench/promql_bench.go
@@ -419,7 +419,11 @@ func (p *PromQL) Run(ctx context.Context) error {
 
 	var reports []PromQLReportQuery
 	if err := p.tracker.Report(ctx,
-		func(ctx context.Context, tq chtracker.TrackedQuery[promQLQuery], queries []chtracker.QueryReport) error {
+		func(ctx context.Context, tq chtracker.TrackedQuery[promQLQuery], queries []chtracker.QueryReport, retriveErr error) error {
+			if retriveErr != nil {
+				return retriveErr
+			}
+
 			entry := PromQLReportQuery{
 				ID:            tq.Meta.ID,
 				DurationNanos: tq.Duration.Nanoseconds(),