moesif_rack 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cc9c9466e539ecf7d672312b98ed2f228a6b850f7c7e315559f80e31ee937a7
-  data.tar.gz: ba2f944d8f3f19cb451c64113412780cd8141359f6473992b603fe9eddf43bac
+  metadata.gz: 9d8635baa7838edc611616b3fcd19d30c6a8c9034f985b1a48df744eae3fc252
+  data.tar.gz: bf138ca57419057dafdc088f076e3b632a623cd5d268012e6e67a9ce60372ea9
 SHA512:
-  metadata.gz: ecac64d6a6f05a347ccb9927630e3a48eda1ad75ec65d32dc23742483f311fa55b8a5d6720bfda6e7bff49146852410c80b4d6a4cae8b17917f16a4458630523
-  data.tar.gz: 630eb05009f358ee214a61e386f0e933222ebeced3ea38e158d70e3f1629351ef52ff885736f2dfb4e49dd41f8c6271ca8ca2731b17cfc363d46c52ab423b375
+  metadata.gz: 25e43ffa1f612ed39c3ddcee9a55b29ff8f81ed0f9e7d36651d605232aec4ef3ba55cf2e072bd99e72ce46fccc565591872bb58ddd982d65da86a7305f0f4784
+  data.tar.gz: '095a38e7f8dc9e4ba2fbf9ffd40dfd2ac01fcd72b5475915266274a807c53b70054f823109648e73319557efc07c61ddfb95f99a5d4586855b3db1f0fed7573a'

data/README.md

@@ -22,7 +22,7 @@ gem install moesif_rack
 and if you have a `Gemfile` in your project, please add this line to
 
 ```
-gem 'moesif_rack', '~> 1.4.1'
+gem 'moesif_rack', '~> 1.4.2'
 
 ```
 

data/lib/moesif_rack/moesif_middleware.rb

@@ -36,6 +36,45 @@ module MoesifRack
       @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
+      @events_queue = Queue.new
+      @event_response_config_etag = nil
+
+      Thread::new do
+        loop do
+          begin
+            until @events_queue.empty? do
+                batch_events = []
+                until batch_events.size == @batch_size || @events_queue.empty? do 
+                  batch_events << @events_queue.pop
+                end 
+                event_api_response =  @api_controller.create_events_batch(batch_events)
+                @event_response_config_etag = event_api_response[:x_moesif_config_etag]
+                if @debug
+                  puts("Events successfully sent to Moesif")
+                end
+            end
+            
+            if @events_queue.empty?
+              if @debug
+                puts("No events to read from the queue")
+              end
+            end
+  
+            # Sleep for 5 seconds
+            sleep 5
+          rescue MoesifApi::APIException => e
+            if e.response_code.between?(401, 403)
+              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 e.response_code
+            end
+          end
+        end
+      end
+
       begin
         if !@config.nil?
           @config_etag, @sampling_percentage, @last_updated_time = @app_config.parse_configuration(@config, @debug)
@@ -259,10 +298,13 @@ module MoesifRack
 
           if @sampling_percentage > @random_percentage
             event_model.weight = @app_config.calculate_weight(@sampling_percentage)
-            event_api_response = @api_controller.create_event(event_model)
-            event_response_config_etag = event_api_response[:x_moesif_config_etag]
+            # Add Event to the queue
+            @events_queue << event_model
+            if @debug
+              puts("Event added to the queue ")
+            end
 
-            if !event_response_config_etag.nil? && !@config_etag.nil? && @config_etag != event_response_config_etag && Time.now.utc > @last_updated_time + 300
+            if !@event_response_config_etag.nil? && !@config_etag.nil? && @config_etag != @event_response_config_etag && Time.now.utc > @last_updated_time + 300
               begin 
                 @config = @app_config.get_config(@api_controller, @debug)
                 @config_etag, @sampling_percentage, @last_updated_time = @app_config.parse_configuration(@config, @debug)
@@ -273,21 +315,15 @@ module MoesifRack
                 end    
               end
             end
-            if @debug
-              puts("Event successfully sent to Moesif")
-            end
           else
             if @debug
               puts("Skipped Event due to sampling percentage: " + @sampling_percentage.to_s + " and random percentage: " + @random_percentage.to_s)
             end
           end
-        rescue MoesifApi::APIException => e
-          if e.response_code.between?(401, 403)
-            puts "Unathorized accesss sending event to Moesif. Please verify your Application Id."
-          end
+        rescue => exception
           if @debug
-            puts "Error sending event to Moesif, with status code: "
-            puts e.response_code
+            puts "Error adding event to the queue "
+            puts exception.to_s
           end
         end
 

data/test/moesif_rack_test.rb

@@ -108,6 +108,8 @@ class MoesifRackTest < Test::Unit::TestCase
 
   def test_log_event
     response = @moesif_rack_app.call(Rack::MockRequest.env_for("https://acmeinc.com/items/42752/reviews"))
+    # Sleep to allow queue to flush for testing purpose
+    sleep 5
     assert_equal response, @app.call(nil)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moesif_rack
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Moesif, Inc
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-11 00:00:00.000000000 Z
+date: 2020-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.11
+        version: 1.2.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.11
+        version: 1.2.12
 description: Collection/Data Ingestion SDK for Rack (also Rails) Middleware / RoR
 email: xing@moesif.com
 executables: []
@@ -76,8 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: moesif_rack