[internal/datadog] Fix Datarace in metrics client #31964
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mx-psi
changed the title
liustanley
reviewed
Mar 26, 2024
|
You will need to rebase this one after #31972 is merged |
songy23
reviewed
Mar 26, 2024
|
@songy23 I would prefer not to add changelog for a data race bug. |
liustanley
approved these changes
Mar 26, 2024
…-data-race-metrics-client
|
I agree with Yang that this would need a changelog, I mistakenly assumed this did not have user-facing implications |
mx-psi
approved these changes
Mar 26, 2024
mx-psi
added
the
ready to merge
songy23
approved these changes
Mar 26, 2024
songy23
reviewed
Mar 26, 2024
Co-authored-by: Yang Song <songy23@users.noreply.github.com>
rimitchell
pushed a commit
to rimitchell/opentelemetry-collector-contrib
that referenced
this pull request
May 8, 2024
**Description:** <Describe what has changed.>
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
Fixes the data race.
```
fatal error: concurrent map read and map write
goroutine 72665 [running]:
github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog.(*metricsClient).Gauge.func1({0x7b895a0?, 0xc07c930790?}, {0x940dac8, 0xc1996ce180})
github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog@v0.96.0/metrics_client.go:49 +0x85
go.opentelemetry.io/otel/sdk/metric.(*meter).float64ObservableInstrument.func1.1({0x9443f08, 0xef10b00})
go.opentelemetry.io/otel/sdk/metric@v1.24.0/meter.go:286 +0x55
go.opentelemetry.io/otel/sdk/metric.(*pipeline).produce(0xc002852bd0, {0x9443f08, 0xef10b00}, 0xc108dd46c0)
go.opentelemetry.io/otel/sdk/metric@v1.24.0/pipeline.go:122 +0x168
go.opentelemetry.io/otel/sdk/metric.(*ManualReader).Collect(0xc0030d2aa0, {0x9443f08, 0xef10b00}, 0xc108dd46c0)
go.opentelemetry.io/otel/sdk/metric@v1.24.0/manual_reader.go:123 +0xe2
go.opentelemetry.io/otel/exporters/prometheus.(*collector).Collect(0xc0030e4aa0, 0xc10a0083c0)
go.opentelemetry.io/otel/exporters/prometheus@v0.46.0/exporter.go:158 +0x72
github.com/prometheus/client_golang/prometheus.(*Registry).Gather.func1()
github.com/prometheus/client_golang@v1.19.0/prometheus/registry.go:457 +0xe5
created by github.com/prometheus/client_golang/prometheus.(*Registry).Gather in goroutine 5
```
**Link to tracking Issue:** <Issue number if applicable>
**Testing:** <Describe what testing was performed and which tests were
added.>
**Documentation:** <Describe the documentation added.>
---------
Co-authored-by: Yang Song <songy23@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description:
Fixes the data race.
Link to tracking Issue:
Testing:
Documentation: