vx-instrumentation 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb50fba2c5ce5b6781180d226e50c9492cd9dc29
-  data.tar.gz: bbb9c4616bff1b15b656c14b7196a852107c74c4
+  metadata.gz: 8e38ae361a2d539a48365d64eaeb9cc905934c7b
+  data.tar.gz: 8eb4ea7ba4eacceb47cda77958dc1e4f4f3919c8
 SHA512:
-  metadata.gz: 64f695cac110a4e115f9bcf2f35befe17a9f56248e776b1d93dd7c094e3df71dc3c1565dca4bacceca18a0bae9bbfd7384598dbbf5b1a948a48fe50d13ade9ae
-  data.tar.gz: 386871fe6f9d668edf0e2075f761424fa3bea67fada6c199b8f8393bdfb642a45a7c17dbdca936d7c96f2bd186b40a126c1fab1dc8ee7d50ad5440f70fb95596
+  metadata.gz: a836d117ec05ce5200a9093ee69ad74d0e16cd86ac8e9109f6a3f14636e81721566e961a74ace09274959340ee62cabe9acd33827943046a374c5b4fce53ac4e
+  data.tar.gz: 3649718e03c7c01187f0553634da00ebae0965df4c2db2658587ce3585e1bcebcf2eb0b018a9a06d53b94c953b8ce792eb737faa83ca92f3081950769b6afbf4

data/lib/vx/instrumentation/rack/handle_exceptions_middleware.rb

@@ -0,0 +1,53 @@
+module Vx
+  module Instrumentation
+    module Rack
+
+      HandleExceptionsMiddleware = Struct.new(:app) do
+
+        IGNORED_EXCEPTIONS = %w{
+          ActionController::RoutingError
+        }
+
+        def clean_env(env)
+          env = env.select{|k,v| k !~ /^(action_dispatch|puma|session|rack\.session|action_controller)/ }
+          env['HTTP_COOKIE'] &&= env['HTTP_COOKIE'].scan(/.{80}/).join("\n")
+          env
+        end
+
+        def notify(exception, env)
+          unless ignore?(exception)
+            Vx::Instrumentation.handle_exception(
+              'handle_exception.rack',
+              exception,
+              clean_env(env)
+            )
+          end
+        end
+
+        def call(env)
+          begin
+            response = app.call(env)
+          rescue Exception => ex
+            notify ex, env
+            raise ex
+          end
+
+          if ex = framework_exception(env)
+            notify ex, env
+          end
+
+          response
+        end
+
+        def framework_exception(env)
+          env['rack.exception'] || env['action_dispatch.exception']
+        end
+
+        def ignore?(ex)
+          IGNORED_EXCEPTIONS.include? ex.class.name
+        end
+
+      end
+    end
+  end
+end

data/lib/vx/instrumentation/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Instrumentation
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/vx/instrumentation.rb

@@ -2,13 +2,12 @@ require 'thread'
 
 require File.expand_path("../instrumentation/version",  __FILE__)
 require File.expand_path("../instrumentation/logger",   __FILE__)
-require File.expand_path("../instrumentation/airbrake", __FILE__)
 require File.expand_path("../instrumentation/stderr",   __FILE__)
+require File.expand_path("../instrumentation/rack/handle_exceptions_middleware", __FILE__)
 
 module Vx
   module Instrumentation
 
-    extend Airbrake
     extend Stderr
 
     DATE_FORMAT = '%Y-%m-%dT%H:%M:%S.%N%z'
@@ -54,9 +53,7 @@ module Vx
       }
 
       notify_stderr(ex)
-
       Vx::Instrumentation::Logger.logger.error(payload)
-      notify_airbrake(ex, env)
     end
 
     def delivery(name, payload, tags, started, finished)

data/spec/lib/rack/handle_exceptions_middleware_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe Vx::Instrumentation::Rack::HandleExceptionsMiddleware do
+  let(:env)        { {} }
+  let(:app)        { ->(e){ e.merge(foo: :bar) } }
+  let(:output)     { StringIO.new }
+  let(:middleware) { described_class.new(app) }
+  let(:result) {
+    output.rewind
+    c = output.read
+    if c.to_s != ""
+      JSON.parse c
+    end
+  }
+
+  before do
+    Vx::Instrumentation::Logger.setup output
+  end
+
+  it "should work when no exceptions raised" do
+    expect(middleware.call(env)).to eq(foo: :bar)
+    expect(result).to be_nil
+  end
+
+  it "should catch raised exception" do
+    app = ->(_) { raise RuntimeError, "Ignore Me" }
+    mid = described_class.new(app)
+    expect{ mid.call(env) }.to raise_error(RuntimeError, 'Ignore Me')
+
+    expect(result["@tags"]).to eq ["handle_exception", "rack", "exception"]
+    expect(result["@event"]).to eq 'handle_exception.rack'
+    expect(result['exception']).to eq 'RuntimeError'
+    expect(result['message']).to eq 'Ignore Me'
+    expect(result['backtrace']).to_not be_empty
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-instrumentation
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -81,12 +81,13 @@ files:
 - README.md
 - Rakefile
 - lib/vx/instrumentation.rb
-- lib/vx/instrumentation/airbrake.rb
 - lib/vx/instrumentation/logger.rb
+- lib/vx/instrumentation/rack/handle_exceptions_middleware.rb
 - lib/vx/instrumentation/stderr.rb
 - lib/vx/instrumentation/version.rb
 - spec/lib/instrumentation_spec.rb
 - spec/lib/logger_spec.rb
+- spec/lib/rack/handle_exceptions_middleware_spec.rb
 - spec/spec_helper.rb
 - vx-instrumentation.gemspec
 homepage: ''
@@ -109,12 +110,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: summary
 test_files:
 - spec/lib/instrumentation_spec.rb
 - spec/lib/logger_spec.rb
+- spec/lib/rack/handle_exceptions_middleware_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/lib/vx/instrumentation/airbrake.rb

@@ -1,24 +0,0 @@
-require 'airbrake'
-
-Airbrake.configure do |config|
-  if ENV['AIRBRAKE_API_KEY']
-    $stdout.puts ' --> initializing Airbrake'
-
-    config.api_key = ENV['AIRBRAKE_API_KEY']
-    config.host    = ENV['AIRBRAKE_HOST']
-    config.port    = ENV['AIRBRAKE_PORT'] || 80
-    config.secure  = config.port == 443
-  end
-end
-
-module Vx
-  module Instrumentation
-    module Airbrake
-
-      def notify_airbrake(ex, env)
-        ::Airbrake.notify ex, env
-      end
-
-    end
-  end
-end