go/sliding-sync
go/sliding-sync
1
0
Fork 0
mirror of https://github.com/matrix-org/sliding-sync.git synced 2025-03-10 13:37:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Include mutexes in spans

Browse Source
This commit is contained in:
Kegan Dougal 2024-02-26 13:01:18 +00:00
parent dcb8854001
commit 8ccb0185b3
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sync3/conn.go
View File

@ -135,6 +135,7 @@ func (c *Conn) isOutstanding(pos int64) bool {
// client. It will NOT be reported to Sentry---this should happen as close as possible // client. It will NOT be reported to Sentry---this should happen as close as possible
// to the creation of the error (or else Sentry cannot provide a meaningful traceback.) // to the creation of the error (or else Sentry cannot provide a meaningful traceback.)
func (c *Conn) OnIncomingRequest(ctx context.Context, req *Request, start time.Time) (resp *Response, herr *internal.HandlerError) { func (c *Conn) OnIncomingRequest(ctx context.Context, req *Request, start time.Time) (resp *Response, herr *internal.HandlerError) {
ctx, span := internal.StartSpan(ctx, "OnIncomingRequest.AcquireMutex")
c.cancelOutstandingRequestMu.Lock() c.cancelOutstandingRequestMu.Lock()
if c.cancelOutstandingRequest != nil { if c.cancelOutstandingRequest != nil {
c.cancelOutstandingRequest() c.cancelOutstandingRequest()
@ -149,6 +150,7 @@ func (c *Conn) OnIncomingRequest(ctx context.Context, req *Request, start time.T
// it's intentional for the lock to be held whilst inside HandleIncomingRequest // it's intentional for the lock to be held whilst inside HandleIncomingRequest
// as it guarantees linearisation of data within a single connection // as it guarantees linearisation of data within a single connection
defer c.mu.Unlock() defer c.mu.Unlock()
span.End()
isFirstRequest := req.pos == 0 isFirstRequest := req.pos == 0
isRetransmit := !isFirstRequest && c.lastClientRequest.pos == req.pos isRetransmit := !isFirstRequest && c.lastClientRequest.pos == req.pos