red_cross 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74b7e78f8ab3f2eb3aa38cf5c1b1a82aafbab5b8
-  data.tar.gz: 2f5ab0fb9befc1a72a717e53b842f128950f8c14
+  metadata.gz: ac7909151c96e69e0a1e63fe749754b3bfd23a8d
+  data.tar.gz: 606e950ecbc33ef42b0a4c5c61b5d9c9d852cf6b
 SHA512:
-  metadata.gz: 0e1c052a905c0589e55ee11b28626d044deab1135066f314fc25b3bb1a50ef36918fa26a355ca9629c8d9f5ede73567022e51744bf0e7c3a6188c7a5b81a3437
-  data.tar.gz: 3eb72066be6d21672d57e79684abd37fb5a08d6be80fcefaae2dc5489f75383770df3ff66af1fced2701895651c0fcdb46ce27a7555d7244adcae56ec071e543
+  metadata.gz: 7a822c815d8c19593e844f2e20c9fdf93b75253a19fdc366471cab5fd3fdef0190b23a66d9e60f3ba8335209fbb22011762311e29ba847753f180f07228fdef7
+  data.tar.gz: 6c40830957e91da09b2c818c1f75a82ede946ca7a1bc95a5bc8a62c5b31d167e15db551ccefed09f10a28564d4fc090daa78df2289e23ad6a8fca788d7683b1f

data/README.md

@@ -1,7 +1,7 @@
 # RedCross
 
 This Gem reports events to segment - to be added:
-Sending events to an event collector which will use Kafka
+Sending events to an eventbus
 
 ## Installation
 

data/lib/red_cross/trackers/http_tracker.rb

@@ -1,7 +1,7 @@
 module RedCross
   module Trackers
     class HttpTracker < RedCross::Trackers::Base
-      class FailedPushingToKafka < Exception
+      class FailedPushingToEventbus < Exception
         def initialize(code, route, return_code)
           @code = code
           @route = route
@@ -9,17 +9,17 @@ module RedCross
         end
 
         def to_s
-          "Failed pushing to Kafka. Error code: #{@code}, route: #{@route} Error: #{@return_code.to_s}"
+          "Failed pushing to Eventbus. Error code: #{@code}, route: #{@route} Error: #{@return_code.to_s}"
         end
       end
-      attr_accessor :clerk_host
+      attr_accessor :eventbus_host
 
       def initialize(host)
-        @clerk_host = host
+        @eventbus_host = host
       end
 
-      def track(attrs, additional_args = {})
-        clerk_request(@clerk_host,attrs.merge(additional_args), :post)
+      def track(route, attrs, additional_args = {})
+        eventbus_request(@eventbus_host + route, attrs.merge(additional_args), :post)
       end
 
       def identify(attrs, additional_args = {})
@@ -30,7 +30,7 @@ module RedCross
         {}
       end
 
