airbrake-ruby 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0d04742504f2fcec6d259b278ccfde98a0e4700
-  data.tar.gz: 91e64261180aeebabeee260abf3f3648498f59fa
+  metadata.gz: eaad02409926687bb224ce9b635ba755d70ae2ca
+  data.tar.gz: 4cf429a9c5cfc4f440ee674ab8c06105447e08a2
 SHA512:
-  metadata.gz: 0c0ccf7ede21cefa29a78849b061070a8d569a6c4e866c51e758b9c2dce17dbebf61c80620410c9387e6357d3618a345294aa6447911676a8649cef46b60d45c
-  data.tar.gz: 9d21bec112c70fd8e38b3c03008488a211a46488c93969fa6ab35534ffadf67c99c298f610eccef61478cbf8eef07e2642d1eba148d4f8e3da3dd3af631aeb8c
+  metadata.gz: 4ad0da44bc123bb6c14387d14772796bfefdbbdf8f143285ba839867051771939faf3a2d9ff328f5f3f89231b4a0c7560038eec45601731ec8e6d32d9bd05530
+  data.tar.gz: 26199fd126b11a6ea0a7449ff41591760ffd9642b8eef9c20f7f0e3cb041acb13ba0d1be70d40526a470458374896f086dd3b0c4a7cff657204eb189a02cb165

data/lib/airbrake-ruby/backtrace.rb

@@ -8,7 +8,7 @@ module Airbrake
   #   begin
   #     raise 'Oops!'
   #   rescue
-  #     Backtrace.parse($!)
+  #     Backtrace.parse($!, Logger.new(STDOUT))
   #   end
   module Backtrace
     ##
