vwo-fme-ruby-sdk 1.2.0 → 1.3.0

data/lib/vwo/packages/network_layer/manager/network_manager.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -69,10 +69,12 @@ class NetworkManager
     begin
       network_options = create_request(request)
       raise 'No URL found' if network_options.get_url.nil?
-
-      @client.post(network_options)
+  
+      response = @client.post(network_options) # Return the response
+      response
     rescue => e
       LoggerService.log(LogLevelEnum::ERROR, "Error posting: #{e.message}", nil)
+      return ResponseModel.new.set_error(e.message) # Return error response
     end
-  end  
+  end
 end

data/lib/vwo/packages/network_layer/models/global_request_model.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/vwo/packages/network_layer/models/request_model.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/vwo/packages/network_layer/models/response_model.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -41,5 +41,13 @@ class ResponseModel
     def set_error(error)
       @error = error
     end
+
+    def get_error
+      @error
+    end
+
+    def get_status_code
+      @status_code
+    end
   end
   

data/lib/vwo/packages/segmentation_evaluator/core/segmentation_manager.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/vwo/packages/segmentation_evaluator/enums/segment_operand_regex_enum.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/vwo/packages/segmentation_evaluator/enums/segment_operand_value_enum.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/vwo/packages/segmentation_evaluator/enums/segment_operator_value_enum.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/vwo/packages/segmentation_evaluator/evaluators/segment_evaluator.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/vwo/packages/segmentation_evaluator/evaluators/segment_operand_evaluator.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/vwo/packages/segmentation_evaluator/utils/segment_util.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/vwo/packages/storage/connector.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/vwo/packages/storage/storage.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,9 +18,11 @@ class Storage
   @instance = nil
 
   attr_reader :connector
+  attr_accessor :is_storage_enabled
 
   def initialize
     @connector = nil
+    @is_storage_enabled = false
   end
 
   # Attach a connector (can be an instance or a class)

data/lib/vwo/services/batch_event_queue.rb

