moesif_rack 1.3.10 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5449e55b2da865cdc2bd4d52eef977b45db5a3e7648ee18f67f93795bf1fcd46
-  data.tar.gz: 930c9fb3a9181eec3b12d5aea8073c12646f94f77d16638dfa0422107b8000f3
+  metadata.gz: 8c44fb915ecec7479c930ab41b3b74eeb58a368f387d3fa8d47211e41c4a0c80
+  data.tar.gz: 6974bb001d57faeffc0f58df1a4c4661ac52d4a6f5280d78c1e35c7deb5fb183
 SHA512:
-  metadata.gz: 13012b377dac7ca5da3dcaf1d50ef97e71f6515df9e7f94e61b39746b4f29b134efcbc87eaafcb8dcd04dd67e0e052d8f0c5e9c77dd6ea20a7d997f50df3feb6
-  data.tar.gz: d7499b20fa602a2dd1bde29099b5b11755f36421f79c32f59fc1e1aa7f0e1dce7794b7ed1ca703c74ff07f040492b3ecc12f038eb3f52625348b13ae9becb2ec
+  metadata.gz: '08b7997c9a683384cc7725dff3248a41b5ddb15974be2d259d9553fb1903075814260e8df0cda6a7d1e6340b7d8d27d3c99f725f0dd088caaae28476539f162c'
+  data.tar.gz: c0d75f0f8ab0f8d87d4a86fa4396e4100a94d7a0f37190260bbbe3db91ec40dcaa91f4d1d945f768a1fd0483dde2a816eb388a7e9cfd5fd89c4df33881104639

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/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.3.9'
+gem 'moesif_rack', '~> 1.4.2'
 
 ```
 
@@ -334,7 +334,7 @@ This method is a convenient helper that calls the Moesif API lib.
 For details, visit the [Ruby API Reference](https://www.moesif.com/docs/api?ruby#update-a-user).
 
 ```ruby
