Skip to content

Commit

Permalink
fix: avoid gotestsum import in libbeat es output (#39835)
Browse files Browse the repository at this point in the history
gotestsum is being imported causing downstream apps to include it
in the dependency tree.
Drop the import and use the client logger.

(cherry picked from commit a2ab85d)

# Conflicts:
#	libbeat/outputs/elasticsearch/client.go
  • Loading branch information
kruskall authored and mergify[bot] committed Jun 10, 2024
1 parent de256b8 commit 168b1ec
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions libbeat/outputs/elasticsearch/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -397,9 +397,15 @@ func (client *Client) bulkCollectPublishFails(result eslegclient.BulkResult, dat
return nil, bulkResultStats{}
}

<<<<<<< HEAD

Check failure on line 400 in libbeat/outputs/elasticsearch/client.go

View workflow job for this annotation

GitHub Actions / lint (darwin)

expected statement, found '<<' (typecheck)
if status < 300 {
stats.acked++
continue // ok value
=======

Check failure on line 404 in libbeat/outputs/elasticsearch/client.go

View workflow job for this annotation

GitHub Actions / lint (darwin)

expected statement, found '==' (typecheck)
if client.applyItemStatus(events[i], itemStatus, itemMessage, &stats) {
eventsToRetry = append(eventsToRetry, events[i])
client.log.Debugf("Bulk item insert failed (i=%v, status=%v): %s", i, itemStatus, itemMessage)
>>>>>>> a2ab85dac7 (fix: avoid gotestsum import in libbeat es output (#39835))

Check failure on line 408 in libbeat/outputs/elasticsearch/client.go

View workflow job for this annotation

GitHub Actions / lint (darwin)

expected statement, found '>>' (typecheck)
}

if status == 409 {
Expand Down

0 comments on commit 168b1ec

Please sign in to comment.