copperegg-apm 1.0.0.pre10 → 1.0.0.pre11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb34a133475c1607e01bf772b6a90ebd39ca7af2
-  data.tar.gz: 686545748d0be3430df149329e23a19765c7a816
+  metadata.gz: 0e3868f8c2d86ea09b507987e52a6c29eac450bf
+  data.tar.gz: bf9a9ab59c8476e7714967f29119ff8a4516fbe6
 SHA512:
-  metadata.gz: ce7c65610e6d29cb2e678ed10109d493c3bde1a98aed47d385cc2b52177a08911f7acfdc7a78aa30026e8dc592824284936463cf683ced416542ca453657aaff
-  data.tar.gz: 333dc247db68184c21beef81afa6d059e904627ae015e0b497146fb90205c447ea997b738da1c3a988a69bbb39d0b9f7cbdad1e7591d7de1b84b5ef4014e2881
+  metadata.gz: 9964cf7f797aec7b2bf30ad20edcbe6e38babcce34d058a087c67b9bbacc20dc39598ae5f71dd7337d59659f5f9ebcb0cd39312a364e82da1d9c5b46215f9232
+  data.tar.gz: 216c2890bc3ea494d43979a9d4eacade6914d65c33274e236d11627fafb709c6d2d1ba47cce0ed34e64b9867c8d88ecf245fc1a48833dd5d2e89595cd2a5ea62

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    copperegg-apm (1.0.0.pre10)
+    copperegg-apm (1.0.0.pre11)
 
 GEM
   remote: https://rubygems.org/

data/lib/copperegg/apm.rb

@@ -1,5 +1,8 @@
+# encoding: utf-8
+
 at_exit do
   begin
+    CopperEgg::APM.capture_exception($!) if !$!.nil? && CopperEgg::APM::Configuration.benchmark_exceptions?
     CopperEgg::APM.send_payload_cache
   rescue
   end
@@ -10,8 +13,8 @@ end
   active_record/connection_adapters/abstract_adapter
   configuration
   errors
+  exception_capturer
   ethon/easy/operations
-  kernel
   mysql
   mysql2/client 
   net/http

data/lib/copperegg/apm/benchmark.rb

