wildsight 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6851f06ff1db60ac0d56474afda00fd6b18e09d1
-  data.tar.gz: 3312120ae18f8fd3b5a4afe0914818b20086e8a5
+  metadata.gz: f4791f160bb8740c344c10ceb3d07444b222911e
+  data.tar.gz: f55122ba5015cc584c5421b1e973a107dfccc335
 SHA512:
-  metadata.gz: bb319c3e5a8f5cfe08e3e94e0ba276350e4662ce39569d898cbf235650c429ec66a6d1e244c20e641fb368015951c3bf937c5c6f49ca883f17c1089dc4e46b92
-  data.tar.gz: 58b6abffe9a936605b7880f892293819b20b42f71b56afe39fe68e00a50b1883fb9e928e454748eb0d77674f909ab7e126387354f17e4a8b1ea12a532072ba38
+  metadata.gz: 62b76b5ef370d73ff68f5b735b9dc290a8c17158023b1f71d02674e848a1fe908d5d171359bf21370b2b73afac06be073fdf95a7315a1a9e7a0405c6499ab611
+  data.tar.gz: f3a334daba22fe22d1900c52f68fad99500e33db8577b10e10a2779edf56110ec9a8bc958601bb7148836efcfbe879ffe510f16eabeca11731d60e143f8638cf

data/lib/wildsight/agent/agent.rb

@@ -52,6 +52,7 @@ module Wildsight
       end
 
       def submit(event)
+        event[:client] = 'ruby'
         @events << event
         if @events.size > @config['agent']['threshold']
           self.logger.log(:debug) { 'Uploading collected data' }

data/lib/wildsight/context/context.rb

@@ -1,9 +1,3 @@
-require 'wildsight/context/rack'
-require 'wildsight/context/rails'
-require 'wildsight/context/logger'
-require 'wildsight/context/exception'
-require 'wildsight/context/active_record'
-
 module Wildsight
   module Context
 
@@ -13,22 +7,18 @@ module Wildsight
 
     class Context
 
-      include Wildsight::Context::Logs
-      include Wildsight::Context::Exception
-      include Wildsight::Context::Rack
-      include Wildsight::Context::Rails
-      include Wildsight::Context::ActiveRecord
-
-      attr_reader :name
-
       def initialize(name, agent)
         @name = name
         @agent = agent
         @data = {}
       end
 
-      def submit
-        @agent.submit({ :context => { :id => @name }, :payload => @data })
+      def name
+        @name
+      end
+
+      def data
+        @data
       end
 
       def unregister
@@ -43,8 +33,12 @@ module Wildsight
         thread.thread_variable_set('wildsight.context', nil)
       end
 
-      def data
-        @data
+      def report(series, occurred = DateTime.now, payload = {})
+        if occurred.kind_of?(Hash)
+          payload = occurred
+          occurred = DateTime.now
+        end
+        @agent.submit({ series: series, context: @name, occurred: occurred, payload: payload })
       end
 
       def profiler

data/lib/wildsight/context/logger.rb

@@ -3,18 +3,6 @@ require 'logger'
 module Wildsight
   module Context
 
-    module Logs
-
-      def log_data
-        @data[:logs] = []
-      end
-
-      def log_report(log)
-        log_data << log
-      end
-
-    end
-
     class Logger < ::Logger
 
       def initialize(context = nil)
@@ -30,9 +18,8 @@ module Wildsight
             :facility => progname,
             :message => msg.to_s.strip
         }
-        context = @context
-        context = Wildsight::Context.detect unless context
-        context.log_report(payload)
+        context = @context || Wildsight::Context.detect
+        context.report(:logs, payload) if context
         return nil
       end
 

data/lib/wildsight/profiler/profiler.rb

@@ -4,30 +4,92 @@ module Wildsight
 
       def initialize(context)
         @context = context
-        @context.data[:profiler] ||= {}
+        @data = {}
+        @profile = nil
       end
 
       def duration(name, time = nil, options = {}, &block)
+        p = @profile = Profile.new(@profile)
+
         if block_given?
-          start = DateTime.now.to_f
-          result = block.call
-          stop = DateTime.now.to_f
-          item = { before: start, after: stop }
+          @profile.profile!(&block)
         else
-          result = nil
-          item = { before: time[0], after: time[1] }
+          @profile.set(time[0], time[1])
         end
