sentry-raven 0.4.1 → 0.4.2

data/lib/raven.rb

@@ -19,7 +19,7 @@ module Raven
   class << self
     # The client object is responsible for delivering formatted data to the Sentry server.
     # Must respond to #send. See Raven::Client.
-    attr_accessor :client
+    attr_writer :client
 
     # A Raven configuration object. Must act like a hash and return sensible
     # values for all Raven configuration options. See Raven::Configuration.
@@ -40,6 +40,11 @@ module Raven
       @configuration ||= Configuration.new
     end
 
+    # The client object is responsible for delivering formatted data to the Sentry server.
+    def client
+      @client ||= Client.new(configuration)
+    end
+
     # Call this method to modify defaults in your initializers.
     #
     # @example
@@ -47,7 +52,10 @@ module Raven
     #     config.server = 'http://...'
     #   end
     def configure(silent = false)
-      yield(configuration)
+      if block_given?
+        yield(configuration)
+      end
+
       self.client = Client.new(configuration)
       report_ready unless silent
       self.client
@@ -59,7 +67,7 @@ module Raven
     #   evt = Raven::Event.new(:message => "An error")
     #   Raven.send(evt)
     def send(evt)
-      @client.send(evt) if @client
+      client.send(evt)
     end
 
     # Capture and process any exceptions from the given block, or globally if
@@ -100,6 +108,24 @@ module Raven
       send(evt) if evt
     end
 
+    # Bind context for any future events
+    #
+    # @example
+    #   Raven.context({
+    #     :tags => {
+    #       'key' => 'value',
+    #     }
+    #   })
+    def context(hash = {})
+      Thread.current[:sentry_context] ||= {}
+      Thread.current[:sentry_context].merge!(hash)
+      self
+    end
+
+    def clear!
+      Thread.current[:sentry_context] = nil
+    end
+
     # For cross-language compat
     alias :captureException :capture_exception
     alias :captureMessage :capture_message

data/lib/raven/client.rb

@@ -1,4 +1,3 @@
-require 'openssl'
 require 'multi_json'
 require 'zlib'
 require 'base64'
@@ -11,7 +10,7 @@ module Raven
 
   class Client
 
-    PROTOCOL_VERSION = '2.0'
+    PROTOCOL_VERSION = '3.0'
     USER_AGENT = "raven-ruby/#{Raven::VERSION}"
     CONTENT_TYPE = 'application/json'
 
@@ -57,10 +56,6 @@ module Raven
         end
     end
 
-    def generate_signature(timestamp, data)
-      OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new('sha1'), self.configuration.secret_key, "#{timestamp} #{data}")
-    end
-
     def generate_auth_header(data)
       now = Time.now.to_i.to_s
       fields = {
@@ -68,7 +63,7 @@ module Raven
         'sentry_client' => USER_AGENT,
         'sentry_timestamp' => now,
         'sentry_key' => self.configuration.public_key,
-        'sentry_signature' => generate_signature(now, data)
+        'sentry_secret' => self.configuration.secret_key,
       }
       'Sentry ' + fields.map{|key, value| "#{key}=#{value}"}.join(', ')
     end

data/lib/raven/event.rb

@@ -23,42 +23,57 @@ module Raven
     PLATFORM = "ruby"
 
     attr_reader :id
-    attr_accessor :project, :message, :timestamp, :level
+    attr_accessor :project, :message, :timestamp, :level, :context
     attr_accessor :logger, :culprit, :server_name, :modules, :extra, :tags
 
     def initialize(options={}, &block)
       @configuration = options[:configuration] || Raven.configuration
       @interfaces = {}
 
+      @context = Thread.current[:sentry_context] || {}
+
       @id = options[:id] || UUIDTools::UUID.random_create.hexdigest
       @message = options[:message]
       @timestamp = options[:timestamp] || Time.now.utc
-      @level = options[:level] || :error
-      @logger = options[:logger] || 'root'
+
+      @level = options[:level]
+      @logger = options[:logger]
       @culprit = options[:culprit]
-      @extra = options[:extra]
-      @tags = options[:tags]
+
+      @extra = options[:extra] || {}
+      @tags = options[:tags] || {}
 
       # Try to resolve the hostname to an FQDN, but fall back to whatever the load name is
-      hostname = Socket.gethostname
-      hostname = Socket.gethostbyname(hostname).first rescue hostname
-      @server_name = options[:server_name] || hostname
+      @server_name = options[:server_name] || get_hostname
 
-      # Older versions of Rubygems don't support iterating over all specs
-      if @configuration.send_modules && Gem::Specification.respond_to?(:map)
-        options[:modules] ||= Hash[Gem::Specification.map {|spec| [spec.name, spec.version.to_s]}]
+      if @configuration.send_modules
+        options[:modules] ||= get_modules
       end
       @modules = options[:modules]
 
       block.call(self) if block
 
+      # Merge in context
+      @level ||= @context[:level] || :error
+      @logger ||= @context[:logger] || 'root'
+      @culprit ||= @context[:culprit]
+
+      @tags.merge!(@context[:tags]) if @context[:tags]
+      @extra.merge!(@context[:extra]) if @context[:extra]
+
       # Some type coercion
       @timestamp = @timestamp.strftime('%Y-%m-%dT%H:%M:%S') if @timestamp.is_a?(Time)
       @level = LOG_LEVELS[@level.to_s.downcase] if @level.is_a?(String) || @level.is_a?(Symbol)
+    end
 
-      # Basic sanity checking
-      raise Error.new('A message is required for all events') unless @message && !@message.empty?
-      raise Error.new('A timestamp is required for all events') unless @timestamp
+    def get_hostname
+      hostname = Socket.gethostname
+      hostname = Socket.gethostbyname(hostname).first rescue hostname
+    end
+
+    def get_modules
+      # Older versions of Rubygems don't support iterating over all specs
+      Hash[Gem::Specification.map {|spec| [spec.name, spec.version.to_s]}] if Gem::Specification.respond_to?(:map)
     end
 
     def interface(name, value=nil, &block)
@@ -126,7 +141,7 @@ module Raven
                 frame.in_app = line.in_app
                 if context_lines and frame.abs_path
                   frame.pre_context, frame.context_line, frame.post_context = \
-                    evt.get_context(frame.abs_path, frame.lineno, context_lines)
+                    evt.get_file_context(frame.abs_path, frame.lineno, context_lines)
                 end
               end
             }.select{ |f| f.filename }
@@ -160,7 +175,7 @@ module Raven
     def self._source_lines(path, from, to)
     end
 
-    def get_context(filename, lineno, context)
+    def get_file_context(filename, lineno, context)
       lines = (2 * context + 1).times.map do |i|
         Raven::LineCache::getline(filename, lineno - context + i)
       end
@@ -168,7 +183,7 @@ module Raven
     end
 
     def get_culprit(frames)
-      lastframe = frames[-1]
+      lastframe = frames.reverse.detect { |f| f.in_app } || frames.last
       "#{lastframe.filename} in #{lastframe.function}" if lastframe
     end
 

data/lib/raven/rack.rb

@@ -31,6 +31,8 @@ module Raven
         evt = Event.capture_rack_exception(e, env)
         Raven.send(evt)
         raise
+      ensure
+        Raven.context.clear!
       end
 
       error = env['rack.exception'] || env['sinatra.error']

data/lib/raven/version.rb

@@ -1,3 +1,3 @@
 module Raven
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sentry-raven
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
+date: 2013-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday