errplane 0.5.30 → 0.6.0

data/lib/errplane.rb

@@ -3,15 +3,16 @@ require "net/https"
 require "rubygems"
 require "socket"
 require "thread"
+require "base64"
 
 require "json" unless Hash.respond_to?(:to_json)
 
 require "errplane/version"
 require "errplane/logger"
-require "errplane/black_box"
+require "errplane/exception_presenter"
 require "errplane/max_queue"
 require "errplane/configuration"
-require "errplane/transmitter"
+require "errplane/api"
 require "errplane/backtrace"
 require "errplane/worker"
 require "errplane/rack"
@@ -23,11 +24,11 @@ module Errplane
     include Logger
 
     attr_writer :configuration
-    attr_accessor :transmitter
+    attr_accessor :api
 
     def configure(silent = false)
       yield(configuration)
-      self.transmitter = Transmitter.new(configuration)
+      self.api = Api.new
     end
 
     def configuration
@@ -38,28 +39,37 @@ module Errplane
       @queue ||= MaxQueue.new(configuration.queue_maximum_depth)
     end
 
-    def report(name, params = {})
+    def report(name, params = {}, async = true)
       unless configuration.ignored_reports.find{ |msg| /#{msg}/ =~ name  }
-        Errplane.queue.push({
+        data = {
           :name => name.gsub(/\s+/, "_"),
-          :source => "custom",
-          :timestamp => current_timestamp
-        }.merge(params))
+          :timestamp => "now"
+        }.merge(params)
+
+        if async
+          Errplane.queue.push(data)
+        else
+          Errplane.api.post(Errplane.process_line(data))
+        end
       end
     end
 
+    def report_deployment(context = nil, async = false)
+      report("deployments", {:context => context}, async)
+    end
+
     def heartbeat(name, interval)
       log :debug, "Starting heartbeat '#{name}' on a #{interval} second interval."
       Thread.new do
         while true do
           log :debug, "Sleeping '#{name}' for #{interval} seconds."
           sleep(interval)
-          report(name)
+          report(name, :timestamp => "now")
         end
       end
     end
 
-    def time(name = nil, params = {})
+    def time(name, params = {})
       value = if block_given?
         start_time = Time.now
         yield
@@ -68,35 +78,22 @@ module Errplane
         params[:value] || 0
       end
 
-      report("timed_blocks/#{(name || Socket.gethostname)}", :value => value)
+      report(name, :value => value)
     end
 
     def transmit_unless_ignorable(e, env)
-      begin
-        black_box = assemble_black_box_for(e, env)
-        log :info, "Transmitter: #{transmitter.inspect}"
-        log :info, "Black Box: #{black_box.to_json}"
-        log :info, "Ignorable Exception? #{ignorable_exception?(e)}"
-        log :info, "Environment: #{ENV.to_hash}"
-
-        transmitter.enqueue(black_box) unless ignorable_exception?(e)
-      rescue => e
-        log :info, "[Errplane] Something went terribly wrong. Exception failed to take off! #{e.class}: #{e.message}"
-      end
+      transmit(e, env) unless ignorable_exception?(e)
     end
 
     def transmit(e, env = {})
       begin
-        black_box = if e.is_a?(String)
-                      assemble_black_box_for(Exception.new(e), env)
-                    else
-                      assemble_black_box_for(e, env)
-                    end
-
-        log :info, "Transmitter: #{transmitter.inspect}"
-        log :info, "Black Box: #{black_box.to_json}"
-        log :info, "Environment: #{ENV.to_hash}"
-        transmitter.enqueue(black_box)
+        exception_presenter = ExceptionPresenter.new(e, env)
+        log :info, "Exception: #{exception_presenter.to_json[0..512]}..."
+
+        Errplane.queue.push({
+          :name => exception_presenter.time_series_name,
+          :context => exception_presenter
+        })
       rescue => e
         log :info, "[Errplane] Something went terribly wrong. Exception failed to take off! #{e.class}: #{e.message}"
       end
@@ -106,8 +103,16 @@ module Errplane
       Time.now.utc.to_i
     end
 
+    def process_line(line)
+      data = "#{line[:name]} #{line[:value] || 1} #{line[:timestamp] || "now"}"
+      data = "#{data} #{Base64.strict_encode64(line[:context].to_json)}" if line[:context]
+      data
+    end
+
     def ignorable_exception?(e)
-      configuration.ignore_current_environment? || !!configuration.ignored_exception_messages.find{ |msg| /.*#{msg}.*/ =~ e.message  } || configuration.ignored_exceptions.include?(e.class.to_s)
+      configuration.ignore_current_environment? ||
+      !!configuration.ignored_exception_messages.find{ |msg| /.*#{msg}.*/ =~ e.message  } ||
+      configuration.ignored_exceptions.include?(e.class.to_s)
     end
 
     def rescue(&block)
@@ -116,28 +121,16 @@ module Errplane
       if configuration.ignore_current_environment?
         raise(e)
       else
-        transmit_unless_ignorable(e, {})
+        transmit_unless_ignorable(e, {}) unless ignorable_exception?(e)
       end
     end
 
     def rescue_and_reraise(&block)
       block.call
     rescue StandardError => e
-      transmit_unless_ignorable(e, {})
+      transmit_unless_ignorable(e, {}) unless ignorable_exception?(e)
       raise(e)
     end
-
-    private
-
-    def assemble_black_box_for(e, opts = {})
-      opts ||= {}
-      log :info, "OPTS: #{opts}"
-      e = e.continued_exception if e.respond_to?(:continued_exception)
-      e = e.original_exception if e.respond_to?(:original_exception)
-      opts = opts.merge(:exception => e)
-      opts[:environment_variables] = ENV.to_hash
-      black_box = BlackBox.new(opts)
-    end
   end
 end
 

data/lib/errplane/api.rb

@@ -0,0 +1,65 @@
+module Errplane
+  class Api
+    include Errplane::Logger
+
+    attr_reader :last_response
+
+    POST_RETRIES = 5
+    READ_TIMEOUT = 3
+    OPEN_TIMEOUT = 3
+
+    HTTP_ERRORS = [ EOFError,
+                    Errno::ECONNREFUSED,
+                    Errno::ECONNRESET,
+                    Errno::EINVAL,
+                    Net::HTTPBadResponse,
+                    Net::HTTPHeaderSyntaxError,
+                    Net::ProtocolError,
+                    Timeout::Error ].freeze
+
+    def post(data)
+      https = initialize_secure_connection
+      retry_count = POST_RETRIES
+      log :debug, "POSTing to #{url}"
+
+      response = begin
+                   https.post(url, data)
+                 rescue *HTTP_ERRORS => e
+                   log :error, "HTTP error contacting API! #{e.class}: #{e.message}"
+                   retry_count -= 1
+                   unless retry_count.zero?
+                     log :info, "Retrying failed POST..."
+                     sleep 1
+                     retry
+                   end
+                   log :info, "Unable to POST after #{POST_RETRIES} attempts. Aborting!"
+                 end
+
+      if response.is_a?(Net::HTTPSuccess)
+        log :info, "POST Succeeded: #{response.inspect}"
+      else
+        log :error, "POST Failed: #{response.inspect}"
+      end
+
+      @last_response = response
+    end
+
+    private
+    def url
+      "/databases/" \
+      + Errplane.configuration.application_id \
+      + Errplane.configuration.environment \
+      + "/points?api_key=" \
+      + Errplane.configuration.api_key
+    end
+
+    def initialize_secure_connection
+      connection = Net::HTTP.new("apiv2.errplane.com", 443)
+      connection.use_ssl = true
+      connection.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      connection.read_timeout = READ_TIMEOUT
+      connection.open_timeout = OPEN_TIMEOUT
+      connection
+    end
+  end
+end

data/lib/errplane/capistrano.rb

@@ -16,9 +16,9 @@ Capistrano::Configuration.instance(:must_exist).load do
       load File.join(Dir.pwd, "config/initializers/errplane.rb")
 
       Errplane.configuration.logger = Logger.new("/dev/null")
-      Errplane.configuration.rails_environment = framework_env
+      Errplane.configuration.environment = framework_env
 
-      deploy_options = {
+      context = {
         :environment => framework_env,
         :revision => current_revision,
         :repository => repository,
@@ -30,8 +30,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         :scm_user_email => deploying_user_email
       }
 
-      Errplane::Transmitter.new.relay(deploy_options, true)
-      puts 'Done.'
+      Errplane.report_deployment(context)
     end
   end
 end

data/lib/errplane/configuration.rb

@@ -9,7 +9,7 @@ module Errplane
     attr_accessor :application_root
 
     attr_accessor :logger
-    attr_accessor :rails_environment
+    attr_accessor :environment
     attr_accessor :framework
     attr_accessor :framework_version
     attr_accessor :language
@@ -101,7 +101,7 @@ module Errplane
     end
 
     def ignore_current_environment?
-      self.ignored_environments.include?(self.rails_environment)
+      self.ignored_environments.include?(self.environment)
     end
 
     def define_custom_exception_data(&block)

data/lib/errplane/{black_box.rb → exception_presenter.rb}

@@ -1,7 +1,12 @@
+require "base64"
+require "socket"
+
 module Errplane
-  class BlackBox
+  class ExceptionPresenter
     attr_accessor :hash
+
     attr_reader :exception
+    attr_reader :backtrace
     attr_reader :params
     attr_reader :session_data
     attr_reader :controller
@@ -10,8 +15,12 @@ module Errplane
     attr_reader :user_agent
     attr_reader :custom_data
 
-    def initialize(params = {})
-      @exception = params[:exception]
+    def initialize(e, params = {})
+      e = e.continued_exception if e.respond_to?(:continued_exception)
+      e = e.original_exception if e.respond_to?(:original_exception)
+
+      @exception = e.is_a?(String) ? Exception.new(e) : e
+      @backtrace = Errplane::Backtrace.new(@exception.backtrace).to_a || []
       @params = params[:params]
       @session_data = params[:session_data]
       @controller = params[:controller]
@@ -19,7 +28,7 @@ module Errplane
       @request_url = params[:request_url]
       @user_agent = params[:user_agent]
       @custom_data = params[:custom_data] || {}
-      @environment_variables = params[:environment_variables] || {}
+      @environment_variables = ENV.to_hash || {}
     end
 
     def to_json
@@ -30,11 +39,12 @@ module Errplane
         :framework => Errplane.configuration.framework,
         :framework_version => Errplane.configuration.framework_version,
         :message => @exception.message,
-        :backtrace => Errplane::Backtrace.new(@exception.backtrace).to_a || [],
+        :backtrace => @backtrace,
         :exception_class => @exception.class.to_s,
         :language => "Ruby",
         :language_version => "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}",
         :reporter => reporter,
+        :hostname => Socket.gethostname,
         :custom_data => @custom_data
       }
 
@@ -45,19 +55,33 @@ module Errplane
       Errplane.configuration.add_custom_exception_data(self)
 
       payload[:request_data] = request_data if @controller || @action || !@params.blank?
-      payload[:hash] = hash if hash
-      if Errplane.configuration.aggregated_exception_classes.include?(@exception.class.to_s)
-        payload[:hash] = Digest::SHA1.hexdigest(@exception.class.to_s)
+      payload[:hash] = calculate_hash
+      payload.to_json
+    end
+
+    def calculate_hash
+      if hash
+        hash
+      elsif Errplane.configuration.aggregated_exception_classes.include?(@exception.class.to_s)
+        Digest::SHA1.hexdigest(@exception.class.to_s)
+      else
+        Digest::SHA1.hexdigest(@exception.class.to_s + @backtrace.first.to_s)
       end
+    end
 
-      payload.to_json
+    def time_series_name
+      "exceptions/" + calculate_hash
+    end
+
+    def context
+      Base64.strict_encode64(to_json)
     end
 
     def reporter
       {
         :name => "Errplane",
         :version => Errplane::VERSION,
-        :url => "https://github.com/errplane/gem"
+        :url => "https://github.com/errplane/errplane-ruby"
       }
     end
 

data/lib/errplane/rails.rb

@@ -18,7 +18,7 @@ module Errplane
       Errplane.configure(true) do |config|
         config.logger                ||= ::Rails.logger
         config.debug                   = true
-        config.rails_environment     ||= ::Rails.env
+        config.environment           ||= ::Rails.env
         config.application_root      ||= ::Rails.root
         config.application_name      ||= "Application"
         config.framework               = "Rails"

data/lib/errplane/railtie.rb

@@ -63,16 +63,16 @@ module Errplane
 
           10.times do
             sleep 1
-            break unless Errplane.transmitter.last_response.nil?
+            break unless Errplane.api.last_response.nil?
           end
 
           if response.try(:first) == 500
-            if Errplane.transmitter.last_response.nil?
+            if Errplane.api.last_response.nil?
               puts "Uh oh. Your app threw an exception, but we didn't get a response. Check your network connection and try again."
-            elsif Errplane.transmitter.last_response.code == "201"
+            elsif Errplane.api.last_response.code == "201"
               puts "Done. Check your email or http://errplane.com for the exception notice."
             else
-              puts "That didn't work. The Errplane API said: #{Errplane.transmitter.last_response.body}"
+              puts "That didn't work. The Errplane API said: #{Errplane.api.last_response.body}"
             end
           else
             puts "Request failed: #{response}"
@@ -82,12 +82,12 @@ module Errplane
             response = ::Rails.application.call(env)
 
             if response.try(:first) == 500
-              if Errplane.transmitter.last_response.nil?
+              if Errplane.api.last_response.nil?
                 puts "Uh oh. Your app threw an exception, but we didn't get a response. Check your network connection and try again."
-              elsif Errplane.transmitter.last_response.code == "201"
+              elsif Errplane.api.last_response.code == "201"
                 puts "Done. Check your email or http://errplane.com for the exception notice."
               else
-                puts "That didn't work. The Errplane API said: #{Errplane.transmitter.last_response.body}"
+                puts "That didn't work. The Errplane API said: #{Errplane.api.last_response.body}"
               end
             else
               puts "Request failed: #{response}"
@@ -105,7 +105,7 @@ module Errplane
     config.after_initialize do
       Errplane.configure(true) do |config|
         config.logger                ||= ::Rails.logger
-        config.rails_environment     ||= ::Rails.env
+        config.environment           ||= ::Rails.env
         config.application_root      ||= ::Rails.root
         config.application_name      ||= ::Rails.application.class.parent_name
         config.framework               = "Rails"
@@ -130,13 +130,30 @@ module Errplane
       if defined?(ActiveSupport::Notifications)
         ActiveSupport::Notifications.subscribe "process_action.action_controller" do |name, start, finish, id, payload|
           if Errplane.configuration.instrumentation_enabled?
-            h = { :name => name,
-                  :start => start,
-                  :finish => finish,
-                  :nid => id,
-                  :payload => payload,
-                  :source => "active_support"}
-            Errplane.queue.push(h)
+            timestamp = finish.utc.to_i
+            controller_runtime = ((finish - start)*1000).ceil
+            view_runtime = (payload[:view_runtime] || 0).ceil
+            db_runtime = (payload[:db_runtime] || 0).ceil
+            controller_name = payload[:controller]
+            action_name = payload[:action]
+
+            Errplane.queue.push({
+              :name => "controllers/#{controller_name}##{action_name}",
+              :value => controller_runtime,
+              :timestamp => timestamp
+            })
+
+            Errplane.queue.push({
+              :name => "views/#{controller_name}##{action_name}",
+              :value => view_runtime,
+              :timestamp => timestamp
+            })
+
+            Errplane.queue.push({
+              :name => "db/#{controller_name}##{action_name}",
+              :value => db_runtime,
+              :timestamp => timestamp
+            })
           end
         end
       end

data/lib/errplane/sinatra.rb

@@ -4,7 +4,7 @@ Errplane.configure(true) do |config|
   config.framework_version      = ::Sinatra::VERSION
 
   if defined?(settings)
-    config.rails_environment  ||= settings.environment
+    config.environment        ||= settings.environment
     config.application_root   ||= settings.root
   end
 end

data/lib/errplane/version.rb

@@ -1,3 +1,3 @@
 module Errplane
-  VERSION = "0.5.30"
+  VERSION = "0.6.0"
 end

data/lib/errplane/worker.rb

@@ -6,13 +6,13 @@ require "base64"
 module Errplane
   class Worker
     MAX_POST_LINES = 200
-    POST_RETRIES = 5
+    MAX_TIME_SERIES_NAME_LENGTH = 255
 
     class << self
       include Errplane::Logger
 
       def indent_lines(lines, num)
-        lines.split("\n").map {|line| (" " * num) + line}.join("\n")
+        lines.split("\n").map {|line| (" " * num) + line[0..64]}.join("\n")
       end
 
       def post_data(data)
@@ -20,33 +20,12 @@ module Errplane
           log :debug, "Current environment is ignored, skipping POST."
           return false
         else
-          log :debug, "Posting data:\n#{indent_lines(data, 13)}"
-          url = "/databases/#{Errplane.configuration.application_id}#{Errplane.configuration.rails_environment}/points?api_key=#{Errplane.configuration.api_key}"
-          log :debug, "Posting to: #{url}"
-
-          retry_count = POST_RETRIES
+          log :debug, "POSTing data:\n#{indent_lines(data, 13)}"
           begin
-            # http = Net::HTTP.new(Errplane.configuration.api_host, Errplane.configuration.api_host_port)
-            http = Net::HTTP.new(Errplane.configuration.api_host, 443)
-            http.use_ssl = true
-            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-            http.open_timeout = 3
-            http.read_timeout = 3
-
-            response = http.post(url, data)
-            log :debug, "Response code: #{response.code}"
-            log :debug, "Response: #{response.inspect}"
+            Errplane.api.post(data)
           rescue => e
-            retry_count -= 1
-            unless retry_count.zero?
-              log :info, "POST failed, retrying."
-              sleep 1
-              retry
-            end
-            log :info, "Unable to POST after retrying, aborting!"
-            return false
+            log :error, "Error calling API: #{e.inspect}"
           end
-          return true
         end
       end
 
@@ -88,29 +67,10 @@ module Errplane
           log :debug, "Found data in the queue! (#{n[:name]})"
 
           begin
-            case n[:source]
-            when "active_support"
-              case n[:name].to_s
-              when "process_action.action_controller"
-                timestamp = n[:finish].utc.to_i
-                controller_runtime = ((n[:finish] - n[:start])*1000).ceil
-                view_runtime = (n[:payload][:view_runtime] || 0).ceil
-                db_runtime = (n[:payload][:db_runtime] || 0).ceil
-
-                data << "controllers/#{n[:payload][:controller]}##{n[:payload][:action]} #{controller_runtime} #{timestamp}"
-                data << "views #{view_runtime} #{timestamp}"
-                data << "db #{db_runtime} #{timestamp}"
-              end
-            when "exception"
-              Errplane.transmitter.deliver n[:data], n[:url]
-            when "custom"
-              if n[:name].length > 255
-                log :error, "Time series name too long! Discarding data for: #{n[:name]}"
-              else
-                line = "#{n[:name]} #{n[:value] || 1} #{n[:timestamp]}"
-                line = "#{line} #{Base64.encode64(n[:message]).strip}" if n[:message]
-                data << line
-              end
+            if n[:name].split("|").any?{|x| x.length > MAX_TIME_SERIES_NAME_LENGTH}
+              log :error, "Time series name too long! Discarding data for: #{n[:name]}"
+            else
+              data << Errplane.process_line(n)
             end
           rescue => e
             log :info, "Instrumentation Error! #{e.inspect}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: errplane
 version: !ruby/object:Gem::Version
-  version: 0.5.30
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-18 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70334629503980 !ruby/object:Gem::Requirement
+  requirement: &70316697813820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70334629503980
+  version_requirements: *70316697813820
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70334629536720 !ruby/object:Gem::Requirement
+  requirement: &70316697809360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70334629536720
+  version_requirements: *70316697809360
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70334629536200 !ruby/object:Gem::Requirement
+  requirement: &70316697824100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70334629536200
+  version_requirements: *70316697824100
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70334629535720 !ruby/object:Gem::Requirement
+  requirement: &70316697823360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70334629535720
+  version_requirements: *70316697823360
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70334629535240 !ruby/object:Gem::Requirement
+  requirement: &70316697822620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334629535240
+  version_requirements: *70316697822620
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70334629534760 !ruby/object:Gem::Requirement
+  requirement: &70316697821800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334629534760
+  version_requirements: *70316697821800
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70334629534280 !ruby/object:Gem::Requirement
+  requirement: &70316697821120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334629534280
+  version_requirements: *70316697821120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70334629533800 !ruby/object:Gem::Requirement
+  requirement: &70316697820380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334629533800
+  version_requirements: *70316697820380
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70334629533320 !ruby/object:Gem::Requirement
+  requirement: &70316697819800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334629533320
+  version_requirements: *70316697819800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70334629532840 !ruby/object:Gem::Requirement
+  requirement: &70316697819200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334629532840
+  version_requirements: *70316697819200
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70334629532360 !ruby/object:Gem::Requirement
+  requirement: &70316697817820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334629532360
+  version_requirements: *70316697817820
 description: This gem provides implements instrumentation with Errplane for Rails
   2.3.x and 3.x applications.
 email:
@@ -141,7 +141,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - config.ru
-- errplane-0.5.29.gem
 - errplane.gemspec
 - Gemfile
 - Gemfile.lock
@@ -156,10 +155,11 @@ files:
 - gemfiles/versioned/Gemfile.rails-2.3.2
 - generators/errplane/errplane_generator.rb
 - generators/errplane/templates/initializer.rb
+- lib/errplane/api.rb
 - lib/errplane/backtrace.rb
-- lib/errplane/black_box.rb
 - lib/errplane/capistrano.rb
 - lib/errplane/configuration.rb
+- lib/errplane/exception_presenter.rb
 - lib/errplane/logger.rb
 - lib/errplane/max_queue.rb
 - lib/errplane/rack.rb
@@ -172,7 +172,6 @@ files:
 - lib/errplane/railtie.rb
 - lib/errplane/resque.rb
 - lib/errplane/sinatra.rb
-- lib/errplane/transmitter.rb
 - lib/errplane/version.rb
 - lib/errplane/worker.rb
 - lib/errplane.rb
@@ -204,7 +203,6 @@ files:
 - spec/unit/configuration_spec.rb
 - spec/unit/errplane_spec.rb
 - spec/unit/max_queue_spec.rb
-- spec/unit/transmitter_spec.rb
 - spec/unit/worker_spec.rb
 homepage: http://errplane.com
 licenses:
@@ -255,5 +253,4 @@ test_files:
 - spec/unit/configuration_spec.rb
 - spec/unit/errplane_spec.rb
 - spec/unit/max_queue_spec.rb
-- spec/unit/transmitter_spec.rb
 - spec/unit/worker_spec.rb

data/lib/errplane/transmitter.rb

@@ -1,76 +0,0 @@
-module Errplane
-  class Transmitter
-    include Errplane::Logger
-
-    attr_reader :last_response
-
-    HTTP_ERRORS = [ EOFError,
-                    Errno::ECONNREFUSED,
-                    Errno::ECONNRESET,
-                    Errno::EINVAL,
-                    Net::HTTPBadResponse,
-                    Net::HTTPHeaderSyntaxError,
-                    Net::ProtocolError,
-                    Timeout::Error ].freeze
-
-    def initialize(params = {})
-      @last_response = nil
-    end
-
-    def enqueue(black_box)
-      log :info, "Adding exception to the queue."
-      url = "/api/v1/applications/#{Errplane.configuration.application_id}/exceptions/#{Errplane.configuration.rails_environment}?api_key=#{Errplane.configuration.api_key}"
-      exception = { :data => black_box.to_json,
-                    :url => url,
-                    :source => "exception" }
-
-      Errplane.queue.push(exception)
-    end
-
-    def deliver(data, url)
-      http = initialize_http_connection
-      response = begin
-                   log :info, "URL: #{url}"
-                   log :info, "Data: #{data.inspect}"
-                   http.post(url, data)
-                 rescue *HTTP_ERRORS => e
-                   log :error, "HTTP error contacting Errplane API! #{e.class}: #{e.message}"
-                 end
-
-      @last_response = response
-      if response.is_a?(Net::HTTPSuccess)
-        log :info, "Exception POST Succeeded: #{response.inspect}"
-      else
-        log :error, "Exception POST Failed: #{response.inspect}"
-      end
-    end
-
-    def relay(black_box, deployment = false)
-      http = initialize_http_connection
-      data = black_box.to_json
-      response = begin
-                   url = "/api/v1/applications/#{Errplane.configuration.application_id}/exceptions/#{Errplane.configuration.rails_environment}#{"/deploy" if deployment}?api_key=#{Errplane.configuration.api_key}"
-                   log :info, "URL: #{url}"
-                   log :info, "Data: #{data.inspect}"
-                   http.post(url, data)
-                 rescue *HTTP_ERRORS => e
-                   log :error, "HTTP error contacting Errplane API! #{e.class}: #{e.message}"
-                 end
-
-      @last_response = response
-      if response.is_a?(Net::HTTPSuccess)
-        log :info, "Request Succeeded: #{response.inspect}"
-      else
-        log :error, "Request Failed: #{response.inspect}"
-      end
-    end
-
-    private
-    def initialize_http_connection
-      connection = Net::HTTP.new("api.errplane.com", 443)
-      connection.use_ssl = true
-      connection.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      connection
-    end
-  end
-end

data/spec/unit/transmitter_spec.rb

@@ -1,4 +0,0 @@
-require 'spec_helper'
-
-describe Errplane::Transmitter do
-end