@@ -0,0 +1,179 @@
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative '../utils/data_type_util'
+require_relative '../services/logger_service'
+require_relative '../enums/log_level_enum'
+require_relative '../constants/constants'
+require_relative '../packages/network_layer/manager/network_manager'
+require 'concurrent'
+
+class BatchEventsQueue
+    class << self
+        def instance
+          @instance ||= nil
+        end
+    
+        def configure(batch_config)
+          @instance = new(batch_config)
+        end
+    end
+    # Initializes a new batch events queue with the specified configuration
+    # @param batch_config Configuration object containing:
+    #   - request_time_interval: Time interval between batch requests (in seconds)
+    #   - events_per_request: Maximum number of events to include in a single request
+    #   - flush_callback: Callback function to execute after flushing events
+    #   - dispatcher: Function to handle sending the batched events
+    def initialize(batch_config)
+      @queue = []
+      @batch_config = batch_config
+      @network_client = NetworkManager.instance.get_client
+  
+      if DataTypeUtil.is_number(batch_config[:request_time_interval]) && batch_config[:request_time_interval] >= 1
+        @request_time_interval = batch_config[:request_time_interval]
+      else
+        @request_time_interval = Constants::DEFAULT_REQUEST_TIME_INTERVAL
+        LoggerService.log(LogLevelEnum::INFO, "EVENT_BATCH_DEFAULTS", {
+          parameter: 'request_time_interval',
+          minLimit: 0,
+          defaultValue: "#{@request_time_interval} seconds"
+        })
+      end
+  
+      if DataTypeUtil.is_number(batch_config[:events_per_request]) && 
+         batch_config[:events_per_request] > 0 && 
+         batch_config[:events_per_request] <= Constants::MAX_EVENTS_PER_REQUEST
+        @events_per_request = batch_config[:events_per_request]
+      elsif DataTypeUtil.is_number(batch_config[:events_per_request]) && 
+            batch_config[:events_per_request] > Constants::MAX_EVENTS_PER_REQUEST
+        @events_per_request = Constants::MAX_EVENTS_PER_REQUEST
+        LoggerService.log(LogLevelEnum::INFO, "EVENT_BATCH_MAX_LIMIT", {
+          parameter: 'events_per_request',
+          maxLimit: Constants::MAX_EVENTS_PER_REQUEST.to_s
+        })
+      else
+        @events_per_request = Constants::DEFAULT_EVENTS_PER_REQUEST
+        LoggerService.log(LogLevelEnum::INFO, "EVENT_BATCH_DEFAULTS", {
+          parameter: 'events_per_request',
+          minLimit: 0,
+          defaultValue: @events_per_request.to_s
+        })
+      end
+  
+      @flush_callback = batch_config[:flush_callback] if batch_config[:flush_callback].respond_to?(:call)
+  
+      @dispatcher = batch_config[:dispatcher]
+      @batch_lock = Mutex.new
+      @timer = nil
+      create_new_batch_timer
+    end
+  
+    # Creates a new timer thread to automatically flush events after request_time_interval
+    # The timer is only created if one doesn't already exist
+    def create_new_batch_timer
+      return if @timer
+  
+      @timer = Time.now + @request_time_interval
+      @thread = Thread.new { flush_when_request_times_up }
+    end
+  
+    # Adds a new event to the queue and manages batch processing
+    # If queue reaches events_per_request limit, it triggers an immediate flush
+    # @param event The event to be added to the queue
+    def enqueue(event)
+      @queue.push(event)
+  
+      LoggerService.log(LogLevelEnum::INFO, "EVENT_QUEUE", {
+        queueType: 'batch',
+        event: event.to_json
+      })
+
+      # if the number of events in the queue is equal to the events_per_request, flush
+      if @queue.length >= @events_per_request
+        flush
+      end
+    end
+  
+    # Background thread function that monitors the timer
+    # When the timer expires, it flushes the queue and cleans up
+    def flush_when_request_times_up
+      sleep(1) while @timer && Time.now < @timer
+      flush
+    end
+  
+    # Processes and sends all queued events
+    # @param manual Boolean indicating if flush was triggered manually
+    # Clears the queue after successful processing
+    def flush(manual = false)
+      @batch_lock.synchronize do
+        if @queue.any?
+          LoggerService.log(LogLevelEnum::DEBUG, "EVENT_BATCH_BEFORE_FLUSHING", {
+            manually: manual ? 'manually' : '',
+            length: @queue.length,
+            accountId: @batch_config[:account_id],
+            timer: manual ? 'Timer will be cleared and registered again' : ''
+          })
+  
+          # add events to another queue
+          temp_queue = @queue.dup
+          @queue = []
+          
+          if manual
+            future = Concurrent::Future.new(executor: @network_client.get_thread_pool) do
+              handle_flush_response(temp_queue, manual)
+            end
+            future.execute
+            @response = future.value
+          else
+            @network_client.get_thread_pool.post do
+              handle_flush_response(temp_queue, manual)
+            end
+          end
+        else
+          LoggerService.log(LogLevelEnum::DEBUG, "BATCH_QUEUE_EMPTY")
+          @response = {status: "success", events: []}
+        end
+        kill_old_thread if !manual && @thread
+        clear_request_timer
+        create_new_batch_timer
+        @response
+      end
+    end
+  
+    private
+
+    def handle_flush_response(temp_queue, manual)
+      @response = @dispatcher.call(temp_queue, @flush_callback)
+      if @response[:status] == "success"
+        LoggerService.log(LogLevelEnum::INFO, "EVENT_BATCH_After_FLUSHING", {
+          manually: manual ? 'manually' : '',
+          length: temp_queue.length
+        })
+      else
+        @queue.concat(temp_queue)
+      end
+      temp_queue = []
+      @response
+    end
+
+    # Resets the request timer to nil
+    def clear_request_timer
+      @timer = nil
+    end
+
+    def kill_old_thread
+      @old_thread&.kill
+    end
+end
+  

data/lib/vwo/services/campaign_decision_service.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/vwo/services/hooks_service.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/vwo/services/logger_service.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/vwo/services/settings_service.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ require_relative '../enums/log_level_enum'
 require_relative '../models/schemas/settings_schema_validation'
 
 class SettingsService
-  attr_accessor :sdk_key, :account_id, :expiry, :network_timeout, :hostname, :port, :protocol, :is_gateway_service_provided
+  attr_accessor :sdk_key, :account_id, :expiry, :network_timeout, :hostname, :port, :protocol, :is_gateway_service_provided, :is_settings_valid
 
   class << self
     attr_accessor :instance
@@ -38,6 +38,7 @@ class SettingsService
     @account_id = options[:account_id]
     @expiry = options.dig(:settings, :expiry) || Constants::SETTINGS_EXPIRY
     @network_timeout = options.dig(:settings, :timeout) || Constants::SETTINGS_TIMEOUT
+    @is_settings_valid = false
 
     if options[:gateway_service] && options[:gateway_service][:url]
       parsed_url = URI.parse(options[:gateway_service][:url].start_with?(Constants::HTTP_PROTOCOL) || options[:gateway_service][:url].start_with?(Constants::HTTPS_PROTOCOL) ? options[:gateway_service][:url] : "#{Constants::HTTPS_PROTOCOL}#{options[:gateway_service][:url]}")
