appsignal 0.8.7.alpha.1 → 0.8.7

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzE4ZGU1ZGJkN2Y2YmJiYTg4MjlkNjUwZDQ3Y2EzOTgyMzg2NDY0Zg==
-  data.tar.gz: !binary |-
-    OGY1OTYxMzk4MTMyNjcyM2NhMWE0NDY3NDVjNjZhYWEwODU3ODM1Mw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZGFmYzU4ZWUzNDg5NGMwNzU3ZmY3YWRmNTE0NTY0MGNkNWY3Yjk4MGI4MTYz
-    NDQ0MzdkNzdmOGFkNWNiYzUwYjlkNDE4NmFmY2VkNDIwNDkxZWFjNTNkYTU1
-    MTg4ZjUxZDdkMDI5NWI3ZDRmNWE4YzVjMWY0Y2IzMGY4OGJmM2I=
-  data.tar.gz: !binary |-
-    NWNlNTIwNWQ1ZWQ3YWFiZjU1M2UzYzYzNTdjYmI4YTM3NzMyYjAyYjAxYTc3
-    NWM3N2ZiZmNhZDQwNjBhOTY3OGJiOTNhMzY4M2RmNjAxOTY5OWVjNWY3OWQ3
-    NWI3NjZiYjgzYzQ2NmViZDMzOWUyYjQ1OTBjZDhhMWViNWIxZGU=
+SHA1:
+  metadata.gz: 0422f4d917c222a6fd8bb36528e595d9cbad5b3a
+  data.tar.gz: f7c1da242200a9e04f4f907bd030f67cb41ca740
+SHA512:
+  metadata.gz: bf2d64b01365bcfc82a493e864d3d0bc2c3702682996f05d2959c75a5a561762ee95b46e7669135aad011b75655f1eecc8dcb18391997b127713ab7c5f4315c3
+  data.tar.gz: 991d98d796a754b482cf94d1e6601db89bb67f87a4f9f6df77294478156ee675d5dcaeebec360b2c85b741f5c4d3a81948f66fdf16b01e8789255386bab355fc

data/.gitignore

