vx-instrumentation 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74d012da189d53d55245a7fcaef14a2dd9cd18e4
-  data.tar.gz: 72a0ec322657b049bf8912dfb9f3e76f702255c0
+  metadata.gz: 40c7266e5a8ccd0a4ebfa9ac92855c007a866e60
+  data.tar.gz: cc745d13d1d3290c3fcdb88b0a85be2f5c6662f7
 SHA512:
-  metadata.gz: 5f0e1287ed8c56d6c7de3334d445e63ada90a236883d32736d7bce445c8c283ccda2f36fdd646693c31cdb497a37881d73f6d3ca7afd2b6b10d6bf3f12342be1
-  data.tar.gz: e0d7caa444457b13af30082489c8637bcc0f503d13c34785796a6db08c3f8c1ab89a252b5e7d8dc167040614675af55965bd4e5410f74670ef5b8865a044adba
+  metadata.gz: a039d63e7b290a1cde70cc63b47ddb46c4d6833926786d331893b1e0b752cafb2f2466c68ff16aa30f035e8b57a624026db0af55b53d6c5cb02ba7a46abdbbc0
+  data.tar.gz: 32720993fd5304a49b0387e35474886d2f513367d873d7b2eeb299dfd26d9123157f40564d0e6860bd7fbd6d1aa41412241cf0f8e9f9f957ded51aea72d62ab4

data/lib/vx/instrumentation/airbrake.rb

@@ -0,0 +1,24 @@
+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

data/lib/vx/instrumentation/logger.rb

@@ -17,8 +17,8 @@ module Vx
           begin
             @device.send(sym, *args, &block)
           rescue Exception => e
-            $stderr.puts "#{e.class.to_s} in #{e.message.inspect} [#{sym.inspect} #{args.inspect}]"
-            $stderr.puts e.backtrace.map{|b| "    #{b}" }.join("\n")
+            $stderr.puts "#{e.class.to_s}, #{e.message.inspect} [#{sym.inspect} #{args.inspect}]"
+            $stderr.puts e.backtrace.map{|b| "\t#{b}" }.join("\n")
           end
         else
           super
@@ -35,7 +35,6 @@ module Vx
         def setup(target)
           log = ::Logger.new(target)
           log.formatter = Formatter
-          $stdout.puts " --> #{self.to_s} to #{target}"
           @logger = new(log)
         end
       end

data/lib/vx/instrumentation/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Instrumentation
-    VERSION = "0.0.8"
+    VERSION = "0.1.0"
   end
 end

data/lib/vx/instrumentation.rb

@@ -1,31 +1,23 @@
 require 'thread'
 
-require File.expand_path("../instrumentation/version",           __FILE__)
-require File.expand_path("../instrumentation/logger",            __FILE__)
-require File.expand_path("../instrumentation/subscriber",        __FILE__)
-
-require File.expand_path("../instrumentation/faraday",           __FILE__)
-require File.expand_path("../instrumentation/active_record",     __FILE__)
-require File.expand_path("../instrumentation/action_dispatch",   __FILE__)
-require File.expand_path("../instrumentation/rails",             __FILE__)
-require File.expand_path("../instrumentation/amqp_consumer",     __FILE__)
-require File.expand_path("../instrumentation/worker",            __FILE__)
+require File.expand_path("../instrumentation/version",  __FILE__)
+require File.expand_path("../instrumentation/logger",   __FILE__)
+require File.expand_path("../instrumentation/airbrake", __FILE__)
 
 module Vx
   module Instrumentation
 
+    extend Airbrake
+
     DATE_FORMAT = '%Y-%m-%dT%H:%M:%S.%N%z'
     THREAD_KEY  = 'vx_instrumentation_keys'
 
     extend self
 
     def install(target, log_level = 0)
+      $stdout.puts " --> initializing Vx::Instrumentation, log stored in #{target}"
       Instrumentation::Logger.setup target
       Instrumentation::Logger.logger.level = log_level
-      ObjectSpace.each_object(Class) do |c|
-        next unless c.superclass == Instrumentation::Subscriber
-        c.install
-      end
     end
 
     def with(new_keys)
@@ -59,6 +51,7 @@ module Vx
         backtrace:   (ex.backtrace || []).map(&:to_s).join("\n"),
       }
       Vx::Instrumentation::Logger.logger.error(payload)
+      notify_airbrake(ex, env)
     end
 
     def delivery(name, payload, tags, started, finished)
@@ -73,7 +66,6 @@ module Vx
         "@tags"       => tags
       )
     end
-
   end
 
 end

data/vx-instrumentation.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency 'activesupport', '~> 4.0'
+  spec.add_runtime_dependency 'airbrake'
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-instrumentation
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: airbrake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -67,15 +81,9 @@ files:
 - README.md
 - Rakefile
 - lib/vx/instrumentation.rb
