Skip to content

rpc: avoid allocation of TracingInternalClient when tracing disabled #136941

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.

Sign up for GitHub

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

Merged
craig merged 1 commit into from
Dec 10, 2024
Merged

rpc: avoid allocation of TracingInternalClient when tracing disabled #136941

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions pkg/rpc/nodedialer/nodedialer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,9 @@ func (n *Dialer) DialInternalClient(
if err != nil {
return nil, err
}
return TracingInternalClient{InternalClient: kvpb.NewInternalClient(conn)}, nil
client := kvpb.NewInternalClient(conn)
client = maybeWrapInTracingClient(ctx, client)
return client, nil
}

// dial performs the dialing of the remote connection. If checkBreaker
Expand Down Expand Up @@ -282,8 +284,16 @@ type TracingInternalClient struct {
kvpb.InternalClient
}

func maybeWrapInTracingClient(ctx context.Context, client kvpb.InternalClient) kvpb.InternalClient {
sp := tracing.SpanFromContext(ctx)
if sp != nil && !sp.IsNoop() {
client = &TracingInternalClient{InternalClient: client}
}
return client
}

// Batch overrides the Batch RPC client method and fills in tracing information.
func (tic TracingInternalClient) Batch(
func (tic *TracingInternalClient) Batch(
ctx context.Context, ba *kvpb.BatchRequest, opts ...grpc.CallOption,
) (*kvpb.BatchResponse, error) {
sp := tracing.SpanFromContext(ctx)
Expand Down