appsignal 1.3.1 → 1.3.2

data/spec/lib/appsignal/event_formatter/action_view/render_formatter_spec.rb

@@ -14,7 +14,7 @@ if rails_present?
     end
 
     describe "#root_path" do
-      its(:root_path) { should == '/var/www/app/20130101/' }
+      its(:root_path) { should eq '/var/www/app/20130101/' }
     end
 
     describe "#format" do
@@ -23,13 +23,13 @@ if rails_present?
       context "with an identifier" do
         let(:payload) { {:identifier => '/var/www/app/20130101/app/views/home/index/html.erb'} }
 
-        it { should == ['app/views/home/index/html.erb', nil] }
+        it { should eq ['app/views/home/index/html.erb', nil] }
       end
 
       context "with a frozen identifier" do
         let(:payload) { {:identifier => '/var/www/app/20130101/app/views/home/index/html.erb'.freeze} }
 
-        it { should == ['app/views/home/index/html.erb', nil] }
+        it { should eq ['app/views/home/index/html.erb', nil] }
       end
 
       context "without an identifier" do

data/spec/lib/appsignal/event_formatter/active_record/instantiation_formatter_spec.rb

@@ -18,6 +18,6 @@ describe Appsignal::EventFormatter::ActiveRecord::InstantiationFormatter do
 
     subject { formatter.format(payload) }
 
-    it { should == ['User', nil] }
+    it { should eq ['User', nil] }
   end
 end

data/spec/lib/appsignal/event_formatter/active_record/sql_formatter_spec.rb

@@ -18,6 +18,6 @@ describe Appsignal::EventFormatter::ActiveRecord::InstantiationFormatter do
 
     subject { formatter.format(payload) }
 
-    it { should == ['User load', 'SELECT * FROM users', 1] }
+    it { should eq ['User load', 'SELECT * FROM users', 1] }
   end
 end

data/spec/lib/appsignal/event_formatter/faraday/request_formatter_spec.rb

@@ -18,6 +18,6 @@ describe Appsignal::EventFormatter::Faraday::RequestFormatter do
 
     subject { formatter.format(payload) }
 
-    it { should == ['GET http://example.org', 'GET http://example.org/hello/world'] }
+    it { should eq ['GET http://example.org', 'GET http://example.org/hello/world'] }
   end
 end

data/spec/lib/appsignal/event_formatter/moped/query_formatter_spec.rb

@@ -27,7 +27,7 @@ describe Appsignal::EventFormatter::Moped::QueryFormatter do
         )
       end
 
-      it { should == ['Command', '{:database=>"database.collection", :selector=>{"query"=>"?"}}'] }
+      it { should eq ['Command', '{:database=>"database.collection", :selector=>{"query"=>"?"}}'] }
     end
 
     context "Moped::Protocol::Query" do
@@ -43,7 +43,7 @@ describe Appsignal::EventFormatter::Moped::QueryFormatter do
         )
       end
 
-      it { should == ['Query', '{:database=>"database.collection", :selector=>{"_id"=>"?"}, :flags=>[], :limit=>0, :skip=>0, :fields=>nil}'] }
+      it { should eq ['Query', '{:database=>"database.collection", :selector=>{"_id"=>"?"}, :flags=>[], :limit=>0, :skip=>0, :fields=>nil}'] }
     end
 
     context "Moped::Protocol::Delete" do
@@ -56,7 +56,7 @@ describe Appsignal::EventFormatter::Moped::QueryFormatter do
         )
       end
 
-      it { should == ['Delete', '{:database=>"database.collection", :selector=>{"_id"=>"?"}, :flags=>[]}'] }
+      it { should eq ['Delete', '{:database=>"database.collection", :selector=>{"_id"=>"?"}, :flags=>[]}'] }
     end
 
     context "Moped::Protocol::Insert" do
@@ -72,7 +72,7 @@ describe Appsignal::EventFormatter::Moped::QueryFormatter do
         )
       end
 
-      it { should == ['Insert', '{:database=>"database.collection", :documents=>{"_id"=>"?", "events"=>"?"}, :count=>2, :flags=>[]}'] }
+      it { should eq ['Insert', '{:database=>"database.collection", :documents=>{"_id"=>"?", "events"=>"?"}, :count=>2, :flags=>[]}'] }
     end
 
     context "Moped::Protocol::Update" do
@@ -86,7 +86,7 @@ describe Appsignal::EventFormatter::Moped::QueryFormatter do
         )
       end
 
