Skip to content

Commit 6b03170

Browse files
committed
Fixed test to verify 'message' form
1 parent f71bb09 commit 6b03170

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

lib/logstash/codecs/json_lines.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ def register
6161
deprecation_logger.deprecated "The default value for `decode_size_limit_bytes`, currently at 512MB, will be lowered in a future version to prevent Out of Memory errors from abnormally large messages or missing delimiters. Please set a value that reflects the largest expected message size (e.g. 20971520 for 20MB)"
6262
end
6363
@buffer = FileWatch::BufferedTokenizer.new(@delimiter, @decode_size_limit_bytes)
64+
puts "DNADBG>> delimiter is [#{@delimiter}]"
6465
@converter = LogStash::Util::Charset.new(@charset)
6566
@converter.logger = @logger
6667
end
@@ -71,7 +72,7 @@ def decode(data, &block)
7172
end
7273
rescue java.lang.IllegalStateException => e
7374
if e.message == "input buffer full" && @decode_size_limit_bytes != "none"
74-
yield event_factory.new_event("message" => data[0..@decode_size_limit_bytes.to_i - 1], "tags" => ["_jsonparsetoobigfailure"]) #TODO check the failure tag
75+
yield event_factory.new_event("message" => "Payload bigger than #{@decode_size_limit_bytes} bytes", "tags" => ["_jsonparsetoobigfailure"])
7576
else
7677
# re-raise the error if doesn't correspond to the buffer overflow condition
7778
raise e

spec/codecs/json_lines_spec.rb

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,17 +131,10 @@
131131
it "should raise an error if the max bytes are exceeded" do
132132
subject.decode(maximum_payload << "z") do |event|
133133
expect(event.get("tags")).to include("_jsonparsetoobigfailure")
134-
expect(event.get("message").size).to eq(decode_size_limit_bytes)
134+
expect(event.get("message")).to eq("Payload bigger than #{subject.decode_size_limit_bytes} bytes")
135135
end
136136
end
137137

138-
it "should raise an error if the max bytes are exceeded" do
139-
subject.decode(maximum_payload << "z") do |event|
140-
expect(event.get("tags")).to include("_jsonparse_too_big_failure")
141-
expect(event.get("message").size).to eq(decode_size_limit_bytes)
142-
end
143-
end
144-
145138
it "should raise an error if the max bytes are exceeded" do
146139
expect {
147140
subject.decode(maximum_payload << "z")

0 commit comments

Comments
 (0)