wildsight 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9f718b43a5208321225ed5cfcb015b19a66fd79
-  data.tar.gz: ec33cba5ffc3a921e27a17d535bb9d5b5c3ebaeb
+  metadata.gz: 6ee42269fa992f53798cec753fcca9badb6fad51
+  data.tar.gz: 7f13c14c90891d7f58bb557e7a8187b8a23810a6
 SHA512:
-  metadata.gz: 14153d97fc2a2068edce6bb26eb193f1acf9afe7f1bc0702085e51271267ca6ad1276d617f20cb1428844e709d8d3f0176e20540ae764f8e63bd4ee60d4f6f4f
-  data.tar.gz: a215ffc0e1ad8565eab667554169fc80a7c7ec639b9dfc68d64dca1314b359277e1ac0e5cbb13fdded89b6872a80766d88c1aa4957bb0b4ee6de8cd30c9ee188
+  metadata.gz: 295b99bd465d01440b07add3deea6281707366171589b867e365fc0b30e288e0e8105a17c27700c669ba94ce6d33f47654abe203007d8284c29295af34e14297
+  data.tar.gz: 3a1563a2cea1d09fae697c808c1cba0c5e1ae11aa5d72b650793c7edecae346d0a4582f1dae70ffa06a06c141146379fe34f1a0817e4a258d7a6ac5061b170fb

data/lib/wildsight/agent/agent.rb

@@ -51,8 +51,8 @@ module Wildsight
         @contexts.delete(name)
       end
 
-      def submit(event)
-        @events << event
+      def submit(type, event)
+        (@events[type] ||= []) << event
         if @events.size > @config['agent']['threshold']
           self.logger.log(:debug) { 'Uploading collected data' }
           upload
@@ -60,7 +60,7 @@ module Wildsight
       end
 
       def upload
-        payload, @events = @events, []
+        payload, @events = @events, {}
         @transport.send(payload) if payload != nil && payload.size > 0
       end
 
@@ -70,7 +70,7 @@ module Wildsight
         @logger = Wildsight::Agent::Logger.new(@config)
         @logger.log(:debug) { 'Logger initialized' }
 
-        @events = []
+        @events = {}
         @contexts = {}
 
         @transport = Wildsight::Transport.detect.new(self, @config)

data/lib/wildsight/context/context.rb

@@ -33,9 +33,27 @@ module Wildsight
         thread.thread_variable_set('wildsight.context', nil)
       end
 
-      def report(series, payload = {}, profiler = nil)
-        occurred = DateTime.now
-        @agent.submit({series: "ruby|#{series}", context: @name, occurred: occurred, payload: payload, profiler: profiler})
+      def event(series, data, occurred = DateTime.now, source = Wildsight.source, host = Wildsight.host)
+        @agent.submit(:events, {
+                          host: host,
+                          source: source,
+                          series: series,
+                          context: @name,
+                          occurred: occurred,
+                          data: data
+                      })
+      end
+
+      def metric(series, value, data = {}, occurred = DateTime.now, source = Wildsight.source, host = Wildsight.host)
+        @agent.submit(:metrics, {
+                          host: host,
+                          source: source,
+                          series: series,
+                          context: @name,
+                          occurred: occurred,
+                          value: value,
+                          data: data
+                      })
       end
 
       def profiler

data/lib/wildsight/context/logger.rb

@@ -14,12 +14,11 @@ module Wildsight
       def call(severity, time, progname, msg)
         payload = {
             :severity => severity,
-            :occurred => time,
             :facility => progname,
             :message => msg.to_s.strip
         }
         context = @context || Wildsight::Context.detect
-        context.report(:log, payload) if context
+        context.event(:log, payload) if context
         return nil
       end
 

data/lib/wildsight/rack/bottom_middleware.rb

@@ -12,7 +12,7 @@ module Wildsight
         response = context.profiler.duration(:rails) { @app.call(env) }
         return response
       rescue Exception => e
-        context.report(:exception, extract(e))
+        context.event(:exception, extract(e))
         raise e
       end
 

data/lib/wildsight/rack/top_middleware.rb

@@ -50,9 +50,11 @@ module Wildsight
           RESPONSE_EXCLUDE_KEYS.each { |key| context.data[:rack][:response][:headers].delete(key) }
         end
 
-        profiler = METRICS.inject({}) { |c, name| c[name] = context.profiler.data[name]; c }
+        context.event(:action_controller, context.data[:rack])
 
-        context.report(:action_controller, context.data[:rack], profiler)
+        context.profiler.data.keys.each do |key|
+          context.metric(key, context.profiler.data[key][:duration])
+        end
 
         return response
       ensure

data/lib/wildsight/rails/railtie.rb

@@ -99,7 +99,7 @@ module Wildsight
                 :connection => args[4][:connection_id].to_s,
                 :duration => (args[2] - args[1]) * 1000
             }
-            context.report(:active_record, event)
+            context.event(:active_record, event)
           end
         end
 

data/lib/wildsight/version.rb

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

data/lib/wildsight_custom.rb

@@ -1,5 +1,27 @@
 require 'wildsight/version'
 
+require 'socket'
+
+module Wildsight
+
+  def self.source=(value)
+    @source = value
+  end
+
+  def self.source
+    @source ||= 'ruby'
+  end
+
+  def self.host=(value)
+    @host = value
+  end
+
+  def self.host
+    @host ||= Socket.gethostname
+  end
+
+end
+
 require 'wildsight/transport/transport'
 require 'wildsight/metrics/metrics'
 require 'wildsight/profiler/profiler'
@@ -7,13 +29,18 @@ require 'wildsight/context/context'
 require 'wildsight/context/logger'
 require 'wildsight/agent/agent'
 
+
 if defined?(Rack)
+  Wildsight.source = 'rack'
+
   require 'wildsight/rack/rack'
   require 'wildsight/rack/top_middleware'
   require 'wildsight/rack/bottom_middleware'
 end
 
 if defined?(Rails)
+  Wildsight.source = 'rails'
+
   require 'wildsight/rails/action_controller'
   require 'wildsight/rails/active_record'
   require 'wildsight/rails/railtie'

metadata

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