-      it { should == ['Update', '{:database=>"database.collection", :selector=>{"_id"=>"?"}, :update=>{"user.?"=>"?"}, :flags=>[]}'] }
+      it { should eq ['Update', '{:database=>"database.collection", :selector=>{"_id"=>"?"}, :update=>{"user.?"=>"?"}, :flags=>[]}'] }
     end
 
     context "Moped::Protocol::KillCursors" do
@@ -97,7 +97,7 @@ describe Appsignal::EventFormatter::Moped::QueryFormatter do
         )
       end
 
-      it { should == ['KillCursors', '{:number_of_cursor_ids=>2}'] }
+      it { should eq ['KillCursors', '{:number_of_cursor_ids=>2}'] }
     end
 
     context "Moped::Protocol::Other" do
@@ -108,7 +108,7 @@ describe Appsignal::EventFormatter::Moped::QueryFormatter do
         )
       end
 
-      it { should == ['Other', '{:database=>"database.collection"}'] }
+      it { should eq ['Other', '{:database=>"database.collection"}'] }
     end
   end
 

data/spec/lib/appsignal/event_formatter_spec.rb

@@ -69,10 +69,10 @@ describe Appsignal::EventFormatter do
       klass.register('mock.specific', MockFormatter)
       Appsignal::EventFormatter.initialize_formatters
 
-      klass.formatter_classes['mock.specific'].should == MockFormatter
+      klass.formatter_classes['mock.specific'].should eq MockFormatter
       klass.registered?('mock.specific').should be_true
       klass.formatters['mock.specific'].should be_instance_of(MockFormatter)
-      klass.formatters['mock.specific'].body.should == 'some value'
+      klass.formatters['mock.specific'].body.should eq 'some value'
     end
 
     it "should not have a formatter that's not registered" do
@@ -92,11 +92,11 @@ describe Appsignal::EventFormatter do
 
   context "calling formatters" do
     it "should return nil if there is no formatter registered" do
-      klass.format('nonsense', {}).should == nil
+      klass.format('nonsense', {}).should be_nil
     end
 
     it "should call the formatter if it is registered and use a value set in the initializer" do
-      klass.format('mock', {}).should == ['title', 'some value']
+      klass.format('mock', {}).should eq ['title', 'some value']
     end
   end
 end

data/spec/lib/appsignal/hooks/redis_spec.rb

@@ -37,7 +37,7 @@ describe Appsignal::Hooks::RedisHook do
 
           client = Redis::Client.new
 
-          client.process([]).should == 1
+          client.process([]).should eq 1
         end
       end
     end

data/spec/lib/appsignal/hooks/sidekiq_spec.rb

@@ -105,7 +105,7 @@ describe Appsignal::Hooks::SidekiqPlugin do
     end
 
     it "should only add items to the hash that do not appear in JOB_KEYS" do
-      plugin.formatted_metadata(item).should == {'foo' => 'bar'}
+      plugin.formatted_metadata(item).should eq({'foo' => 'bar'})
     end
   end
 end

data/spec/lib/appsignal/hooks_spec.rb

@@ -87,20 +87,20 @@ describe Appsignal::Hooks::Helpers do
     end
 
     it "should truncate the text to 200 chars max" do
-      with_helpers.truncate(very_long_text).should == "#{'a' * 197}..."
+      with_helpers.truncate(very_long_text).should eq "#{'a' * 197}..."
     end
   end
 
   describe "#string_or_inspect" do
     context "when string" do
       it "should return the string" do
-        with_helpers.string_or_inspect('foo').should == 'foo'
+        with_helpers.string_or_inspect('foo').should eq 'foo'
       end
     end
 
     context "when integer" do
       it "should return the string" do
-        with_helpers.string_or_inspect(1).should == '1'
+        with_helpers.string_or_inspect(1).should eq '1'
       end
     end
 
@@ -108,7 +108,7 @@ describe Appsignal::Hooks::Helpers do
       let(:object) { Object.new }
 
       it "should return the string" do
-        with_helpers.string_or_inspect(object).should == object.inspect
+        with_helpers.string_or_inspect(object).should eq object.inspect
       end
     end
   end
@@ -120,7 +120,7 @@ describe Appsignal::Hooks::Helpers do
       context "when the key exists" do
         subject { with_helpers.extract_value(hash, :key) }
 
-        it { should == 'value' }
+        it { should eq 'value' }
       end
 
       context "when the key does not exist" do
