This commit is contained in:
Abhishek Pandey 2023-08-22 11:44:44 +05:30
parent 11253bf816
commit 7b88c9ae8d
3 changed files with 33 additions and 1 deletions

View File

@ -3,6 +3,7 @@ package graph
import (
"context"
"fmt"
"net"
"net/http"
"net/url"
"os"
@ -183,7 +184,18 @@ func IsErrTimeout(err error) bool {
errors.Is(err, context.Canceled) ||
errors.Is(err, context.DeadlineExceeded) ||
errors.Is(err, http.ErrHandlerTimeout) ||
os.IsTimeout(err)
os.IsTimeout(err) ||
IsNetworkTimeoutError(err)
}
func IsNetworkTimeoutError(err error) bool {
var netErr net.Error
if errors.As(err, &netErr) && netErr.Timeout() {
return true
}
return false
}
func IsErrConnectionReset(err error) bool {

View File

@ -122,8 +122,18 @@ func (mw *LoggingMiddleware) Intercept(
middlewareIndex int,
req *http.Request,
) (*http.Response, error) {
// log request
logger.Ctx(req.Context()).Infow("logging middleware: graph api req",
"method", req.Method,
"url", LoggableURL(req.URL.String()))
// call the next middleware
resp, err := pipeline.Next(req, middlewareIndex)
if err != nil {
logger.CtxErr(req.Context(), err).Errorw("logging middleware: graph api error",
"network_timeout_error", IsNetworkTimeoutError(err))
}
if resp == nil {
return resp, err
}
@ -212,6 +222,11 @@ func (mw RetryMiddleware) Intercept(
IsErrConnectionReset(err) ||
mw.isRetriableRespCode(ctx, resp)
if err != nil {
logger.CtxErr(ctx, err).Errorw("retry middleware: graph api error",
"network_timeout_error", IsNetworkTimeoutError(err))
}
if !retriable {
return resp, stackReq(ctx, req, resp, err).OrNil()
}
@ -295,6 +310,10 @@ func (mw RetryMiddleware) retryRequest(
}
nextResp, err := pipeline.Next(req, middlewareIndex)
if err != nil {
logger.CtxErr(ctx, err).Error("retry middleware: retryRequest: graph api error")
}
if err != nil && !IsErrTimeout(err) && !IsErrConnectionReset(err) {
return nextResp, stackReq(ctx, req, nextResp, err)
}

View File

@ -188,6 +188,7 @@ func (p *DriveItemDeltaPageCtrl) GetPage(ctx context.Context) (DeltaPageLinker,
resp, err = p.builder.Get(ctx, p.options)
if err != nil {
logger.CtxErr(ctx, err).Error("delta GET error")
return nil, graph.Stack(ctx, err)
}