appsignal 0.11.9 → 0.11.10.beta.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6a30600b4b012173c320662d41ae079891c0cfc2
+  data.tar.gz: bd7eb17b8bea68b32f91b6a7d7eb0b6e23fa6208
+SHA512:
+  metadata.gz: 6b84d295eecb0fa909d4831c4009564592deebc7f9cd25cbbd41526e288ff1502bc880d69a8aff38fa175e5bb8ae937b255d558e5a69a7f6446b50b2ca5b93d9
+  data.tar.gz: 3643403fb62be693d355a31d93fdc574a83a6d84154aaefc9cb0a8ca878f7defb0b8e191ea9f59f6074df3fc59ffb9749e969eceeb988c0c68a1142ca038f250

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.11.10
+* Fix for binding bug in exceptions in Resque
+* Handle invalidly encoded characters in payload
+
 # 0.11.9
 * Fix for infinite attempts to transmit if there is no valid api key
 

data/lib/appsignal/transaction.rb

@@ -38,7 +38,7 @@ module Appsignal
       @request_id = request_id
       @events = []
       @process_action_event = nil
-      @exception = nil
+      @exception = {}
       @env = env
       @tags = {}
       @paused = false
@@ -92,13 +92,27 @@ module Appsignal
       @events << event unless @paused == true
     end
 
-    def add_exception(ex)
+    def add_exception(ex=nil)
+      return unless ex
       @time = Time.now.utc.to_f
-      @exception = ex
+      @exception = {
+        :exception  => ex.class.name,
+        :message    => ex.message,
+        :backtrace  => clean_backtrace(ex)
+      }
     end
 
     def exception?
-      !! exception
+      exception.any?
+    end
+
+    def clean_backtrace(exception)
+      return [] unless exception.backtrace.is_a?(Array)
+      if defined?(::Rails)
+        ::Rails.backtrace_cleaner.clean(exception.backtrace, nil)
+      else
+        exception.backtrace
+      end
     end
 
     def slow_request?

data/lib/appsignal/transaction/formatter.rb

@@ -60,20 +60,7 @@ module Appsignal
       end
 
       def add_exception_to_hash!
-        hash[:exception] = {
-          :exception => exception.class.name,
-          :message => exception.message,
-          :backtrace => clean_backtrace(exception)
-        }
-      end
-
-      def clean_backtrace(exception)
-        return [] unless exception.backtrace.is_a?(Array)
-        if defined?(::Rails)
-          ::Rails.backtrace_cleaner.clean(exception.backtrace, nil)
-        else
-          exception.backtrace
-        end
+        hash[:exception] = exception
       end
 
       def add_events_to_hash!

data/lib/appsignal/version.rb

@@ -1,3 +1,3 @@
 module Appsignal
-  VERSION = '0.11.9'
+  VERSION = '0.11.10.beta.1'
 end

data/lib/appsignal/zipped_payload.rb

@@ -4,10 +4,34 @@ module Appsignal
 
     def initialize(given_body)
       @body = Zlib::Deflate.deflate(
-        JSON.generate(given_body, :quirks_mode => true),
+        Appsignal::ZippedPayload.json_generate(given_body),
         Zlib::BEST_SPEED
       )
     end
 
+    protected
+
+    def self.json_generate(given_body)
+      JSON.generate(jsonify(given_body))
+    end
+
+    def self.jsonify(value)
+      case value
+      when String
+        begin
+          value.encode('utf-8')
+        rescue Encoding::UndefinedConversionError
+          '[invalid-utf8]'
+        end
+      when Numeric, NilClass, TrueClass, FalseClass
+        value
+      when Hash
+        Hash[value.map { |k, v| [jsonify(k), jsonify(v)] }]
+      when Array
+        value.map { |v| jsonify(v) }
+      else
+        jsonify value.to_s
+      end
+    end
   end
 end

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

@@ -83,21 +83,12 @@ describe Appsignal::Transaction::Formatter do
       context "exception content" do
         subject { formatter.to_hash[:exception] }
 
+        it "should set the exception" do
+          subject.should eql(transaction_with_exception.exception)
+        end
         its(:keys) { should =~ [:exception, :message, :backtrace] }
         its([:exception]) { should == 'ArgumentError' }
         its([:message]) { should == 'oh no' }
-
-        if rails_present?
-          its([:backtrace]) { should == [
-            'app/controllers/somethings_controller.rb:10',
-            '/user/local/ruby/path.rb:8'
-          ] }
-        else
-          its([:backtrace]) { should == [
-            File.join(project_fixture_path, 'app/controllers/somethings_controller.rb:10'),
-            '/user/local/ruby/path.rb:8'
-          ] }
-        end
       end
     end
 

