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.

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

[internal/datadog] Fix Datarace in metrics client #31964

Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
2 changes: 2 additions & 0 deletions internal/datadog/metrics_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ func (m *metricsClient) Gauge(name string, value float64, tags []string, _ float
m.gauges[name] = value
_, err := m.meter.Float64ObservableGauge(name, metric.WithFloat64Callback(func(_ context.Context, f metric.Float64Observer) error {
attr := m.attributeFromTags(tags)
m.mutex.Lock()
defer m.mutex.Unlock()
if v, ok := m.gauges[name]; ok {
f.Observe(v, metric.WithAttributeSet(attr))
}
Expand Down
38 changes: 38 additions & 0 deletions internal/datadog/metrics_client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package datadog

import (
"context"
"sync"
"testing"
"time"

Expand Down Expand Up @@ -72,6 +73,43 @@ func TestGaugeMultiple(t *testing.T) {
metricdatatest.AssertEqual(t, want, got, metricdatatest.IgnoreTimestamp())
}

func TestGaugeDataRace(t *testing.T) {
reader, metricClient, _ := setupMetricClient()
var wg sync.WaitGroup
wg.Add(2)

ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()

go func() {
defer wg.Done()
for {
select {
case <-ctx.Done():
return
default:
err := metricClient.Gauge("test_gauge", 1, []string{"otlp:true"}, 1)
assert.NoError(t, err)
}
}
}()

go func() {
defer wg.Done()
for {
select {
case <-ctx.Done():
return
default:
err := reader.Collect(context.Background(), &metricdata.ResourceMetrics{})
assert.NoError(t, err)
}
}
}()

wg.Wait()
}

func TestCount(t *testing.T) {
reader, metricClient, _ := setupMetricClient()

Expand Down
Loading