Skip to content
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

Jump to bottom

fix: filter ES error responses #206

Merged
merged 2 commits into from
Oct 15, 2024
Merged

fix: filter ES error responses #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30fcb06
fix: filter ES error responses
kruskall Oct 10, 2024
83bf223
Merge branch 'main' into fix/document-parsing-exception
kruskall Oct 15, 2024
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
18 changes: 11 additions & 7 deletions appender_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,7 @@ func TestAppenderIndexFailedLogging(t *testing.T) {
for i, item := range result.Items {
itemResp := item["create"]
itemResp.Index = "an_index"
switch i % 4 {
switch i % 5 {
case 0:
itemResp.Error.Type = "error_type"
itemResp.Error.Reason = "error_reason_even. Preview of field's value: 'abc def ghi'"
Expand All @@ -761,7 +761,9 @@ func TestAppenderIndexFailedLogging(t *testing.T) {
case 3:
itemResp.Error.Type = "x_content_parse_exception"
itemResp.Error.Reason = "this reason should not be logged"

case 4:
itemResp.Error.Type = "document_parsing_exception"
itemResp.Error.Reason = "this reason should not be logged"
}
item["create"] = itemResp
}
Expand All @@ -777,7 +779,7 @@ func TestAppenderIndexFailedLogging(t *testing.T) {
require.NoError(t, err)
defer indexer.Close(context.Background())

const N = 4 * 2
const N = 5 * 2
for i := 0; i < N; i++ {
addMinimalDoc(t, indexer, "logs-foo-testing")
}
Expand All @@ -789,14 +791,16 @@ func TestAppenderIndexFailedLogging(t *testing.T) {
return entries[i].Message < entries[j].Message
})
require.Len(t, entries, N/2)
assert.Equal(t, "failed to index documents in 'an_index' (error_type): error_reason_even", entries[0].Message)
assert.Equal(t, "failed to index documents in 'an_index' (document_parsing_exception): ", entries[0].Message)
assert.Equal(t, int64(2), entries[0].Context[0].Integer)
assert.Equal(t, "failed to index documents in 'an_index' (error_type): error_reason_odd", entries[1].Message)
assert.Equal(t, "failed to index documents in 'an_index' (error_type): error_reason_even", entries[1].Message)
assert.Equal(t, int64(2), entries[1].Context[0].Integer)
assert.Equal(t, "failed to index documents in 'an_index' (unavailable_shards_exception): ", entries[2].Message)
assert.Equal(t, "failed to index documents in 'an_index' (error_type): error_reason_odd", entries[2].Message)
assert.Equal(t, int64(2), entries[2].Context[0].Integer)
assert.Equal(t, "failed to index documents in 'an_index' (x_content_parse_exception): ", entries[3].Message)
assert.Equal(t, "failed to index documents in 'an_index' (unavailable_shards_exception): ", entries[3].Message)
assert.Equal(t, int64(2), entries[3].Context[0].Integer)
assert.Equal(t, "failed to index documents in 'an_index' (x_content_parse_exception): ", entries[4].Message)
assert.Equal(t, int64(2), entries[4].Context[0].Integer)
}

func TestAppenderRetryLimit(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion bulk_indexer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ func init() {
return true
})
// For specific exceptions, remove item.Error.Reason as it may contain sensitive request content.
if item.Error.Type == "unavailable_shards_exception" || item.Error.Type == "x_content_parse_exception" {
if item.Error.Type == "unavailable_shards_exception" || item.Error.Type == "x_content_parse_exception" || item.Error.Type == "document_parsing_exception" {
item.Error.Reason = ""
}

Expand Down