larryh/corso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

log api call start-end times (#5025)

Browse Source 
#### Does this PR need a docs update or release note?

- [x] ⛔ No

#### Type of change

- [x] 🤖 Supportability/Tests
This commit is contained in:
Keepers 2024-01-12 13:53:25 -07:00 committed by GitHub
parent 6beb774ba8
commit 8c2d7c3c18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pkg/services/m365/api/graph/http_wrapper.go
View File

@ -14,6 +14,7 @@ import (
"github.com/alcionai/corso/src/internal/events"
"github.com/alcionai/corso/src/internal/version"
"github.com/alcionai/corso/src/pkg/count"
"github.com/alcionai/corso/src/pkg/dttm"
"github.com/alcionai/corso/src/pkg/logger"
)
@ -129,15 +130,18 @@ func (hw httpWrapper) Request(
time.Sleep(hw.retryDelay)
}
ctx = clues.Add(ctx, "request_retry_iter", i)
ictx := clues.Add(
ctx,
"request_retry_iter", i,
"request_start_time", dttm.Now())
resp, err := hw.client.Do(req)
if err == nil {
logResp(ctx, resp)
logResp(ictx, resp)
return resp, nil
}
err = stackWithCoreErr(ctx, err, 1)
err = stackWithCoreErr(ictx, err, 1)
e = err
var http2StreamErr http2.StreamError
@ -146,14 +150,16 @@ func (hw httpWrapper) Request(
break
}
logger.Ctx(ctx).Debug("http2 stream error")
logger.Ctx(ictx).Debug("http2 stream error")
events.Inc(events.APICall, "streamerror")
retriedErrors = append(retriedErrors, err.Error())
}
e = clues.Stack(e).
With("retried_errors", retriedErrors).
With(
"retried_errors", retriedErrors,
"request_end_time", dttm.Now()).
WithTrace(1).
OrNil()

10
src/pkg/services/m365/api/graph/service.go
View File

@ -19,6 +19,7 @@ import (
"github.com/alcionai/corso/src/internal/common/idname"
"github.com/alcionai/corso/src/internal/events"
"github.com/alcionai/corso/src/pkg/count"
"github.com/alcionai/corso/src/pkg/dttm"
"github.com/alcionai/corso/src/pkg/errs/core"
"github.com/alcionai/corso/src/pkg/filters"
"github.com/alcionai/corso/src/pkg/logger"
@ -402,7 +403,10 @@ func (aw *adapterWrap) Send(
time.Sleep(aw.retryDelay)
}
ictx := clues.Add(ctx, "request_retry_iter", i)
ictx := clues.Add(
ctx,
"request_retry_iter", i,
"request_start_time", dttm.Now())
resp, err := aw.RequestAdapter.Send(ictx, requestInfo, constructor, errorMappings)
if err == nil {
@ -434,7 +438,9 @@ func (aw *adapterWrap) Send(
}
e = clues.Stack(e).
With("retried_errors", retriedErrors).
With(
"retried_errors", retriedErrors,
"request_end_time", dttm.Now()).
WithTrace(1).
OrNil()