-        item[:duration] = (item[:after] - item[:before]) * 1000
-        durations[name] ||= { intervals: [], duration: 0.0 }
-        durations[name][:intervals] << item
-        durations[name][:duration] += item[:duration]
-        return result
+
+        @profile = @profile.close
+
+        durations(name)[:intervals] << p.export
+        durations(name)[:duration] += p.duration
+
+        raise p.exception if p.exception
+        return p.result
       end
 
-      def durations
-        @context.data[:profiler][:durations] ||= {}
+      def data
+        @data
+      end
+
+      def durations(name)
+        @data[name] ||= { intervals: [], duration: 0.0 }
       end
 
     end
+
+    class Profile
+
+      def initialize(parent)
+        @parent = parent
+        @subtimes = []
+        @result = nil
+        @exception = nil
+      end
+
+      def set(before, after)
+        @before = before
+        @after = after
+      end
+
+      def profile!(&block)
+        @before = DateTime.now.to_f
+        begin
+          @result = block.call
+        rescue Exception => e
+          @exception = e
+        end
+        @after = DateTime.now.to_f
+      end
+
+      def close
+        @parent << duration if @parent
+        @parent
+      end
+
+      def result
+        @result
+      end
+
+      def exception
+        @exception
+      end
+
+      def <<(time)
+        @subtimes << time
+      end
+
+      def duration
+        return raw - @subtimes.inject(0.0) { |c,x| c + x }
+      end
+
+      def raw
+        (@after - @before) * 1000
+      end
+
+      def export
+        { before: @before, after: @after, duration: duration, raw: raw }
+      end
+
+    end
+
   end
 end

data/lib/wildsight/rack/bottom_middleware.rb

@@ -0,0 +1,28 @@
+module Wildsight
+  module Rack
+
+    class BottomMiddleware
+
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        context = Wildsight::Rack.detect_context(env)
+        response = context.profiler.duration(:routes) { @app.call(env) }
+        return response
+      rescue Exception => e
+        context.report(:exception, extract(e))
+        raise e
+      end
+
+      def extract(exception)
+        data = {:occurred => DateTime.now, :message => exception.message, :name => exception.class.name, :backtrace => exception.backtrace}
+        data[:cause] = extract_exception(exception.cause) if exception.cause
+        return data
+      end
+
+    end
+
+  end
+end

data/lib/wildsight/rack/rack.rb

@@ -0,0 +1,11 @@
+module Wildsight
+  module Rack
+
+    RACK_ENV_KEY = 'wildsight.context'
+
+    def self.detect_context(env)
+      env[Wildsight::Rack::RACK_ENV_KEY] || Wildsight::Context.detect
+    end
+
+  end
+end

data/lib/wildsight/rack/top_middleware.rb

@@ -0,0 +1,65 @@
+module Wildsight
+  module Rack
+
+    class TopMiddleware
+
+      METRICS = [:middleware, :routes]
+
+      REQUEST_INCLUDE_KEYS = ['SCRIPT_NAME', 'QUERY_STRING', 'PATH_INFO', 'REMOTE_ADDR']
+      REQUEST_EXCLUDE_KEYS = ['HTTP_COOKIE']
+      RESPONSE_EXCLUDE_KEYS = ['Set-Cookie']
+
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        context = Wildsight::Agent.default.context
+        context.bind_thread
+
+        context.data[:rack] ||= {
+            request_target: env['SCRIPT_NAME'].to_s + env['PATH_INFO'].to_s,
+            request_headers: {}
+        }
+
+        env.each_pair do |key,value|
+          name = key.to_s
+          context.data[:rack][:request_headers][key] = value if REQUEST_INCLUDE_KEYS.include?(name)
+          context.data[:rack][:request_headers][key] = value if name.start_with?('HTTP_')
+          context.data[:rack][:request_headers][key] = value if name.start_with?('REQUEST_')
+          context.data[:rack][:request_headers][key] = value if name.start_with?('SERVER_')
+        end
+
+        env[Wildsight::Rack::RACK_ENV_KEY] = context
+
+        response = context.profiler.duration(:middleware) { @app.call(env) }
+
+        if !context.data[:session_id] && !env['rack.session'].nil? && env['rack.session'].respond_to?(:id)
+          context.data[:session_id] ||= env['rack.session'].id
+        end
+
+        REQUEST_EXCLUDE_KEYS.each { |key| context.data[:rack][:request_headers].delete(key) }
+
+        if response
+          context.data[:rack][:response_code] ||= response[0]
+          context.data[:rack][:response_headers] ||= response[1].dup
+          RESPONSE_EXCLUDE_KEYS.each { |key| context.data[:rack][:response_headers].delete(key) }
+        end
+
+        context.data[:rack] = {
+            metrics: METRICS.inject({}) { |c, name| c[name] = context.profiler.data[name]; c }
+        }.merge(context.data[:rack])
+
+        context.report(:action_controller, context.data[:rack])
+
+        return response
+      ensure
+        env.delete(Wildsight::Rack::RACK_ENV_KEY)
+        context.release_thread
+        context.unregister
+      end
+
+    end
+
+  end
+end