@@ -38,29 +38,61 @@ module Airbrake
     # @return [Regexp] the template that tries to assume what a generic stack
     #   frame might look like, when exception's backtrace is set manually.
     GENERIC_STACKFRAME_REGEXP = %r{\A
+      (?:from\s)?
       (?<file>.+)              # Matches '/foo/bar/baz.ext'
       :
       (?<line>\d+)?            # Matches '43' or nothing
-      (in\s`(?<function>.+)')? # Matches "in `func'" or nothing
+      (?:
+        in\s`(?<function>.+)'  # Matches "in `func'"
+      |
+        :in\s(?<function>.+)   # Matches ":in func"
+      )?                       # ... or nothing
     \z}x
 
+    ##
+    # @return [Regexp] the template that matches exceptions from PL/SQL such as
+    #   ORA-06512: at "STORE.LI_LICENSES_PACK", line 1945
+    # @note This is raised by https://github.com/kubo/ruby-oci8
+    OCI_STACKFRAME_REGEXP = /\A
+      (?:
+        ORA-\d{5}
+        :\sat\s
+        (?:"(?<function>.+)",\s)?
+        line\s(?<line>\d+)
+      |
+        #{GENERIC_STACKFRAME_REGEXP}
+      )
+    \z/x
+
     ##
     # Parses an exception's backtrace.
     #
     # @param [Exception] exception The exception, which contains a backtrace to
     #   parse
     # @return [Array<Hash{Symbol=>String,Integer}>] the parsed backtrace
-    def self.parse(exception)
+    def self.parse(exception, logger)
       return [] if exception.backtrace.nil? || exception.backtrace.none?
 
       regexp = if java_exception?(exception)
                  JAVA_STACKFRAME_REGEXP
+               elsif oci_exception?(exception)
+                 OCI_STACKFRAME_REGEXP
                else
                  RUBY_STACKFRAME_REGEXP
                end
 
       exception.backtrace.map do |stackframe|
-        stack_frame(match_frame(regexp, stackframe))
+        frame = match_frame(regexp, stackframe)
+
+        unless frame
+          logger.error(
+            "can't parse '#{stackframe}' (please file an issue so we can fix " \
+            "it: https://github.com/airbrake/airbrake-ruby/issues/new)"
+          )
+          frame = { file: nil, line: nil, function: stackframe }
+        end
+
+        stack_frame(frame)
       end
     end
 
@@ -77,6 +109,10 @@ module Airbrake
     class << self
       private
 
+      def oci_exception?(exception)
+        defined?(OCIError) && exception.is_a?(OCIError)
+      end
+
       def stack_frame(match)
         { file: match[:file],
           line: (Integer(match[:line]) if match[:line]),
@@ -87,10 +123,7 @@ module Airbrake
         match = regexp.match(stackframe)
         return match if match
 
-        match = GENERIC_STACKFRAME_REGEXP.match(stackframe)
-        return match if match
-
-        raise Airbrake::Error, "can't parse '#{stackframe}'"
+        GENERIC_STACKFRAME_REGEXP.match(stackframe)
       end
     end
   end

data/lib/airbrake-ruby/nested_exception.rb

@@ -8,15 +8,16 @@ module Airbrake
     #   can unwrap. Exceptions that have a longer cause chain will be ignored
     MAX_NESTED_EXCEPTIONS = 3
 
-    def initialize(exception)
+    def initialize(exception, logger)
       @exception = exception
+      @logger = logger
     end
 
     def as_json
       unwind_exceptions.map do |exception|
         { type: exception.class.name,
           message: exception.message,
-          backtrace: Backtrace.parse(exception) }
+          backtrace: Backtrace.parse(exception, @logger) }
       end
     end
 

data/lib/airbrake-ruby/notice.rb

@@ -60,7 +60,7 @@ module Airbrake
       }.freeze
 
       @modifiable_payload = {
-        errors: NestedException.new(exception).as_json,
+        errors: NestedException.new(exception, @config.logger).as_json,
         context: context(params),
         environment: {},
         session: {},

data/lib/airbrake-ruby/version.rb

@@ -3,5 +3,5 @@
 module Airbrake
   ##
   # @return [String] the library version
-  AIRBRAKE_RUBY_VERSION = '1.4.3'.freeze
+  AIRBRAKE_RUBY_VERSION = '1.4.4'.freeze
 end

data/spec/backtrace_spec.rb

@@ -3,8 +3,6 @@ require 'spec_helper'
 RSpec.describe Airbrake::Backtrace do
   describe ".parse" do
     context "UNIX backtrace" do
-      let(:backtrace) { described_class.new(AirbrakeTestError.new) }
-
       let(:parsed_backtrace) do
         # rubocop:disable Metrics/LineLength, Style/HashSyntax, Style/SpaceAroundOperators, Style/SpaceInsideHashLiteralBraces
         [{:file=>"/home/kyrylo/code/airbrake/ruby/spec/spec_helper.rb", :line=>23, :function=>"<top (required)>"},
@@ -24,8 +22,9 @@ RSpec.describe Airbrake::Backtrace do
       end
 
       it "returns a properly formatted array of hashes" do
-        expect(described_class.parse(AirbrakeTestError.new)).
-          to eq(parsed_backtrace)
+        expect(
+          described_class.parse(AirbrakeTestError.new, Logger.new('/dev/null'))
+        ).to eq(parsed_backtrace)
       end
     end
 
@@ -45,7 +44,9 @@ RSpec.describe Airbrake::Backtrace do
       end
 
       it "returns a properly formatted array of hashes" do
-        expect(described_class.parse(ex)).to eq(parsed_backtrace)
+        expect(
+          described_class.parse(ex, Logger.new('/dev/null'))
+        ).to eq(parsed_backtrace)
       end
     end
 
@@ -69,8 +70,9 @@ RSpec.describe Airbrake::Backtrace do
       it "returns a properly formatted array of hashes" do
         allow(described_class).to receive(:java_exception?).and_return(true)
 
-        expect(described_class.parse(JavaAirbrakeTestError.new)).
-          to eq(backtrace_array)
+        expect(
+          described_class.parse(JavaAirbrakeTestError.new, Logger.new('/dev/null'))
+        ).to eq(backtrace_array)
       end
     end
 
@@ -95,7 +97,9 @@ RSpec.describe Airbrake::Backtrace do
         end
 
         it "returns a properly formatted array of hashes" do
-          expect(described_class.parse(ex)).to eq(parsed_backtrace)
+          expect(
+            described_class.parse(ex, Logger.new('/dev/null'))
+          ).to eq(parsed_backtrace)
         end
       end
 
@@ -113,7 +117,9 @@ RSpec.describe Airbrake::Backtrace do
         end
 
         it "returns a properly formatted array of hashes" do
-          expect(described_class.parse(ex)).to eq(parsed_backtrace)
+          expect(
+            described_class.parse(ex, Logger.new('/dev/null'))
+          ).to eq(parsed_backtrace)
         end
       end
     end
@@ -123,9 +129,20 @@ RSpec.describe Airbrake::Backtrace do
 
       let(:ex) { AirbrakeTestError.new.tap { |e| e.set_backtrace(unknown_bt) } }
 
-      it "raises error" do
-        expect { described_class.parse(ex) }.
-          to raise_error(Airbrake::Error, /can't parse/)
+      it "returns array of hashes where each unknown frame is marked as 'function'" do
+        expect(
+          described_class.parse(ex, Logger.new('/dev/null'))
+        ).to eq([file: nil, line: nil, function: 'a b c 1 23 321 .rb'])
+      end
+
+      it "logs unknown frames as errors" do
+        out = StringIO.new
+        logger = Logger.new(out)
+
+        expect { described_class.parse(ex, logger) }.
+          to change { out.string }.
+          from('').
+          to(/ERROR -- : can't parse 'a b c 1 23 321 .rb'/)
       end
     end
 
@@ -143,7 +160,34 @@ RSpec.describe Airbrake::Backtrace do
       end
 
       it "returns a properly formatted array of hashes" do
-        expect(described_class.parse(ex)).to eq(parsed_backtrace)
+        expect(
+          described_class.parse(ex, Logger.new('/dev/null'))
+        ).to eq(parsed_backtrace)
+      end
+    end
+
+    context "given an Oracle backtrace" do
+      let(:bt) do
+        ['ORA-06512: at "STORE.LI_LICENSES_PACK", line 1945',
+         'ORA-06512: at "ACTIVATION.LI_ACT_LICENSES_PACK", line 101',
+         'ORA-06512: at line 2',
+         'from stmt.c:243:in oci8lib_220.bundle']
+      end
+
+      let(:ex) { OCIError.new.tap { |e| e.set_backtrace(bt) } }
+
+      let(:parsed_backtrace) do
+        [{ file: nil, line: 1945, function: 'STORE.LI_LICENSES_PACK' },
+         { file: nil, line: 101, function: 'ACTIVATION.LI_ACT_LICENSES_PACK' },
+         { file: nil, line: 2, function: nil },
+         { file: 'stmt.c', line: 243, function: 'oci8lib_220.bundle' }]
+      end
+
+      it "returns a properly formatted array of hashes" do
+        stub_const('OCIError', AirbrakeTestError)
+        expect(
+          described_class.parse(ex, Logger.new('/dev/null'))
+        ).to eq(parsed_backtrace)
       end
     end
   end

data/spec/nested_exception_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe Airbrake::NestedException do
             Ruby21Error.raise_error('bingo')
           end
         rescue Ruby21Error => ex
-          nested_exception = described_class.new(ex)
+          nested_exception = described_class.new(ex, Logger.new('/dev/null'))
           exceptions = nested_exception.as_json
 
           expect(exceptions.size).to eq(2)
@@ -40,7 +40,7 @@ RSpec.describe Airbrake::NestedException do
             end
           end
         rescue Ruby21Error => ex
-          nested_exception = described_class.new(ex)
+          nested_exception = described_class.new(ex, Logger.new('/dev/null'))
           exceptions = nested_exception.as_json
 
           expect(exceptions.size).to eq(3)
@@ -64,7 +64,7 @@ RSpec.describe Airbrake::NestedException do
           end
         rescue Ruby21Error => ex1
           ex1.set_backtrace([])
-          nested_exception = described_class.new(ex1)
+          nested_exception = described_class.new(ex1, Logger.new('/dev/null'))
           exceptions = nested_exception.as_json
 
           expect(exceptions.size).to eq(2)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake-ruby
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-11 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec