moesif_rack 1.4.19 → 2.0.1

data/moesif_capture_outgoing/httplog/http_log.rb

@@ -3,17 +3,14 @@ require 'rack'
 require 'moesif_api'
 require 'json'
 require 'base64'
-require_relative '../../lib/moesif_rack/app_config.rb'
+require_relative '../../lib/moesif_rack/app_config'
 
 module MoesifCaptureOutgoing
-
   class << self
-
-    def start_capture_outgoing(options)
+    def start_capture_outgoing(options, app_config_manager, events_queue)
       @moesif_options = options
-      if not @moesif_options['application_id']
-        raise 'application_id required for Moesif Middleware'
-      end
+      raise 'application_id required for Moesif Middleware' unless @moesif_options['application_id']
+
       @api_client = MoesifApi::MoesifAPIClient.new(@moesif_options['application_id'])
       @api_controller = @api_client.api
       @debug = @moesif_options['debug']
@@ -24,31 +21,22 @@ module MoesifCaptureOutgoing
       @skip_outgoing = options['skip_outgoing']
       @mask_data_outgoing = options['mask_data_outgoing']
       @log_body_outgoing = options.fetch('log_body_outgoing', true)
-      @app_config = AppConfig.new(@debug)
-      @config_etag = nil
+
+      @app_config = app_config_manager
+      # @app_config and @events_queue should be shared instance from the middleware
+      # so that we can use the same queue and same loaded @app_config
+      @events_queue = events_queue
       @sampling_percentage = 100
       @last_updated_time = Time.now.utc
-      @config_dict = Hash.new
-      begin
-        new_config = @app_config.get_config(@api_controller)
-        if !new_config.nil?
-          @config, @config_etag, @last_config_download_time = @app_config.parse_configuration(new_config)
-        end
-      rescue => exception
-        if @debug
-          puts 'Error while parsing application configuration on initialization'
-          puts exception.to_s
-        end
-      end
     end
 
-    def call (url, request, request_time, response, response_time)
+    def call(url, request, request_time, response, response_time)
       send_moesif_event(url, request, request_time, response, response_time)
     end
-    
+
     def get_response_body(response)
       body = response.respond_to?(:body) ? response.body : response
-      body = body.inject("") { |i, a| i << a } if body.respond_to?(:each)
+      body = body.inject('') { |i, a| i << a } if body.respond_to?(:each)
       body.to_s
     end
 
@@ -57,12 +45,9 @@ module MoesifCaptureOutgoing
     end
 
     def send_moesif_event(url, request, request_time, response, response_time)
-
-      if url.downcase.include? "moesif"
-        if @debug
-          puts "Skip sending as it is moesif Event"
-        end
-      else 
+      if url.downcase.include? 'moesif'
+        puts 'Skip sending as it is moesif Event' if @debug
+      else
         response.code = transform_response_code(response.code) if response.code.is_a?(Symbol)
 
         # Request Body
@@ -70,14 +55,12 @@ module MoesifCaptureOutgoing
         req_body_transfer_encoding = nil
         req_body = nil
 
-        if @log_body_outgoing
-          if req_body_string && req_body_string.length != 0
-            begin
-              req_body = JSON.parse(req_body_string)
-            rescue
-              req_body = Base64.encode64(req_body_string)
-              req_body_transfer_encoding = 'base64'
-            end
+        if @log_body_outgoing && (req_body_string && req_body_string.length != 0)
+          begin
+            req_body = JSON.parse(req_body_string)
+          rescue StandardError
+            req_body = Base64.encode64(req_body_string)
+            req_body_transfer_encoding = 'base64'
           end
         end
 
@@ -86,19 +69,17 @@ module MoesifCaptureOutgoing
         rsp_body_transfer_encoding = nil
         rsp_body = nil
 
-        if @log_body_outgoing
-          if rsp_body_string && rsp_body_string.length != 0
-            begin
-              rsp_body = JSON.parse(rsp_body_string)
-            rescue
-              rsp_body = Base64.encode64(rsp_body_string)
-              rsp_body_transfer_encoding = 'base64'
-            end
+        if @log_body_outgoing && (rsp_body_string && rsp_body_string.length != 0)
+          begin
+            rsp_body = JSON.parse(rsp_body_string)
+          rescue StandardError
+            rsp_body = Base64.encode64(rsp_body_string)
+            rsp_body_transfer_encoding = 'base64'
           end
         end
 
         # Event Request
-        event_req = MoesifApi::EventRequestModel.new()
+        event_req = MoesifApi::EventRequestModel.new
         event_req.time = request_time
         event_req.uri = url
         event_req.verb = request.method.to_s.upcase
@@ -107,8 +88,8 @@ module MoesifCaptureOutgoing
         event_req.body = req_body
         event_req.transfer_encoding = req_body_transfer_encoding
 
-        # Event Response 
-        event_rsp = MoesifApi::EventResponseModel.new()
+        # Event Response
+        event_rsp = MoesifApi::EventResponseModel.new
         event_rsp.time = response_time
         event_rsp.status = response.code.to_i
         event_rsp.headers = response.each_header.collect.to_h
