moesif_rack 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d8635baa7838edc611616b3fcd19d30c6a8c9034f985b1a48df744eae3fc252
-  data.tar.gz: bf138ca57419057dafdc088f076e3b632a623cd5d268012e6e67a9ce60372ea9
+  metadata.gz: e8bde32f3f60b62bfe1dfd5aef52ba6c56f21db3e2f8ac78743972c227ff1d2b
+  data.tar.gz: d0fe24cc62aa794dab07b04fa6ce943f85d015db045eb654cd66e9827e9b97fe
 SHA512:
-  metadata.gz: 25e43ffa1f612ed39c3ddcee9a55b29ff8f81ed0f9e7d36651d605232aec4ef3ba55cf2e072bd99e72ce46fccc565591872bb58ddd982d65da86a7305f0f4784
-  data.tar.gz: '095a38e7f8dc9e4ba2fbf9ffd40dfd2ac01fcd72b5475915266274a807c53b70054f823109648e73319557efc07c61ddfb95f99a5d4586855b3db1f0fed7573a'
+  metadata.gz: 0db637f28ba8d87d7e5e8a81b9642eeeb64f2c701d862c941e90ac0bdc5a2d15584f597df82420b736020dcd8f426c87e1e727cb9dcf081214e9aeecc07fdcd9
+  data.tar.gz: 134f36829793337b6d78a7a51dedddeadd2d4e2fc1353e5b0ae5962f7ddb72f08562c5ff9f5f93248b7ee80db14a987f4935c58eb152b0229bfae9f7ea9e128c

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2019 Moesif, Inc
+Copyright (c) 2020 Moesif, Inc
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/lib/moesif_rack/app_config.rb

@@ -19,7 +19,12 @@ class AppConfig
                 puts 'Error getting application configuration, with status code:'
                 puts e.response_code
             end
+        rescue => e
+            if debug
+                puts e.to_s
+            end
         end
+        rescue
     end
 
     def parse_configuration(config_api_response, debug)

data/lib/moesif_rack/client_ip.rb

@@ -1,8 +1,8 @@
 
 def is_ip?(value)
+    ipv4 = /^(?:(?:\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])\.){3}(?:\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])$/
+    ipv6 = /^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/
     if 
-        ipv4 = /^(?:(?:\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])\.){3}(?:\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])$/
-        ipv6 = /^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/
         # We use !! to convert the return value to a boolean
         !!(value =~ ipv4 or value=~ ipv6)
     end

data/lib/moesif_rack/moesif_middleware.rb

@@ -32,65 +32,29 @@ module MoesifRack
       @config = @app_config.get_config(@api_controller, @debug)
       @config_etag = nil
       @sampling_percentage = 100
-      @last_updated_time = Time.now.utc
+      @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_max_time = options['batch_max_time'] || 2
       @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
+      start_worker()
 
       begin
         if !@config.nil?
-          @config_etag, @sampling_percentage, @last_updated_time = @app_config.parse_configuration(@config, @debug)
+          @config_etag, @sampling_percentage, @last_config_download_time = @app_config.parse_configuration(@config, @debug)
         end
       rescue => exception
-        if @debug
-          puts 'Error while parsing application configuration on initialization'
-          puts exception.to_s
-        end
+        log_debug 'Error while parsing application configuration on initialization'
+        log_debug exception.to_s
       end
       @capture_outoing_requests = options['capture_outoing_requests']
       @capture_outgoing_requests = options['capture_outgoing_requests']
       if @capture_outoing_requests || @capture_outgoing_requests
-        if @debug
-          puts 'Start Capturing outgoing requests'
-        end
+        log_debug 'Start Capturing outgoing requests'
         require_relative '../../moesif_capture_outgoing/httplog.rb'
         MoesifCaptureOutgoing.start_capture_outgoing(options)
       end
@@ -128,6 +92,12 @@ module MoesifRack
       return Base64.encode64(body), 'base64'
     end
 
+    def log_debug(message)
+      if @debug
+        puts("#{Time.now.to_s} [Moesif Middleware] PID #{Process.pid} TID #{Thread.current.object_id} #{message}")
+      end
+    end
+
     def parse_body(body, headers)
       begin
         if start_with_json(body)
@@ -145,12 +115,45 @@ module MoesifRack
       return parsed_body, transfer_encoding
     end
 
+    def start_worker
+      Thread::new do
+        @last_worker_run = Time.now.utc
+        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 
+                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]
+                log_debug(event_api_response.to_s)
+                log_debug("Events successfully sent to Moesif")
+            end
+            
+            if @events_queue.empty?
+              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)
+              puts "Unathorized accesss sending event to Moesif. Please verify your Application Id."
+              log_debug(e.to_s)
+            end
+            log_debug("Error sending event to Moesif, with status code #{e.response_code.to_s}")
+          rescue => e
+            log_debug(e.to_s)
+          end
+        end
+      end
+    end
+
     def call env
       start_time = Time.now.utc.iso8601
 
