Skip to content

Use if clause to detect requirements for emitting error label events #57

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
May 25, 2022
Merged

Use if clause to detect requirements for emitting error label events #57

Show file tree
Hide file tree
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
15 changes: 6 additions & 9 deletions lib/fluent/plugin/opensearch_error_handler.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,8 @@ def log_os_400_reason(&block)
end
end

def emit_error_label_event(&block)
# If `emit_error_label_event` is specified as false, error event emittions are not occurred.
if @plugin.emit_error_label_event
block.call
end
def emit_error_label_event?
!!@plugin.emit_error_label_event
end

def handle_error(response, tag, chunk, bulk_message_count, extracted_values)
Expand Down Expand Up @@ -138,14 +135,14 @@ def handle_error(response, tag, chunk, bulk_message_count, extracted_values)
reason += " [reason]: \'#{item[write_operation]['error']['reason']}\'"
end
end
emit_error_label_event do
if emit_error_label_event?
@plugin.router.emit_error_event(tag, time, rawrecord, OpenSearchError.new("400 - Rejected by OpenSearch#{reason}"))
end
else
if item[write_operation]['error'].is_a?(String)
reason = item[write_operation]['error']
stats[:errors_block_resp] += 1
emit_error_label_event do
if emit_error_label_event?
@plugin.router.emit_error_event(tag, time, rawrecord, OpenSearchError.new("#{status} - #{reason}"))
end
next
Expand All @@ -156,7 +153,7 @@ def handle_error(response, tag, chunk, bulk_message_count, extracted_values)
raise OpenSearchRequestAbortError, "Rejected OpenSearch due to #{type}"
end
if unrecoverable_record_error?(type)
emit_error_label_event do
if emit_error_label_event?
@plugin.router.emit_error_event(tag, time, rawrecord, OpenSearchError.new("#{status} - #{type}: #{reason}"))
end
next
Expand All @@ -167,7 +164,7 @@ def handle_error(response, tag, chunk, bulk_message_count, extracted_values)
# When we don't have a type field, something changed in the API
# expected return values.
stats[:errors_bad_resp] += 1
emit_error_label_event do
if emit_error_label_event?
@plugin.router.emit_error_event(tag, time, rawrecord, OpenSearchError.new("#{status} - No error type provided in the response"))
end
next
Expand Down
11 changes: 4 additions & 7 deletions lib/fluent/plugin/out_opensearch.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,11 +465,8 @@ def placeholder?(name, param)
placeholder_validities.include?(true)
end

def emit_error_label_event(&block)
# If `emit_error_label_event` is specified as false, error event emittions are not occurred.
if @emit_error_label_event
block.call
end
def emit_error_label_event?
!!@emit_error_label_event
end

def compression
Expand Down Expand Up @@ -588,7 +585,7 @@ def convert_numeric_time_into_string(numeric_time, time_key_format = "%Y-%m-%d %
def parse_time(value, event_time, tag)
@time_parser.call(value)
rescue => e
emit_error_label_event do
if emit_error_label_event?
router.emit_error_event(@time_parse_error_tag, Fluent::Engine.now, {'tag' => tag, 'time' => event_time, 'format' => @time_key_format, 'value' => value}, e)
end
return Time.at(event_time).to_datetime
Expand Down Expand Up @@ -882,7 +879,7 @@ def write(chunk)
end
end
rescue => e
emit_error_label_event do
if emit_error_label_event?
router.emit_error_event(tag, time, record, e)
end
end
Expand Down