@@ -116,71 +97,58 @@ module MoesifCaptureOutgoing
         event_rsp.transfer_encoding = rsp_body_transfer_encoding
 
         # Prepare Event Model
-        event_model = MoesifApi::EventModel.new()
+        event_model = MoesifApi::EventModel.new
         event_model.request = event_req
         event_model.response = event_rsp
-        event_model.direction = "Outgoing"
+        event_model.direction = 'Outgoing'
 
         # Metadata for Outgoing Request
         if @get_metadata_outgoing
-          if @debug
-            puts "calling get_metadata_outgoing proc"
-          end
+          puts 'calling get_metadata_outgoing proc' if @debug
           event_model.metadata = @get_metadata_outgoing.call(request, response)
         end
 
         # Identify User
         if @identify_user_outgoing
-          if @debug
-            puts "calling identify_user_outgoing proc"
-          end
+          puts 'calling identify_user_outgoing proc' if @debug
           event_model.user_id = @identify_user_outgoing.call(request, response)
         end
 
         # Identify Company
         if @identify_company_outgoing
-          if @debug
-            puts "calling identify_company_outgoing proc"
-          end
+          puts 'calling identify_company_outgoing proc' if @debug
           event_model.company_id = @identify_company_outgoing.call(request, response)
         end
 
         # Session Token
         if @identify_session_outgoing
-          if @debug
-            puts "calling identify_session_outgoing proc"
-          end
+          puts 'calling identify_session_outgoing proc' if @debug
           event_model.session_token = @identify_session_outgoing.call(request, response)
         end
 
         # Skip Outgoing Request
         should_skip = false
 
-        if @skip_outgoing
-          if @skip_outgoing.call(request, response)
-            should_skip = true;
-          end
-        end
+        should_skip = true if @skip_outgoing && @skip_outgoing.call(request, response)
 
         if !should_skip
 
           # Mask outgoing Event
           if @mask_data_outgoing
-            if @debug
-              puts "calling mask_data_outgoing proc"
-            end
+            puts 'calling mask_data_outgoing proc' if @debug
             event_model = @mask_data_outgoing.call(event_model)
           end
 
           # Send Event to Moesif
           begin
             @random_percentage = Random.rand(0.00..100.00)
-            begin 
-              @sampling_percentage = @app_config.get_sampling_percentage(event_model, @config, event_model.user_id, event_model.company_id)
-            rescue => exception
+            begin
+              @sampling_percentage = @app_config.get_sampling_percentage(event_model, event_model.user_id,
+                                                                         event_model.company_id)
+            rescue StandardError => e
               if @debug
                 puts 'Error while getting sampling percentage, assuming default behavior'
-                puts exception.to_s
+                puts e
               end
               @sampling_percentage = 100
             end
@@ -191,47 +159,29 @@ module MoesifCaptureOutgoing
                 puts 'Sending Outgoing Request Data to Moesif'
                 puts event_model.to_json
               end
-              event_api_response = @api_controller.create_event(event_model)
-              event_response_config_etag = event_api_response[:x_moesif_config_etag]
-
-              if !event_response_config_etag.nil? && !@config_etag.nil? && @config_etag != event_response_config_etag && Time.now.utc > @last_updated_time + 300
-                begin 
-                  new_config = @app_config.get_config(@api_controller)
-                  if !new_config.nil?
-                    @config, @config_etag, @last_config_download_time = @app_config.parse_configuration(new_config)
-                  end
-                rescue => exception
-                  if @debug
-                    puts 'Error while updating the application configuration'
-                    puts exception.to_s
-                  end
-                end
-              end
-              if @debug
-                puts("Event successfully sent to Moesif")
-              end
-            else
-              if @debug
-                puts("Skipped outgoing Event due to sampling percentage: " + @sampling_percentage.to_s + " and random percentage: " + @random_percentage.to_s)
+
+              # we put in the queue and format abot it.
+              unless @events_queue.nil?
+                @events_queue << event_model
+                puts('Outgoing Event successfully added to event queue') if @debug
+                return
               end
+            elsif @debug
+              puts('Skipped outgoing Event due to sampling percentage: ' + @sampling_percentage.to_s + ' and random percentage: ' + @random_percentage.to_s)
             end
           rescue MoesifApi::APIException => e
             if e.response_code.between?(401, 403)
-              puts "Unathorized accesss sending event to Moesif. Please verify your Application Id."
+              puts 'Unathorized accesss sending event to Moesif. Please verify your Application Id.'
             end
             if @debug
-              puts "Error sending event to Moesif, with status code: "
+              puts 'Error sending event to Moesif, with status code: '
               puts e.response_code
             end
-          rescue => e
-            if @debug
-                puts e.to_s
-            end
+          rescue StandardError => e
+            puts e if @debug
           end
-        else 
-          if @debug
-            puts 'Skip sending outgoing request'
-          end 
+        elsif @debug
+          puts 'Skip sending outgoing request'
         end
       end
     end

data/moesif_capture_outgoing/httplog.rb

@@ -1,2 +1,2 @@
-require_relative 'httplog/http_log.rb'
-require_relative 'httplog/adapters/net_http.rb'
+require_relative 'httplog/http_log'
+require_relative 'httplog/adapters/net_http'