-      if @debug
-        puts 'inside moesif middleware'
-      end
+      log_debug('Calling Moesif middleware')
 
       status, headers, body = @app.call env
       end_time = Time.now.utc.iso8601
@@ -245,43 +248,31 @@ module MoesifRack
         event_model.direction = "Incoming"
         
         if @identify_user
-          if @debug
-            puts "calling identify user proc"
-          end
+          log_debug "calling identify user proc"
           event_model.user_id = @identify_user.call(env, headers, body)
         end
 
         if @identify_company
-          if @debug
-            puts "calling identify company proc"
-          end
+          log_debug "calling identify company proc"
           event_model.company_id = @identify_company.call(env, headers, body)
         end
 
         if @get_metadata
-          if @debug
-            puts "calling get_metadata proc"
-          end
+          log_debug "calling get_metadata proc"
           event_model.metadata = @get_metadata.call(env, headers, body)
         end
 
         if @identify_session
-          if @debug
-            puts "calling identify session proc"
-          end
+          log_debug "calling identify session proc"
           event_model.session_token = @identify_session.call(env, headers, body)
         end
         if @mask_data
-          if @debug
-            puts "calling mask_data proc"
-          end
+          log_debug "calling mask_data proc"
           event_model = @mask_data.call(event_model)
         end
 
-        if @debug
-          puts "sending data to moesif"
-          puts event_model.to_json
-        end
+        log_debug "sending data to moesif"
+        log_debug event_model.to_json
         # Perform the API call through the SDK function
         begin
           @random_percentage = Random.rand(0.00..100.00)
@@ -289,10 +280,8 @@ module MoesifRack
           begin 
             @sampling_percentage = @app_config.get_sampling_percentage(@config, event_model.user_id, event_model.company_id, @debug)
           rescue => exception
-            if @debug
-              puts 'Error while getting sampling percentage, assuming default behavior'
-              puts exception.to_s
-            end
+            log_debug 'Error while getting sampling percentage, assuming default behavior'
+            log_debug exception.to_s
             @sampling_percentage = 100
           end
 
@@ -300,31 +289,26 @@ module MoesifRack
             event_model.weight = @app_config.calculate_weight(@sampling_percentage)
             # Add Event to the queue
             @events_queue << event_model
-            if @debug
-              puts("Event added to the queue ")
+            log_debug("Event added to the queue ")
+            if Time.now.utc > (@last_config_download_time + 60)
+              start_worker()
             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_config_download_time + 300)
               begin 
                 @config = @app_config.get_config(@api_controller, @debug)
-                @config_etag, @sampling_percentage, @last_updated_time = @app_config.parse_configuration(@config, @debug)
+                @config_etag, @sampling_percentage, @last_config_download_time = @app_config.parse_configuration(@config, @debug)
               rescue => exception
-                if @debug
-                  puts 'Error while updating the application configuration'
-                  puts exception.to_s
-                end    
+                log_debug 'Error while updating the application configuration'
+                log_debug exception.to_s
               end
             end
           else
-            if @debug
-              puts("Skipped Event due to sampling percentage: " + @sampling_percentage.to_s + " and random percentage: " + @random_percentage.to_s)
-            end
+            log_debug("Skipped Event due to sampling percentage: " + @sampling_percentage.to_s + " and random percentage: " + @random_percentage.to_s)
           end
         rescue => exception
-          if @debug
-            puts "Error adding event to the queue "
-            puts exception.to_s
-          end
+          log_debug "Error adding event to the queue "
+          log_debug exception.to_s
         end
 
       end
@@ -338,11 +322,7 @@ module MoesifRack
       end
 
       if !should_skip
-        if @debug
-          process_send.call
-        else
-          Thread.start(&process_send)
-        end
+        process_send.call
       end
 
       [status, headers, body]

data/moesif_capture_outgoing/httplog/http_log.rb

@@ -221,6 +221,10 @@ module MoesifCaptureOutgoing
               puts "Error sending event to Moesif, with status code: "
               puts e.response_code
             end
+          rescue => e
+            if debug
+                puts e.to_s
+            end
           end
         else 
           if @debug

metadata

@@ -1,28 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: moesif_rack
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Moesif, Inc
 - Xing Wang
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.5
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.5
 - !ruby/object:Gem::Dependency
@@ -30,6 +36,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.12
   type: :runtime
@@ -37,9 +46,12 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.12
-description: Collection/Data Ingestion SDK for Rack (also Rails) Middleware / RoR
+description: Rack/Rails middleware to log API calls to Moesif API analytics and monitoring
 email: xing@moesif.com
 executables: []
 extensions: []
@@ -61,7 +73,7 @@ homepage: https://moesif.com
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -76,8 +88,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.7
+signing_key:
 specification_version: 4
 summary: moesif_rack
 test_files: []