Merge pull request #554 from go-faster/perf/improve-label-lookup

perf(chstorage): only query resource attributes for labels

cmd/otelbench/chtracker/chtracker.go

@@ -39,6 +39,7 @@ type Tracker[Q any] struct {
 type TrackedQuery[Q any] struct {
 	TraceID  string
 	Duration time.Duration
+	Timeout  bool
 	Meta     Q
 }
 
@@ -65,15 +66,24 @@ func (t *Tracker[Q]) Track(ctx context.Context, meta Q, cb func(context.Context,
 		}()
 	}
 
-	if err := cb(ctx, meta); err != nil {
-		return errors.Wrap(err, "send tracked")
+	var (
+		timeout bool
+		sendErr = cb(ctx, meta)
+	)
+	switch {
+	case sendErr == nil:
+	case errors.Is(sendErr, context.DeadlineExceeded):
+		timeout = true
+	default:
+		return errors.Wrap(sendErr, "send tracked")
 	}
 	duration := time.Since(start)
 
 	t.queriesMux.Lock()
 	t.queries = append(t.queries, TrackedQuery[Q]{
 		TraceID:  traceID,
 		Duration: duration,
+		Timeout:  timeout,
 		Meta:     meta,
 	})
 	t.queriesMux.Unlock()

cmd/otelbench/logqlbench/logqlbench.go

@@ -94,7 +94,7 @@ func (p *LogQLBenchmark) Run(ctx context.Context) error {
 		// Warmup.
 		for i := 0; i < p.Warmup; i++ {
 			if err := p.send(ctx, q); err != nil {
-				return errors.Wrap(err, "send")
+				return errors.Wrap(err, "send (warmup)")
 			}
 			if err := pb.Add(1); err != nil {
 				return errors.Wrap(err, "update progress bar")
@@ -139,6 +139,7 @@ func (p *LogQLBenchmark) Run(ctx context.Context) error {
 				Matchers:      tq.Meta.Match,
 				DurationNanos: tq.Duration.Nanoseconds(),
 				Queries:       queries,
+				Timeout:       tq.Timeout,
 			})
 			return nil
 		},

cmd/otelbench/logqlbench/result.go

@@ -14,4 +14,5 @@ type LogQLReportQuery struct {
 	DurationNanos int64                   `yaml:"duration_nanos,omitempty"`
 	Matchers      []string                `yaml:"matchers,omitempty"`
 	Queries       []chtracker.QueryReport `yaml:"queries,omitempty"`
+	Timeout       bool                    `yaml:"timeout,omitempty"`
 }

dev/local/ch-log-bench-read/benchmark.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+echo ">> Benchmark"
+start_time="2024-11-20T00:00:00Z"
+end_time="2024-12-01T00:00:00Z"
+
+queries_file="${BENCH_QUERIES:-testdata/logql.yml}"
+benchmark_runs="${BENCH_RUNS:-15}"
+
+OTEL_EXPORTER_OTLP_INSECURE="true" go run github.com/go-faster/oteldb/cmd/otelbench logql bench \
+    --start "$start_time" \
+    --end "$end_time" \
+    -i "$queries_file" \
+    -o report.yml \
+    --trace \
+    --allow-empty=false \
+    --count "$benchmark_runs"
+
+echo ">> Analyze"
+go run github.com/go-faster/oteldb/cmd/otelbench logql analyze \
+    --input report.yml \
+    --format benchstat >benchstat.report.txt
+
+echo ">> Benchstat"
+benchstat benchstat.report.txt

dev/local/ch-log-bench-read/setup.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+echo ">> Setup oteldb locally"
+docker compose up -d --remove-orphans --build
+
+DUMP_DIR="${DUMP_DIR:-/tmp/slowdump}"
+
+echo ">> Upload benchmark data"
+go run github.com/go-faster/oteldb/cmd/otelbench dump restore \
+    --truncate \
+    --database default \
+    --input "${DUMP_DIR}"

dev/local/ch-log-bench-read/testdata/logql.yml

@@ -1,7 +1,7 @@
 range:
-  - title: Failed POST requests
+  - title: Lookup by materialzied attribute
     query: |-
-      {http_method="POST"} |= "Error"
-series:
-  - title: All POST series
-    match: ['{http_method="POST"}']
+      {level!="DEBUG", service_name="go-faster.oteldb"}
+  - title: Lookup by regular attribute
+    query: |-
+      {operationName="SearchTagValuesV2"}