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

Tempo: remove internal error reason for discarded spans #4554

Merged
merged 2 commits into from
Jan 15, 2025
Merged

Tempo: remove internal error reason for discarded spans #4554

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
c3fa7d3
remove internal error reason
joe-elliott Jan 14, 2025
2d05d6e
changelog
joe-elliott Jan 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## main / unreleased

* [CHANGE] **BREAKING CHANGE** Removed `internal_error` as a reason from `tempo_discarded_spans_total`. [#4554](https://github.com/grafana/tempo/pull/4554) (@joe-elliott)
* [BUGFIX] Choose a default step for a gRPC streaming query range request if none is provided. [#4546](https://github.com/grafana/tempo/pull/4546) (@joe-elliott)
Fix an issue where the tempo-cli was not correctly dumping exemplar results.

Expand Down
4 changes: 0 additions & 4 deletions modules/distributor/distributor.go
View file
Open in desktop
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