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.

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

Re-established previous behaviour without a default limit for 'decode_size_limit_bytes' #45

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 3.2.3
- Update behaviour of `decode_size_limit_bytes` to do not apply any limitation to the length of a line, eventually tagging the event if it's set. [#45](https://github.com/logstash-plugins/logstash-codec-json_lines/pull/45)

## 3.2.2
- Fix: updated the way to check if the `decode_size_limit_bytes` has been explicitly customised. [#47](https://github.com/logstash-plugins/logstash-codec-json_lines/pull/47)

Expand Down
7 changes: 7 additions & 0 deletions lib/logstash/codecs/json_lines.rb
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@ def decode(data, &block)
@buffer.extract(data).each do |line|
parse_json(@converter.convert(line), &block)
end
rescue java.lang.IllegalStateException => e
if e.message == "input buffer full" && @decode_size_limit_bytes != "none"
yield event_factory.new_event("message" => "Payload bigger than #{@decode_size_limit_bytes} bytes", "tags" => ["_jsonparsetoobigfailure"])
else
# re-raise the error if doesn't correspond to the buffer overflow condition
raise e
end
end

def encode(event)
Expand Down
2 changes: 1 addition & 1 deletion logstash-codec-json_lines.gemspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Gem::Specification.new do |s|

s.name = 'logstash-codec-json_lines'
s.version = '3.2.2'
s.version = '3.2.3'
s.licenses = ['Apache License (2.0)']
s.summary = "Reads and writes newline-delimited JSON"
s.description = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
Expand Down
9 changes: 5 additions & 4 deletions spec/codecs/json_lines_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,12 @@
subject.decode(maximum_payload)
}.not_to raise_error
end

it "should raise an error if the max bytes are exceeded" do
expect {
subject.decode(maximum_payload << "z")
}.to raise_error(java.lang.IllegalStateException, "input buffer full")
subject.decode(maximum_payload << "z") do |event|
expect(event.get("tags")).to include("_jsonparsetoobigfailure")
expect(event.get("message")).to eq("Payload bigger than #{subject.decode_size_limit_bytes} bytes")
end
end
end

Expand Down