moesif_rack 1.4.17 → 1.4.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b73acd14bb1af6f2d4ee8225fdd39ee19c6d1d9cf937ad37a9b10a7278842272
-  data.tar.gz: c1e74c3f4afdbdbfe0cef5fc75dca534f8d289c0f0befdac9085b9f48d4575bf
+  metadata.gz: 9648d28da08853893881cd32fef5fcf61d4f8d2c6a573d06ced10bb4e01bda3c
+  data.tar.gz: cebdf8b64372dd77a80520e8cbec1da161f623a6435a8ced10a700aa86e57113
 SHA512:
-  metadata.gz: 186263e17ebe464783f65297d205c6fea8dcde346ecf979bc1c79c0fd2468e31f474ab278ca94ff2664f6ebd5b9b5a8bc991f00c7f82532ccf709091d6db543e
-  data.tar.gz: e7c29d009f3dc63464181025aa2679f45ee1b3972c72402934e43fa4fef0e778da300084d03b524f689c1b2dda81f3d16a351deb234c68d06cd01f21bd847111
+  metadata.gz: 35bb379b52dc6f4323d5dc98154c5ba741e438ec1cf98030f06775405c405e4a34871b9435a9a3f89d0b32e6545c2f6ec88083e59d2c4e97c271e765200e89bc
+  data.tar.gz: 72422bb99d80d78e91af4034ff4dd31f7f94c8424a498819a6767ce066045209e4dc8c1e9784a88377cf100e79fad3cb0733989f0869b449dedf60e91b916f60

data/README.md

@@ -255,8 +255,17 @@ Optional. Boolean. Default false. If true, it will print out debug messages. In
 
 Optional. Boolean. Default true. If false, will not log request and response body to Moesif.
 
+#### __`batch_size`__
+Optional. int, default 200, Maximum batch size when sending to Moesif.
+
+#### __`batch_max_time`__
+Optional. int in seconds Default 2.	This is the maximum wait time (approximately) before triggering flushing of the queue and sending to Moesif.
+
+#### __`event_queue_size`__
+Optional. int, Default 1000, Maximum number of events to hold in queue before sending to Moesif. In case of network issues when not able to connect/send event to Moesif, skips adding new to event to queue to prevent memory overflow.
+
 #### __`capture_outgoing_requests`__