-metadata => {
+metadata = {
   :email => 'john@acmeinc.com',
   :first_name => 'John',
   :last_name => 'Doe',
@@ -348,7 +348,7 @@ metadata => {
 
 # Campaign object is optional, but useful if you want to track ROI of acquisition channels
 # See https://www.moesif.com/docs/api#users for campaign schema
-campaign = CampaignModel.new()
+campaign = MoesifApi::CampaignModel.new()
 campaign.utm_source = "google"
 campaign.utm_medium = "cpc"
 campaign.utm_campaign = "adwords"
@@ -357,7 +357,7 @@ campaign.utm_content = "landing"
 
 # Only user_id is required.
 # metadata can be any custom object
-user = UserModel.new()
+user = MoesifApi::UserModel.new()
 user.user_id = "12345"
 user.company_id = "67890" # If set, associate user with a company object
 user.campaign = campaign
@@ -373,15 +373,9 @@ This method is a convenient helper that calls the Moesif API lib.
 For details, visit the [Ruby API Reference](https://www.moesif.com/docs/api?ruby#update-users-in-batch).
 
 ```ruby
-metadata = JSON.parse('{'\
-      '"email": "testrubyapi@user.com",'\
-      '"name": "ruby api user",'\
-      '"custom": "testdata"'\
-    '}')
-
 users = []
 
-metadata => {
+metadata = {
   :email => 'john@acmeinc.com',
   :first_name => 'John',
   :last_name => 'Doe',
@@ -395,7 +389,7 @@ metadata => {
 
 # Campaign object is optional, but useful if you want to track ROI of acquisition channels
 # See https://www.moesif.com/docs/api#users for campaign schema
-campaign = CampaignModel.new()
+campaign = MoesifApi::CampaignModel.new()
 campaign.utm_source = "google"
 campaign.utm_medium = "cpc"
 campaign.utm_campaign = "adwords"
@@ -404,7 +398,7 @@ campaign.utm_content = "landing"
 
 # Only user_id is required.
 # metadata can be any custom object
-user = UserModel.new()
+user = MoesifApi::UserModel.new()
 user.user_id = "12345"
 user.company_id = "67890" # If set, associate user with a company object
 user.campaign = campaign
@@ -425,7 +419,7 @@ This method is a convenient helper that calls the Moesif API lib.
 For details, visit the [Ruby API Reference](https://www.moesif.com/docs/api?ruby#update-a-company).
 
 ```ruby
-metadata => {
+metadata = {
   :org_name => 'Acme, Inc',
   :plan_name => 'Free',
   :deal_stage => 'Lead',
@@ -438,7 +432,7 @@ metadata => {
 
 # Campaign object is optional, but useful if you want to track ROI of acquisition channels
 # See https://www.moesif.com/docs/api#update-a-company for campaign schema
-campaign = CampaignModel.new()
+campaign = MoesifApi::CampaignModel.new()
 campaign.utm_source = "google"
 campaign.utm_medium = "cpc"
 campaign.utm_campaign = "adwords"
@@ -447,7 +441,7 @@ campaign.utm_content = "landing"
 
 # Only company_id is required.
 # metadata can be any custom object
-company = CompanyModel.new()
+company = MoesifApi::CompanyModel.new()
 company.company_id = "67890"
 company.company_domain = "acmeinc.com" # If domain is set, Moesif will enrich your profiles with publicly available info 
 company.campaign = campaign
@@ -463,15 +457,9 @@ This method is a convenient helper that calls the Moesif API lib.
 For details, visit the [Ruby API Reference](https://www.moesif.com/docs/api?ruby#update-companies-in-batch).
 
 ```ruby
-metadata = JSON.parse('{'\
-      '"email": "testrubyapi@user.com",'\
-      '"name": "ruby api user",'\
-      '"custom": "testdata"'\
-    '}')
-
 companies = []
 
-metadata => {
+metadata = {
   :org_name => 'Acme, Inc',
   :plan_name => 'Free',
   :deal_stage => 'Lead',
@@ -484,7 +472,7 @@ metadata => {
 
 # Campaign object is optional, but useful if you want to track ROI of acquisition channels
 # See https://www.moesif.com/docs/api#update-a-company for campaign schema
-campaign = CampaignModel.new()
+campaign = MoesifApi::CampaignModel.new()
 campaign.utm_source = "google"
 campaign.utm_medium = "cpc"
 campaign.utm_campaign = "adwords"
@@ -493,7 +481,7 @@ campaign.utm_content = "landing"
 
 # Only company_id is required.
 # metadata can be any custom object
-company = CompanyModel.new()
+company = MoesifApi::CompanyModel.new()
 company.company_id = "67890"
 company.company_domain = "acmeinc.com" # If domain is set, Moesif will enrich your profiles with publicly available info 
 company.campaign = campaign

data/lib/moesif_rack/app_config.rb

@@ -3,66 +3,71 @@ require 'json'
 require 'time'
 require 'zlib'
 require 'stringio'
+require_relative './helpers.rb'
 
 class AppConfig
 
-    def get_config(api_controller, debug)
+    def initialize debug
+        @debug = debug
+        @helpers = Helpers.new(debug)
+    end
+
+    def get_config(api_controller)
         # Get Application Config
         begin 
             config_api_response = api_controller.get_app_config()
+            @helpers.log_debug("new config downloaded")
+            @helpers.log_debug(config_api_response.to_s)
             return config_api_response
         rescue MoesifApi::APIException => e
             if e.response_code.between?(401, 403)
-                puts 'Unauthorized access getting application configuration. Please check your Appplication Id.'
-            end
-            if debug
-                puts 'Error getting application configuration, with status code:'
-                puts e.response_code
+                @helpers.log_debug 'Unauthorized access getting application configuration. Please check your Appplication Id.'
             end
+            @helpers.log_debug 'Error getting application configuration, with status code:'
+            @helpers.log_debug e.response_code
+        rescue => e
+            @helpers.log_debug e.to_s
         end
+        rescue
     end
 
-    def parse_configuration(config_api_response, debug)
+    def parse_configuration(config_api_response)
         # Parse configuration object and return Etag, sample rate and last updated time
         begin
             # Rails return gzipped compressed response body, so decompressing it and getting JSON response body
-            response_body = decompress_gzip_body(config_api_response, debug)
+            response_body = decompress_gzip_body(config_api_response)
+            @helpers.log_debug(response_body.to_s)
 
             # Check if response body is not nil
             if !response_body.nil? then 
                 # Return Etag, sample rate and last updated time
-                return config_api_response.headers[:x_moesif_config_etag], response_body.fetch("sample_rate", 100), Time.now.utc
+                return response_body, config_api_response.headers[:x_moesif_config_etag], Time.now.utc
             else
-                if debug
-                    puts 'Response body is nil, assuming default behavior'
-                end
+                @helpers.log_debug 'Response body is nil, assuming default behavior'
                 # Response body is nil, so assuming default behavior
                 return nil, 100, Time.now.utc
             end
         rescue => exception
-            if debug
-                puts 'Error while parsing the configuration object, assuming default behavior'
-                puts exception.to_s
-            end
+            @helpers.log_debug 'Error while parsing the configuration object, assuming default behavior'
+            @helpers.log_debug exception.to_s
             # Assuming default behavior
             return nil, 100, Time.now.utc
         end
     end
 
-    def get_sampling_percentage(config_api_response, user_id, company_id, debug)
+    def get_sampling_percentage(config_api_response, user_id, company_id)
         # Get sampling percentage
         begin
-            # Rails return gzipped compressed response body, so decompressing it and getting JSON response body
-            response_body = decompress_gzip_body(config_api_response, debug)
-
             # Check if response body is not nil
-            if !response_body.nil? then 
-                
+            if !config_api_response.nil? then 
+                @helpers.log_debug("Getting sample rate for user #{user_id} company #{company_id}")
+                @helpers.log_debug(config_api_response.to_s)
+
                 # Get user sample rate object
-                user_sample_rate = response_body.fetch('user_sample_rate', nil)
+                user_sample_rate = config_api_response.fetch('user_sample_rate', nil)
 
                 # Get company sample rate object
-                company_sample_rate = response_body.fetch('company_sample_rate', nil)
+                company_sample_rate = config_api_response.fetch('company_sample_rate', nil)
 
                 # Get sample rate for the user if exist
                 if !user_id.nil? && !user_sample_rate.nil? && user_sample_rate.key?(user_id)
@@ -75,22 +80,18 @@ class AppConfig
                 end
 
                 # Return sample rate
-                return response_body.fetch('sample_rate', 100)
+                return config_api_response.fetch('sample_rate', 100)
             else 
-                if debug
-                    puts 'Assuming default behavior as response body is nil - '
-                end
+                @helpers.log_debug 'Assuming default behavior as response body is nil - '
                 return 100
             end
         rescue => exception
-            if debug
-                puts 'Error while geting sampling percentage, assuming default behavior'
-            end
+            @helpers.log_debug 'Error while geting sampling percentage, assuming default behavior'
             return 100
         end
     end
 
-    def decompress_gzip_body(config_api_response, debug)
+    def decompress_gzip_body(config_api_response)
         # Decompress gzip response body
         begin
             # Check if the content-encoding header exist and is of type zip
@@ -105,17 +106,17 @@ class AppConfig
                 # Return the parsed body
                 return JSON.parse( uncompressed_string )
             else
-                if debug
-                    puts 'Content Encoding is of type other than gzip, returning nil'
-                end
+                @helpers.log_debug 'Content Encoding is of type other than gzip, returning nil'
                 return nil
             end
         rescue => exception
-            if debug
-                puts 'Error while decompressing the response body'
-                puts exception.to_s
-            end
+            @helpers.log_debug 'Error while decompressing the response body'
+            @helpers.log_debug exception.to_s
             return nil
         end
     end
+
+    def calculate_weight(sample_rate)
+        return sample_rate == 0 ? 1 : (100 / sample_rate).floor
+    end
 end

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/helpers.rb

@@ -0,0 +1,14 @@
+require 'time'
+
+class Helpers
+
+    def initialize debug
+        @debug = debug
+    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
+end

data/lib/moesif_rack/moesif_middleware.rb

@@ -6,6 +6,9 @@ require_relative './client_ip.rb'
 require_relative './app_config.rb'
 require_relative './update_user.rb'
 require_relative './update_company.rb'
+require_relative './helpers.rb'
+require 'zlib'
+require 'stringio'
 
 module MoesifRack
 
@@ -26,30 +29,34 @@ module MoesifRack
       @mask_data = options['mask_data']
       @skip = options['skip']
       @debug = options['debug']
-      @app_config = AppConfig.new
-      @config = @app_config.get_config(@api_controller, @debug)
+      @app_config = AppConfig.new(@debug)
+      @helpers = Helpers.new(@debug)
+      @config = @app_config.get_config(@api_controller)
       @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
+      start_worker()
+
       begin
-        if !@config.nil?
-          @config_etag, @sampling_percentage, @last_updated_time = @app_config.parse_configuration(@config, @debug)
+        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
+        @helpers.log_debug 'Error while parsing application configuration on initialization'
+        @helpers.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
+        @helpers.log_debug 'Start Capturing outgoing requests'
         require_relative '../../moesif_capture_outgoing/httplog.rb'
         MoesifCaptureOutgoing.start_capture_outgoing(options)
       end
@@ -71,12 +78,84 @@ module MoesifRack
       CompanyHelper.new.update_companies_batch(@api_controller, @debug, company_profiles)
     end
 
-    def call env
-      start_time = Time.now.utc.iso8601
+    def start_with_json(body)
+      body.start_with?('{') || body.start_with?('[')
+    end
+
+    def decompress_body(body)
+      Zlib::GzipReader.new(StringIO.new(body)).read
+    end
+
+    def transform_headers(headers)
+      Hash[headers.map { |k, v| [k.downcase, v]}]
+    end
+
+    def base64_encode_body(body)
+      return Base64.encode64(body), 'base64'
+    end
 
+    def @helpers.log_debug(message)
       if @debug
-        puts 'inside moesif middleware'
+        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)
+          parsed_body = JSON.parse(body)
+          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)
+        else
+          parsed_body, transfer_encoding = base64_encode_body(body)
+        end
+      rescue
+        parsed_body, transfer_encoding = base64_encode_body(body)
+      end
+      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 
+                @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]
+                @helpers.log_debug(event_api_response.to_s)
+                @helpers.log_debug("Events successfully sent to Moesif")
+            end
+            
+            if @events_queue.empty?
+              @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)
+              puts "Unathorized accesss sending event to Moesif. Please verify your Application Id."
+              @helpers.log_debug(e.to_s)
+            end
+            @helpers.log_debug("Error sending event to Moesif, with status code #{e.response_code.to_s}")
+          rescue => e
+            @helpers.log_debug(e.to_s)
+          end
+        end
       end
+    end
+
+    def call env
+      start_time = Time.now.utc.iso8601
+
+      @helpers.log_debug('Calling Moesif middleware')
 
       status, headers, body = @app.call env
       end_time = Time.now.utc.iso8601
@@ -86,7 +165,7 @@ module MoesifRack
         complex_copy = env.dup
 
         req_headers = {}
-        complex_copy.select {|k,v| k.start_with? 'HTTP_'}.each do |key, val|
+        complex_copy.select {|k,v| k.start_with?('HTTP_', 'CONTENT_') }.each do |key, val|
           new_key = key.sub(/^HTTP_/, '')
           new_key = new_key.sub('_', '-')
           req_headers[new_key] = val
@@ -99,12 +178,7 @@ module MoesifRack
 
         if @log_body
           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
+            req_body, req_body_transfer_encoding = parse_body(req_body_string, transform_headers(req_headers))
           end
         end
 
@@ -116,12 +190,7 @@ module MoesifRack
 
         if @log_body
           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
+            rsp_body, rsp_body_transfer_encoding = parse_body(rsp_body_string, transform_headers(rsp_headers))
           end
         end
 
@@ -181,88 +250,71 @@ module MoesifRack
         event_model.direction = "Incoming"
         
         if @identify_user
-          if @debug
-            puts "calling identify user proc"
-          end
+          @helpers.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
+          @helpers.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
+          @helpers.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
+          @helpers.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
+          @helpers.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
+        @helpers.log_debug "sending data to moesif"
+        @helpers.log_debug event_model.to_json
         # Perform the API call through the SDK function
         begin
-          @random_percentage = Random.rand(0.00..100.00)
+          random_percentage  = Random.rand(0.00..100.00)
 
           begin 
-            @sampling_percentage = @app_config.get_sampling_percentage(@config, event_model.user_id, event_model.company_id, @debug)
+            sampling_percentage = @app_config.get_sampling_percentage(@config, event_model.user_id, event_model.company_id)
+            @helpers.log_debug "Using sample rate #{sampling_percentage}"
           rescue => exception
-            if @debug
-              puts 'Error while getting sampling percentage, assuming default behavior'
-              puts exception.to_s
-            end
-            @sampling_percentage = 100
+            @helpers.log_debug 'Error while getting sampling percentage, assuming default behavior'
+            @helpers.log_debug exception.to_s
+            sampling_percentage = 100
           end
 
-          if @sampling_percentage > @random_percentage
-            event_api_response = @api_controller.create_event(event_model)
-            event_response_config_etag = event_api_response[:x_moesif_config_etag]
+          if sampling_percentage > random_percentage 
+            event_model.weight = @app_config.calculate_weight(sampling_percentage)
+            # Add Event to the queue
+            @events_queue << event_model
+            @helpers.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)
+                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    
+                @helpers.log_debug 'Error while updating the application configuration'
+                @helpers.log_debug exception.to_s
               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
-          if @debug
-            puts "Error sending event to Moesif, with status code: "
-            puts e.response_code
+            @helpers.log_debug("Skipped Event due to sampling percentage: " + sampling_percentage.to_s + " and random percentage: " + random_percentage .to_s)
           end
+        rescue => exception
+          @helpers.log_debug "Error adding event to the queue "
+          @helpers.log_debug exception.to_s
         end
 
       end
@@ -276,11 +328,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

@@ -3,6 +3,7 @@ require 'rack'
 require 'moesif_api'
 require 'json'
 require 'base64'
+require_relative '../../lib/moesif_rack/app_config.rb'
 
 module MoesifCaptureOutgoing
 
@@ -23,6 +24,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
+      @config = @app_config.get_config(@api_controller, @debug)
+      @config_etag = nil
+      @sampling_percentage = 100
+      @last_updated_time = Time.now.utc
+      @config_dict = Hash.new
+      begin
+        if !@config.nil?
+          @config_etag, @sampling_percentage, @last_updated_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
+      end
     end
 
     def call (url, request, request_time, response, response_time)
@@ -157,11 +174,45 @@ module MoesifCaptureOutgoing
 
           # Send Event to Moesif
           begin
-            if @debug
-              puts 'Sending Outgoing Request Data to Moesif'
-              puts event_model.to_json
+            @random_percentage = Random.rand(0.00..100.00)
+            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
+              @sampling_percentage = 100
+            end
+
+            if @sampling_percentage > @random_percentage
+              event_model.weight = @app_config.calculate_weight(@sampling_percentage)
+              if @debug
+                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 
+                  @config = @app_config.get_config(@api_controller, @debug)
+                  @config_etag, @sampling_percentage, @last_updated_time = @app_config.parse_configuration(@config, @debug)
+                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)
+              end
             end
-            @api_controller.create_event(event_model)
           rescue MoesifApi::APIException => e
             if e.response_code.between?(401, 403)
               puts "Unathorized accesss sending event to Moesif. Please verify your Application Id."
@@ -170,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

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,28 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: moesif_rack
 version: !ruby/object:Gem::Version
-  version: 1.3.10
+  version: 1.4.4
 platform: ruby
 authors:
 - Moesif, Inc
 - Xing Wang
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-16 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
@@ -31,15 +37,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.10
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.10
-description: Collection/Data Ingestion SDK for Rack (also Rails) Middleware / RoR
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.12
+description: Rack/Rails middleware to log API calls to Moesif API analytics and monitoring
 email: xing@moesif.com
 executables: []
 extensions: []
@@ -50,6 +62,7 @@ files:
 - lib/moesif_rack.rb
 - lib/moesif_rack/app_config.rb
 - lib/moesif_rack/client_ip.rb
+- lib/moesif_rack/helpers.rb
 - lib/moesif_rack/moesif_middleware.rb
 - lib/moesif_rack/update_company.rb
 - lib/moesif_rack/update_user.rb
@@ -61,7 +74,7 @@ homepage: https://moesif.com
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -76,9 +89,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.7
-signing_key: 
+signing_key:
 specification_version: 4
 summary: moesif_rack
 test_files: []