data/lib/wildsight/rails/active_record.rb

@@ -1,7 +1,6 @@
 module Wildsight
   module Rails
     module ActiveRecord
-
     end
   end
 end

data/lib/wildsight/rails/railtie.rb

@@ -6,37 +6,6 @@ module Wildsight
 
       @instrumented = true
 
-      ::Rails::Engine.class_eval do
-
-        alias_method :call_without_ws, :call
-
-        def call(env)
-          context = Wildsight::Agent.default.context
-          context.bind_thread
-          context.rack_instrument_request(env)
-
-          response = context.profiler.duration(:middleware) { call_without_ws(env) }
-
-          return response
-        ensure
-          context.rack_report(env, response)
-          context.release_thread
-          context.unregister
-        end
-
-      end
-
-      ::ActionDispatch::Routing::RouteSet.class_eval do
-
-        alias_method :call_without_ws, :call
-
-        def call(env)
-          context = Wildsight::Context::Rack.detect_context(env)
-          result = context.profiler.duration(:routing) { call_without_ws(env) }
-          return result
-        end
-      end
-
       ::AbstractController::Base.class_eval do
 
         include Wildsight::Rails::ActionController
@@ -45,7 +14,7 @@ module Wildsight
         alias_method :process_action_without_ws, :process_action
 
         def process(*args)
-          context = Wildsight::Context::Rack.detect_context(self.respond_to?(:request) ? request.env : {})
+          context = Wildsight::Rack.detect_context(self.respond_to?(:request) ? request.env : {})
           if context
             result = context.profiler.duration(:rails) { process_without_ws(*args) }
           else
@@ -55,16 +24,31 @@ module Wildsight
         end
 
         def wildsight_context
-          @_wildsight_context ||= Wildsight::Context::Rack.detect_context(self.respond_to?(:request) ? request.env : {})
+          @_wildsight_context ||= Wildsight::Rack.detect_context(self.respond_to?(:request) ? request.env : {})
         end
 
         def process_action(*args)
-          context = Wildsight::Context::Rack.detect_context(self.respond_to?(:request) ? request.env : {})
-          context.rails_extract(self)
+          context = Wildsight::Rack.detect_context(self.respond_to?(:request) ? request.env : {})
+          return process_action_without_ws(*args) unless context
+
+          if respond_to?(:request)
+            context.data[:rack][:request_target] = self.class.name + '#' + request.params['action']
+
+            context.data[:rack][:method] = request.method
+            context.data[:rack][:path] = request.original_fullpath
+            context.data[:rack][:params] = request.filtered_parameters
+
+            context.data[:rack][:session_id] = request.session.id
+
+            context.data[:rack][:url] = request.original_url
+            context.data[:rack][:protocol] = request.protocol
+            context.data[:rack][:host] = request.host_with_port
+
+            context.data[:rack][:remote_ip] = request.remote_ip
+          end
           result = context.profiler.duration(:action) { process_action_without_ws(*args) }
           return result
         rescue Exception => e
-          request.env['rack.exception'] = e
           raise e
         end
 
@@ -75,8 +59,8 @@ module Wildsight
         alias_method :render_without_ws, :render
 
         def render(*args, &block)
-          context = Wildsight::Context::Rack.detect_context(self.respond_to?(:request) ? request.env : {})
-          result = context.profiler.duration(:render) { render_without_ws(*args, &block) }
+          context = Wildsight::Rack.detect_context(self.respond_to?(:request) ? request.env : {})
+          result = context.profiler.duration(:view) { render_without_ws(*args, &block) }
           return result
         end
 
@@ -86,6 +70,14 @@ module Wildsight
 
     class Railtie < ::Rails::Railtie
 
+      initializer('wildsight.rails.middleware.top') do |app|
+        app.middleware.unshift(Wildsight::Rack::TopMiddleware)
+      end
+
+      initializer('wildsight.rails.middleware.bottom') do |app|
+        app.middleware.use(Wildsight::Rack::BottomMiddleware)
+      end
+
       initializer('wildsight.rails.logger') do |app|
         ::Rails.logger.extend(ActiveSupport::Logger.broadcast(Wildsight::Context::Logger.new))
       end