-Optional. boolean, Default `false`. Set to `true` to capture all outgoing API calls from your app to third parties like Stripe, Github or to your own dependencies while using [Net::HTTP](https://ruby-doc.org/stdlib-2.6.3/libdoc/net/http/rdoc/Net/HTTP.html) package. The options below is applied to outgoing API calls. When the request is outgoing, for options functions that take request and response as input arguments, the request and response objects passed in are [Request](https://www.rubydoc.info/stdlib/net/Net/HTTPRequest) request and [Response](https://www.rubydoc.info/stdlib/net/Net/HTTPResponse) response objects.
+Optional. Boolean, Default `false`. Set to `true` to capture all outgoing API calls from your app to third parties like Stripe, Github or to your own dependencies while using [Net::HTTP](https://ruby-doc.org/stdlib-2.6.3/libdoc/net/http/rdoc/Net/HTTP.html) package. The options below is applied to outgoing API calls. When the request is outgoing, for options functions that take request and response as input arguments, the request and response objects passed in are [Request](https://www.rubydoc.info/stdlib/net/Net/HTTPRequest) request and [Response](https://www.rubydoc.info/stdlib/net/Net/HTTPResponse) response objects.
 
 
 ##### __`identify_user_outgoing`__

data/lib/moesif_rack/moesif_middleware.rb

@@ -4,6 +4,7 @@ require 'time'
 require 'base64'
 require 'zlib'
 require 'stringio'
+require 'rack'
 require_relative './client_ip.rb'
 require_relative './app_config.rb'
 require_relative './update_user.rb'
@@ -34,14 +35,17 @@ module MoesifRack
       @config = @app_config.get_config(@api_controller)
       @config_etag = nil
       @last_config_download_time = Time.now.utc
-      @last_worker_run = Time.now.utc
       @config_dict = Hash.new
       @disable_transaction_id = options['disable_transaction_id'] || false
       @log_body = options.fetch('log_body', true)
-      @batch_size = options['batch_size'] || 25
+      @batch_size = options['batch_size'] || 200
+      @event_queue_size = options['event_queue_size'] || 1000
       @batch_max_time = options['batch_max_time'] || 2
       @events_queue = Queue.new
       @event_response_config_etag = nil
+
+      # start the worker and Update the last worker run
+      @last_worker_run = Time.now.utc
       start_worker()
 
       begin
@@ -100,6 +104,24 @@ module MoesifRack
       end
     end
 
+    def parse_multipart(multipart_form_data, content_type)
+      @moesif_helpers.log_debug("try to parse multiple part #{content_type}")
+
+      sanitized_multipart_form_data = multipart_form_data.gsub(/\r?\n/, "\r\n")
+
+      io = StringIO.new(sanitized_multipart_form_data)
+      tempfile = Rack::Multipart::Parser::TEMPFILE_FACTORY
+      bufsize = Rack::Multipart::Parser::BUFSIZE
+      query_parser = Rack::Utils.default_query_parser
+      result = Rack::Multipart::Parser.parse(io, sanitized_multipart_form_data.length, content_type, tempfile, bufsize, query_parser)
+
+      @moesif_helpers.log_debug("multipart parse result")
+      @moesif_helpers.log_debug(result.inspect)
+
+      # this is a hash shold be treated as JSON down the road.
+      result.params
+    end
+
     def parse_body(body, headers)
       begin
         if (body.instance_of?(Hash) || body.instance_of?(Array))
@@ -108,6 +130,9 @@ module MoesifRack
         elsif start_with_json(body)
           parsed_body = JSON.parse(body)
           transfer_encoding = 'json'
+        elsif headers.key?('content-type') && ((headers['content-type'].downcase).include? 'multipart/form-data')
+          parsed_body = parse_multipart(body, headers['content-type'])
+          transfer_encoding = 'json'
         elsif headers.key?('content-encoding') && ((headers['content-encoding'].downcase).include? "gzip")
           uncompressed_string = decompress_body(body)
           parsed_body, transfer_encoding = base64_encode_body(uncompressed_string)
@@ -122,25 +147,29 @@ module MoesifRack
 
     def start_worker
       Thread::new do
-        @last_worker_run = Time.now.utc
         loop do
+          # Update the last worker run, in case the events_queue is empty
+          @last_worker_run = Time.now.utc
           begin
             until @events_queue.empty? do
+                # Update the last worker run in case sending events take more than 60 seconds
+                @last_worker_run = Time.now.utc
+                # Populate the batch events from queue
                 batch_events = []
-                until batch_events.size == @batch_size || @events_queue.empty? do 
+                until batch_events.size == @batch_size || @events_queue.empty? do
                   batch_events << @events_queue.pop
-                end 
+                end
                 @moesif_helpers.log_debug("Sending #{batch_events.size.to_s} events to Moesif")
                 event_api_response =  @api_controller.create_events_batch(batch_events)
                 @event_response_config_etag = event_api_response[:x_moesif_config_etag]
                 @moesif_helpers.log_debug(event_api_response.to_s)
                 @moesif_helpers.log_debug("Events successfully sent to Moesif")
             end
-            
+
             if @events_queue.empty?
               @moesif_helpers.log_debug("No events to read from the queue")
             end
-  
+
             sleep @batch_max_time
           rescue MoesifApi::APIException => e
             if e.response_code.between?(401, 403)
@@ -177,6 +206,8 @@ module MoesifRack
           req_headers[new_key] = val
         end
 
+        # rewind first in case someone else already read the body
+        req.body.rewind
         req_body_string = req.body.read
         req.body.rewind
         req_body_transfer_encoding = nil
@@ -229,12 +260,12 @@ module MoesifRack
         end
 
         # Add Transaction Id to the Response Header
-        if !transaction_id.nil?  
+        if !transaction_id.nil?
           rsp_headers["X-Moesif-Transaction-Id"] = transaction_id
         end
 
         # Add Transaction Id to the Repsonse Header sent to the client
-        if !transaction_id.nil?  
+        if !transaction_id.nil?
           headers["X-Moesif-Transaction-Id"] = transaction_id
         end
 
@@ -254,7 +285,7 @@ module MoesifRack
         event_model.request = event_req
         event_model.response = event_rsp
         event_model.direction = "Incoming"
-        
+
         if @identify_user
           @moesif_helpers.log_debug "calling identify user proc"
           event_model.user_id = @identify_user.call(env, headers, body)
@@ -285,7 +316,7 @@ module MoesifRack
         begin
           random_percentage  = Random.rand(0.00..100.00)
 
-          begin 
+          begin
             sampling_percentage = @app_config.get_sampling_percentage(event_model, @config, event_model.user_id, event_model.company_id)
             @moesif_helpers.log_debug "Using sample rate #{sampling_percentage}"
           rescue => exception
@@ -294,17 +325,22 @@ module MoesifRack
             sampling_percentage = 100
           end
 
-          if sampling_percentage > random_percentage 
+          if sampling_percentage > random_percentage
             event_model.weight = @app_config.calculate_weight(sampling_percentage)
             # Add Event to the queue
-            @events_queue << event_model
-            @moesif_helpers.log_debug("Event added to the queue ")
+            if @events_queue.size >= @event_queue_size
+              @moesif_helpers.log_debug("Skipped Event due to events_queue size [#{@events_queue.size}] is over max #{@event_queue_size} ")
+            else
+              @events_queue << event_model
+              @moesif_helpers.log_debug("Event added to the queue ")
+            end
+
             if Time.now.utc > (@last_worker_run + 60)
               start_worker()
             end
 
             if !@event_response_config_etag.nil? && !@config_etag.nil? && @config_etag != @event_response_config_etag && Time.now.utc > (@last_config_download_time + 300)
-              begin 
+              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)
@@ -334,7 +370,7 @@ module MoesifRack
       end
 
       if !should_skip
-        begin 
+        begin
           process_send.call
         rescue => exception
           @moesif_helpers.log_debug 'Error while logging event - '

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moesif_rack
 version: !ruby/object:Gem::Version
-  version: 1.4.17
+  version: 1.4.19
 platform: ruby
 authors:
 - Moesif, Inc
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-23 00:00:00.000000000 Z
+date: 2023-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit