ridc 0.0.6 → 0.0.7

data/lib/exception_reporter.rb

@@ -8,6 +8,7 @@ class Ridc::ExceptionReporter
 	def call(env)
 		response = @app.call(env)
 	rescue Exception => exception
+		#Rails.logger.original.info("yeah!")
 		report(exception, env)
 		raise exception
 	end
@@ -15,14 +16,17 @@ class Ridc::ExceptionReporter
 	def report(exception, environment)
 		event_session_id = Thread.current["session_id"]
 		event_session_content = Thread.current["session_content"]
+	
 		event = {
-			:exception => exception.clone, # TODO signature is failing because of this,
+			:event_type => "exception",
+			:exception_class => exception.class.to_s,
+			:description => exception.to_s, 
+			:backtrace => Array(exception.backtrace).join("\n").to_s,
 			:environment => useful_environment_parts(environment),
 			:event_session_id => event_session_id,
 			:event_session_content => event_session_content
 		}
-	
-		Ridc.sender.load(event)
+		Ridc.sender.add_to_queue(event)
 	end
     # thanks raygun4ruby guys! 
 	def useful_environment_parts(env)

data/lib/log_reporter.rb

@@ -9,13 +9,26 @@ class Ridc::LogReporter
 	end
 
 	def method_missing(m, *args, &block)  
-		if %w{debug info warn error fatal}.include?(m.to_s)
+		severities = %w{debug info warn error fatal unknown}
+		if severities.include?(m.to_s)
 			event = {
+				"event_type" => "log_entry",
 				"logger_severity" => m.to_s,
-				"logger_message" => args.join(' ')
+				"logger_message" => args.map{ |x| x.to_s }.join(' ')
 			}
-			Ridc.sender.load(event) if event["logger_message"].to_s.length > 0
+
+	    Ridc.sender.add_to_queue(event) if event["logger_message"].to_s.length > 0
+		elsif m.to_s == "add"
+		
+			event = {
+				"event_type" => "log_entry",
+				"logger_severity" => severities[args[0]],
+				"logger_message" => args.map{ |x| x.to_s }.join(' ')
+			}
+			Ridc.logger.info("Logging the log!")			
+			Ridc.sender.add_to_queue(event) if event["logger_message"].to_s.length > 0
 		end
-		@original.send(m, *args, &block)
+		Ridc.logger.info(m)
+		@original.send(m, *args, &block) unless @original.nil? # for rails.version < 4
 	end
 end

data/lib/ridc.rb

@@ -5,22 +5,80 @@ require 'log_reporter'
 require 'configuration'
 require 'configuration_generator'
 
-class Ridc::MainRailtie < Rails::Railtie
 
+#fix for JSON gem/activesupport bug. More info: http://stackoverflow.com/questions/683989/how-do-you-deal-with-the-conflict-between-activesupportjson-and-the-json-gem
+
+if defined?(ActiveSupport::JSON)
+  [Object,Array, FalseClass, Float, Hash, Integer, NilClass, String, TrueClass].each do |klass|
+    klass.class_eval do
+
+      alias :to_json_raisintelligence_bup :to_json 
+      def to_json(*args)
+        if self.respond_to?("to_ridc_json")
+          to_ridc_json(*args)
+        else
+          to_json_raisintelligence_bup(*args)
+        end
+      rescue Exception => ex
+        return '{ "error":' +  %Q{"#{self.class.to_s} - #{ex.to_s}"} + '}'
+      end
+    end
+  end
+ 
+    Hash.class_eval do
+      def to_ridc_json(*args)
+        jsonstring = "{ "
+        self.each_pair do |key,value|
+          begin
+            jsonstring << %Q{"#{key}":} + value.to_json  + ","
+          rescue Exception => e
+            jsonstring << %Q{"#{key}":} + e.to_s.to_json + ","
+          end
+        end
+        jsonstring.gsub!(/,$/, " }")
+        return jsonstring
+      end
+    end
+end
+
+
+
+class Ridc::MainRailtie < Rails::Railtie
 	initializer "rails_intelligence.configure_rails_initialization" do |app|
-  
 