@@ -19,3 +19,4 @@ pickle-email-*.html
 Gemfile.lock
 gemfiles/*.lock
 .DS_Store
+.ruby-version

data/CHANGELOG.md

@@ -1,5 +1,7 @@
 # 0.8.7
 * Dup process action event to avoid threading issue
+* Rescue failing inspects in param sanitizer
+* Add option to pause instrumentation
 
 # 0.8.6
 * Resque support (beta)

data/Rakefile

@@ -90,3 +90,14 @@ task :spec do
   puts 'Running sinatra'
   system 'env BUNDLE_GEMFILE=gemfiles/sinatra.gemfile bundle exec rspec'
 end
+
+task :console do
+  require 'irb'
+  require 'irb/completion'
+  require 'appsignal'
+
+  Appsignal.config = Appsignal::Config.new('.', :console)
+
+  ARGV.clear
+  IRB.start
+end

data/lib/appsignal.rb

@@ -129,6 +129,16 @@ module Appsignal
     def is_ignored_exception?(exception)
       Appsignal.config[:ignore_exceptions].include?(exception.class.name)
     end
+
+    # Convenience method for skipping instrumentations around a block of code.
+    #
+    # @since 0.8.7
+    def without_instrumentation
+      agent.paused = true
+      yield
+    ensure
+      agent.paused = false
+    end
   end
 end
 

data/lib/appsignal/agent.rb

@@ -3,7 +3,7 @@ module Appsignal
     ACTION = 'log_entries'.freeze
 
     attr_accessor :aggregator, :thread, :master_pid, :pid, :active, :sleep_time,
-                  :transmitter, :subscriber
+                  :transmitter, :subscriber, :paused
 
     def initialize
       return unless Appsignal.active?
@@ -56,7 +56,7 @@ module Appsignal
           elsif event.name.start_with?('perform_job')
             Appsignal::Transaction.current.set_perform_job_event(event)
           end
-          Appsignal::Transaction.current.add_event(event)
+          Appsignal::Transaction.current.add_event(event) unless paused
         end
       end
     end

data/lib/appsignal/transaction/params_sanitizer.rb

@@ -53,6 +53,9 @@ module Appsignal
 
         def inspected(value)
           value.inspect
+        rescue
+          # It turns out that sometimes inspect can fail
+          "#<#{value.class.to_s}/>"
         end
       end
     end

data/lib/appsignal/version.rb

@@ -1,3 +1,3 @@
 module Appsignal
-  VERSION = '0.8.7.alpha.1'
+  VERSION = '0.8.7'
 end

data/spec/lib/appsignal/agent_spec.rb

@@ -94,7 +94,14 @@ describe Appsignal::Agent do
     end
 
     context "handling events" do
-      before do
+      before(:each) do
+        # Unsubscribe previous notification subscribers
+        ActiveSupport::Notifications.notifier.instance_variable_get(:@subscribers).
+          reject { |sub| sub.instance_variable_get(:@pattern).is_a? String }.
+          each { |sub| ActiveSupport::Notifications.unsubscribe(sub) }
+        # And re-subscribe with just one subscriber
+        Appsignal.agent.subscribe
+
         Appsignal::Transaction.create('123', {})
       end
 
@@ -113,6 +120,16 @@ describe Appsignal::Agent do
         ActiveSupport::Notifications.instrument 'render_template'
       end
 
+      context "when paused" do
+        it "should add a normal event" do
+          Appsignal::Transaction.current.should_not_receive(:add_event)
+
+          Appsignal.without_instrumentation do
+            ActiveSupport::Notifications.instrument 'moo'
+          end
+        end
+      end
+
       it "should add and set a process action event" do
         Appsignal::Transaction.current.should_receive(:set_process_action_event).with(
           kind_of(ActiveSupport::Notifications::Event)

data/spec/lib/appsignal/transaction/params_sanitizer_spec.rb

@@ -1,5 +1,11 @@
 require 'spec_helper'
 
+class ErrorOnInspect
+  def inspect
+    raise 'Error'
+  end
+end
+
 describe Appsignal::Transaction::ParamsSanitizer do
   let(:klass) { Appsignal::Transaction::ParamsSanitizer }
   let(:file) { uploaded_file }
@@ -16,7 +22,8 @@ describe Appsignal::Transaction::ParamsSanitizer do
           {
             :key => 'value',
             :file => file,
-          }
+          },
+          ErrorOnInspect.new
         ]
       }
     }
@@ -47,6 +54,7 @@ describe Appsignal::Transaction::ParamsSanitizer do
         its([1]) { should == 'else' }
         its([2]) { should be_instance_of String }
         its([2]) { should include '::UploadedFile' }
+        its([4]) { should == '#<ErrorOnInspect/>' }
 
         context "nested hash" do
           subject { params[:hash][:nested_array][3] }

data/spec/lib/appsignal_spec.rb

@@ -335,5 +335,23 @@ describe Appsignal do
         Appsignal.add_exception(nil)
       end
     end
+
+    describe ".without_instrumentation" do
+      let(:agent) { double }
+      before do
+        Appsignal.stub(:agent => agent)
+      end
+
+      it "should pause and unpause the agent around the block" do
+        agent.should_receive(:paused=).with(true)
+        agent.should_receive(:paused=).with(false)
+      end
+
+      after do
+        Appsignal.without_instrumentation do
+          # nothing
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.8.7.alpha.1
+  version: 0.8.7
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,118 +12,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thread_safe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: The official appsignal.com gem
@@ -134,9 +134,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -236,17 +235,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Logs performance and exception data from your app toappsignal.com

data/.ruby-version

@@ -1 +0,0 @@
-1.9.3-p392