moesif_rack 1.3.10 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5449e55b2da865cdc2bd4d52eef977b45db5a3e7648ee18f67f93795bf1fcd46
-  data.tar.gz: 930c9fb3a9181eec3b12d5aea8073c12646f94f77d16638dfa0422107b8000f3
+  metadata.gz: 818bfecddcafd4b2b71a662e762cb5468b4bf54c7fc5397fb0812ad4274b82ac
+  data.tar.gz: 96385b853df74e5a7ca95d669244fc8e744079fcfd6d109c1c7855663bd61ea8
 SHA512:
-  metadata.gz: 13012b377dac7ca5da3dcaf1d50ef97e71f6515df9e7f94e61b39746b4f29b134efcbc87eaafcb8dcd04dd67e0e052d8f0c5e9c77dd6ea20a7d997f50df3feb6
-  data.tar.gz: d7499b20fa602a2dd1bde29099b5b11755f36421f79c32f59fc1e1aa7f0e1dce7794b7ed1ca703c74ff07f040492b3ecc12f038eb3f52625348b13ae9becb2ec
+  metadata.gz: eb421c6472805827b2f7c23442c3047ba36c34172ef9af86d2c1266e3867c5aea201cb1900b9e11c16f6915773273a366d75e2b81a0bd02676f147f432de2988
+  data.tar.gz: 557bea2a4a9e8c223bde8d2242d47c23ff69adf591ee2f55101b74f9910e788ec584aaf7b5e61942f485a2aa43bd423b6a4196094586424c217de0ded3fe36b9

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.0'
 
 ```
 
@@ -373,12 +373,6 @@ 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 => {
@@ -463,12 +457,6 @@ 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 => {

data/lib/moesif_rack/app_config.rb

@@ -118,4 +118,8 @@ class AppConfig
             return nil
         end
     end
+
+    def calculate_weight(sample_rate)
+        return sample_rate == 0 ? 1 : (100 / sample_rate).floor
+    end
 end

data/lib/moesif_rack/moesif_middleware.rb

@@ -233,6 +233,7 @@ module MoesifRack
           end
 
           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]
 

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."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moesif_rack
 version: !ruby/object:Gem::Version
-  version: 1.3.10
+  version: 1.4.0
 platform: ruby
 authors:
 - Moesif, Inc
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2019-12-18 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.10
+        version: 1.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.10
+        version: 1.2.11
 description: Collection/Data Ingestion SDK for Rack (also Rails) Middleware / RoR
 email: xing@moesif.com
 executables: []