@@ -131,7 +131,7 @@ describe Appsignal::Hooks::Helpers do
         context "with a default value" do
           subject { with_helpers.extract_value(hash, :nonexistent_key, 1) }
 
-          it { should == 1 }
+          it { should eq 1 }
         end
       end
     end
@@ -145,7 +145,7 @@ describe Appsignal::Hooks::Helpers do
       context "when the key exists" do
         subject { with_helpers.extract_value(struct, :key) }
 
-        it { should == 'value' }
+        it { should eq 'value' }
       end
 
       context "when the key does not exist" do
@@ -156,7 +156,7 @@ describe Appsignal::Hooks::Helpers do
         context "with a default value" do
           subject { with_helpers.extract_value(struct, :nonexistent_key, 1) }
 
-          it { should == 1 }
+          it { should eq 1 }
         end
       end
     end
@@ -167,7 +167,7 @@ describe Appsignal::Hooks::Helpers do
       context "when the method exists" do
         subject { with_helpers.extract_value(object, :existing_method) }
 
-        it { should == 'value' }
+        it { should eq 'value' }
       end
 
       context "when the method does not exist" do
@@ -178,7 +178,7 @@ describe Appsignal::Hooks::Helpers do
         context "and there is a default value" do
           subject { with_helpers.extract_value(object, :nonexistent_method, 1) }
 
-          it { should == 1 }
+          it { should eq 1 }
         end
       end
 
@@ -189,7 +189,7 @@ describe Appsignal::Hooks::Helpers do
 
       subject { with_helpers.extract_value(object, :existing_method, nil, true) }
 
-      it { should == '1' }
+      it { should eq '1' }
     end
   end
 
@@ -205,12 +205,12 @@ describe Appsignal::Hooks::Helpers do
     end
 
     it "should format the arguments" do
-      with_helpers.format_args(args).should == [
+      with_helpers.format_args(args).should eq([
         'Model',
         '1',
         object.inspect,
         'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ...'
-      ]
+      ])
     end
   end
 end

data/spec/lib/appsignal/integrations/mongo_ruby_driver_spec.rb

@@ -27,7 +27,7 @@ describe Appsignal::Hooks::MongoMonitorSubscriber do
       it "should store command on the transaction" do
         subscriber.started(event)
 
-        transaction.store('mongo_driver').should == { 1 => {'foo' => '?'}}
+        transaction.store('mongo_driver').should eq({1 => {'foo' => '?'}})
       end
 
       it "should start an event in the extension" do

data/spec/lib/appsignal/integrations/railtie_spec.rb

@@ -29,17 +29,17 @@ if rails_present?
 
           it { should be_a(Appsignal::Config) }
 
-          its(:root_path)  { should == Pathname.new(project_fixture_path) }
-          its(:env)        { should == 'test' }
-          its([:name])     { should == 'TestApp' }
-          its([:log_path]) { should == Pathname.new(File.join(project_fixture_path, 'log')) }
+          its(:root_path)  { should eq Pathname.new(project_fixture_path) }
+          its(:env)        { should eq 'test' }
+          its([:name])     { should eq 'TestApp' }
+          its([:log_path]) { should eq Pathname.new(File.join(project_fixture_path, 'log')) }
         end
 
         context "initial config" do
           before  { Appsignal::Integrations::Railtie.initialize_appsignal(app) }
           subject { Appsignal.config.initial_config }
 
-          its([:name]) { should == 'MyApp' }
+          its([:name]) { should eq 'MyApp' }
         end
 
         context "with APPSIGNAL_APP_ENV ENV var set" do
@@ -48,7 +48,7 @@ if rails_present?
             Appsignal::Integrations::Railtie.initialize_appsignal(app)
           end
 
-          its(:env) { should == 'env_test' }
+          its(:env) { should eq 'env_test' }
         end
       end
 

data/spec/lib/appsignal/integrations/webmachine_spec.rb

@@ -69,7 +69,7 @@ if webmachine_present?
       after do
         begin
           fsm.send(:handle_exceptions) { raise error };
-        rescue VerySpecificError => e
+        rescue VerySpecificError
         end
       end
     end

data/spec/lib/appsignal/rack/rails_instrumentation_spec.rb

@@ -99,13 +99,13 @@ if defined?(::Rails)
       context "with request id set" do
         let(:env) { {'action_dispatch.request_id' => 'id'} }
 
-        it { should == 'id' }
+        it { should eq 'id' }
       end
 
       context "with request id not set" do
         let(:env) { {} }
 