data/spec/lib/appsignal/transaction_spec.rb

@@ -190,13 +190,56 @@ describe Appsignal::Transaction do
     end
 
     context "using exceptions" do
-      let(:exception) { double(:exception, :name => 'test') }
+      let(:exception) do
+        double(
+          :exception,
+          :class => double(:name => 'test'),
+          :message   => 'Broken',
+          :backtrace => [
+            File.join(project_fixture_path, 'app/controllers/somethings_controller.rb:10').to_s,
+            '/user/local/ruby/path.rb:8'
+          ]
+        )
+      end
 
       describe '#add_exception' do
-        it 'should add an exception' do
+        it 'should add an exception', :if => rails_present? do
+          if Gem::Version.new(Rails.version) >= Gem::Version.new('4.2.1')
+            expect {
+              transaction.add_exception(exception)
+            }.to change(transaction, :exception).to({
+              :exception => 'test',
+              :message   => 'Broken',
+              :backtrace => [
+                'spec/support/project_fixture/app/controllers/somethings_controller.rb:10',
+                '/user/local/ruby/path.rb:8'
+              ]
+            })
+          else
+            expect {
+              transaction.add_exception(exception)
+            }.to change(transaction, :exception).to({
+              :exception => 'test',
+              :message   => 'Broken',
+              :backtrace => [
+                'app/controllers/somethings_controller.rb:10',
+                '/user/local/ruby/path.rb:8'
+              ]
+            })
+          end
+        end
+
+        it 'should add an exception', :if => !rails_present? do
           expect {
             transaction.add_exception(exception)
-          }.to change(transaction, :exception).to(exception)
+          }.to change(transaction, :exception).to({
+            :exception => 'test',
+            :message   => 'Broken',
+            :backtrace => [
+              File.join(project_fixture_path, 'app/controllers/somethings_controller.rb:10'),
+              '/user/local/ruby/path.rb:8'
+            ]
+          })
         end
       end
 
@@ -397,6 +440,17 @@ describe Appsignal::Transaction do
 
     describe '#complete!' do
       let(:event) { double(:event) }
+      let(:exception) do
+        double(
+          :exception,
+          :class => double(:name => 'test'),
+          :message   => 'Broken',
+          :backtrace => [
+            'app/controllers/somethings_controller.rb:10',
+            '/user/local/ruby/path.rb:8'
+          ]
+        )
+      end
       before do
         Appsignal::IPC.stub(:current => nil)
         transaction.set_process_action_event(notification_event)
@@ -427,7 +481,7 @@ describe Appsignal::Transaction do
         end
 
         context 'with exception' do
-          before { transaction.add_exception(event) }
+          before { transaction.add_exception(exception) }
 
           it 'should add transaction to the agent' do
             Appsignal.should_receive(:enqueue).with(transaction)

data/spec/lib/appsignal/zipped_payload_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Appsignal::ZippedPayload do
-
   describe "#initialize" do
     it "should initialize a new `Appsignal::ZippedPayload` and zip the body" do
       payload = Appsignal::ZippedPayload.new({'the' => 'payload'})
@@ -13,4 +12,29 @@ describe Appsignal::ZippedPayload do
     end
   end
 
+  describe ".json_generate" do
+    subject { Appsignal::ZippedPayload.send(:json_generate, body) }
+
+    context "with a valid body" do
+      let(:body) { {'the' => 'payload'} }
+
+      it { should == "{\"the\":\"payload\"}" }
+    end
+
+    context "with a body that contains strings with invalid utf-8 content" do
+      let(:string_with_invalid_utf8) { [0x61, 0x61, 0x85].pack('c*') }
+      let(:body) { {
+        'field_one' => [0x61, 0x61].pack('c*'),
+        'field_two' => string_with_invalid_utf8,
+        'field_three' => [
+          'one', string_with_invalid_utf8
+        ],
+        'field_four' => {
+          'one' => string_with_invalid_utf8
+        }
+      } }
+
+      it { should == "{\"field_one\":\"aa\",\"field_two\":\"[invalid-utf8]\",\"field_three\":[\"one\",\"[invalid-utf8]\"],\"field_four\":{\"one\":\"[invalid-utf8]\"}}" }
+    end
+  end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.11.9
-  prerelease: 
+  version: 0.11.10.beta.1
 platform: ruby
 authors:
 - Robert Beekman
@@ -13,118 +12,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thread_safe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: The official appsignal.com gem
@@ -135,9 +120,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -259,27 +244,26 @@ files:
 homepage: https://github.com/appsignal/appsignal
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
 test_files:
 - spec/lib/appsignal/agent_spec.rb