wildsight 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65d837ab02bd66fe49d9441f6d168519ce65bac7
-  data.tar.gz: 4083aa040757c15a1d1f04a9badf31d5fa8b5d9d
+  metadata.gz: d0b043b6bdf567a187eaf195729978ab7b187fe1
+  data.tar.gz: 79421c3cba0177185caf0f8235512a7a93c0c162
 SHA512:
-  metadata.gz: 170a7e6d6c8d6cd7390491be6e2ec57be87aeed92a7565fce8d504c26d506afc32e988aaa4e5b953d9dbc7842858543e494501ad123100e65f47a1b003abb3cc
-  data.tar.gz: 11ccc7f2d32ff8f039fd1006349f1adc64e73ae564f38964d15b7e1a1b2af2dcc43dad45809fd3e4ce911f66d2afad44ee870c5d7e77b08e4955fbc1b6cbcf4a
+  metadata.gz: ffcaec0911490b358e86cd2a251fc71b25d7c9be9b2bc9f0ff9ea10aa34dea60e83b308721d374f4c27c892828ef16658e74be31ce305a866cda196ba3e4b5a8
+  data.tar.gz: 6d9e9cb8c1f5c19cc59912c35b156105a5fab5356ecb49ab8676276ccd689bf12da971fdb1e4552fe01a4785b0cd00b3ae61dbb55f37e5c7a2662e145c84e380

data/lib/wildsight/agent/agent.rb

@@ -1,4 +1,5 @@
 require 'securerandom'
+require 'pp'
 
 require 'wildsight/agent/tools'
 require 'wildsight/agent/config'
@@ -50,7 +51,7 @@ module Wildsight
         @contexts.delete(name)
       end
 
-      def event(event)
+      def submit(event)
         @events << event
         if @events.size > @config['agent']['threshold']
           self.logger.log(:debug) { 'Uploading collected data' }
@@ -60,7 +61,7 @@ module Wildsight
 
       def upload
         payload, @events = @events, []
-        @transport.send(payload)
+        @transport.send(payload) if payload != nil && payload.size > 0
       end
 
       private

data/lib/wildsight/context/active_record.rb

@@ -0,0 +1,17 @@
+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/context.rb

@@ -1,6 +1,8 @@
 require 'wildsight/context/rack'
+require 'wildsight/context/rails'
 require 'wildsight/context/logger'
-require 'wildsight/context/sql'
+require 'wildsight/context/exception'
+require 'wildsight/context/active_record'
 
 module Wildsight
   module Context
@@ -11,9 +13,11 @@ module Wildsight
 
     class Context
 
-      include Wildsight::Context::Rack
       include Wildsight::Context::Logs
-      include Wildsight::Context::Sql
+      include Wildsight::Context::Exception
+      include Wildsight::Context::Rack
+      include Wildsight::Context::Rails
+      include Wildsight::Context::ActiveRecord
 
       attr_reader :name
 
@@ -23,8 +27,8 @@ module Wildsight
         @data = {}
       end
 
-      def event(name, data)
-        @agent.event({ :context => { :id => @name }, name => data })
+      def submit
+        @agent.submit({ :context => { :id => @name }, :payload => @data })
       end
 
       def unregister
@@ -39,18 +43,16 @@ module Wildsight
         thread.thread_variable_set('wildsight.context', nil)
       end
 
-      def request
-        @data[:http_request] ||= {}
+      def data
+        @data
       end
 
-      def self.thread_context_id(thread=Thread.current)
-        thread.thread_variable_get('wildsight.context')
+      def profiler
+        @profiler ||= ::Wildsight::Profiler::Profiler.new(self)
       end
 
-      def extract_exception(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
+      def self.thread_context_id(thread=Thread.current)
+        thread.thread_variable_get('wildsight.context')
       end
 
     end

data/lib/wildsight/context/exception.rb

@@ -0,0 +1,24 @@
+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/logger.rb

@@ -5,8 +5,12 @@ module Wildsight
 
     module Logs
 
-      def report_log(log)
-        event(:log, log)
+      def log_data
+        @data[:logs] = []
+      end
+
+      def log_report(log)
+        log_data << log
       end
 
     end
@@ -28,7 +32,7 @@ module Wildsight
         }
         context = @context
         context = Wildsight::Context.detect unless context
