Skip to content

Commit d13fa26

Browse files
committed
fix tests
1 parent 32a1bee commit d13fa26

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

lib/logstash/outputs/elasticsearch/http_client.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ def bulk(actions)
145145
:content_length => body_stream.size,
146146
:batch_offset => (index + 1 - batch_actions.size))
147147
headers = {
148-
EVENT_COUNT_HEADER => batch_actions.size,
149-
UNCOMPRESSED_LENGTH_HEADER => stream_writer.pos
148+
EVENT_COUNT_HEADER => batch_actions.size.to_s,
149+
UNCOMPRESSED_LENGTH_HEADER => stream_writer.pos.to_s
150150
}
151151
bulk_responses << bulk_send(body_stream, batch_actions, headers)
152152
body_stream.truncate(0) && body_stream.seek(0)
@@ -167,8 +167,8 @@ def bulk(actions)
167167

168168
if body_stream.size > 0
169169
headers = {
170-
EVENT_COUNT_HEADER => batch_actions.size,
171-
UNCOMPRESSED_LENGTH_HEADER => stream_writer.pos
170+
EVENT_COUNT_HEADER => batch_actions.size.to_s,
171+
UNCOMPRESSED_LENGTH_HEADER => stream_writer.pos.to_s
172172
}
173173
bulk_responses << bulk_send(body_stream, batch_actions, headers)
174174
end

spec/unit/outputs/elasticsearch/http_client_spec.rb

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -301,9 +301,8 @@
301301
it "carries bulk request's uncompressed size" do
302302
expect(pool).to receive(:post) do |path, params, body|
303303
headers = params.fetch(:headers, {})
304-
expect(headers["X-Elastic-Event-Count"]).to be(3)
305-
expect(headers["X-Elastic-Uncompressed-Request-Length"]).to eq messages_size + (action_overhead * 3)
306-
expect(headers["X-Elastic-Uncompressed-Request-Length"]).to be > body.size
304+
expect(headers["X-Elastic-Event-Count"]).to eq("3")
305+
expect(headers["X-Elastic-Uncompressed-Request-Length"]).to eq (messages_size + (action_overhead * 3)).to_s
307306
end.and_return(response)
308307

309308
subject.send(:bulk, actions)
@@ -313,9 +312,8 @@
313312
it "carries bulk request's uncompressed size" do
314313
expect(pool).to receive(:post) do |path, params, body|
315314
headers = params.fetch(:headers, {})
316-
expect(headers["X-Elastic-Event-Count"]).to be(3)
317-
expect(headers["X-Elastic-Uncompressed-Request-Length"]).to eq messages_size + (action_overhead * 3)
318-
expect(headers["X-Elastic-Uncompressed-Request-Length"]).to eq body.size
315+
expect(headers["X-Elastic-Event-Count"]).to eq("3")
316+
expect(headers["X-Elastic-Uncompressed-Request-Length"]).to eq (messages_size + (action_overhead * 3)).to_s
319317
end.and_return(response)
320318
subject.send(:bulk, actions)
321319
end
@@ -327,22 +325,22 @@
327325
# only the first, tiny, message is sent first
328326
expect(pool).to receive(:post) do |path, params, body|
329327
headers = params.fetch(:headers, {})
330-
expect(headers["X-Elastic-Uncompressed-Request-Length"]).to be == message_1.size + action_overhead
331-
expect(headers["X-Elastic-Event-Count"]).to be(1)
328+
expect(headers["X-Elastic-Uncompressed-Request-Length"]).to eq (message_1.size + action_overhead).to_s
329+
expect(headers["X-Elastic-Event-Count"]).to eq("1")
332330
end.and_return(response)
333331

334332
# huge message_2 is sent afterwards alone
335333
expect(pool).to receive(:post) do |path, params, body|
336334
headers = params.fetch(:headers, {})
337-
expect(headers["X-Elastic-Uncompressed-Request-Length"]).to be >= message_2.size + action_overhead
338-
expect(headers["X-Elastic-Event-Count"]).to be(1)
335+
expect(headers["X-Elastic-Uncompressed-Request-Length"]).to eq (message_2.size + action_overhead).to_s
336+
expect(headers["X-Elastic-Event-Count"]).to eq("1")
339337
end.and_return(response)
340338

341339
# finally medium message_3 is sent alone as well
342340
expect(pool).to receive(:post) do |path, params, body|
343341
headers = params.fetch(:headers, {})
344-
expect(headers["X-Elastic-Uncompressed-Request-Length"]).to be >= message_3.size + action_overhead
345-
expect(headers["X-Elastic-Event-Count"]).to be(1)
342+
expect(headers["X-Elastic-Uncompressed-Request-Length"]).to eq (message_3.size + action_overhead).to_s
343+
expect(headers["X-Elastic-Event-Count"]).to eq("1")
346344
end.and_return(response)
347345

348346
subject.send(:bulk, actions)

0 commit comments

Comments
 (0)