Merge pull request #1666 from josephschorr/observable-proxy

Don't call ObserveDuration more than one in the observable proxy
authzed · Nov 28, 2023 · 6e1677c · 6e1677c
2 parents 688ee40 + 7dae9b3
commit 6e1677c
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/internal/datastore/proxy/observable.go b/internal/datastore/proxy/observable.go
@@ -318,8 +318,14 @@ func (rwt *observableRWT) BulkLoad(ctx context.Context, iter datastore.BulkWrite
 func observe(ctx context.Context, name string, opts ...trace.SpanStartOption) (context.Context, func()) {
 	ctx, span := tracer.Start(ctx, name, opts...)
 	timer := prometheus.NewTimer(queryLatency.WithLabelValues(name))
+	closed := false
 
 	return ctx, func() {
+		if closed {
+			return
+		}
+
+		closed = true
 		timer.ObserveDuration()
 		span.End()
 	}