-        context.report_log(payload)
+        context.log_report(payload)
         return nil
       end
 

data/lib/wildsight/context/rack.rb

@@ -1,5 +1,3 @@
-require 'pp'
-
 module Wildsight
   module Context
 
@@ -7,57 +5,55 @@ module Wildsight
 
       RACK_ENV_KEY = 'wildsight.context'
 
-      INCLUDE_KEYS = ['SCRIPT_NAME', 'QUERY_STRING', 'PATH_INFO', 'REMOTE_ADDR']
-      EXCLUDE_KEYS = ['HTTP_COOKIE']
+      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 report_rack_request(env)
-        @started = DateTime.now
+      def rack_instrument_request(env)
         env[RACK_ENV_KEY] = self
+      end
+
+      def rack_data
+        @data[:rack] ||= {}
+      end
 
-        self.request[:occurred] = DateTime.now
-        self.request[:request_headers] = {}
-        self.request[:metrics] ||= {}
+      def rack_report(env, response = nil)
+        env.delete(RACK_ENV_KEY)
 
-        self.request[:request_target] = env['SCRIPT_NAME'].to_s + env['PATH_INFO'].to_s
+        rack_data[:request_target] ||= env['SCRIPT_NAME'].to_s + env['PATH_INFO'].to_s
 
         env.each_pair do |key,value|
           name = key.to_s
-          self.request[:request_headers][key] = value if INCLUDE_KEYS.include?(name)
-          self.request[:request_headers][key] = value if name.start_with?('HTTP_')
-          self.request[:request_headers][key] = value if name.start_with?('REQUEST_')
-          self.request[:request_headers][key] = value if name.start_with?('SERVER_')
+          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
 
-        EXCLUDE_KEYS.each { |key| self.request[:request_headers].delete(key) }
-
-        if !self.request[:session_id] && !env['rack.session'].nil? && env['rack.session'].respond_to?(:id)
-          self.request[:session_id] = env['rack.session'].id
+        if !rack_data[:session_id] && !env['rack.session'].nil? && env['rack.session'].respond_to?(:id)
+          rack_data[:session_id] ||= env['rack.session'].id
         end
-      rescue => e
-        @agent.logger.log(:error, e)
-      end
 
-      def report_rack_response(env, response = nil)
-        @finished = DateTime.now
-        env.delete(RACK_ENV_KEY)
+        REQUEST_EXCLUDE_KEYS.each { |key| rack_data[:request_headers].delete(key) }
 
         if response
-          self.request[:response_code] = response[0]
-          self.request[:response_headers] = response[1]
+          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
 
-        self.request[:metrics][:request] = (@finished.to_f - @started.to_f) * 1000
-
         exception = env['rack.exception'] || env['action_dispatch.exception'] || env['sinatra.error']
 
         if exception
-          event(:exception, extract_exception(exception))
+          exception_report(exception)
         end
-        event(:http_request, self.request)
+
+        self.submit
       rescue => e
         @agent.logger.log(:error, e)
       end

data/lib/wildsight/context/rails.rb

@@ -0,0 +1,31 @@
+module Wildsight
+  module Context
+
+    module Rails
+
+      def rails_data
+        @data[:rails] ||= {}
+      end
+
+      def rails_extract(controller)
+        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

data/lib/wildsight/profiler/profiler.rb

