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

Put back req logging

Browse Source
This commit is contained in:
Abhishek Pandey 2023-12-07 11:00:47 -08:00
parent 21c006ebd8
commit 8dbda8ebda
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/pkg/services/m365/api/graph/logging.go
View File

@ -46,6 +46,7 @@ func logResp(ctx context.Context, resp *http.Response) {
// measure to help us understand why graph is returning transient 400s. // measure to help us understand why graph is returning transient 400s.
if resp.StatusCode == http.StatusBadRequest { if resp.StatusCode == http.StatusBadRequest {
log.With("response", getRespDump(ctx, resp, logBody)). log.With("response", getRespDump(ctx, resp, logBody)).
With("request", getRequestDump(ctx, resp.Request, true)).
Info("graph api bad request") 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) { func logReq(ctx context.Context, req *http.Request) {
// var ( var (
// log = logger.Ctx(ctx) log = logger.Ctx(ctx)
// ) )
// log.With("request", getRequestDump(ctx, req, true)). log.With("request", getRequestDump(ctx, req, true)).
// Info("graph api req") Info("graph api req")
// } }
func getRespDump(ctx context.Context, resp *http.Response, getBody bool) string { func getRespDump(ctx context.Context, resp *http.Response, getBody bool) string {
respDump, err := httputil.DumpResponse(resp, getBody) respDump, err := httputil.DumpResponse(resp, getBody)
@ -86,11 +87,11 @@ func getRespDump(ctx context.Context, resp *http.Response, getBody bool) string
return string(respDump) return string(respDump)
} }
// func getRequestDump(ctx context.Context, req *http.Request, getBody bool) string { func getRequestDump(ctx context.Context, req *http.Request, getBody bool) string {
// reqDump, err := httputil.DumpRequest(req, getBody) reqDump, err := httputil.DumpRequest(req, getBody)
// if err != nil { if err != nil {
// logger.CtxErr(ctx, err).Error("dumping http request") logger.CtxErr(ctx, err).Error("dumping http request")
// } }
// return string(reqDump) return string(reqDump)
// } }

2
src/pkg/services/m365/api/graph/middleware.go
View File

@ -118,7 +118,7 @@ func (mw *LoggingMiddleware) Intercept(
middlewareIndex int, middlewareIndex int,
req *http.Request, req *http.Request,
) (*http.Response, error) { ) (*http.Response, error) {
// logReq(req.Context(), req) logReq(req.Context(), req)
// call the next middleware // call the next middleware
resp, err := pipeline.Next(req, middlewareIndex) resp, err := pipeline.Next(req, middlewareIndex)