From 978fedc6246d7c8ebe1f48a630f3a958ceb26fd6 Mon Sep 17 00:00:00 2001
From: dany74q <danny@wiz.io>
Date: Thu, 3 Oct 2024 08:10:42 +0300
Subject: [PATCH 1/3] - Fix timer channel drain to avoid hanging in go1.23 w/
 asynctimerchan=0

---
 CHANGELOG.md                      | 1 +
 sdk/trace/batch_span_processor.go | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb9991a59df..6739f72b778 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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 with asynctimerchan=0 (#5868)
 
 <!-- Released section -->
 <!-- Don't change this section unless doing release -->
diff --git a/sdk/trace/batch_span_processor.go b/sdk/trace/batch_span_processor.go
index 1d399a75db2..bc301b5a1eb 100644
--- a/sdk/trace/batch_span_processor.go
+++ b/sdk/trace/batch_span_processor.go
@@ -316,7 +316,10 @@ func (bsp *batchSpanProcessor) processQueue() {
 			bsp.batchMutex.Unlock()
 			if shouldExport {
 				if !bsp.timer.Stop() {
-					<-bsp.timer.C
+					select {
+					case <-bsp.timer.C:
+					default:
+					}
 				}
 				if err := bsp.exportSpans(ctx); err != nil {
 					otel.Handle(err)

From 4366d898ec1fa9e0d85a04a9d9fdc3cba83e3a82 Mon Sep 17 00:00:00 2001
From: dany74q <danny@wiz.io>
Date: Thu, 3 Oct 2024 16:14:01 +0300
Subject: [PATCH 2/3] CR notes

---
 CHANGELOG.md                      | 2 +-
 sdk/trace/batch_span_processor.go | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6739f72b778..b52b4749f2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,7 +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 with asynctimerchan=0 (#5868)
+- Fix timer channel drain to avoid hanging on Go 1.23. (#5868)
 
 <!-- Released section -->
 <!-- Don't change this section unless doing release -->
diff --git a/sdk/trace/batch_span_processor.go b/sdk/trace/batch_span_processor.go
index bc301b5a1eb..6100eb86f4c 100644
--- a/sdk/trace/batch_span_processor.go
+++ b/sdk/trace/batch_span_processor.go
@@ -316,6 +316,7 @@ func (bsp *batchSpanProcessor) processQueue() {
 			bsp.batchMutex.Unlock()
 			if shouldExport {
 				if !bsp.timer.Stop() {
+					// Handle both GODEBUG=asynctimerchan=[0|1] properly
 					select {
 					case <-bsp.timer.C:
 					default:

From a591090f1a58a61db998b85af4dc93a631da6b3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Paj=C4=85k?= <pellared@hotmail.com>
Date: Thu, 3 Oct 2024 15:27:46 +0200
Subject: [PATCH 3/3] Update batch_span_processor.go

---
 sdk/trace/batch_span_processor.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/trace/batch_span_processor.go b/sdk/trace/batch_span_processor.go
index 6100eb86f4c..4ce757dfd6b 100644
--- a/sdk/trace/batch_span_processor.go
+++ b/sdk/trace/batch_span_processor.go
@@ -316,7 +316,7 @@ func (bsp *batchSpanProcessor) processQueue() {
 			bsp.batchMutex.Unlock()
 			if shouldExport {
 				if !bsp.timer.Stop() {
-					// Handle both GODEBUG=asynctimerchan=[0|1] properly
+					// Handle both GODEBUG=asynctimerchan=[0|1] properly.
 					select {
 					case <-bsp.timer.C:
 					default: