-
Notifications
You must be signed in to change notification settings - Fork 4.6k
stats/opentelemetry: record retry attempts from clientStream #8342
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
base: master
Are you sure you want to change the base?
stats/opentelemetry: record retry attempts from clientStream #8342
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #8342 +/- ##
==========================================
- Coverage 82.48% 81.57% -0.92%
==========================================
Files 413 413
Lines 40518 40546 +28
==========================================
- Hits 33422 33076 -346
- Misses 5738 6047 +309
- Partials 1358 1423 +65
🚀 New features to boost your workflow:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I remember we had separate tests for retries. This change should only affect that test. This change shouldn't affect tests which are doing only single attempt.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@vinothkumarr227 have you tested this to ensure its working correctly? I was under impression that TestTraceSpan_WithRetriesAndNameResolutionDelay will need changes for expected values. I think its not working as expected because you are not setting the count back to ctx after incrementing.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, adding a second reviewer. Please address the minor comment.
stats/opentelemetry/e2e_test.go
Outdated
@@ -1548,12 +1547,12 @@ const delayedResolutionEventName = "Delayed name resolution complete" | |||
// TestTraceSpan_WithRetriesAndNameResolutionDelay verifies that | |||
// "Delayed name resolution complete" event is recorded in the call trace span | |||
// only once if any of the retry attempt encountered a delay in name resolution | |||
func (s) TestTraceSpan_WithRetriesAndNameResolutionDelay(t *testing.T) { | |||
func TestTraceSpan_WithRetriesAndNameResolutionDelay(t *testing.T) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add the (s)
back.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
@vinothkumarr227 there is a failure in the updated test reported by PTAL and ensure the test is not flaky. |
Sure, I’ll check it out. |
|
stats/opentelemetry/trace.go
Outdated
span.SetAttributes( | ||
attribute.Bool("Client", rs.Client), | ||
attribute.Bool("FailFast", rs.FailFast), | ||
attribute.Int64("previous-rpc-attempts", int64(ai.previousRPCAttempts)), | ||
// TODO: Remove "previous-rpc-attempts" and "transparent-retry" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this a TODO?
Isn't this simply?
attribs := []attribute.KeyValue{...Bool("Client", rs.Client), /* etc */}
if ai.previousRPCAttempts != nil {
attribs = append(attribs, attribute.Int64("prev...", ..), ...)
}
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the suggestion. Per @arjan-bal recommendation, this will be handled in a separate PR, which is why it's a TODO. I've created an issue for reference: #8430
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure I understand why. If these attributes are not supposed to be present, then wouldn't it be incorrect to include them.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks Doug. I've made changes and pushed the fix.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh it was already setting these things?
Also what is this about "Go was always setting these attributes even though they aren't in the spec"?
Are we intentionally not implementing the spec? Why are we mentioning the OC spec in the OT plugin? I'm kind of lost here, TBH.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi Doug, regarding this line "Go was always setting these attributes even though they aren't in the spec"?, I see that this one are already there, but I'm not familiar with this one. Could you please clarify that?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right. I don't understand this either. Something is wrong.
Either way, this function should probably not have client/server-specific code in it, as it does not. It should only contain things we do commonly for both. We have separate client and server handlers for this specific reason. If we need to delete this function or rework it so it behaves differently, then that's probably worth doing.
grpc-go/stats/opentelemetry/client_tracing.go
Line 135 in 57b69b4
populateSpan(rs, ri.ai) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the feedback, Doug. I've refactored the code to address your concerns. The client- and server-specific logic has been moved out of populateSpan and into their dedicated handlers. The populateSpan function now only contains the common logic.
|
||
// Client-specific Begin attributes. | ||
var previousRPCAttempts int64 | ||
if ri.ai.previousRPCAttempts != nil { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it possible for this to be false?
And is there any reason this is a pointer instead of just a value? Then we wouldn't need nil checks, or to construct it explicitly.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It’s not possible for it to be nil — we always initialize it in getOrCreateCallInfo with ci.previousRPCAttempts = new(atomic.Uint32). I’ve removed the nil check as well. The pointer is used so that updates in ai are automatically reflected in ci.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh this is in the attemptInfo. Why are we keeping it here instead of just loading it out of the callInfo?
Also I realized that with hedging, the previous attempts accounting is racy:
- Attempt 1 starts
- Attempt 2 starts
- Attempt 3 starts
- All attempts do
Begin
simultaneously
It's possible for any of them to have any value now. You need to instead increment and read together:
previousAttempts := previousRPCAttempts.Add(1) - 1 // Add returns the new value; we need the old value
Then they will all see unique values.
(We don't implement hedging yet, but we need to keep in mind that we will one day.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
previousRPCAttempts represents the number of retries before the current attempt. We should record the existing retry count in attemptInfo before incrementing it. After that, we increment the retry count.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also I realized that with hedging, the previous attempts accounting is racy:
- Attempt 1 starts
- Attempt 2 starts
- Attempt 3 starts
- All attempts do
Begin
simultaneouslyIt's possible for any of them to have any value now. You need to instead increment and read together:
previousAttempts := previousRPCAttempts.Add(1) - 1 // Add returns the new value; we need the old valueThen they will all see unique values.
(We don't implement hedging yet, but we need to keep in mind that we will one day.)
Sure, I’ll keep that in mind; we’ll do it in a future update.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
previousRPCAttempts represents the number of retries before the current attempt. We should record the existing retry count in attemptInfo before incrementing it. After that, we increment the retry count.
No, we need to atomically read and increment it, as I explained.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi Doug, I’m a bit confused. Initially, I had the increment here — https://github.com/grpc/grpc-go/blob/master/stats/opentelemetry/client_metrics.go#L78 — but after the review comments, I’m moved to trace. Could you clarify what exactly you’d like to change here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we do the load and add separately, there is a race if multiple attempts are happening at once, with hedging. So we need to do the add and use the value it returns. It returns the incremented value, so we need to subtract 1 from it to get the original value. This way if multiple attempts are happening at the same time, then each one will get a unique value.
I think we should also see about removing the previousRPCAttempts pointer from the attemptInfo, and instead read it out of the callInfo, which is stored in the context too, right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the suggestion! I'll update the code accordingly. I'll also double-check how it's stored in the context.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we do the load and add separately, there is a race if multiple attempts are happening at once, with hedging. So we need to do the add and use the value it returns. It returns the incremented value, so we need to subtract 1 from it to get the original value. This way if multiple attempts are happening at the same time, then each one will get a unique value.
I think we should also see about removing the previousRPCAttempts pointer from the attemptInfo, and instead read it out of the callInfo, which is stored in the context too, right?
Thanks for the feedback! I've updated the code.
// Client-specific Begin attributes. | ||
var previousRPCAttempts int64 | ||
if ri.ai.previousRPCAttempts != nil { | ||
previousRPCAttempts = int64(ri.ai.previousRPCAttempts.Load()) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are we loading this here but only using it inside the if
below? Why not load only when needed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No need for the condition — I’ve removed the nil check as well.
attribute.Bool("Client", begin.Client), | ||
attribute.Bool("FailFast", begin.FailFast), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's remove these now since they are not part of the spec
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
Fixes: #8299
RELEASE NOTES:
grpc.previous-rpc-attempts
) are now recorded as span attributes for non-transparent client retries.