-		Rails.logger = Ridc::LogReporter.new(Rails.logger)
+    Rails.logger.info("RIDC: Wrapping the rails logger!")
+
+    
+     
+     
+     if Rails.version.to_i < 4
+       Ridc.logger = Rails.logger
+	 	   Rails.logger = Ridc::LogReporter.new(Rails.logger)
+     else
+       Ridc.logger = Logger.new("#{Rails.root}/log/rails_intelligence.log")
+       log_reporter = Ridc::LogReporter.new(nil)
+       # broadcast to ridcs log reporter
+       Rails.logger.extend(ActiveSupport::Logger.broadcast(log_reporter))
+     end
 
-		ActiveSupport::Notifications.subscribe do |*args|
-			
-			event_payload = ActiveSupport::Notifications::Event.new *args
-			
+  #  Rails.logger.original.info("RIDC: Wrapped the rails logger!")
 
-			event = { 
-				:event => event_payload,
-			}
-			Ridc.sender.load(event)
+		ActiveSupport::Notifications.subscribe do |name, start, finish, id, payload|
+			# |name, start, finish, id, payload|
+			#event_payload = ActiveSupport::Notifications::Event.new *args
+			#event_payload = ActiveSupport::Notifications::Event.new |name, start, finish, id, payload|
+			event = {
+        :event_type => "notification",
+        :event_payload => { 
+          :name => name,
+          :start => start, 
+          :finish => finish, 
+          :id => id, 
+          :specific => payload
+        }
+      }
+      
+			Ridc.sender.add_to_queue(event)
 			# for debugging use: 
 			# Rails.logger.original.debug(event.to_json)
 		end

data/lib/sender.rb

@@ -6,12 +6,20 @@ require 'digest/sha1'
 require 'socket'
 require 'configuration'
 
+
 module Ridc
 
   SEND_LOOP_DELAY_S = 1
+  def Ridc.logger
+    @@logger
+  end
+
+  def Ridc.logger=(logger)
+    @@logger = logger
+  end
 
   def Ridc.sender
-      
+  #  Rails.logger.original.info("RIDC: Getting the sender.")
     Thread.current[:sender_worker] ||= Sender.new(
       Ridc.configuration.customer_key , 
       Ridc.configuration.secret_key, 
@@ -38,11 +46,12 @@ module Ridc
       @sender_thread = nil
     end
 
-    def load(event)
+    def add_to_queue(event)
+    #  Rails.logger.original.debug("RIDC: Loading event.")
       event[:event_session_id] = Thread.current["session_id"]
       event[:event_session_content] = Thread.current["session_content"]
       event[:time] = Time.now.utc.to_i
-      body = {
+      body = {  
       "customerKey" => @customer_key,
       "signature" => sign_with_secret_key(event.to_json),
       "event" => event,
@@ -67,11 +76,13 @@ module Ridc
     end
 
     def start_sender_thread
+  #    Rails.logger.original.info("RIDC: Starting sender thread.")
      @sender_thread = Thread.new { send_all_events() }
      @sender_started = true
    end
 
    def send_all_events
+  #  Rails.logger.original.info("RIDC: Sending all events")
     loop do 
       begin
         if @queue.empty? 
@@ -80,8 +91,6 @@ module Ridc
            body = @queue.pop(true)
           unless body.nil?
             send_request(body)
-          else
-            sleep(SEND_LOOP_DELAY_S)
           end
         end
       rescue Exception => e
@@ -91,8 +100,10 @@ module Ridc
   end
 
   def send_request(body)
+      
       req = Net::HTTP::Post.new("/events", initheader = {'Content-Type' => 'application/json'})
       req.body = body.to_json
+      Ridc.logger.debug("RIDC: Sending event: " + req.body)
       response = Net::HTTP.new(@host, @port).start { |http| http.request(req) }
       return response
   rescue Exception => e 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridc
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -11,8 +11,40 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2013-12-08 00:00:00.000000000 Z
-dependencies: []
-description: ''
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.2
+description: Data collection for our wonderful new SaaS
 email:
 - senad.uka@gmail.com
 - edin.dazdarevic@gmail.com