@@ -0,0 +1,33 @@
+module Wildsight
+  module Profiler
+    class Profiler
+
+      def initialize(context)
+        @context = context
+        @context.data[:profiler] ||= {}
+      end
+
+      def duration(name, time = nil, options = {}, &block)
+        if block_given?
+          start = DateTime.now.to_f
+          result = block.call
+          stop = DateTime.now.to_f
+          item = { before: start, after: stop }
+        else
+          result = nil
+          item = { before: time[0], after: 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
+      end
+
+      def durations
+        @context.data[:profiler][:durations] ||= {}
+      end
+
+    end
+  end
+end

data/lib/wildsight/rack/middleware_context.rb

@@ -10,13 +10,13 @@ module Wildsight
       def call(env)
         @context = Wildsight::Agent.default.context
         @context.bind_thread
-        @context.report_rack_request(env)
+        @context.rack_instrument_request(env)
         response = @app.call(env)
       rescue Exception => exception
         env['rack.exception'] = exception
         raise exception
       ensure
-        @context.report_rack_response(env, response)
+        @context.rack_report(env, response)
         @context.release_thread
         @context.unregister
       end

data/lib/wildsight/rails/railtie.rb

@@ -2,50 +2,95 @@ module Wildsight
   module Rails
     class Railtie < ::Rails::Railtie
 
-      initializer('wildsight.middleware') do |app|
-        app.config.middleware.insert_before('ActionDispatch::Executor', Wildsight::Rack::Middleware)
-        app.config.middleware.insert_after('ActionDispatch::DebugExceptions', Wildsight::Rack::MiddlewareException)
-      end
-
       initializer('wildsight.rails.logger') do |app|
         ::Rails.logger.extend(ActiveSupport::Logger.broadcast(Wildsight::Context::Logger.new))
       end
 
       initializer('wildsight.action_controller.extensions') do |app|
         ActiveSupport.on_load(:action_controller) do
-          include Wildsight::Rails::ActionController
-        end
-      end
 
-      initializer('wildsight.action_controller.metrics') do |app|
-        ActiveSupport::Notifications.subscribe('process_action.action_controller') do |*args|
-          request = args[4][:request]
+          ::Rails::Engine.class_eval do
 
-          context = Wildsight::Context::Rack.detect_context(request.env)
+            alias_method :call_without_ws, :call
 
-          context.request[:request_target] = args[4][:controller_class] + '#' + request.params['action']
+            def call(env)
+              context = Wildsight::Agent.default.context
+              context.bind_thread
+              context.rack_instrument_request(env)
 
-          context.request[:metrics][:rails] = (args[2] - args[1]) * 1000
-          context.request[:metrics][:view] = args[4][:view_runtime] || 0
+              response = context.profiler.duration(:middleware) { call_without_ws(env) }
+
+              return response
+            ensure
+              context.rack_report(env, response)
+              context.release_thread
+              context.unregister
+            end
 
-          if context.request[:metrics][:database] == nil || context.request[:metrics][:database] == 0
-            context.request[:metrics][:database] = args[4][:db_runtime] || 0
           end
 
-          context.request[:method] = args[4][:method]
-          context.request[:path] = args[4][:path]
-          context.request[:params] = args[4][:params]
+          ::ActionDispatch::Routing::RouteSet.class_eval do
 
-          context.request[:response_code] = args[4][:status]
+            alias_method :call_without_ws, :call
 
-          context.request[:session_id] = request.session.id
-          context.request[:session] = request.session.to_hash
+            def call(env)
+              context = Wildsight::Context::Rack.detect_context(env)
+              result = context.profiler.duration(:routing) { call_without_ws(env) }
+              return result
+            end
+          end
 
-          context.request[:url] = request.original_url
-          context.request[:protocol] = request.protocol
-          context.request[:host] = request.host_with_port
+          ::AbstractController::Base.class_eval do
+
+            alias_method :process_without_ws, :process
+
+            def process(*args)
+              context = Wildsight::Context::Rack.detect_context(request.env)
+              result = context.profiler.duration(:rails) { process_without_ws(*args) }
+              return result
+            end
+
+          end
+
+          self.class_eval do
+
+            alias_method :process_action_without_ws, :process_action
+
+            def wildsight_context
+              @_wildsight_context ||= Wildsight::Context::Rack.detect_context(request.env)
+            end
+
+            def process_action(*args)
+              context = Wildsight::Context::Rack.detect_context(request.env)
+              context.rails_extract(self)
+              result = context.profiler.duration(:action) { process_action_without_ws(*args) }
+              return result
+            rescue Exception => e
+              request.env['rack.exception'] = e
+              raise e
+            end
+          end
+
+          include Wildsight::Rails::ActionController
+        end
+
+        ::AbstractController::Rendering.class_eval do
+
+          alias_method :render_without_ws, :render
+
+          def render(*args, &block)
+            context = Wildsight::Context::Rack.detect_context(request.env)
+            result = context.profiler.duration(:render) { render_without_ws(*args, &block) }
+            return result
+          end
+
+        end
+
+      end
+
+      initializer('wildsight.action_controller.metrics') do |app|
+        ActiveSupport::Notifications.subscribe('process_action.action_controller') do |*args|
 
-          context.request[:remote_ip] = request.remote_ip
         end
       end
 
@@ -57,20 +102,21 @@ module Wildsight
 
       initializer('wildsight.active_record.metrics') do |app|
         ActiveSupport::Notifications.subscribe('sql.active_record') do |*args|
-          event = {
-              :name => args[4][:name],
-              :statement => args[4][:statement_name],
-              :binds => args[4][:binds],
-              :query => args[4][:sql],
-              :connection => args[4][:connection_id],
-              :occurred => args[1],
-              :duration => (args[2] - args[1]) * 1000
-          }
           context = Wildsight::Context.detect
-          context.request[:metrics] ||= {}
-          context.request[:metrics][:database] ||= 0
-          context.request[:metrics][:database] += (args[2] - args[1]) * 1000
-          context.report_sql_query(event)
+          if context
+            context.profiler.duration(:database, [args[1].to_f, args[2].to_f])
+
+            event = {
+                :name => args[4][:name],
+                :statement => args[4][:statement_name],
+                :binds => args[4][:binds],
+                :query => args[4][:sql],
+                :connection => args[4][:connection_id],
+                :occurred => args[1],
+                :duration => (args[2] - args[1]) * 1000
+            }
+            context.active_record_report(event)
+          end
         end
 
       end

data/lib/wildsight/transport/faraday.rb

@@ -15,10 +15,8 @@ module Wildsight
 
       def send(payload)
         begin
-          if payload != nil && payload.size > 0
-            @agent.logger.log(:debug) { @connection.post(@uri, {'payload' => MultiJson.dump(payload)}).inspect }
-            @agent.logger.log(:debug) { 'Uploaded' }
-          end
+          data = { payload: MultiJson.dump(payload), client: 'ruby' }
+          @agent.logger.log(:debug) { @connection.post(@uri, data).inspect }
         rescue Exception => e
           @agent.logger.log(:error) { e }
         end

data/lib/wildsight/transport/net_http.rb

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

data/lib/wildsight/version.rb

@@ -1,3 +1,3 @@
 module Wildsight
-  VERSION = '0.1.11'
+  VERSION = '0.1.12'
 end

data/lib/wildsight_custom.rb

@@ -2,12 +2,12 @@ require 'wildsight/version'
 
 require 'wildsight/transport/transport'
 require 'wildsight/metrics/metrics'
+require 'wildsight/profiler/profiler'
 require 'wildsight/context/context'
 require 'wildsight/agent/agent'
 
 if defined?(Rack)
   require 'wildsight/rack/middleware_context'
-  require 'wildsight/rack/middleware_exception'
   require 'wildsight/rack/middleware'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wildsight
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Marek Jelen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-18 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -103,17 +103,19 @@ 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/sql.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/middleware_exception.rb
 - lib/wildsight/rails/action_controller.rb
 - lib/wildsight/rails/active_record.rb
 - lib/wildsight/rails/railtie.rb
@@ -143,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Multi language/framework/platform error and statistics monitor

data/lib/wildsight/context/sql.rb

@@ -1,13 +0,0 @@
-module Wildsight
-  module Context
-
-    module Sql
-
-      def report_sql_query(event)
-        event(:sql, event)
-      end
-
-    end
-
-  end
-end

data/lib/wildsight/rack/middleware_exception.rb

@@ -1,20 +0,0 @@
-module Wildsight
-  module Rack
-
-    class MiddlewareException
-
-      def initialize(app)
-        @app = app
-      end
-
-      def call(env)
-        @app.call(env)
-      rescue Exception => e
-        env['rack.exception'] ||= e
-        raise e
-      end
-
-    end
-
-  end
-end