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

Dont log req

Browse Source
This commit is contained in:
Abhishek Pandey 2023-12-06 21:35:33 -08:00
parent 93079b0812
commit eaf252a26c
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,8 +45,7 @@ func logResp(ctx context.Context, resp *http.Response) {
// Dump both request and response for graph 400 errors. This is a temporary
// measure to help us understand why graph is returning transient 400s.
if resp.StatusCode == http.StatusBadRequest {
log.With("request", getRequestDump(ctx, resp.Request, true)).
With("response", getRespDump(ctx, resp, logBody)).
log.With("response", getRespDump(ctx, resp, logBody)).
Info("graph api bad request")
}
@ -69,14 +68,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)
@ -87,11 +86,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)
// }

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

@ -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)

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

@ -291,16 +291,16 @@ func kiotaMiddlewares(
chaosOpt := &khttp.ChaosHandlerOptions{
ChaosStrategy: khttp.Random,
ChaosPercentage: 50,
StatusCode: 502,
StatusCode: 503,
ResponseBody: &http.Response{
Status: "Bad Gateway",
StatusCode: 502,
Status: "Service Unavailable",
StatusCode: 503,
// Retry-After header
// Header: http.Header{
// "Retry-After": []string{"1"},
// },
// Dummy body
Body: io.NopCloser(strings.NewReader("bad gateway, deal with it")),
Body: io.NopCloser(strings.NewReader("service is down. deal with it")),
},
}