wildsight 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfddf497428900da038c5e4ed0c432c6755947d5
-  data.tar.gz: be828b1ce2c4250e0e18984131baa28cb40cc9d5
+  metadata.gz: f9f718b43a5208321225ed5cfcb015b19a66fd79
+  data.tar.gz: ec33cba5ffc3a921e27a17d535bb9d5b5c3ebaeb
 SHA512:
-  metadata.gz: 1574c438926f0b68e1982a91f23435172c42436f7c775d0c83e77da4bf85bf160900f5785b6bcdc35dd2a22f0edaa40b04bd68281f25f2f88b9c19ffbec01ac9
-  data.tar.gz: '052695d83931984b4622697a2096d934d067559f13fbed420b89c28eae4f62d69a260ea82ac0cb52af8e7d56242febb6a5782576278fd15ecd86e2272fbdfc38'
+  metadata.gz: 14153d97fc2a2068edce6bb26eb193f1acf9afe7f1bc0702085e51271267ca6ad1276d617f20cb1428844e709d8d3f0176e20540ae764f8e63bd4ee60d4f6f4f
+  data.tar.gz: a215ffc0e1ad8565eab667554169fc80a7c7ec639b9dfc68d64dca1314b359277e1ac0e5cbb13fdded89b6872a80766d88c1aa4957bb0b4ee6de8cd30c9ee188

data/lib/wildsight/agent/agent.rb

@@ -52,7 +52,6 @@ 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

@@ -33,12 +33,9 @@ module Wildsight
         thread.thread_variable_set('wildsight.context', nil)
       end
 
-      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 })
+      def report(series, payload = {}, profiler = nil)
+        occurred = DateTime.now
+        @agent.submit({series: "ruby|#{series}", context: @name, occurred: occurred, payload: payload, profiler: profiler})
       end
 
       def profiler

data/lib/wildsight/context/logger.rb

@@ -19,7 +19,7 @@ module Wildsight
             :message => msg.to_s.strip
         }
         context = @context || Wildsight::Context.detect
-        context.report(:logs, payload) if context
+        context.report(:log, payload) if context
         return nil
       end
 

data/lib/wildsight/rack/bottom_middleware.rb

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

data/lib/wildsight/rack/top_middleware.rb

@@ -3,7 +3,7 @@ module Wildsight
 
     class TopMiddleware
 
-      METRICS = [:middleware, :routes]
+      METRICS = [:middleware, :rails, :view, :database]
 
       REQUEST_INCLUDE_KEYS = ['SCRIPT_NAME', 'QUERY_STRING', 'PATH_INFO', 'REMOTE_ADDR']
       REQUEST_EXCLUDE_KEYS = ['HTTP_COOKIE']
@@ -18,39 +18,41 @@ module Wildsight
         context.bind_thread
 
         context.data[:rack] ||= {
-            request_target: env['SCRIPT_NAME'].to_s + env['PATH_INFO'].to_s,
-            request_headers: {}
+            request: {
+                target: env['SCRIPT_NAME'].to_s + env['PATH_INFO'].to_s,
+                headers: {}
+            },
+            response: {
+            }
         }
 
         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_')
+          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
+        if !context.data[:session] && !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) }
+        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) }
+          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])
+        profiler = METRICS.inject({}) { |c, name| c[name] = context.profiler.data[name]; c }
 
-        context.report(:action_controller, context.data[:rack])
+        context.report(:action_controller, context.data[:rack], profiler)
 
         return response
       ensure

data/lib/wildsight/rails/railtie.rb

@@ -10,19 +10,8 @@ module Wildsight
 
         include Wildsight::Rails::ActionController
 
-        alias_method :process_without_ws, :process
         alias_method :process_action_without_ws, :process_action
 
-        def process(*args)
-          context = Wildsight::Rack.detect_context(self.respond_to?(:request) ? request.env : {})
-          if context
-            result = context.profiler.duration(:rails) { process_without_ws(*args) }
-          else
-            result = process_without_ws(*args)
-          end
-          return result
-        end
-
         def wildsight_context
           @_wildsight_context ||= Wildsight::Rack.detect_context(self.respond_to?(:request) ? request.env : {})
         end
@@ -32,19 +21,17 @@ module Wildsight
           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][: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][:request][:method] = request.method
+            context.data[:rack][:request][:path] = request.original_fullpath
+            context.data[:rack][:request][:params] = request.filtered_parameters
 
-            context.data[:rack][:session_id] = request.session.id
+            context.data[:rack][:request][: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][:request][:url] = request.original_url
 
-            context.data[:rack][:remote_ip] = request.remote_ip
+            context.data[:rack][:request][:remote] = request.remote_ip
           end
           result = context.profiler.duration(:action) { process_action_without_ws(*args) }
           return result
@@ -108,10 +95,8 @@ module Wildsight
 
             event = {
                 :name => args[4][:name],
-                :statement => args[4][:statement_name],
                 :query => args[4][:sql],
-                :connection => args[4][:connection_id],
-                :occurred => args[1],
+                :connection => args[4][:connection_id].to_s,
                 :duration => (args[2] - args[1]) * 1000
             }
             context.report(:active_record, event)

data/lib/wildsight/version.rb

@@ -1,3 +1,3 @@
 module Wildsight
-  VERSION = '0.1.18'
+  VERSION = '0.1.19'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wildsight
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Marek Jelen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json