-        its(:length) { should == 36 }
+        its(:length) { should eq 36 }
       end
     end
   end

data/spec/lib/appsignal/subscriber_spec.rb

@@ -21,7 +21,7 @@ describe Appsignal::Subscriber do
     it "should be in the subscriber list" do
       ActiveSupport::Notifications.notifier.instance_variable_get(:@subscribers).select do |s|
         s.instance_variable_get(:@delegate).is_a?(Appsignal::Subscriber)
-      end.count.should == 1
+      end.count.should eq 1
     end
   end
 
@@ -33,7 +33,7 @@ describe Appsignal::Subscriber do
 
         ActiveSupport::Notifications.notifier.instance_variable_get(:@subscribers).select do |s|
           s.instance_variable_get(:@delegate).is_a?(Appsignal::Subscriber)
-        end.count.should == 2
+        end.count.should eq 2
       end
     end
 
@@ -44,7 +44,7 @@ describe Appsignal::Subscriber do
 
         ActiveSupport::Notifications.notifier.instance_variable_get(:@subscribers).select do |s|
           s.instance_variable_get(:@delegate).is_a?(Appsignal::Subscriber)
-        end.count.should == 0
+        end.count.should eq 0
       end
     end
 
@@ -55,7 +55,7 @@ describe Appsignal::Subscriber do
 
         ActiveSupport::Notifications.notifier.instance_variable_get(:@subscribers).select do |s|
           s.instance_variable_get(:@delegate).is_a?(Appsignal::Subscriber)
-        end.count.should == 1
+        end.count.should eq 1
       end
     end
   end

data/spec/lib/appsignal/transaction_spec.rb

@@ -29,15 +29,15 @@ describe Appsignal::Transaction do
 
         created_transaction = Appsignal::Transaction.create('1', namespace, request, options)
 
-        Thread.current[:appsignal_transaction].should == created_transaction
+        Thread.current[:appsignal_transaction].should eq created_transaction
       end
 
       it "should create a transaction" do
         created_transaction = Appsignal::Transaction.create('1', namespace, request, options)
 
         created_transaction.should be_a Appsignal::Transaction
-        created_transaction.transaction_id.should == '1'
-        created_transaction.namespace.should == 'http_request'
+        created_transaction.transaction_id.should eq '1'
+        created_transaction.namespace.should eq 'http_request'
       end
 
       context "when a transaction is already running" do
@@ -78,7 +78,7 @@ describe Appsignal::Transaction do
         before { Appsignal::Transaction.create('1', namespace, request, options) }
 
         it "should return the correct transaction" do
-          should == transaction
+          should eq transaction
         end
 
         it "should indicate it's not a nil transaction" do
@@ -119,6 +119,25 @@ describe Appsignal::Transaction do
 
         Thread.current[:appsignal_transaction].should be_nil
       end
+
+      context "if a transaction is discarded" do
+        it "should not complete the transaction" do
+          Appsignal::Transaction.current.should_not_receive(:complete)
+
+          Appsignal::Transaction.current.discard!
+          expect(Appsignal::Transaction.current.discarded?).to be_true
+          Appsignal::Transaction.complete_current!
+
+          Thread.current[:appsignal_transaction].should be_nil
+        end
+
+        it "should not be discarded when restore! is called" do
+          Appsignal::Transaction.current.discard!
+          expect(Appsignal::Transaction.current.discarded?).to be_true
+          Appsignal::Transaction.current.restore!
+          expect(Appsignal::Transaction.current.discarded?).to be_false
+        end
+      end
     end
   end
 
@@ -180,21 +199,21 @@ describe Appsignal::Transaction do
       subject { transaction }
 
       its(:ext)                { should_not be_nil }
-      its(:transaction_id)     { should == '1' }
-      its(:namespace)          { should == 'http_request' }
+      its(:transaction_id)     { should eq '1' }
+      its(:namespace)          { should eq 'http_request' }
       its(:request)            { should_not be_nil }
       its(:paused)             { should be_false }
-      its(:tags)               { should == {} }
+      its(:tags)               { should eq({}) }
 
       context "options" do
         subject { transaction.options }
 
-        its([:params_method]) { should == :params }
+        its([:params_method]) { should eq :params }
 
         context "with overridden options" do
           let(:options) { {:params_method => :filtered_params} }
 
-          its([:params_method]) { should == :filtered_params }
+          its([:params_method]) { should eq :filtered_params }
         end
       end
     end
