go/opentelemetry-go
1
0
Fork 0
mirror of https://github.com/open-telemetry/opentelemetry-go.git synced 2026-06-03 18:35:08 +02:00
Code Issues Releases Activity

refactor: replace uint64 and int32 with atomic types in tests (#7941)

Browse Source 
Because [atomic types](https://go.dev/doc/go1.19#atomic_types) are
easier to use.
This commit is contained in:
Oleksandr Redko
2026-03-04 18:20:31 +02:00
committed by GitHub
parent a7624f50f7
commit 60161f97c4
7 changed files with 33 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
exporters/otlp/otlplog/otlploggrpc/exporter_test.go
+3 -3
View File
@@ -124,7 +124,7 @@ func TestExporterConcurrentSafe(t *testing.T) {
var wg sync.WaitGroup
ctx, cancel := context.WithCancel(t.Context())
runs := new(uint64)
var runs atomic.Uint64
for range goroutines {
wg.Go(func() {
r := make([]sdklog.Record, 1)
@@ -135,13 +135,13 @@ func TestExporterConcurrentSafe(t *testing.T) {
default:
_ = e.Export(ctx, r)
_ = e.ForceFlush(ctx)
atomic.AddUint64(runs, 1)
runs.Add(1)
}
}
})
}
for atomic.LoadUint64(runs) == 0 {
for runs.Load() == 0 {
runtime.Gosched()
}
exporters/otlp/otlplog/otlploghttp/exporter_test.go
+3 -3
View File
@@ -92,7 +92,7 @@ func TestExporterConcurrentSafe(t *testing.T) {
var wg sync.WaitGroup
ctx, cancel := context.WithCancel(t.Context())
runs := new(uint64)
var runs atomic.Uint64
for range goroutines {
wg.Go(func() {
r := make([]log.Record, 1)
@@ -103,13 +103,13 @@ func TestExporterConcurrentSafe(t *testing.T) {
default:
_ = e.Export(ctx, r)
_ = e.ForceFlush(ctx)
atomic.AddUint64(runs, 1)
runs.Add(1)
}
}
})
}
for atomic.LoadUint64(runs) == 0 {
for runs.Load() == 0 {
runtime.Gosched()
}
internal/global/trace_test.go
+6 -6
View File
@@ -140,10 +140,10 @@ func TestTraceProviderDelegatesConcurrentSafe(t *testing.T) {
<-time.After(100 * time.Millisecond)
// Configure it with a spy.
called := int32(0)
var called atomic.Int32
SetTracerProvider(fnTracerProvider{
tracer: func(name string, _ ...trace.TracerOption) trace.Tracer {
newVal := atomic.AddInt32(&called, 1)
newVal := called.Add(1)
assert.Equal(t, "abc", name)
if newVal == 10 {
// Signal the goroutine to finish.
@@ -156,7 +156,7 @@ func TestTraceProviderDelegatesConcurrentSafe(t *testing.T) {
// Wait for the go routine to finish
<-done
assert.LessOrEqual(t, int32(10), atomic.LoadInt32(&called), "expected configured TraceProvider to be called")
assert.LessOrEqual(t, int32(10), called.Load(), "expected configured TraceProvider to be called")
}
func TestTracerDelegatesConcurrentSafe(t *testing.T) {
@@ -184,13 +184,13 @@ func TestTracerDelegatesConcurrentSafe(t *testing.T) {
<-time.After(100 * time.Millisecond)
// Configure it with a spy.
called := int32(0)
var called atomic.Int32
SetTracerProvider(fnTracerProvider{
tracer: func(name string, _ ...trace.TracerOption) trace.Tracer {
assert.Equal(t, "abc", name)
return fnTracer{
start: func(ctx context.Context, spanName string, _ ...trace.SpanStartOption) (context.Context, trace.Span) {
newVal := atomic.AddInt32(&called, 1)
newVal := called.Add(1)
assert.Equal(t, "name", spanName)
if newVal == 10 {
// Signal the goroutine to finish.
@@ -205,7 +205,7 @@ func TestTracerDelegatesConcurrentSafe(t *testing.T) {
// Wait for the go routine to finish
<-done
assert.LessOrEqual(t, int32(10), atomic.LoadInt32(&called), "expected configured TraceProvider to be called")
assert.LessOrEqual(t, int32(10), called.Load(), "expected configured TraceProvider to be called")
}
func TestTraceProviderDelegatesSameInstance(t *testing.T) {
sdk/log/exporter_test.go
+9 -12
View File
@@ -33,7 +33,7 @@ type testExporter struct {
ExportTrigger chan struct{}
// Counts of method calls.
exportN, shutdownN, forceFlushN *int32
exportN, shutdownN, forceFlushN atomic.Int32
stopped atomic.Bool
inputMu sync.Mutex
@@ -43,11 +43,8 @@ type testExporter struct {
func newTestExporter(err error) *testExporter {
e := &testExporter{
Err: err,
exportN: new(int32),
shutdownN: new(int32),
forceFlushN: new(int32),
input: make(chan instruction),
Err: err,
input: make(chan instruction),
}
e.done = run(e.input)
@@ -81,7 +78,7 @@ func (e *testExporter) Records() [][]Record {
}
func (e *testExporter) Export(ctx context.Context, r []Record) error {
atomic.AddInt32(e.exportN, 1)
e.exportN.Add(1)
if e.ExportTrigger != nil {
select {
case <-e.ExportTrigger:
@@ -98,7 +95,7 @@ func (e *testExporter) Export(ctx context.Context, r []Record) error {
}
func (e *testExporter) ExportN() int {
return int(atomic.LoadInt32(e.exportN))
return int(e.exportN.Load())
}
func (e *testExporter) Stop() {
@@ -113,21 +110,21 @@ func (e *testExporter) Stop() {
}
func (e *testExporter) Shutdown(context.Context) error {
atomic.AddInt32(e.shutdownN, 1)
e.shutdownN.Add(1)
return e.Err
}
func (e *testExporter) ShutdownN() int {
return int(atomic.LoadInt32(e.shutdownN))
return int(e.shutdownN.Load())
}
func (e *testExporter) ForceFlush(context.Context) error {
atomic.AddInt32(e.forceFlushN, 1)
e.forceFlushN.Add(1)
return e.Err
}
func (e *testExporter) ForceFlushN() int {
return int(atomic.LoadInt32(e.forceFlushN))
return int(e.forceFlushN.Load())
}
func TestChunker(t *testing.T) {
sdk/metric/internal/aggregate/atomic_test.go
+3 -3
View File
@@ -78,12 +78,12 @@ func benchmarkAtomicCounter[N int64 | float64](b *testing.B) {
func TestHotColdWaitGroupConcurrentSafe(t *testing.T) {
var wg sync.WaitGroup
hcwg := &hotColdWaitGroup{}
var data [2]uint64
var data [2]atomic.Uint64
for range 5 {
wg.Go(func() {
hotIdx := hcwg.start()
defer hcwg.done(hotIdx)
atomic.AddUint64(&data[hotIdx], 1)
data[hotIdx].Add(1)
})
}
for range 2 {
@@ -92,7 +92,7 @@ func TestHotColdWaitGroupConcurrentSafe(t *testing.T) {
// reading without using atomics should not panic since we are
// reading from the cold element, and have waited for all writes to
// finish.
t.Logf("read value %+v", data[readIdx])
t.Logf("read value %+v", data[readIdx].Load())
})
}
wg.Wait()
sdk/metric/pipeline_registry_test.go
+6 -6
View File
@@ -596,26 +596,26 @@ func TestPipelineRegistryCreateAggregatorsIncompatibleInstrument(t *testing.T) {
type logCounter struct {
logr.LogSink
errN uint32
infoN uint32
errN atomic.Uint32
infoN atomic.Uint32
}
func (l *logCounter) Info(level int, msg string, keysAndValues ...any) {
atomic.AddUint32(&l.infoN, 1)
l.infoN.Add(1)
l.LogSink.Info(level, msg, keysAndValues...)
}
func (l *logCounter) InfoN() int {
return int(atomic.SwapUint32(&l.infoN, 0))
return int(l.infoN.Swap(0))
}
func (l *logCounter) Error(err error, msg string, keysAndValues ...any) {
atomic.AddUint32(&l.errN, 1)
l.errN.Add(1)
l.LogSink.Error(err, msg, keysAndValues...)
}
func (l *logCounter) ErrorN() int {
return int(atomic.SwapUint32(&l.errN, 0))
return int(l.errN.Swap(0))
}
func TestResolveAggregatorsDuplicateErrors(t *testing.T) {
sdk/trace/trace_test.go
+3 -3
View File
@@ -1180,9 +1180,9 @@ func TestRecordingSpanRuntimeTracerTaskEnd(t *testing.T) {
tp := NewTracerProvider(WithSampler(AlwaysSample()))
tr := tp.Tracer("TestRecordingSpanRuntimeTracerTaskEnd")
var n uint64
var n atomic.Uint64
executionTracerTaskEnd := func() {
atomic.AddUint64(&n, 1)
n.Add(1)
}
_, apiSpan := tr.Start(t.Context(), "foo")
s, ok := apiSpan.(*recordingSpan)
@@ -1193,7 +1193,7 @@ func TestRecordingSpanRuntimeTracerTaskEnd(t *testing.T) {
s.executionTracerTaskEnd = executionTracerTaskEnd
s.End()
if n != 1 {
if n.Load() != 1 {
t.Error("recording span did not end runtime trace task")
}
}