Skip to content

Add CallWarn #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 4, 2024
Merged

Add CallWarn #152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,14 +162,20 @@ func createAccessEntry(r *http.Request, start time.Time, statusCode int, err err
// Call logs the result of an outgoing call
func Call(r *http.Request, resp *http.Response, start time.Time, err error) {
fields := fieldsForCall(r, resp, start, err)
logCall(fields, r, resp, err)
logCall(fields, r, resp, err, logrus.ErrorLevel)
}

// Call logs the result of an outgoing call. Same as Call but never logs errors on warning level instead on error level.
func CallWarn(r *http.Request, resp *http.Response, start time.Time, err error) {
fields := fieldsForCall(r, resp, start, err)
logCall(fields, r, resp, err, logrus.WarnLevel)
}

// FlakyCall logs the result of an outgoing call and marks it as flaky
func FlakyCall(r *http.Request, resp *http.Response, start time.Time, err error) {
fields := fieldsForCall(r, resp, start, err)
fields[FlakyField] = true
logCall(fields, r, resp, err)
logCall(fields, r, resp, err, logrus.ErrorLevel)
}

func fieldsForCall(r *http.Request, resp *http.Response, start time.Time, err error) logrus.Fields {
Expand Down Expand Up @@ -199,7 +205,7 @@ func fieldsForCall(r *http.Request, resp *http.Response, start time.Time, err er
return fields
}

func logCall(fields logrus.Fields, r *http.Request, resp *http.Response, err error) {
func logCall(fields logrus.Fields, r *http.Request, resp *http.Response, err error, levelForErrors logrus.Level) {
entry := Log.WithContext(r.Context()).WithFields(fields)

if ctxErr := r.Context().Err(); ctxErr != nil {
Expand All @@ -208,7 +214,7 @@ func logCall(fields logrus.Fields, r *http.Request, resp *http.Response, err err
}

if err != nil {
entry.Error(err)
entry.Log(levelForErrors, err)
return
}

Expand All @@ -220,7 +226,7 @@ func logCall(fields logrus.Fields, r *http.Request, resp *http.Response, err err
} else if resp.StatusCode >= 400 && resp.StatusCode <= 499 {
entry.Warn(msg)
} else {
entry.Error(msg)
entry.Log(levelForErrors, msg)
}
return
}
Expand Down