@@ -99,7 +91,6 @@ module Wildsight
 
       initializer('wildsight.action_controller.metrics') do |app|
         ActiveSupport::Notifications.subscribe('process_action.action_controller') do |*args|
-
         end
       end
 
@@ -124,7 +115,7 @@ module Wildsight
                 :occurred => args[1],
                 :duration => (args[2] - args[1]) * 1000
             }
-            context.active_record_report(event)
+            context.report(:active_record, event)
           end
         end
 

data/lib/wildsight/transport/faraday.rb

@@ -7,6 +7,7 @@ module Wildsight
         @agent = agent
         @config = config
         @connection = Faraday.new(:url => @config['transport']['url']) do |faraday|
+          faraday.request(:multipart)
           faraday.request(:url_encoded)
           faraday.adapter(Faraday.default_adapter)
         end
@@ -15,8 +16,7 @@ module Wildsight
 
       def send(payload)
         begin
-          data = { payload: MultiJson.dump(payload), client: 'ruby' }
-          @agent.logger.log(:debug) { @connection.post(@uri, data).inspect }
+          @agent.logger.log(:debug) { @connection.post(@uri, payload: MultiJson.dump(payload)).inspect }
         rescue Exception => e
           @agent.logger.log(:error) { e }
         end

data/lib/wildsight/transport/net_http.rb

@@ -13,8 +13,7 @@ module Wildsight
 
       def send(payload)
         begin
-          data = { payload: MultiJson.dump(payload), client: 'ruby' }
-          @agent.logger.log(:debug) { Net::HTTP.post_form(@uri, data).inspect }
+          @agent.logger.log(:debug) { Net::HTTP.post_form(@uri, payload: MultiJson.dump(payload)).inspect }
         rescue Exception => e
           @agent.logger.log(:error) { e }
         end

data/lib/wildsight/version.rb

@@ -1,3 +1,3 @@
 module Wildsight
-  VERSION = '0.1.16'
+  VERSION = '0.1.17'
 end

data/lib/wildsight_custom.rb

@@ -4,11 +4,13 @@ require 'wildsight/transport/transport'
 require 'wildsight/metrics/metrics'
 require 'wildsight/profiler/profiler'
 require 'wildsight/context/context'
+require 'wildsight/context/logger'
 require 'wildsight/agent/agent'
 
 if defined?(Rack)
-  require 'wildsight/rack/middleware_context'
-  require 'wildsight/rack/middleware'
+  require 'wildsight/rack/rack'
+  require 'wildsight/rack/top_middleware'
+  require 'wildsight/rack/bottom_middleware'
 end
 
 if defined?(Rails)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wildsight
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Marek Jelen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-25 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -103,19 +103,16 @@ files:
 - lib/wildsight/agent/config.yml
 - lib/wildsight/agent/logger.rb
 - lib/wildsight/agent/tools.rb
-- lib/wildsight/context/active_record.rb
 - lib/wildsight/context/context.rb
-- lib/wildsight/context/exception.rb
 - lib/wildsight/context/logger.rb
-- lib/wildsight/context/rack.rb
-- lib/wildsight/context/rails.rb
 - lib/wildsight/metrics/counter.rb
 - lib/wildsight/metrics/gauge.rb
 - lib/wildsight/metrics/metrics.rb
 - lib/wildsight/metrics/statistics.rb
 - lib/wildsight/profiler/profiler.rb
-- lib/wildsight/rack/middleware.rb
-- lib/wildsight/rack/middleware_context.rb
+- lib/wildsight/rack/bottom_middleware.rb
+- lib/wildsight/rack/rack.rb
+- lib/wildsight/rack/top_middleware.rb
 - lib/wildsight/rails/action_controller.rb
 - lib/wildsight/rails/active_record.rb
 - lib/wildsight/rails/railtie.rb

data/lib/wildsight/context/active_record.rb

@@ -1,17 +0,0 @@
-module Wildsight
-  module Context
-
-    module ActiveRecord
-
-      def active_record_data
-        @data[:active_record] ||= []
-      end
-
-      def active_record_report(event)
-        active_record_data << event
-      end
-
-    end
-
-  end
-end

data/lib/wildsight/context/exception.rb

