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.

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

Tempo: remove internal error reason for discarded spans #4554

Merged
merged 2 commits into from
Jan 15, 2025
Merged
Changes from 1 commit
Commits
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
Next Next commit
remove internal error reason
Signed-off-by: Joe Elliott <[email protected]>
  • Loading branch information
joe-elliott committed Jan 14, 2025
commit c3fa7d3de242765e8eb6571fe61c94871ceb1b24
4 changes: 0 additions & 4 deletions modules/distributor/distributor.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ const (
reasonTraceTooLarge = "trace_too_large"
// reasonLiveTracesExceeded indicates that tempo is already tracking too many live traces in the ingesters for this user
reasonLiveTracesExceeded = "live_traces_exceeded"
// reasonInternalError indicates an unexpected error occurred processing these spans. analogous to a 500
reasonInternalError = "internal_error"
// reasonUnknown indicates a pushByte error at the ingester level not related to GRPC
reasonUnknown = "unknown_error"

Expand Down Expand Up @@ -443,7 +441,6 @@ func (d *Distributor) PushTraces(ctx context.Context, traces ptrace.Traces) (*te

keys, rebatchedTraces, truncatedAttributeCount, err := requestsByTraceID(batches, userID, spanCount, d.cfg.MaxSpanAttrByte)
if err != nil {
overrides.RecordDiscardedSpans(spanCount, reasonInternalError, userID)
logDiscardedResourceSpans(batches, userID, &d.cfg.LogDiscardedSpans, d.logger)
return nil, err
}
Expand Down Expand Up @@ -537,7 +534,6 @@ func (d *Distributor) sendToIngestersViaBytes(ctx context.Context, userID string
}, ring.DoBatchOptions{})
// if err != nil, we discarded everything because of an internal error (like "context cancelled")
if err != nil {
overrides.RecordDiscardedSpans(totalSpanCount, reasonInternalError, userID)
logDiscardedRebatchedSpans(traces, userID, &d.cfg.LogDiscardedSpans, d.logger)
return err
}
Expand Down
Loading