@@ -197,15 +197,8 @@ module CopperEgg
       caller[1] =~ /`([^']*)'/ and $1
     end
 
-    def capture_exception(*args)
-      exception = if args.size == 0
-        $!.nil? ? RuntimeError.new : $!        
-      elsif args.size == 1
-        args.first.is_a?(String) ? RuntimeError.exception(args.first) : args.first.exception
-      elsif args.size <= 3
-        args.first.exception(args[1])
-      end
-      stacktrace = trim_stacktrace(caller)
+    def capture_exception(exception)
+      stacktrace = trim_stacktrace(exception.backtrace)
       return if stacktrace.length == 0
       parameters = {:error => "#{exception.class}|#{stacktrace.first}", :stacktrace => "#{exception.message}\n#{stacktrace.join("\n")}", :ts => Time.now.to_i}
       send_payload(parameters)

data/lib/copperegg/apm/configuration.rb

@@ -195,6 +195,10 @@ module CopperEgg
           if @@benchmark_browser && defined?(::Rails) && ::Rails.respond_to?(:configuration) && ::Rails.configuration.respond_to?(:middleware) && ::Rails.configuration.middleware.respond_to?(:use)
             ::Rails.configuration.middleware.use CopperEgg::APM::RUMBlender
           end
+
+          if @@benchmark_exceptions && defined?(::Rails) && ::Rails.respond_to?(:configuration) && ::Rails.configuration.respond_to?(:middleware) && ::Rails.configuration.middleware.respond_to?(:use)
+            ::Rails.configuration.middleware.use CopperEgg::APM::ExceptionCapturer
+          end
         end
       end
 

data/lib/copperegg/apm/exception_capturer.rb

@@ -0,0 +1,21 @@
+require 'rack'
+
+module CopperEgg
+  module APM
+    class ExceptionCapturer
+
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        begin
+          @app.call(env)
+        rescue Exception => e
+          CopperEgg::APM.capture_exception(e)
+          raise e
+        end
+      end
+    end
+  end
+end

data/lib/copperegg/apm/version.rb

@@ -1,5 +1,5 @@
 module CopperEgg
   module APM
-    GEM_VERSION = '1.0.0.pre10' unless defined? GEM_VERSION
+    GEM_VERSION = '1.0.0.pre11' unless defined? GEM_VERSION
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: copperegg-apm
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre10
+  version: 1.0.0.pre11
 platform: ruby
 authors:
 - Mike Bradford
@@ -197,11 +197,10 @@ files:
 - ./lib/copperegg/apm/active_record/connection_adapters/abstract_adapter.rb
 - ./lib/copperegg/apm/benchmark.rb
 - ./lib/copperegg/apm/benchmark_methods_table.rb
-- ./lib/copperegg/apm/benchmark_middleware.rb
 - ./lib/copperegg/apm/configuration.rb
 - ./lib/copperegg/apm/errors.rb
 - ./lib/copperegg/apm/ethon/easy/operations.rb
-- ./lib/copperegg/apm/kernel.rb
+- ./lib/copperegg/apm/exception_capturer.rb
 - ./lib/copperegg/apm/mysql.rb
 - ./lib/copperegg/apm/mysql2/client.rb
 - ./lib/copperegg/apm/net/http.rb
@@ -223,7 +222,6 @@ files:
 - ./README.md
 - ./screenshot01.png
 - ./screenshot02.png
-- ./spec/action_controller_spec.rb
 - ./spec/apm_spec.rb
 - ./spec/ethon_spec.rb
 - ./spec/helpers/mysql2_setup.rb
@@ -231,7 +229,6 @@ files:
 - ./spec/helpers/pg_setup.rb
 - ./spec/helpers/rails.rb
 - ./spec/helpers/sqlite3_setup.rb
-- ./spec/kernel_spec.rb
 - ./spec/mysql2_spec.rb
 - ./spec/mysql_spec.rb
 - ./spec/net_http_spec.rb
@@ -244,7 +241,6 @@ files:
 - README.md
 - Rakefile
 - copperegg-apm.gemspec
-- spec/action_controller_spec.rb
 - spec/apm_spec.rb
 - spec/ethon_spec.rb
 - spec/helpers/mysql2_setup.rb
@@ -252,7 +248,6 @@ files:
 - spec/helpers/pg_setup.rb
 - spec/helpers/rails.rb
 - spec/helpers/sqlite3_setup.rb
-- spec/kernel_spec.rb
 - spec/mysql2_spec.rb
 - spec/mysql_spec.rb
 - spec/net_http_spec.rb
@@ -293,9 +288,8 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: copperegg-apm-1.0.0.pre10
+summary: copperegg-apm-1.0.0.pre11
 test_files:
-- spec/action_controller_spec.rb
 - spec/apm_spec.rb
 - spec/ethon_spec.rb
 - spec/helpers/mysql2_setup.rb
@@ -303,7 +297,6 @@ test_files:
 - spec/helpers/pg_setup.rb
 - spec/helpers/rails.rb
 - spec/helpers/sqlite3_setup.rb
-- spec/kernel_spec.rb
 - spec/mysql2_spec.rb
 - spec/mysql_spec.rb
 - spec/net_http_spec.rb

data/lib/copperegg/apm/benchmark_middleware.rb

@@ -1,20 +0,0 @@
-module CopperEgg
-  module APM
-    class BenchmarkMiddleware
-      def initialize(app)
-        @app = app
-      end
-      
-      def call(env)
-        CopperEgg::APM.benchmark(:url => env['REQUEST_URI'].gsub(/\/\/[^:]+:[^@]@/,"//").gsub(/\?.*/,"")) do
-          @status, @headers, @response = @app.call(env)
-        end
-        [@status, @headers, self]
-      end
-      
-      def each(&block)
-        @response.each(&block)
-      end
-    end
-  end
-end

data/lib/copperegg/apm/kernel.rb

@@ -1,19 +0,0 @@
-module CopperEgg
-  module APM
-    module Kernel
-      def raise(*args)
-        CopperEgg::APM.capture_exception(*args) if CopperEgg::APM::Configuration.benchmark_exceptions?
-        super
-      end
-
-      def fail(*args)
-        CopperEgg::APM.capture_exception(*args) if CopperEgg::APM::Configuration.benchmark_exceptions?
-        super
-      end
-    end
-  end
-end
-
-Object.class_eval do
-  include CopperEgg::APM::Kernel
-end

data/spec/action_controller_spec.rb

@@ -1,37 +0,0 @@
-# Props to @relishapp (http://www.relishapp.com/rspec/rspec-rails/docs/controller-specs/anonymous-controller) and 
-# @AlexandrZaytsev (http://say26.com/rspec-testing-controllers-outside-of-a-rails-application) for their helpful blog posts
-require File.dirname(__FILE__) + '/helpers/rails'
-require 'spec_helper'
-
-RSpec.configure do |c|
-  c.infer_base_class_for_anonymous_controllers = true
-end
-
-class ApplicationController < ActionController::Base
-  include Rails.application.routes.url_helpers
-end
-
-class ExceptionController < ApplicationController; end
-
-describe ExceptionController, :type => :controller do
-  controller(ExceptionController) do
-    def index
-      @count = 1/0
-    end
-  end
-
-  it "should instrument all exceptions not rescued" do
-    expect { get :index, {:id => 1, :sort => "name"} }.to raise_error
-
-    last_payload = CopperEgg::APM.send(:class_variable_get, :@@payload_cache).split("\x00").select {|i| i.size > 2}.map {|i| i.sub(/^[^\{]+/,'')}.last
-    hash = JSON.parse last_payload
-
-    expect(hash.keys.sort).to eq ["excp", "id"]
-    expect(hash["id"]).to match(/\A[0-1a-z]{16}\z/i)
-    expect(hash["excp"].keys.sort).to eq ["error", "stacktrace", "ts"]
-    expect(hash["excp"]["error"]).to match(/\AZeroDivisionError\|/)
-    expect(hash["excp"]["error"]).to match(/\{Ruby\}\Z/)
-    expect(hash["excp"]["stacktrace"]).to match(/\Adivided by 0\n/)
-    expect(hash["excp"]["ts"]).to be_an_instance_of(Fixnum)
-  end
-end

data/spec/kernel_spec.rb

@@ -1,37 +0,0 @@
-require 'spec_helper'
-
-describe Kernel do
-  describe "#raise" do
-    it "should instrument any exception" do
-      expect { raise "the roof" }.to raise_error(RuntimeError)
-      print "."
-
-      last_payload = CopperEgg::APM.send(:class_variable_get, :@@payload_cache).split("\x00").select {|i| i.size > 2}.map {|i| i.sub(/^[^\{]+/,'')}.last
-      hash = JSON.parse last_payload
-      
-      expect(hash.keys.sort).to eq ["excp", "id"]
-      expect(hash["id"]).to match(/\A[0-1a-z]{16}\z/i)
-      expect(hash["excp"].keys.sort).to eq ["error", "stacktrace", "ts"]
-      expect(hash["excp"]["error"]).to match(/RuntimeError\|/)
-      expect(hash["excp"]["stacktrace"]).to match(/\Athe roof\n/)
-      expect(hash["excp"]["ts"]).to be_an_instance_of(Fixnum)
-    end
-  end
-
-  describe "#fail" do
-    it "should instrument any exception" do      
-      expect { fail "epically" }.to raise_error(RuntimeError)
-      print "."
-
-      last_payload = CopperEgg::APM.send(:class_variable_get, :@@payload_cache).split("\x00").select {|i| i.size > 2}.map {|i| i.sub(/^[^\{]+/,'')}.last
-      hash = JSON.parse last_payload
-      
-      expect(hash.keys.sort).to eq ["excp", "id"]
-      expect(hash["id"]).to match(/\A[0-1a-z]{16}\z/i)
-      expect(hash["excp"].keys.sort).to eq ["error", "stacktrace", "ts"]
-      expect(hash["excp"]["error"]).to match(/RuntimeError\|/)
-      expect(hash["excp"]["stacktrace"]).to match(/\Aepically\n/)
-      expect(hash["excp"]["ts"]).to be_an_instance_of(Fixnum)
-    end
-  end
-end