diff --git a/lib/rackstash/rack/middleware.rb b/lib/rackstash/rack/middleware.rb index d240091..f817f3e 100644 --- a/lib/rackstash/rack/middleware.rb +++ b/lib/rackstash/rack/middleware.rb @@ -297,11 +297,13 @@ module Rackstash } buffer.fields.merge!(fields, force: false) - buffer.fields.deep_merge!( - @response_fields, - scope: headers, - force: false - ) unless @response_fields.nil? + unless @response_fields.nil? + buffer.fields.deep_merge!( + @response_fields, + scope: headers, + force: false + ) + end buffer.tag(@response_tags, scope: headers) unless @response_tags.nil? end diff --git a/spec/rackstash/class_registry_spec.rb b/spec/rackstash/class_registry_spec.rb index 71943d1..3e0aee5 100644 --- a/spec/rackstash/class_registry_spec.rb +++ b/spec/rackstash/class_registry_spec.rb @@ -11,7 +11,7 @@ require 'rackstash/class_registry' describe Rackstash::ClassRegistry do let(:registry) { described_class.new('value') } - let(:klass) { Class.new} + let(:klass) { Class.new } describe '#initialize' do it 'sets the object_type' do diff --git a/spec/rackstash/fields/hash_spec.rb b/spec/rackstash/fields/hash_spec.rb index a4bf71a..51c6280 100644 --- a/spec/rackstash/fields/hash_spec.rb +++ b/spec/rackstash/fields/hash_spec.rb @@ -496,8 +496,19 @@ describe Rackstash::Fields::Hash do hash['key'] = 'value' called_with = [] - expect(hash.fetch('key') { |key| called_with << key; :default }).to eql 'value' - expect(hash.fetch('missing') { |key| called_with << key; :default }).to eql :default + expect( + hash.fetch('key') { |key| + called_with << key + :default + } + ).to eql 'value' + + expect( + hash.fetch('missing') { |key| + called_with << key; + :default + } + ).to eql :default expect(called_with).to eql ['missing'] end diff --git a/spec/rackstash/filter/anonymize_ip_mask_spec.rb b/spec/rackstash/filter/anonymize_ip_mask_spec.rb index 3e58efc..efc7aba 100644 --- a/spec/rackstash/filter/anonymize_ip_mask_spec.rb +++ b/spec/rackstash/filter/anonymize_ip_mask_spec.rb @@ -87,7 +87,6 @@ describe Rackstash::Filter::AnonymizeIPMask do expect(event).not_to include 'ignored' end - it 'anonymizes arrays' do filter_spec['array'] = 'anonymized' filter.call(event) diff --git a/spec/rackstash/filter_spec.rb b/spec/rackstash/filter_spec.rb index 839d763..641a503 100644 --- a/spec/rackstash/filter_spec.rb +++ b/spec/rackstash/filter_spec.rb @@ -15,7 +15,7 @@ describe Rackstash::Filter do let(:filter_class) { Class.new do - def call(event) + def call(_event) 'filtered' end end @@ -87,7 +87,7 @@ describe Rackstash::Filter do end it 'keeps the class hierarchy unchanged' do - filter = described_class.build(filter_name, only_if: ->(event){ false }) + filter = described_class.build(filter_name, only_if: ->(_event) { false }) expect(filter).to be_instance_of(filter_class) end @@ -113,7 +113,7 @@ describe Rackstash::Filter do attr_reader :mandatory end - filter = described_class.build(filter_name, only_if: ->{}, mandatory: 'foo') + filter = described_class.build(filter_name, only_if: -> {}, mandatory: 'foo') expect(filter.mandatory).to eql 'foo' end end @@ -160,7 +160,8 @@ describe Rackstash::Filter do describe '.register' do let(:filter_class) { Class.new do - def call; end + def call + end end } diff --git a/spec/rackstash/flow_spec.rb b/spec/rackstash/flow_spec.rb index a503171..c364ecd 100644 --- a/spec/rackstash/flow_spec.rb +++ b/spec/rackstash/flow_spec.rb @@ -94,10 +94,8 @@ describe Rackstash::Flow do 'error' => 'RuntimeError', 'error_message' => 'ERROR', 'error_trace' => instance_of(String), - 'tags' => [], 'message' => [instance_of(Rackstash::Message)], - '@timestamp' => instance_of(Time) ) expect(flow).to receive(:error_flow).and_return(error_flow) @@ -128,10 +126,8 @@ describe Rackstash::Flow do 'error' => 'RuntimeError', 'error_message' => 'ERROR', 'error_trace' => instance_of(String), - 'tags' => [], 'message' => [instance_of(Rackstash::Message)], - '@timestamp' => instance_of(Time) ) expect(flow).to receive(:error_flow).and_return(error_flow) @@ -302,19 +298,19 @@ describe Rackstash::Flow do end it 'can set to true or false' do - expect(flow.raise_on_error 'something').to eql true + expect(flow.raise_on_error('something')).to eql true expect(flow.raise_on_error).to eql true expect(flow.raise_on_error?).to eql true - expect(flow.raise_on_error nil).to eql false + expect(flow.raise_on_error(nil)).to eql false expect(flow.raise_on_error).to eql false expect(flow.raise_on_error?).to eql false - expect(flow.raise_on_error true).to eql true + expect(flow.raise_on_error(true)).to eql true expect(flow.raise_on_error).to eql true expect(flow.raise_on_error?).to eql true - expect(flow.raise_on_error false).to eql false + expect(flow.raise_on_error(false)).to eql false expect(flow.raise_on_error).to eql false expect(flow.raise_on_error?).to eql false end @@ -345,10 +341,8 @@ describe Rackstash::Flow do 'error' => 'RuntimeError', 'error_message' => 'ERROR', 'error_trace' => instance_of(String), - 'tags' => [], 'message' => [instance_of(Rackstash::Message)], - '@timestamp' => instance_of(Time) ) expect(flow).to receive(:error_flow).and_return(error_flow) @@ -379,10 +373,8 @@ describe Rackstash::Flow do 'error' => 'RuntimeError', 'error_message' => 'ERROR', 'error_trace' => instance_of(String), - 'tags' => [], 'message' => [instance_of(Rackstash::Message)], - '@timestamp' => instance_of(Time) ) expect(flow).to receive(:error_flow).and_return(error_flow) @@ -454,10 +446,8 @@ describe Rackstash::Flow do 'error' => 'RuntimeError', 'error_message' => 'ERROR', 'error_trace' => instance_of(String), - 'tags' => [], 'message' => [instance_of(Rackstash::Message)], - '@timestamp' => instance_of(Time) ) expect(flow).to receive(:error_flow).and_return(error_flow) @@ -488,10 +478,8 @@ describe Rackstash::Flow do 'error' => 'RuntimeError', 'error_message' => 'ERROR', 'error_trace' => instance_of(String), - 'tags' => [], 'message' => [instance_of(Rackstash::Message)], - '@timestamp' => instance_of(Time) ) expect(flow).to receive(:error_flow).and_return(error_flow) diff --git a/spec/rackstash/rack/middleware_spec.rb b/spec/rackstash/rack/middleware_spec.rb index d91fc8c..29b2542 100644 --- a/spec/rackstash/rack/middleware_spec.rb +++ b/spec/rackstash/rack/middleware_spec.rb @@ -113,9 +113,7 @@ describe Rackstash::Rack::Middleware do 'path' => '/demo', 'status' => 200, 'duration' => be_a(Float).and(be > 0), - 'message' => "Request started\nNothing to do...\n", - '@timestamp' => /\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d.\d{6}Z/, 'tags' => [] ) @@ -247,10 +245,8 @@ describe Rackstash::Rack::Middleware do 'error' => 'RuntimeError', 'error_message' => 'kaputt', 'error_trace' => %r{\A#{__FILE__}:#{__LINE__ - 8}:in}, - # The app did its thing 'message' => "Request started\nNothing to do...\n", - # We explicitly override the logged status, even if the app returned a # successful response earlier 'status' => 500