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

bulk_indexer: Remove ES field mapper field preview #190

Merged
merged 3 commits into from
Jul 29, 2024
Merged

bulk_indexer: Remove ES field mapper field preview #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a2456b
bulk_indexer: Remove ES field mapper field preview
kruskall Jul 26, 2024
114a661
fix: update code
kruskall Jul 26, 2024
f9365d3
Update bulk_indexer.go
kruskall Jul 29, 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
10 changes: 8 additions & 2 deletions appender_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,7 @@ func TestAppenderIndexFailedLogging(t *testing.T) {
for i, item := range result.Items {
itemResp := item["create"]
itemResp.Index = "an_index"
switch i % 3 {
switch i % 4 {
case 0:
itemResp.Error.Type = "error_type"
itemResp.Error.Reason = "error_reason_even. Preview of field's value: 'abc def ghi'"
Expand All @@ -757,6 +757,10 @@ func TestAppenderIndexFailedLogging(t *testing.T) {
case 2:
itemResp.Error.Type = "unavailable_shards_exception"
itemResp.Error.Reason = "this reason should not be logged"
case 3:
itemResp.Error.Type = "x_content_parse_exception"
itemResp.Error.Reason = "this reason should not be logged"

}
item["create"] = itemResp
}
Expand All @@ -772,7 +776,7 @@ func TestAppenderIndexFailedLogging(t *testing.T) {
require.NoError(t, err)
defer indexer.Close(context.Background())

const N = 3 * 2
const N = 4 * 2
for i := 0; i < N; i++ {
addMinimalDoc(t, indexer, "logs-foo-testing")
}
Expand All @@ -790,6 +794,8 @@ func TestAppenderIndexFailedLogging(t *testing.T) {
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, 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, int64(2), entries[3].Context[0].Integer)
}

func TestAppenderRetryLimit(t *testing.T) {
Expand Down
7 changes: 4 additions & 3 deletions bulk_indexer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,12 @@ func init() {
case "type":
item.Error.Type = i.ReadString()
case "reason":
reason := i.ReadString()
// Match Elasticsearch field mapper field value:
// failed to parse field [%s] of type [%s] in %s. Preview of field's value: '%s'
// https://github.com/elastic/elasticsearch/blob/588eabe185ad319c0268a13480465966cef058cd/server/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java#L234
item.Error.Reason, _, _ = strings.Cut(
i.ReadString(), ". Preview",
reason, ". Preview",
)
default:
i.Skip()
Expand All @@ -155,8 +156,8 @@ func init() {
}
return true
})
// For unavailable_shards_exception, remove item.Error.Reason as it may contain sensitive request content.
if item.Error.Type == "unavailable_shards_exception" {
// 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" {
item.Error.Reason = ""
}

Expand Down