Merge branch 'master' of https://github.com/getsentry/raven-ruby

Author: nateberkopec

.travis.yml

@@ -24,7 +24,6 @@ notifications:
 
 matrix:
   allow_failures:
-    - rvm: jruby-19mode
     - rvm: ruby-head
   exclude:
     - rvm: 1.8.7

LICENSE

@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
    same "printed page" as the copyright notice for easier
    identification within third-party archives.
 
-Copyright [yyyy] [name of copyright owner]
+Copyright 2015 Functional Software, Inc
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

lib/raven/backtrace.rb

@@ -9,7 +9,10 @@ class Backtrace
     class Line
 
       # regexp (optionnally allowing leading X: for windows support)
-      INPUT_FORMAT = %r{^((?:[a-zA-Z]:)?[^:]+|<.*>):(\d+)(?::in `([^']+)')?$}.freeze
+      RUBY_INPUT_FORMAT = %r{^((?:[a-zA-Z]:)?[^:]+|<.*>):(\d+)(?::in `([^']+)')?$}.freeze
+
+      # org.jruby.runtime.callsite.CachingCallSite.call(CachingCallSite.java:170)
+      JAVA_INPUT_FORMAT = %r{^(.+)\.([^\.]+)\(([^\:]+)\:(\d+)\)$}.freeze
 
       APP_DIRS_PATTERN = /(bin|app|config|lib|test)/
 
@@ -22,16 +25,27 @@ class Line
       # The method of the line (such as index)
       attr_reader :method
 
+      # The module name (JRuby)
+      attr_reader :module_name
+
       # Parses a single line of a given backtrace
       # @param [String] unparsed_line The raw line from +caller+ or some backtrace
       # @return [Line] The parsed backtrace line
       def self.parse(unparsed_line)
-        _, file, number, method = unparsed_line.match(INPUT_FORMAT).to_a
-        new(file, number, method)
+        ruby_match = unparsed_line.match(RUBY_INPUT_FORMAT)
+        if ruby_match
+          _, file, number, method = ruby_match.to_a
+          module_name = nil
+        else
+          java_match = unparsed_line.match(JAVA_INPUT_FORMAT)
+          _, module_name, method, file, number = java_match.to_a
+        end
+        new(file, number, method, module_name)
       end
 
-      def initialize(file, number, method)
+      def initialize(file, number, method, module_name)
         self.file = file
+        self.module_name = module_name
         self.number = number.to_i
         self.method = method
       end
@@ -66,7 +80,7 @@ def inspect
 
       private
 
-      attr_writer :file, :number, :method
+      attr_writer :file, :number, :method, :module_name
     end
 
     # holder for an Array of Backtrace::Line instances

lib/raven/base.rb

@@ -121,6 +121,8 @@ def capture_type(obj, options = {})
         else
           send_event(evt)
         end
+
+        evt
       end
     end
     alias_method :capture_message, :capture_type

lib/raven/configuration.rb

@@ -1,3 +1,4 @@
+require 'certifi'
 require 'logger'
 require 'uri'
 
@@ -58,6 +59,9 @@ class Configuration
     # Should the SSL certificate of the server be verified?
     attr_accessor :ssl_verification
 
+    # The path to the SSL certificate file
+    attr_accessor :ssl_ca_file
+
     # SSl settings passed direactly to faraday's ssl option
     attr_accessor :ssl
 
@@ -113,7 +117,8 @@ def initialize
       self.send_modules = true
       self.excluded_exceptions = IGNORE_DEFAULT
       self.processors = [Raven::Processor::RemoveCircularReferences, Raven::Processor::UTF8Conversion, Raven::Processor::SanitizeData]
-      self.ssl_verification = false
+      self.ssl_verification = true
+      self.ssl_ca_file = Certifi.where
       self.encoding = 'gzip'
       self.timeout = 1
       self.open_timeout = 1

lib/raven/event.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'socket'
 require 'securerandom'
+require 'digest/md5'
 
 require 'raven/error'
 require 'raven/linecache'
@@ -24,7 +25,8 @@ class Event
 
     attr_reader :id
     attr_accessor :project, :message, :timestamp, :time_spent, :level, :logger,
-      :culprit, :server_name, :release, :modules, :extra, :tags, :context, :configuration
+      :culprit, :server_name, :release, :modules, :extra, :tags, :context, :configuration,
+      :checksum
 
     def initialize(init = {})
       @configuration = Raven.configuration
@@ -43,6 +45,7 @@ def initialize(init = {})
       @user          = {}
       @extra         = {}
       @tags          = {}
+      @checksum      = nil
 
       yield self if block_given?
 
@@ -108,6 +111,7 @@ def to_hash
       data[:extra] = @extra if @extra
       data[:tags] = @tags if @tags
       data[:user] = @user if @user
+      data[:checksum] = @checksum if @checksum
       @interfaces.each_pair do |name, int_data|
         data[name.to_sym] = int_data.to_hash
       end
@@ -186,10 +190,11 @@ def self.stacktrace_interface_from(int, evt, backtrace)
       backtrace = Backtrace.parse(backtrace)
       int.frames = backtrace.lines.reverse.map do |line|
         StacktraceInterface::Frame.new.tap do |frame|
-          frame.abs_path = line.file
-          frame.function = line.method
+          frame.abs_path = line.file if line.file
+          frame.function = line.method if line.method
           frame.lineno = line.number
           frame.in_app = line.in_app
+          frame.module = line.module_name if line.module_name
 
           if evt.configuration[:context_lines] && frame.abs_path
             frame.pre_context, frame.context_line, frame.post_context = \
@@ -206,6 +211,7 @@ def self._source_lines(_path, _from, _to)
     end
 
     def get_file_context(filename, lineno, context)
+      return nil, nil, nil unless Raven::LineCache.is_valid_file(filename)
       lines = (2 * context + 1).times.map do |i|
         Raven::LineCache.getline(filename, lineno - context + i)
       end
@@ -234,7 +240,7 @@ def generate_event_id
       ary[2] = (ary[2] & 0x0fff) | 0x4000
       ary[3] = (ary[3] & 0x3fff) | 0x8000
       uuid = "%08x-%04x-%04x-%04x-%04x%08x" % ary
-      Digest::MD5.hexdigest(uuid)
+      ::Digest::MD5.hexdigest(uuid)
     end
   end
 end

lib/raven/integrations/rails.rb

@@ -14,6 +14,13 @@ class Rails < ::Rails::Railtie
       end
     end
 
+    initializer 'raven.active_job' do
+      ActiveSupport.on_load :active_job do
+        require 'raven/integrations/rails/active_job'
+        include Raven::Rails::ActiveJob
+      end
+    end
+
     config.after_initialize do
       Raven.configure do |config|
         config.logger ||= ::Rails.logger
@@ -34,5 +41,9 @@ class Rails < ::Rails::Railtie
     rake_tasks do
       require 'raven/integrations/tasks'
     end
+
+    runner do
+      Raven.capture
+    end
   end
 end

lib/raven/integrations/rails/active_job.rb

@@ -0,0 +1,18 @@
+module Raven
+  class Rails
+    module ActiveJob
+      def self.included(base)
+        base.class_eval do
+          rescue_from(Exception) do |exception|
+            # Do not capture exceptions when using Sidekiq so we don't capture
+            # The same exception twice.
+            unless self.class.queue_adapter.to_s == 'ActiveJob::QueueAdapters::SidekiqAdapter'
+              Raven.capture_exception(exception, :extra => { :active_job => self.class.name })
+              raise exception
+            end
+          end
+        end
+      end
+    end
+  end
+end

lib/raven/interfaces/stack_trace.rb

@@ -25,6 +25,7 @@ class Frame < Interface
       attr_accessor :pre_context
       attr_accessor :post_context
       attr_accessor :context_line
+      attr_accessor :module
       attr_accessor :lineno
       attr_accessor :in_app
 

lib/raven/linecache.rb

@@ -5,17 +5,24 @@ class LineCache
     class << self
       CACHE = {}
 
+      def is_valid_file(path)
+        lines = getlines(path)
+        return lines != nil
+      end
+
       def getlines(path)
         CACHE[path] ||= begin
           IO.readlines(path)
         rescue
-          []
+          nil
         end
       end
 
       def getline(path, n)
         return nil if n < 1
-        getlines(path)[n - 1]
+        lines = getlines(path)
+        return nil if lines == nil
+        lines[n - 1]
       end
     end
   end