Skip to content
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

Fix sample rate for late spans #504

Merged
merged 1 commit into from
Sep 7, 2022
Merged

Fix sample rate for late spans #504

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions collect/collect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ func (i *InMemCollector) processSpan(sp *types.Span) {
}
// if the trace we got back from the cache has already been sent, deal with the
// span.
if trace.Sent == true {
if trace.Sent {
i.dealWithSentTrace(trace.KeepSample, trace.SampleRate, sp)
}

Expand Down Expand Up @@ -394,6 +394,9 @@ func (i *InMemCollector) dealWithSentTrace(keep bool, sampleRate uint, sp *types
}
if keep {
i.Logger.Debug().WithField("trace_id", sp.TraceID).Logf("Sending span because of previous decision to send trace")
if sp.SampleRate < 1 {
sp.SampleRate = 1
}
sp.SampleRate *= sampleRate
i.Transmission.EnqueueSpan(sp)
return
Expand All @@ -414,7 +417,7 @@ func isRootSpan(sp *types.Span) bool {
}

func (i *InMemCollector) send(trace *types.Trace) {
if trace.Sent == true {
if trace.Sent {
// someone else already sent this so we shouldn't also send it. This happens
// when two timers race and two signals for the same trace are sent down the
// toSend channel
Expand All @@ -426,7 +429,7 @@ func (i *InMemCollector) send(trace *types.Trace) {
}
trace.Sent = true

traceDur := time.Now().Sub(trace.StartTime)
traceDur := time.Since(trace.StartTime)
i.Metrics.Histogram("trace_duration_ms", float64(traceDur.Milliseconds()))
i.Metrics.Histogram("trace_span_count", float64(len(trace.GetSpans())))
if trace.HasRootSpan {
Expand Down