Skip to content

client: use batch-level runtime trace regions (#10965) #11062

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

Open
ti-chi-bot wants to merge 1 commit into
base: release-8.5
Choose a base branch
from
+20 −12
Open

client: use batch-level runtime trace regions (#10965) #11062

Show file tree
Hide file tree
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
17 changes: 9 additions & 8 deletions client/clients/router/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,23 +597,24 @@ batchLoop:

func (c *Cli) processRequests(stream pdpb.PD_QueryRegionClient) error {
var (
requests = c.batchController.GetCollectedRequests()
traceRegions = make([]*trace.Region, 0, len(requests))
spans = make([]opentracing.Span, 0, len(requests))
requests = c.batchController.GetCollectedRequests()
spans = make([]opentracing.Span, 0, len(requests))
)
traceCtx := context.Background()
if len(requests) > 0 {
traceCtx = requests[0].requestCtx
}
traceRegion := trace.StartRegion(traceCtx, "pdclient.regionReqSendBatch")
for _, req := range requests {
traceRegions = append(traceRegions, trace.StartRegion(req.requestCtx, "pdclient.regionReqSend"))
if span := opentracing.SpanFromContext(req.requestCtx); span != nil && span.Tracer() != nil {
spans = append(spans, span.Tracer().StartSpan("pdclient.processRegionRequests", opentracing.ChildOf(span.Context())))
}
}
defer func() {
for i := range spans {
for i := len(spans) - 1; i >= 0; i-- {
spans[i].Finish()
}
for i := range traceRegions {
traceRegions[i].End()
}
traceRegion.End()
}()

queryReq := &pdpb.QueryRegionRequest{
Expand Down
15 changes: 11 additions & 4 deletions client/clients/tso/dispatcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,12 +401,15 @@ func (td *tsoDispatcher) processRequests(
) error {
// `done` must be guaranteed to be eventually called.
var (
requests = tbc.GetCollectedRequests()
traceRegions = make([]*trace.Region, 0, len(requests))
spans = make([]opentracing.Span, 0, len(requests))
requests = tbc.GetCollectedRequests()
spans = make([]opentracing.Span, 0, len(requests))
)
traceCtx := context.Background()
if len(requests) > 0 {
traceCtx = requests[0].requestCtx
}
traceRegion := trace.StartRegion(traceCtx, "pdclient.tsoReqSendBatch")
for _, req := range requests {
traceRegions = append(traceRegions, trace.StartRegion(req.requestCtx, "pdclient.tsoReqSend"))
if span := opentracing.SpanFromContext(req.requestCtx); span != nil && span.Tracer() != nil {
spans = append(spans, span.Tracer().StartSpan("pdclient.processRequests", opentracing.ChildOf(span.Context())))
}
Expand All @@ -415,9 +418,13 @@ func (td *tsoDispatcher) processRequests(
for i := range spans {
spans[i].Finish()
}
<<<<<<< HEAD
for i := range traceRegions {
traceRegions[i].End()
}
=======
traceRegion.End()
>>>>>>> 4f08e58847 (client: use batch-level runtime trace regions (#10965))
}()

var (
Expand Down
Loading