@@ -553,8 +572,8 @@ describe Appsignal::Transaction do
           }
         end
 
-        its(:env) { should == env }
-        its(:params) { should == {:id => 1} }
+        its(:env) { should eq env }
+        its(:params) { should eq({:id => 1}) }
       end
     end
 
@@ -564,13 +583,13 @@ describe Appsignal::Transaction do
       subject { transaction.send(:background_queue_start) }
 
       context "when queue start is nil" do
-        it { should == nil }
+        it { should eq nil }
       end
 
       context "when queue start is set" do
         let(:env) { background_env_with_data }
 
-        it { should == 1389783590000 }
+        it { should eq 1389783590000 }
       end
     end
 
@@ -595,7 +614,7 @@ describe Appsignal::Transaction do
         context "with the HTTP_X_REQUEST_START header set" do
           let(:env) { {'HTTP_X_REQUEST_START' => "t=#{slightly_earlier_time_value}"} }
 
-          it { should == 1389783599600 }
+          it { should eq 1389783599600 }
 
           context "with unparsable content" do
             let(:env) { {'HTTP_X_REQUEST_START' => 'something'} }
@@ -606,7 +625,7 @@ describe Appsignal::Transaction do
           context "with some cruft" do
             let(:env) { {'HTTP_X_REQUEST_START' => "t=#{slightly_earlier_time_value}aaaa"} }
 
-            it { should == 1389783599600 }
+            it { should eq 1389783599600 }
           end
 
           context "with a really low number" do
@@ -618,7 +637,7 @@ describe Appsignal::Transaction do
           context "with the alternate HTTP_X_QUEUE_START header set" do
             let(:env) { {'HTTP_X_QUEUE_START' => "t=#{slightly_earlier_time_value}"} }
 
-            it { should == 1389783599600 }
+            it { should eq 1389783599600 }
           end
         end
       end
@@ -669,13 +688,13 @@ describe Appsignal::Transaction do
           Appsignal::Transaction::GenericRequest.new(background_env_with_data(:params => ['arg1', 'arg2']))
         end
 
-        it { should == ['arg1', 'arg2'] }
+        it { should eq ['arg1', 'arg2'] }
 
         context "with AppSignal filtering" do
           before { Appsignal.config.config_hash[:filter_parameters] = %w(foo) }
           after { Appsignal.config.config_hash[:filter_parameters] = [] }
 
-          it { should == ['arg1', 'arg2'] }
+          it { should eq ['arg1', 'arg2'] }
         end
       end
 
@@ -688,7 +707,7 @@ describe Appsignal::Transaction do
 
           it "should call the params sanitizer" do
             puts Appsignal.config.config_hash[:filter_parameters].inspect
-            subject.should == { :foo => :bar }
+            subject.should eq({:foo => :bar })
           end
         end
 
@@ -701,10 +720,10 @@ describe Appsignal::Transaction do
           after { Appsignal.config.config_hash[:filter_parameters] = [] }
 
           it "should call the params sanitizer with filtering" do
-            subject.should == {
+            subject.should eq({
               :foo => '[FILTERED]',
               :baz => :bat
-            }
+            })
           end
         end
       end
@@ -746,7 +765,7 @@ describe Appsignal::Transaction do
       context "when env is empty" do
         before { transaction.request.stub(:session => {}) }
 
-        it { should == {} }
+        it { should eq({}) }
       end
 
       context "when request class does not have a session method" do
@@ -765,7 +784,7 @@ describe Appsignal::Transaction do
         it "passes the session data into the params sanitizer" do
           Appsignal::Utils::ParamsSanitizer.should_receive(:sanitize).with({:foo => :bar}).
             and_return(:sanitized_foo)
-          subject.should == :sanitized_foo
+          subject.should eq :sanitized_foo
         end
 
         if defined? ActionDispatch::Request::Session
@@ -817,7 +836,7 @@ describe Appsignal::Transaction do
       context "when env is present" do
         let(:env) { {:metadata => {:key => 'value'}} }
 
-        it { should == env[:metadata] }
+        it { should eq env[:metadata] }
       end
     end
 
@@ -852,7 +871,7 @@ describe Appsignal::Transaction do
     describe "#cleaned_backtrace" do
       subject { transaction.send(:cleaned_backtrace, ['line 1']) }
 
-      it { should == ['line 1'] }
+      it { should eq ['line 1'] }
 
       pending "calls Rails backtrace cleaner if Rails is present"
     end