Skip to content

fix: add a retry on span routing #1525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mterhar wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: add a retry on span routing #1525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9fff33
add a retry on span routing
mterhar Apr 10, 2025
cfc9673
add _sum to legacy metrics histograms
mterhar Apr 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion metrics/legacy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,9 @@ func (h *LegacyMetrics) reportToHoneycomb(ctx context.Context) {
ev.AddField(histogram.name+"_p99", histogram.vals[p99Index])
ev.AddField(histogram.name+"_min", histogram.vals[0])
ev.AddField(histogram.name+"_max", histogram.vals[len(histogram.vals)-1])
ev.AddField(histogram.name+"_avg", average(histogram.vals))
avg, sum := averageAndSum(histogram.vals)
ev.AddField(histogram.name+"_avg", avg)
ev.AddField(histogram.name+"_sum", sum)
histogram.vals = histogram.vals[:0]
}
histogram.lock.Unlock()
Expand Down Expand Up @@ -306,6 +308,14 @@ func average(vals []float64) float64 {
return total / float64(len(vals))
}

func averageAndSum(vals []float64) (float64, float64) {
var total float64
for _, val := range vals {
total += val
}
return total / float64(len(vals)), total
}

func (h *LegacyMetrics) Register(metadata Metadata) {
h.Logger.Debug().Logf("metrics registering %s with name %s", metadata.Type, metadata.Name)
switch metadata.Type {
Expand Down
20 changes: 17 additions & 3 deletions route/route.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,9 +661,23 @@ func (r *Router) processEvent(ev *types.Event, reqID interface{}) error {
err = r.Collector.AddSpanFromPeer(span)
}
if err != nil {
r.Metrics.Increment(r.incomingOrPeer + "_router_dropped")
debugLog.Logf("Dropping span from batch, channel full")
return err
// process immediately or offload to the proper peer
targetShard := r.Sharder.WhichShard(traceID)
if targetShard.Equals(r.Sharder.MyShard()) {
ok, _ := r.Collector.ProcessSpanImmediately(span)
// ProcessSpanImmediately function handles the metrics
if !ok {
r.Metrics.Increment(r.incomingOrPeer + "_router_dropped")
debugLog.Logf("Dropping span from batch, channel full")
return err
}
} else {
ev.APIHost = targetShard.GetAddress()
r.PeerTransmission.EnqueueEvent(ev)
r.Metrics.Increment(r.incomingOrPeer + "_router_peer")
debugLog.Logf("redirected span due to AddSpan channel being full")
return err
}
}

r.Metrics.Increment(r.incomingOrPeer + "_router_span")
Expand Down