diff --git a/src/pkg/services/m365/api/graph/logging.go b/src/pkg/services/m365/api/graph/logging.go index bc8448bb1..0832cd744 100644 --- a/src/pkg/services/m365/api/graph/logging.go +++ b/src/pkg/services/m365/api/graph/logging.go @@ -46,6 +46,7 @@ func logResp(ctx context.Context, resp *http.Response) { // measure to help us understand why graph is returning transient 400s. if resp.StatusCode == http.StatusBadRequest { log.With("response", getRespDump(ctx, resp, logBody)). + With("request", getRequestDump(ctx, resp.Request, true)). Info("graph api bad request") } @@ -68,14 +69,14 @@ func logResp(ctx context.Context, resp *http.Response) { } } -// func logReq(ctx context.Context, req *http.Request) { -// var ( -// log = logger.Ctx(ctx) -// ) +func logReq(ctx context.Context, req *http.Request) { + var ( + log = logger.Ctx(ctx) + ) -// log.With("request", getRequestDump(ctx, req, true)). -// Info("graph api req") -// } + log.With("request", getRequestDump(ctx, req, true)). + Info("graph api req") +} func getRespDump(ctx context.Context, resp *http.Response, getBody bool) string { respDump, err := httputil.DumpResponse(resp, getBody) @@ -86,11 +87,11 @@ func getRespDump(ctx context.Context, resp *http.Response, getBody bool) string return string(respDump) } -// func getRequestDump(ctx context.Context, req *http.Request, getBody bool) string { -// reqDump, err := httputil.DumpRequest(req, getBody) -// if err != nil { -// logger.CtxErr(ctx, err).Error("dumping http request") -// } +func getRequestDump(ctx context.Context, req *http.Request, getBody bool) string { + reqDump, err := httputil.DumpRequest(req, getBody) + if err != nil { + logger.CtxErr(ctx, err).Error("dumping http request") + } -// return string(reqDump) -// } + return string(reqDump) +} diff --git a/src/pkg/services/m365/api/graph/middleware.go b/src/pkg/services/m365/api/graph/middleware.go index a976c7812..8be93be1f 100644 --- a/src/pkg/services/m365/api/graph/middleware.go +++ b/src/pkg/services/m365/api/graph/middleware.go @@ -118,7 +118,7 @@ func (mw *LoggingMiddleware) Intercept( middlewareIndex int, req *http.Request, ) (*http.Response, error) { - // logReq(req.Context(), req) + logReq(req.Context(), req) // call the next middleware resp, err := pipeline.Next(req, middlewareIndex)