@@ -109,6 +110,7 @@ class SettingsService
       settings = fetch_settings_and_cache_in_storage
       is_valid = SettingsSchema.new.is_settings_valid(settings)
       if is_valid
+        @is_settings_valid = true
         LoggerService.log(LogLevelEnum::INFO, "SETTINGS_FETCH_SUCCESS")
         settings
       else

data/lib/vwo/services/storage_service.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/vwo/utils/batch_event_dispatcher.rb

@@ -0,0 +1,117 @@
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative './network_util'
+require_relative '../enums/http_method_enum'
+require_relative '../enums/url_enum'
+require_relative '../enums/log_level_enum'
+require_relative '../services/logger_service'
+require_relative '../packages/network_layer/manager/network_manager'
+require_relative '../packages/network_layer/models/request_model'
+
+class BatchEventDispatcher
+
+  class << self
+
+    # Dispatches a batch of events to the VWO server
+    # @param properties [Hash] The event properties to send
+    # @param callback [Proc] Optional callback function to execute after the request (defaults to empty proc)
+    # @param query_params [Hash] Query parameters to include in the request
+    def dispatch(properties, callback = -> {}, query_params)
+      # Send the prepared payload via POST API request
+      send_batch_post_api_request(query_params, properties, callback)
+    end
+
+    # Sends a POST API request with given properties and payload
+    def send_batch_post_api_request(properties, payload, callback)
+      network_instance = NetworkManager.instance
+      headers = {}
+      headers['Authorization'] = "#{SettingsService.instance.sdk_key}"
+
+      request = RequestModel.new(
+        UrlUtil.get_base_url,
+        HttpMethodEnum::POST,
+        UrlEnum::BATCH_EVENTS,
+        properties,
+        payload,
+        headers,
+        SettingsService.instance.protocol,
+        SettingsService.instance.port
+      )
+
+      begin
+        response = network_instance.post(request)
+        handle_batch_response(UrlEnum::BATCH_EVENTS, payload, properties, response, response.get_data, callback)
+      rescue StandardError => err
+        LoggerService.log(LogLevelEnum::ERROR, "NETWORK_CALL_FAILED", {
+              method: "#{HttpMethodEnum::POST} #{UrlEnum::BATCH_EVENTS}",
+              err: err.is_a?(Hash) ? err.to_json : err
+          })
+      end
+  end
+
+    # Handles the response from a batch event API call
+    # @param end_point [String] The API endpoint that was called
+    # @param payload [Hash] The payload that was sent in the request
+    # @param query_params [Hash] The query parameters used in the request
+    # @param res [ResponseModel] The response object from the API call
+    # @param raw_data [String] The raw response data from the API
+    # @param callback [Proc] Optional callback to be executed after handling the response
+    def handle_batch_response(end_point, payload, query_params, res, raw_data, callback)
+      events_per_request = payload[:ev].length
+      account_id = query_params[:a]
+
+      error = res.get_error
+      if error
+        LoggerService.log(LogLevelEnum::INFO, "IMPRESSION_BATCH_FAILED")
+        LoggerService.log(LogLevelEnum::ERROR, "NETWORK_CALL_FAILED", {
+          method: "#{HttpMethodEnum::POST} #{UrlEnum::BATCH_EVENTS}",
+          err: error
+        })
+        callback.call(error, payload.to_json) if callback.respond_to?(:call)
+        return {status: "error", events: payload}
+      else
+        case res.get_status_code
+        when 200
+          LoggerService.log(LogLevelEnum::INFO, "IMPRESSION_BATCH_SUCCESS", {
+            accountId: account_id,
+            endPoint: end_point,
+          })
+          callback.call(nil, payload.to_json) if callback.respond_to?(:call)
+          return {status: "success", events: payload}
+        when 413
+          LoggerService.log(LogLevelEnum::DEBUG, "CONFIG_BATCH_EVENT_LIMIT_EXCEEDED", {
+              accountId: account_id,
+              endPoint: end_point,
+              eventsPerRequest: events_per_request
+          })
+          LoggerService.log(LogLevelEnum::ERROR, "NETWORK_CALL_FAILED", {
+              method: "#{HttpMethodEnum::POST} #{UrlEnum::BATCH_EVENTS}",
+              err: error
+          })
+          callback.call(error, payload.to_json) if callback.respond_to?(:call)
+          return {status: "error", events: payload}
+        else
+          LoggerService.log(LogLevelEnum::INFO, "IMPRESSION_BATCH_FAILED")
+          LoggerService.log(LogLevelEnum::ERROR, "NETWORK_CALL_FAILED", {
+              method: "#{HttpMethodEnum::POST} #{UrlEnum::BATCH_EVENTS}",
+              err: error
+          })
+          callback.call(error, payload.to_json) if callback.respond_to?(:call)
+          return {status: "error", events: payload}
+        end
+      end
+    end
+  end
+end

