[chore] Replace usage of puzpuzpuz/xsync with standard sync (#13165)

Signed-off-by: Bogdan Drutu <[email protected]>

Author: bogdandrutu

cmd/otelcorecol/go.mod

@@ -74,7 +74,6 @@ require (
 	github.com/prometheus/client_model v0.6.2 // indirect
 	github.com/prometheus/common v0.64.0 // indirect
 	github.com/prometheus/procfs v0.16.1 // indirect
-	github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect
 	github.com/rs/cors v1.11.1 // indirect
 	github.com/shirou/gopsutil/v4 v4.25.5 // indirect
 	github.com/spf13/cobra v1.9.1 // indirect

cmd/otelcorecol/go.sum

@@ -40,7 +40,6 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/collector/config/configretry v1.33.0 // indirect
 	go.opentelemetry.io/collector/consumer/consumererror v0.127.0 // indirect

exporter/debugexporter/go.mod

@@ -6,8 +6,6 @@ import (
 	"context"
 	"sync"
 
-	"github.com/puzpuzpuz/xsync/v3"
-
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/exporter/exporterhelper/internal/request"
 	"go.opentelemetry.io/collector/exporter/exporterhelper/internal/sender"
@@ -23,14 +21,14 @@ type batcherSettings[T any] struct {
 
 type multiBatcher struct {
 	cfg         BatchConfig
-	workerPool  chan struct{}
+	wp          chan struct{}
 	sizerType   request.SizerType
 	sizer       request.Sizer[request.Request]
 	partitioner Partitioner[request.Request]
 	consumeFunc sender.SendFunc[request.Request]
 
 	singleShard *shardBatcher
-	shards      *xsync.MapOf[string, *shardBatcher]
+	shards      sync.Map
 }
 
 var _ Batcher[request.Request] = (*multiBatcher)(nil)
@@ -45,17 +43,15 @@ func newMultiBatcher(bCfg BatchConfig, bSet batcherSettings[request.Request]) *m
 	}
 	mb := &multiBatcher{
 		cfg:         bCfg,
-		workerPool:  workerPool,
+		wp:          workerPool,
 		sizerType:   bSet.sizerType,
 		sizer:       bSet.sizer,
 		partitioner: bSet.partitioner,
 		consumeFunc: bSet.next,
 	}
 
 	if bSet.partitioner == nil {
-		mb.singleShard = newShard(mb.cfg, mb.sizerType, mb.sizer, mb.workerPool, mb.consumeFunc)
-	} else {
-		mb.shards = xsync.NewMapOf[string, *shardBatcher]()
+		mb.singleShard = newShard(mb.cfg, mb.sizerType, mb.sizer, mb.wp, mb.consumeFunc)
 	}
 	return mb
 }
@@ -66,12 +62,19 @@ func (mb *multiBatcher) getShard(ctx context.Context, req request.Request) *shar
 	}
 
 	key := mb.partitioner.GetKey(ctx, req)
-	result, _ := mb.shards.LoadOrCompute(key, func() *shardBatcher {
-		s := newShard(mb.cfg, mb.sizerType, mb.sizer, mb.workerPool, mb.consumeFunc)
-		s.start(ctx, nil)
-		return s
-	})
-	return result
+	// Fast path, shard already created.
+	s, found := mb.shards.Load(key)
+	if found {
+		return s.(*shardBatcher)
+	}
+	newS := newShard(mb.cfg, mb.sizerType, mb.sizer, mb.wp, mb.consumeFunc)
+	newS.start(ctx, nil)
+	s, loaded := mb.shards.LoadOrStore(key, newS)
+	// If not loaded, there was a race condition in adding the new shard. Shutdown the newly created shard.
+	if loaded {
+		newS.shutdown(ctx)
+	}
+	return s.(*shardBatcher)
 }
 
 func (mb *multiBatcher) Start(ctx context.Context, host component.Host) error {
@@ -93,11 +96,11 @@ func (mb *multiBatcher) Shutdown(ctx context.Context) error {
 	}
 
 	var wg sync.WaitGroup
-	wg.Add(mb.shards.Size())
-	mb.shards.Range(func(_ string, shard *shardBatcher) bool {
+	mb.shards.Range(func(_ any, shard any) bool {
+		wg.Add(1)
 		go func() {
-			shard.shutdown(ctx)
-			wg.Done()
+			defer wg.Done()
+			shard.(*shardBatcher).shutdown(ctx)
 		}()
 		return true
 	})

exporter/debugexporter/go.sum

@@ -43,7 +43,6 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/collector/confmap v1.33.0 // indirect
 	go.opentelemetry.io/collector/extension v1.33.0 // indirect

exporter/exporterhelper/internal/queuebatch/multi_batcher.go

@@ -39,7 +39,6 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/collector/confmap v1.33.0 // indirect
 	go.opentelemetry.io/collector/consumer/xconsumer v0.127.0 // indirect

exporter/exporterhelper/xexporterhelper/go.mod

@@ -4,7 +4,6 @@ go 1.23.0
 
 require (
 	github.com/cenkalti/backoff/v5 v5.0.2
-	github.com/puzpuzpuz/xsync/v3 v3.5.1
 	github.com/stretchr/testify v1.10.0
 	go.opentelemetry.io/collector/client v1.33.0
 	go.opentelemetry.io/collector/component v1.33.0

exporter/exporterhelper/xexporterhelper/go.sum

@@ -56,7 +56,6 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/mostynb/go-grpc-compression v1.2.3 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/collector/client v1.33.0 // indirect
 	go.opentelemetry.io/collector/config/configmiddleware v0.127.0 // indirect

exporter/exportertest/go.mod

@@ -55,7 +55,6 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pierrec/lz4/v4 v4.1.22 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect
 	github.com/rs/cors v1.11.1 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/collector/client v1.33.0 // indirect

exporter/exportertest/go.sum

@@ -78,7 +78,6 @@ require (
 	github.com/prometheus/client_model v0.6.2 // indirect
 	github.com/prometheus/common v0.64.0 // indirect
 	github.com/prometheus/procfs v0.16.1 // indirect
-	github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect
 	github.com/rs/cors v1.11.1 // indirect
 	github.com/shirou/gopsutil/v4 v4.25.5 // indirect
 	github.com/tklauser/go-sysconf v0.3.12 // indirect