Skip to content

Commit

Permalink
[8.11](backport #36956) x-pack/filebeat/input/internal/httplog: fix i…
Browse files Browse the repository at this point in the history
…ncorrect append source (#36959)

* x-pack/filebeat/input/internal/httplog: fix incorrect append source (#36956)

(cherry picked from commit bbf0111)

* remove irrelevant changelog lines

---------

Co-authored-by: Dan Kortschak <[email protected]>
  • Loading branch information
mergify[bot] and efd6 authored Oct 25, 2023
1 parent 93504ea commit fd0446f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ is collected by it.
- Ensure winlog input retains metric collection when handling recoverable errors. {issue}36479[36479] {pull}36483[36483]
- Revert error introduced in {pull}35734[35734] when symlinks can't be resolved in filestream. {pull}36557[36557]
- Fix ignoring external input configuration in `take_over: true` mode {issue}36378[36378] {pull}36395[36395]
- Fix handling of response errors in HTTPJSON and CEL request trace logging. {pull}36956[36956]

*Heartbeat*

Expand Down
4 changes: 2 additions & 2 deletions x-pack/filebeat/input/internal/httplog/roundtripper.go
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,9 @@ func (rt *LoggingRoundTripper) RoundTrip(req *http.Request) (*http.Response, err
switch len(errorsMessages) {
case 0:
case 1:
respParts = append(reqParts, zap.String("error.message", errorsMessages[0]))
respParts = append(respParts, zap.String("error.message", errorsMessages[0]))
default:
respParts = append(reqParts, zap.Strings("error.message", errorsMessages))
respParts = append(respParts, zap.Strings("error.message", errorsMessages))
}
log.Debug("HTTP response", respParts...)

Expand Down

0 comments on commit fd0446f

Please sign in to comment.