data/lib/vwo/utils/campaign_util.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/vwo/utils/data_type_util.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/vwo/utils/decision_util.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/vwo/utils/function_util.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,6 +17,10 @@ require_relative '../models/campaign/campaign_model'
 require_relative '../models/campaign/feature_model'
 require_relative '../models/settings/settings_model'
 require_relative '../utils/data_type_util'
+require_relative '../services/logger_service'
+require_relative '../enums/log_level_enum'
+require_relative '../constants/constants'
+require_relative '../utils/data_type_util'
 
 # Clones an object deeply.
 # @param obj [Object] The object to clone.

data/lib/vwo/utils/gateway_service_util.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/vwo/utils/impression_util.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ require_relative '../models/settings/settings_model'
 require_relative './network_util'
 require_relative '../models/user/context_model'
 require_relative '../enums/event_enum'
-
+require_relative '../services/batch_event_queue'
 # Creates and sends an impression for a variation shown event.
 # This function constructs the necessary properties and payload for the event
 # and uses the NetworkUtil to send a POST API request.
@@ -45,5 +45,12 @@ def create_and_send_impression_for_variation_shown(settings, campaign_id, variat
     context.get_ip_address
   )
 
-  NetworkUtil.send_post_api_request(properties, payload)
+  # check if batching is enabled
+  if BatchEventsQueue.instance
+    # add the payload to the batch events queue
+    BatchEventsQueue.instance.enqueue(payload)
+  else
+    # Send the constructed payload via POST request
+    NetworkUtil.send_post_api_request(properties, payload)
+  end
 end

data/lib/vwo/utils/log_message_util.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/vwo/utils/meg_util.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/vwo/utils/network_util.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -104,8 +104,6 @@ class NetworkUtil
             msgId: "#{uuid}-#{get_current_unix_timestamp_in_millis}",
             visId: uuid,
             sessionId: get_current_unix_timestamp,
-            visitor_ua: visitor_user_agent,
-            visitor_ip: ip_address,
             event: {
             props: {
                 vwo_sdkName: Constants::SDK_NAME,
@@ -130,6 +128,10 @@ class NetworkUtil
         properties[:d][:event][:props][:id] = campaign_id
         properties[:d][:event][:props][:variation] = variation_id
         properties[:d][:event][:props][:isFirst] = 1
+
+        # Only add visitor_ua and visitor_ip if they are non-null
+        properties[:d][:visitor_ua] = visitor_user_agent if visitor_user_agent && !visitor_user_agent.empty?
+        properties[:d][:visitor_ip] = ip_address if ip_address && !ip_address.empty?
         
         LoggerService.log(LogLevelEnum::DEBUG, "IMPRESSION_FOR_TRACK_USER", {
             accountId: settings.account_id,
@@ -196,9 +198,16 @@ class NetworkUtil
         SettingsService.instance.protocol,
         SettingsService.instance.port
         )
-        
-        begin
-            network_instance.post(request)
+
+        begin 
+            if network_instance.get_client.get_should_use_threading
+                network_instance.get_client.get_thread_pool.post {
+                    response = network_instance.post(request)
+                    response
+                }
+            else
+                response = network_instance.post(request)
+            end
         rescue ResponseModel => err
             LoggerService.log(LogLevelEnum::ERROR, "NETWORK_CALL_FAILED", {
                 method: HttpMethodEnum::POST,
@@ -224,7 +233,7 @@ class NetworkUtil
         
         begin
             network_instance.get(request)
-        rescue ResponseModel => err
+        rescue StandardError => err
             LoggerService.log(LogLevelEnum::ERROR, "NETWORK_CALL_FAILED", {
                 method: HttpMethodEnum::GET,
                 err: err.is_a?(Hash) ? err.to_json : err

data/lib/vwo/utils/rule_evaluation_util.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/vwo/utils/settings_util.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/vwo/utils/url_util.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/vwo/utils/uuid_util.rb

@@ -1,4 +1,4 @@
-# Copyright 2025 Wingify Software Pvt. Ltd.
+# Copyright 2024-2025 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.