appsignal 0.11.13.beta.4 → 0.11.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e385f15b5a860be6ff6f5a9d51c2bbdaf9b16102
-  data.tar.gz: e3bcf119da2785bfac804db2ae618514c1f6b394
+  metadata.gz: 939d3b7a54a4b39ec139e95f135fcd25565fac74
+  data.tar.gz: d186dc6f7a065ae88bff571e3963955dd0bf74a0
 SHA512:
-  metadata.gz: 6eebba7ef93cebef3a80053473b15b405c58166000e04012041c483ece7c81120c14392f03565f49988f11e15f78df8322f468700027d502e8f86085ee320ae3
-  data.tar.gz: 620bdfab71b0e033fbb3f7a289e8d2d068e84743d8a4925836173e25f098744162dc1d0397239b9fea8efd953891d6a0537013f2bc10e6337b1efb0809fcb84a
+  metadata.gz: c8f57aee9899c31b32997a99652702c36f9e3234d35c1e29acfcfc40d19285bd28a1cc244818c0cdbc6fcf804fa3680c770a83929e51765f46c52ae2524807b2
+  data.tar.gz: d5f6ea1bcf79f0c5c23e169baff789e52a5c6ee8f0f75717ed285b3f84aa147694ae403f430a0007e967aae7b706a371c9b00b54174a577176dc77cf65d7a271

data/lib/appsignal/integrations/padrino.rb

@@ -25,23 +25,38 @@ module Padrino::Routing::InstanceMethods
     if env['sinatra.static_file']
       route_without_appsignal(base, pass_block)
     else
