[OTel C++] Fix race when adding and removing callbacks#37485
Closed
yashykt wants to merge 4 commits intogrpc:masterfrom
Closed
[OTel C++] Fix race when adding and removing callbacks#37485yashykt wants to merge 4 commits intogrpc:masterfrom
yashykt wants to merge 4 commits intogrpc:masterfrom
Conversation
yijiem
reviewed
Aug 15, 2024
Comment on lines
+2074
to
+2083
| MetricsCollectorThread new_new_collector{ | ||
| this, | ||
| grpc_core::Duration::Milliseconds(100) * grpc_test_slowdown_factor(), | ||
| kIterations, | ||
| [&](const absl::flat_hash_map< | ||
| std::string, | ||
| std::vector<opentelemetry::sdk::metrics::PointDataAttributes>>& | ||
| data) { return false; }}; | ||
| // We shouldn't get any new callbacks | ||
| EXPECT_THAT(new_new_collector.Stop(), ::testing::IsEmpty()); |
Member
There was a problem hiding this comment.
Here you may do:
{
MetricsCollectorThread collector{
this,
grpc_core::Duration::Milliseconds(100) * grpc_test_slowdown_factor(),
kIterations,
[&](const absl::flat_hash_map<
std::string,
std::vector<opentelemetry::sdk::metrics::PointDataAttributes>>&
data) {
return false;
}};
EXPECT_THAT(collector.Stop(), ::testing::IsEmpty());
}
same below
Member
Author
There was a problem hiding this comment.
that's not helping though. All it is doing is allowing us to use the same variable again. For tests, we should be aiming for readability rather than efficiency.
yashykt
added a commit
to yashykt/grpc
that referenced
this pull request
Aug 16, 2024
Split off from grpc#37425 We are adding and removing callbacks on the OpenTelemetry Async Instruments without synchronization. This opens us to races where we have an AddCallback and RemoveCallback operation happening at the same time. The correct result after these operations is to still have a callback registered with OpenTelemetry at the end, but the two operations could race and we could just decide to remove the OpenTelemetry callback. The fix delays removing OpenTelemetry callbacks to plugin destruction time. Closes grpc#37485 COPYBARA_INTEGRATE_REVIEW=grpc#37485 from yashykt:FixRaceOTelGauge 016b0a4 PiperOrigin-RevId: 663492598
yashykt
added a commit
to yashykt/grpc
that referenced
this pull request
Aug 16, 2024
Split off from grpc#37425 We are adding and removing callbacks on the OpenTelemetry Async Instruments without synchronization. This opens us to races where we have an AddCallback and RemoveCallback operation happening at the same time. The correct result after these operations is to still have a callback registered with OpenTelemetry at the end, but the two operations could race and we could just decide to remove the OpenTelemetry callback. The fix delays removing OpenTelemetry callbacks to plugin destruction time. Closes grpc#37485 COPYBARA_INTEGRATE_REVIEW=grpc#37485 from yashykt:FixRaceOTelGauge 016b0a4 PiperOrigin-RevId: 663492598
yashykt
added a commit
that referenced
this pull request
Aug 16, 2024
Backport #37485 to v1.65.x Split off from #37425 We are adding and removing callbacks on the OpenTelemetry Async Instruments without synchronization. This opens us to races where we have an AddCallback and RemoveCallback operation happening at the same time. The correct result after these operations is to still have a callback registered with OpenTelemetry at the end, but the two operations could race and we could just decide to remove the OpenTelemetry callback. The fix delays removing OpenTelemetry callbacks to plugin destruction time.
yashykt
added a commit
that referenced
this pull request
Aug 16, 2024
Backport #37485 to v1.66 Split off from #37425 We are adding and removing callbacks on the OpenTelemetry Async Instruments without synchronization. This opens us to races where we have an AddCallback and RemoveCallback operation happening at the same time. The correct result after these operations is to still have a callback registered with OpenTelemetry at the end, but the two operations could race and we could just decide to remove the OpenTelemetry callback. The fix delays removing OpenTelemetry callbacks to plugin destruction time.
paulosjca
pushed a commit
to paulosjca/grpc
that referenced
this pull request
Nov 25, 2024
Split off from grpc#37425 We are adding and removing callbacks on the OpenTelemetry Async Instruments without synchronization. This opens us to races where we have an AddCallback and RemoveCallback operation happening at the same time. The correct result after these operations is to still have a callback registered with OpenTelemetry at the end, but the two operations could race and we could just decide to remove the OpenTelemetry callback. The fix delays removing OpenTelemetry callbacks to plugin destruction time. Closes grpc#37485 COPYBARA_INTEGRATE_REVIEW=grpc#37485 from yashykt:FixRaceOTelGauge 016b0a4 PiperOrigin-RevId: 663492598
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Split off from #37425
We are adding and removing callbacks on the OpenTelemetry Async Instruments without synchronization. This opens us to races where we have an AddCallback and RemoveCallback operation happening at the same time. The correct result after these operations is to still have a callback registered with OpenTelemetry at the end, but the two operations could race and we could just decide to remove the OpenTelemetry callback.
The fix delays removing OpenTelemetry callbacks to plugin destruction time.