-      def clerk_request(request_url, params, method = :get)
+      def eventbus_request(request_url, params, method = :get)
         request = Typhoeus::Request.new(
             request_url,
             method: method,
@@ -41,7 +41,7 @@ module RedCross
           if response.success?
             return true
           else
-            raise FailedPushingToKafka.new(response.response_code ,request_url, response.return_code)
+            raise FailedPushingToEventbus.new(response.response_code ,request_url, response.return_code)
           end
         end
         request.run

data/lib/red_cross/trackers/monitor_tracker.rb

@@ -3,8 +3,7 @@ module RedCross
     class MonitorTracker < RedCross::Trackers::Base
       attr_accessor  :client
 
-      def initialize(database = '', host = '', port = '')
-        [database, host, port].each{ |var| return if !var.is_a?(String) || var.empty? }
+      def initialize(database = 'test', host = 'localhost', port = 8086)
         @client = InfluxDB::Client.new database,
                                        host:  host,
                                        port:  port,

data/lib/red_cross/version.rb

@@ -1,3 +1,3 @@
 module RedCross
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/lib/red_cross.rb

@@ -2,6 +2,7 @@ require 'red_cross/version'
 require 'red_cross/configuration'
 require 'segment'
 require 'typhoeus'
+require 'resque/plugins/red_cross_async'
 require 'resque'
 require 'influxdb'
 require 'red_cross/logger'

data/lib/resque/plugins/red_cross_monitor.rb

@@ -0,0 +1,30 @@
+module Resque
+  module Plugins
+    module RedCrossAsync
+      # Hash of properties for RedCross.monitor
+      # Please add count: MY_NUMBER in case your metric value differs 1
+      def properties(*args)
+        {}
+      end
+
+      def after_perform_actions(*args)
+        RedCross.flush
+        send_metrics('performed', *args)
+      end
+
+      def before_perform_send_monitor_data(*args)
+        send_metrics('before_perform', *args)
+      end
+
+      def on_failure_send_monitor_data(e, *args)
+        send_metrics('failed', *args)
+      end
+
+      private
+
+      def send_metrics(event_type, *args)
+        RedCross.monitor_track(event: 'resque_job_' + event_type, properties: { class: self.name }.merge(properties(*args)))
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: red_cross
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - ronbarab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-19 00:00:00.000000000 Z
+date: 2017-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: analytics-ruby
@@ -115,13 +115,12 @@ files:
 - lib/red_cross.rb
 - lib/red_cross/configuration.rb
 - lib/red_cross/logger.rb
-- lib/red_cross/resque/plugins/red_cross_monitor.rb
-- lib/red_cross/resque/scheduler.rb
 - lib/red_cross/trackers/base.rb
 - lib/red_cross/trackers/http_tracker.rb
 - lib/red_cross/trackers/monitor_tracker.rb
 - lib/red_cross/trackers/segment_tracker.rb
 - lib/red_cross/version.rb
+- lib/resque/plugins/red_cross_monitor.rb
 - red_cross.gemspec
 homepage: https://github.com/YotpoLtd
 licenses:

data/lib/red_cross/resque/plugins/red_cross_monitor.rb

@@ -1,65 +0,0 @@
-module Resque
-  module Plugins
-    module RedCrossMonitor
-      # Hash of properties for RedCross.monitor
-      # Please add count: MY_NUMBER in case your metric value differs 1
-      def job_method(*args)
-        #Add the method that triggered by the job
-        'no_job_method'
-      end
-
-      def before_schedule_send_monitor_data(*args)
-        send_metrics('before_schedule', *args)
-      end
-
-      def after_schedule_send_monitor_data(*args)
-        send_metrics('after_schedule', *args)
-      end
-
-      def before_delayed_enqueue_send_monitor_data(*args)
-        send_metrics('before_delayed_enqueue', *args)
-      end
-
-      def before_enqueue_send_monitor_data(*args)
-        send_metrics('before_enqueue', *args)
-      end
-
-      def after_enqueue_send_monitor_data(*args)
-        send_metrics('after_enqueue', *args)
-      end
-
-      def before_perform_send_monitor_data(*args)
-        @job_start_time = Time.now()
-        send_metrics('before_perform', *args)
-      end
-
-      def after_perform_actions(*args)
-        ::RedCross.flush
-        @job_end_time = Time.now()
-        send_metrics('performed', *args)
-      end
-
-      def on_failure_send_monitor_data(e, *args)
-        @job_end_time = Time.now()
-        send_metrics('failed', *args)
-      end
-
-      def default_event_properties(*args)
-        @event_properties ||= { fields: {  } }
-        @event_properties[:class] ||= self.name
-        event_job_method =  @event_properties[:event_method].nil? ? job_method(*args) : @event_properties[:event_method]
-        if (!event_job_method.nil? && ([String, Integer, Symbol].include? event_job_method.class))
-          @event_properties[:event_method] = event_job_method
-        else
-          @event_properties[:event_method] = 'no_valid_job_method'
-        end
-      end
-
-      def send_metrics(job_status, *args)
-        default_event_properties(*args)
-        @event_properties[:fields][:run_time] = ((@job_end_time - @job_start_time)*1000).to_i if %w(performed failed).include? job_status
-        ::RedCross.monitor_track(event: 'resque', properties: @event_properties.merge({ job_status: job_status }))
-      end
-    end
-  end
-end

data/lib/red_cross/resque/scheduler.rb

@@ -1,15 +0,0 @@
-module Resque
-  module Scheduler
-    module DelayingExtensions
-      alias default_last_enqueued_at last_enqueued_at
-      def last_enqueued_at(name, timestemp)
-        properties = {
-            task_name: name,
-            status: 'enqueued'
-        }
-        RedCross.monitor_track(event: 'resque_scheduler', properties: properties)
-        default_last_enqueued_at(name, timestemp)
-      end
-    end
-  end
-end