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

Jump to bottom

Fix timer channel drain to avoid hanging in Go 1.23 #5869

Merged
merged 6 commits into from
Oct 4, 2024
+6 −1
Merged

Fix timer channel drain to avoid hanging in Go 1.23 #5869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
978fedc
- Fix timer channel drain to avoid hanging in go1.23 w/ asynctimerchan=0
dany74q Oct 3, 2024
4366d89
CR notes
dany74q Oct 3, 2024
a591090
Update batch_span_processor.go
pellared Oct 3, 2024
5ee4520
Merge branch 'main' into danny/fix-go-1-23-timer-channel-drain
pellared Oct 3, 2024
86c464a
Merge branch 'main' into danny/fix-go-1-23-timer-channel-drain
pellared Oct 4, 2024
46558ff
Merge branch 'main' into danny/fix-go-1-23-timer-channel-drain
dmathieu Oct 4, 2024
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
Expand Up @@ -27,6 +27,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

- The race condition for multiple `FixedSize` exemplar reservoirs identified in #5814 is resolved. (#5819)
- Fix log records duplication in case of heterogeneous resource attributes by correctly mapping each log record to it's resource and scope. (#5803)
- Fix timer channel drain to avoid hanging on Go 1.23. (#5868)

<!-- Released section -->
<!-- Don't change this section unless doing release -->
Expand Down
6 changes: 5 additions & 1 deletion sdk/trace/batch_span_processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,11 @@ func (bsp *batchSpanProcessor) processQueue() {
bsp.batchMutex.Unlock()
if shouldExport {
if !bsp.timer.Stop() {
<-bsp.timer.C
// Handle both GODEBUG=asynctimerchan=[0|1] properly.
select {
case <-bsp.timer.C:
default:
}
dany74q marked this conversation as resolved.
Show resolved Hide resolved
}
if err := bsp.exportSpans(ctx); err != nil {
otel.Handle(err)
Expand Down
Loading