-- lib/vx/instrumentation/action_dispatch.rb
-- lib/vx/instrumentation/active_record.rb
-- lib/vx/instrumentation/amqp_consumer.rb
-- lib/vx/instrumentation/faraday.rb
+- lib/vx/instrumentation/airbrake.rb
 - lib/vx/instrumentation/logger.rb
-- lib/vx/instrumentation/rails.rb
-- lib/vx/instrumentation/subscriber.rb
 - lib/vx/instrumentation/version.rb
-- lib/vx/instrumentation/worker.rb
 - spec/lib/instrumentation_spec.rb
 - spec/lib/logger_spec.rb
 - spec/spec_helper.rb

data/lib/vx/instrumentation/action_dispatch.rb

@@ -1,23 +0,0 @@
-require 'pp'
-
-module Vx
-  module Instrumentation
-    class ActionDispatch < Subscriber
-
-      event(/\.action_dispatch$/)
-
-      def process
-        req = payload.delete(:request)
-        self.payload = {
-          path:           req.fullpath,
-          ip:             req.remote_ip,
-          method:         req.method,
-          referer:        req.referer,
-          content_length: req.content_length,
-          user_agent:     req.user_agent
-        }
-      end
-
-    end
-  end
-end

data/lib/vx/instrumentation/active_record.rb

@@ -1,33 +0,0 @@
-module Vx
-  module Instrumentation
-    class ActiveRecord < Subscriber
-
-      event(/\.active_record$/)
-
-      def process
-        self.payload = {
-          sql:      payload[:sql].gsub("\n", ' ').gsub(/ +/, ' ').strip,
-          binds:    render_binds,
-          name:     payload[:name],
-          duration: payload[:duration]
-        }
-      end
-
-      private
-
-        def render_binds
-          (payload[:binds] || []).map do |column, value|
-            if column
-              if column.binary?
-                value = "<#{value.bytesize} bytes of binary data>"
-              end
-              [column.name, value]
-            else
-              [nil, value]
-            end
-          end.inspect
-        end
-
-    end
-  end
-end

data/lib/vx/instrumentation/amqp_consumer.rb

@@ -1,9 +0,0 @@
-module Vx
-  module Instrumentation
-    class AmqpConsumer < Subscriber
-
-      event(/\.consumer\.amqp$/)
-
-    end
-  end
-end

data/lib/vx/instrumentation/faraday.rb

@@ -1,31 +0,0 @@
-module Vx
-  module Instrumentation
-    class Faraday < Subscriber
-
-      event 'request.faraday'
-
-      def process
-        self.name    = 'request.http'
-        self.payload = {
-          method:           payload[:method],
-          url:              payload[:url].to_s,
-          status:           payload[:status],
-          response_headers: render_http_header(payload[:response_headers]),
-          request_headers:  render_http_header(payload[:request_headers])
-        }
-      end
-
-      private
-
-        def render_http_header(headers)
-          headers.map do |key,value|
-            if %{ PRIVATE-TOKEN Authorization }.include?(key)
-              value = value.gsub(/./, "*")
-            end
-            "#{key}: #{value}"
-          end.join("\n")
-        end
-
-    end
-  end
-end

data/lib/vx/instrumentation/rails.rb

@@ -1,9 +0,0 @@
-module Vx
-  module Instrumentation
-    class Rails < Subscriber
-
-      event(/\.(action_controller|action_view|action_mailer|active_support|railties)$/)
-
-    end
-  end
-end

data/lib/vx/instrumentation/subscriber.rb

@@ -1,33 +0,0 @@
-require 'logger'
-require 'active_support/notifications'
-
-module Vx
-  module Instrumentation
-    Subscriber = Struct.new(:name, :payload, :tags) do
-
-      def process ; end
-
-      class << self
-
-        def install
-          ev = event || /.*/
-          $stdout.puts " --> add instrumentation #{self.to_s} to #{ev.inspect}"
-          ActiveSupport::Notifications.subscribe(ev) do |name, started, finished, uid, payload|
-            if name[0] != '!'
-              tags = name.split(".")
-              inst = new(name, payload, tags).tap(&:process)
-              Instrumentation.delivery(inst.name, inst.payload, inst.tags.uniq, started, finished)
-            end
-          end
-        end
-
-        def event(name = nil)
-          @event = name if  name
-          @event
-        end
-
-      end
-
-    end
-  end
-end

data/lib/vx/instrumentation/worker.rb

@@ -1,9 +0,0 @@
-module Vx
-  module Instrumentation
-    class Worker < Subscriber
-
-      event(/\.(worker|container)$/)
-
-    end
-  end
-end