copperegg-apm 1.0.0.pre12 → 1.0.0.pre13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4313fab8e77ab385dea7347df5a08b45afac975
-  data.tar.gz: 6a609b051cf3944274e61b6c9952bf88f8c7b8fe
+  metadata.gz: 23f4abd270317192f5473810d909a6ede98b8436
+  data.tar.gz: 2953b01b20c5a20ab52658cbb9b75c8935a853b9
 SHA512:
-  metadata.gz: 94840a8bfcc2ea8f9ce4fc4136f215874a91581401b2a079735a5fdf8678ff082488a09d22fc4fefbf2627ac5cbf6f4c4f1611c0fc52e46f6827ae3676691d7b
-  data.tar.gz: 8541bada34ccf547940bb757423f02659c60f3f1ec62d61bb7017eee973eab870219494c73a9b475cd0ace8978eed2b1ef2ec14a23e6d5481bb6f53425c9edf8
+  metadata.gz: a81b29b7c4c5b9d8128e31b83c3486a31c73dabfd884f1c2340a4f783abd2f01abc59a6e5e926e2ff98b458b7f0ad44ce2a4863a14b9836d81a4c883852e4109
+  data.tar.gz: a3e9ccd26ecd5d9d78f3e7daa81a6d5927fba18d859d460efede0fb4ec5052841513c4302fc09e96c57238a92d76ded6586b5789c9f31cf2242e4fd97563ed2e

data/Gemfile.lock

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

data/README.md

@@ -177,7 +177,17 @@ Outbound HTTP requests performed within your project will be benchmarked from an
 
 ## Exception Aggregation
 
-When exception benchmarking is enabled, any exception raised in your project will be aggregated by class, source location, and system.
+When exception benchmarking is enabled, any un-rescued exception in your project will be aggregated by class, source location, and system. This is performed using a middleware for Rack-based applications and an `at_exit` block for capturing exceptions that result in process termination.
+
+```ruby
+config.benchmark_exceptions = true
+```
+
+For Rails projects, this will automatically add `CopperEgg::APM::ExceptionCapturer` to the middleware stack. For other Rack-based projects, add it to the middleware stack directly:
+
+```ruby
+use CopperEgg::APM::ExceptionCapturer
+```
 
 ## Real User Monitoring
 
@@ -228,7 +238,7 @@ require 'sinatra'
 require 'copperegg_apm_config'
 
 use Rack::Lint
-use CopperEgg::APM::RUM
+use CopperEgg::APM::RUMBlender
 
 get '/hello' do
   'Hello World'

data/lib/copperegg/apm/configuration.rb

@@ -12,7 +12,7 @@ module CopperEgg
       @@app_root                  = ""
       @@instrument_key            = nil
       @@rum_short_url             = false
-      @@rum_beacon_url            = "http://bacon.copperegg.com/bacon.gif"
+      @@rum_beacon_url            = "//bacon.copperegg.com/bacon.gif"
       @@gem_root                  = File.dirname(File.dirname(__FILE__))
       @@log_to                    = nil
       @@benchmark_sql             = true

data/lib/copperegg/apm/exception_capturer.rb

@@ -9,7 +9,7 @@ module CopperEgg
       end
 
       def call(env)
-          @app.call(env)
+          return @app.call(env)
       rescue Exception => e
         CopperEgg::APM.capture_exception(e)
         raise e

data/lib/copperegg/apm/version.rb

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

data/spec/action_controller_spec.rb

@@ -1,8 +1,17 @@
-# 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'
 require 'rack/test'
+require 'benchmark'
+
+$without_middleware = "Controller without middleware: "
+$with_middleware    = "Controller with middleware:    "
+
+at_exit do
+  puts "\nMiddleware benchmarks:\n"
+  puts $without_middleware
+  puts $with_middleware
+  puts ""
+end
 
 RSpec.configure do |c|
   c.infer_base_class_for_anonymous_controllers = true
@@ -10,30 +19,57 @@ end
 
 class ApplicationController < ActionController::Base
   include Rails.application.routes.url_helpers
+end
+
+class ControllerWithoutMiddleware < ApplicationController; end
+
+class ControllerWithMiddleware < ApplicationController; end
+
+class ControllerWithException < ApplicationController; end
+
+describe ControllerWithMiddleware, :type => :controller do
   include Rack::Test::Methods
+
+  let(:action) { lambda { |env| [200, {'Content-Type' => 'text/plain'}, "Hello world"] } }
+  let(:app) { CopperEgg::APM::ExceptionCapturer.new(action) }
+
+  it "should process request" do
+    $with_middleware << Benchmark.realtime do
+                          1000.times { get "/" }
+                        end.to_s
+  end
 end
 
-class ExceptionController < ApplicationController; end
+describe ControllerWithoutMiddleware, :type => :controller do
+  include Rack::Test::Methods
+
+  let(:app) { lambda { |env| [200, {'Content-Type' => 'text/plain'}, "Hello world"] } }
 
-describe ExceptionController, :type => :controller do
-  controller(ExceptionController) do
-    def index
-      @count = 1/0
-    end
+  it "should process request" do
+    $without_middleware <<  Benchmark.realtime do
+                              1000.times { get "/" }
+                            end.to_s
   end
+end
+
+describe ControllerWithException, :type => :controller do
+  include Rack::Test::Methods
+
+  let(:action) { lambda { |env| 1/0 } }
+  let(:app) { CopperEgg::APM::ExceptionCapturer.new(action) }
 
   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)
+    expect { get "/" }.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: copperegg-apm
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre12
+  version: 1.0.0.pre13
 platform: ruby
 authors:
 - Mike Bradford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -304,7 +304,7 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: copperegg-apm-1.0.0.pre12
+summary: copperegg-apm-1.0.0.pre13
 test_files:
 - spec/action_controller_spec.rb
 - spec/apm_spec.rb