@@ -1,24 +0,0 @@
-module Wildsight
-  module Context
-
-    module Exception
-
-      def exception_data
-        @data[:exceptions] = []
-      end
-
-      def exception_report(exception)
-        exception_data << exception_extract(exception)
-      end
-
-
-      def exception_extract(exception)
-        data = {:occurred => DateTime.now, :message => exception.message, :name => exception.class.name, :backtrace => exception.backtrace}
-        data[:cause] = extract_exception(exception.cause) if exception.cause
-        return data
-      end
-
-    end
-
-  end
-end

data/lib/wildsight/context/rack.rb

@@ -1,64 +0,0 @@
-module Wildsight
-  module Context
-
-    module Rack
-
-      RACK_ENV_KEY = 'wildsight.context'
-
-      REQUEST_INCLUDE_KEYS = ['SCRIPT_NAME', 'QUERY_STRING', 'PATH_INFO', 'REMOTE_ADDR']
-      REQUEST_EXCLUDE_KEYS = ['HTTP_COOKIE']
-      RESPONSE_EXCLUDE_KEYS = ['Set-Cookie']
-
-      def self.detect_context(env)
-        env[RACK_ENV_KEY] || Wildsight::Context.detect
-      end
-
-      def rack_instrument_request(env)
-        env[RACK_ENV_KEY] = self
-      end
-
-      def rack_data
-        @data[:rack] ||= {}
-      end
-
-      def rack_report(env, response = nil)
-        env.delete(RACK_ENV_KEY)
-
-        rack_data[:request_target] ||= env['SCRIPT_NAME'].to_s + env['PATH_INFO'].to_s
-
-        env.each_pair do |key,value|
-          name = key.to_s
-          rack_data[:request_headers] ||= {}
-          rack_data[:request_headers][key] = value if REQUEST_INCLUDE_KEYS.include?(name)
-          rack_data[:request_headers][key] = value if name.start_with?('HTTP_')
-          rack_data[:request_headers][key] = value if name.start_with?('REQUEST_')
-          rack_data[:request_headers][key] = value if name.start_with?('SERVER_')
-        end
-
-        if !rack_data[:session_id] && !env['rack.session'].nil? && env['rack.session'].respond_to?(:id)
-          rack_data[:session_id] ||= env['rack.session'].id
-        end
-
-        REQUEST_EXCLUDE_KEYS.each { |key| rack_data[:request_headers].delete(key) }
-
-        if response
-          rack_data[:response_code] ||= response[0]
-          rack_data[:response_headers] ||= response[1].dup
-          RESPONSE_EXCLUDE_KEYS.each { |key| rack_data[:response_headers].delete(key) }
-        end
-
-        exception = env['rack.exception'] || env['action_dispatch.exception'] || env['sinatra.error']
-
-        if exception
-          exception_report(exception)
-        end
-
-        self.submit
-      rescue => e
-        @agent.logger.log(:error, e)
-      end
-
-    end
-
-  end
-end

data/lib/wildsight/context/rails.rb

@@ -1,33 +0,0 @@
-module Wildsight
-  module Context
-
-    module Rails
-
-      def rails_data
-        @data[:rails] ||= {}
-      end
-
-      def rails_extract(controller)
-        if respond_to?(:request)
-          request = controller.request
-
-          rack_data[:request_target] = controller.class.name + '#' + request.params['action']
-
-          rack_data[:method] = request.method
-          rack_data[:path] = request.original_fullpath
-          rack_data[:params] = request.filtered_parameters
-
-          rack_data[:session_id] = request.session.id
-
-          rack_data[:url] = request.original_url
-          rack_data[:protocol] = request.protocol
-          rack_data[:host] = request.host_with_port
-
-          rack_data[:remote_ip] = request.remote_ip
-        end
-      end
-
-    end
-
-  end
-end

data/lib/wildsight/rack/middleware.rb

@@ -1,17 +0,0 @@
-module Wildsight
-  module Rack
-
-    class Middleware
-
-      def initialize(app)
-        @app = app
-      end
-
-      def call(env)
-        MiddlewareContext.new(@app).call(env)
-      end
-
-    end
-
-  end
-end

data/lib/wildsight/rack/middleware_context.rb

@@ -1,26 +0,0 @@
-module Wildsight
-  module Rack
-
-    class MiddlewareContext
-
-      def initialize(app)
-        @app = app
-      end
-
-      def call(env)
-        @context = Wildsight::Agent.default.context
-        @context.bind_thread
-        @context.rack_instrument_request(env)
-        response = @app.call(env)
-      rescue Exception => exception
-        env['rack.exception'] = exception
-        raise exception
-      ensure
-        @context.rack_report(env, response)
-        @context.release_thread
-        @context.unregister
-      end
-
-    end
-  end
-end