-      payload = {
+      request_payload = {
         :params  => request.params,
         :session => request.session,
         :method  => request.request_method,
         :path    => request.path
       }
-      ActiveSupport::Notifications.instrument('process_action.padrino', payload) do |payload|
+      ActiveSupport::Notifications.instrument('process_action.padrino', request_payload) do |request_payload|
         begin
           route_without_appsignal(base, pass_block)
         rescue => e
           Appsignal.add_exception(e); raise e
         ensure
-          payload[:action] = "#{settings.name}:#{request.controller}##{request.action}"
+          request_payload[:action] = get_payload_action(request)
         end
       end
     end
   end
+
+  def get_payload_action(request)
+    # Short-circut is there's no request object to obtain information from
+    return "#{settings.name}" if request.nil?
+
+    # Older versions of Padrino work with a route object
+    route_obj = defined?(request.route_obj) && request.route_obj
+    if route_obj && route_obj.respond_to?(:original_path)
+      return "#{settings.name}:#{request.route_obj.original_path}"
+    end
+
+    # Newer versions expose the action / controller on the request class
+    request_data = request.respond_to?(:action) ? request.action : request.fullpath
+    "#{settings.name}:#{request.controller}##{request_data}"
+  end
 end
 
 Padrino.after_load do

data/lib/appsignal/integrations/sidekiq.rb

@@ -48,7 +48,7 @@ if defined?(::Sidekiq)
         end
 
         def truncate(text)
-          text.size > 100 ? "#{text[0...97]}..." : text
+          text.size > 200 ? "#{text[0...197]}..." : text
         end
       end
     end

data/lib/appsignal/version.rb

@@ -1,3 +1,3 @@
 module Appsignal
-  VERSION = '0.11.13.beta.4'
+  VERSION = '0.11.13'
 end

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

@@ -8,13 +8,13 @@ if padrino_present?
       include Padrino::Routing
     end
 
-    before :all do
+    before do
       @events = []
       @subscriber = ActiveSupport::Notifications.subscribe do |*args|
         @events << ActiveSupport::Notifications::Event.new(*args)
       end
     end
-    after :all do
+    after do
       ActiveSupport::Notifications.unsubscribe(@subscriber)
     end
 
@@ -56,76 +56,116 @@ if padrino_present?
       let(:env)      { {} }
       let(:settings) { double(:name => 'TestApp') }
 
-      let(:request) do
-        double(
-          :params          => {'id' => 1},
-          :session         => {'user_id' => 123},
-          :request_method  => 'GET',
-          :path            => '/users/1',
-          :controller      => 'users',
-          :action          => 'show'
-        )
-      end
+      describe "#route!" do
+        let(:request) do
+          double(
+            :params          => {'id' => 1},
+            :session         => {'user_id' => 123},
+            :request_method  => 'GET',
+            :path            => '/users/1',
+            :controller      => 'users',
+            :action          => 'show'
+          )
+        end
 
-      before do
-        router.stub(
-          :route_without_appsignal => true,
-          :request                 => request,
-          :env                     => env,
-          :settings                => settings
-        )
-      end
+        before do
+          router.stub(
+            :route_without_appsignal => true,
+            :request                 => request,
+            :env                     => env,
+            :settings                => settings,
+            :get_payload_action      => 'controller#action'
+          )
+        end
+
+        context "when Sinatra tells us it's a static file" do
+          let(:env) { {'sinatra.static_file' => true} }
+
+          it "should call the original method" do
+            expect( router ).to receive(:route_without_appsignal)
+          end
 
-      context "when Sinatra tells us it's a static file" do
-        let(:env) { {'sinatra.static_file' => true} }
+          it "should not instrument the request" do
+            expect( ActiveSupport::Notifications ).to_not receive(:instrument)
+          end
 
-        it "should call the original method" do
-          expect( router ).to receive(:route_without_appsignal)
+          after { router.route!(base) }
         end
 
-        it "should not instrument the request" do
-          expect( ActiveSupport::Notifications ).to_not receive(:instrument)
+        context "with a dynamic request" do
+
+          it "should call the original method" do
+            expect( router ).to receive(:route_without_appsignal)
+          end
+
+          it "should instrument the action" do
+            expect( ActiveSupport::Notifications ).to receive(:instrument).with(
+              'process_action.padrino',
+              {
+                :params  => {'id' => 1},
+                :session => {'user_id' => 123},
+                :method  => 'GET',
+                :path    => '/users/1'
+              }
+            )
+          end
+
+          after { router.route!(base) }
         end
 
-        after { router.route!(base) }
-      end
+        it "should add the action to the payload" do
+          router.route!(base)
+
+          expect( @events.first.payload[:action] ).to eql('controller#action')
+        end
 
-      context "with a dynamic request" do
+        context "with an exception" do
+          before { router.stub(:route_without_appsignal).and_raise(VerySpecificError) }
 
-        it "should call the original method" do
-          expect( router ).to receive(:route_without_appsignal)
+          it "should add the exception to the current transaction" do
+            expect( Appsignal ).to receive(:add_exception)
+
+            router.route!(base) rescue VerySpecificError
+          end
         end
+      end
 
-        it "should instrument the action" do
-          expect( ActiveSupport::Notifications ).to receive(:instrument).with(
-            'process_action.padrino',
-            {
-              :params  => {'id' => 1},
-              :session => {'user_id' => 123},
-              :method  => 'GET',
-              :path    => '/users/1'
-            }
-          )
+      describe "#get_payload_action" do
+        before { router.stub(:settings  => settings) }
+
+        context "when request is nil" do
+          it "should return the site" do
+            expect( router.get_payload_action(nil) ).to eql('TestApp')
+          end
         end
 
-        after { router.route!(base) }
-      end
+        context "when there's no route object" do
+          let(:request) { double(:controller => 'Controller', :action => 'action') }
 
-      it "should add the action to the payload" do
-        router.route!(base)
+          it "should return the site name, controller and action" do
+            expect( router.get_payload_action(request) ).to eql('TestApp:Controller#action')
+          end
 
-        expect( @events.first.payload[:action] ).to eql('TestApp:users#show')
-      end
+          context "when there's no action" do
+            let(:request) { double(:controller => 'Controller', :fullpath => '/action') }
 
-      context "with an exception" do
-        before { router.stub(:route_without_appsignal).and_raise(VerySpecificError) }
+            it "should return the site name, controller and fullpath" do
+              expect( router.get_payload_action(request) ).to eql('TestApp:Controller#/action')
+            end
+          end
+        end
 
-        it "should add the exception to the current transaction" do
-          expect( Appsignal ).to receive(:add_exception)
+        context "when request has a route object" do
+          let(:request)      { double }
+          let(:route_object) { double(:original_path => '/accounts/edit/:id') }
+          before             { request.stub(:route_obj => route_object) }
 
-          router.route!(base) rescue VerySpecificError
+          it "should return the original path" do
+            expect( router.get_payload_action(request) ).to eql('TestApp:/accounts/edit/:id')
+          end
         end
       end
+
     end
   end
 end

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

@@ -104,11 +104,11 @@ describe "Sidekiq integration" do
 
   describe "#truncate" do
     let(:very_long_text) do
-      "a" * 200
+      "a" * 400
     end
 
-    it "should truncate the text to 100 chars max" do
-      plugin.truncate(very_long_text).should == "#{'a' * 97}..."
+    it "should truncate the text to 200 chars max" do
+      plugin.truncate(very_long_text).should == "#{'a' * 197}..."
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.11.13.beta.4
+  version: 0.11.13
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -261,9 +261,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5