zuora_api 1.7.66 → 1.11.2

data/lib/zuora_api/login.rb

@@ -7,8 +7,9 @@ module ZuoraAPI
   class Login
     ENVIRONMENTS = [TEST = 'Test', SANDBOX = 'Sandbox', PRODUCTION = 'Production', PREFORMANCE = 'Preformance', SERVICES = 'Services', UNKNOWN = 'Unknown', STAGING = 'Staging' ]
     REGIONS = [EU = 'EU', US = 'US', NA = 'NA' ]
-    MIN_Endpoint = '96.0'
+    MIN_Endpoints = {'Test': '126.0', 'Sandbox': '126.0', 'Production': '126.0', 'Performance': '126.0', 'Services': '96.0', 'Unknown': '96.0', 'Staging': '127.0'}.freeze
     XML_SAVE_OPTIONS = Nokogiri::XML::Node::SaveOptions::AS_XML | Nokogiri::XML::Node::SaveOptions::NO_DECLARATION
+    USER_AGENT = "Zuora#{ENV['Z_APPLICATION_NAME']&.capitalize}/#{ENV['Z_APPLICATION_VERSION']&.delete('v')}"
 
     CONNECTION_EXCEPTIONS = [
       Net::OpenTimeout,
@@ -21,7 +22,7 @@ module ZuoraAPI
     ].freeze
 
     CONNECTION_READ_EXCEPTIONS = [
-      Net::ReadTimeout,
+      Timeout::Error,
       Errno::ECONNRESET,
       Errno::EPIPE
     ].freeze
@@ -39,25 +40,29 @@ module ZuoraAPI
 
     ZUORA_SERVER_ERRORS = [
       ZuoraAPI::Exceptions::ZuoraAPIInternalServerError,
-      ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout,
-      ZuoraAPI::Exceptions::ZuoraAPIReadTimeout,
+        ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout,
+        ZuoraAPI::Exceptions::ZuoraAPIReadTimeout,
       ZuoraAPI::Exceptions::ZuoraUnexpectedError
     ].freeze
-    
-    attr_accessor :region, :url, :wsdl_number, :current_session, :bearer_token, :oauth_session_expires_at, :environment, :status, :errors, :current_error, :user_info, :tenant_id, :tenant_name, :entity_id, :timeout_sleep, :hostname, :zconnect_provider
 
-    def initialize(url: nil, entity_id: nil, session: nil, status: nil, bearer_token: nil, oauth_session_expires_at: nil, **keyword_args)
+    attr_accessor :region, :url, :wsdl_number, :current_session, :bearer_token, :oauth_session_expires_at, :environment, :status, :errors, :current_error, :user_info, :tenant_id, :tenant_name, :entity_id, :entity_identifier, :entity_header_type, :timeout_sleep, :hostname, :zconnect_provider
+
+    def initialize(url: nil, entity_id: nil, entity_identifier: nil, session: nil, status: nil, bearer_token: nil, oauth_session_expires_at: nil, **keyword_args)
       raise "URL is nil or empty, but URL is required" if url.nil? || url.empty?
       # raise "URL is improper. URL must contain zuora.com, zuora.eu, or zuora.na" if /zuora.com|zuora.eu|zuora.na/ === url
       self.hostname = /(?<=https:\/\/|http:\/\/)(.*?)(?=\/|$)/.match(url)[0] if !/(?<=https:\/\/|http:\/\/)(.*?)(?=\/|$)/.match(url).nil?
+      self.update_environment
+      min_endpoint = MIN_Endpoints[self.environment.to_sym]
       if !/apps\/services\/a\/\d+\.\d$/.match(url.strip)
-        self.url = "https://#{hostname}/apps/services/a/#{MIN_Endpoint}"
-      elsif MIN_Endpoint.to_f > url.scan(/(\d+\.\d)$/).dig(0,0).to_f
-        self.url = url.gsub(/(\d+\.\d)$/, MIN_Endpoint)
+        self.url = "https://#{hostname}/apps/services/a/#{min_endpoint}"
+      elsif min_endpoint.to_f > url.scan(/(\d+\.\d)$/).dig(0,0).to_f
+        self.url = url.gsub(/(\d+\.\d)$/, min_endpoint)
       else
         self.url = url
       end
       self.entity_id = get_entity_id(entity_id: entity_id)
+      self.entity_identifier = entity_identifier
+      self.entity_header_type = :entity_id
       self.errors = Hash.new
       self.current_session = session
       self.bearer_token = bearer_token
@@ -65,36 +70,18 @@ module ZuoraAPI
       self.status = status.blank? ? "Active" : status
       self.user_info = Hash.new
       self.update_region
-      self.update_environment
       self.update_zconnect_provider
       @timeout_sleep = 5
     end
 
     def get_identity(cookies)
       zsession = cookies["ZSession"]
-      zconnect_accesstoken = get_zconnect_accesstoken(cookies)
       begin
         if !zsession.blank?
-          response = HTTParty.get("https://#{self.hostname}/apps/v1/identity", :headers => {'Cookie' => "ZSession=#{zsession}", 'Content-Type' => 'application/json'})
-          output_json = JSON.parse(response.body)
-        elsif zconnect_accesstoken.present?
-          begin
-            code = zconnect_accesstoken.split("#!").last
-            encrypted_token, tenant_id = Base64.decode64(code).split(":")
-            body = {'token' => encrypted_token}.to_json
-          rescue => ex
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Invalid ZConnect Cookie")
-          end
-          Rails.logger.info("Using ZConnect cookie in get_identity method")
-
-          response = HTTParty.post("https://#{self.hostname}/apps/zconnectsession/identity", :body => body, :headers => { 'Content-Type' => 'application/json' })
+          response = HTTParty.get("https://#{self.hostname}/apps/v1/identity", :headers => {'Cookie' => "ZSession=#{zsession}", 'Content-Type' => 'application/json', "User-Agent" => USER_AGENT})
           output_json = JSON.parse(response.body)
         else
-          if zconnect_accesstoken.blank? && cookies.keys.any? { |x| x.include? "ZConnect"}
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZConnect cookie present matching #{self.hostname}")
-          else
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
-          end
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
         end
       rescue JSON::ParserError => ex
         output_json = {}
@@ -105,21 +92,12 @@ module ZuoraAPI
 
     def get_full_nav(cookies)
       zsession = cookies["ZSession"]
-      zconnect_accesstoken = get_zconnect_accesstoken(cookies)
       begin
         if zsession.present?
-          response = HTTParty.get("https://#{self.hostname}/apps/v1/navigation", :headers => {'Cookie' => "ZSession=#{zsession}", 'Content-Type' => 'application/json'})
-          output_json = JSON.parse(response.body)
-        elsif zconnect_accesstoken.present?
-          Rails.logger.info("Using ZConnect cookie in get_full_nav method")
-          response = HTTParty.get("https://#{self.hostname}/apps/zconnectsession/navigation", :headers => {'Cookie' => "#{self.zconnect_provider}=#{zconnect_accesstoken}",'Content-Type' => 'application/json'})
+          response = HTTParty.get("https://#{self.hostname}/apps/v1/navigation", :headers => {'Cookie' => "ZSession=#{zsession}", 'Content-Type' => 'application/json', "User-Agent" => USER_AGENT})
           output_json = JSON.parse(response.body)
         else
-          if zconnect_accesstoken.blank? && cookies.keys.any? { |x| x.include? "ZConnect"}
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZConnect cookie present matching #{self.hostname}")
-          else
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
-          end
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
         end
       rescue JSON::ParserError => ex
         output_json = {}
@@ -130,21 +108,12 @@ module ZuoraAPI
 
     def set_nav(state, cookies)
       zsession = cookies["ZSession"]
-      zconnect_accesstoken = get_zconnect_accesstoken(cookies)
       begin
         if !zsession.blank?
-          response = HTTParty.put("https://#{self.hostname}/apps/v1/preference/navigation", :body => state.to_json, :headers => {'Cookie' => "ZSession=#{zsession}", 'Content-Type' => 'application/json'})
-          output_json = JSON.parse(response.body)
-        elsif !zconnect_accesstoken.blank?
-          Rails.logger.info("Using ZConnect cookie in set_nav method")
-          response = HTTParty.post("https://#{self.hostname}/apps/zconnectsession/navigationstate", :body => state.to_json, :headers => {'Cookie' => "#{self.zconnect_provider}=#{zconnect_accesstoken}", 'Content-Type' => 'application/json'})
+          response = HTTParty.put("https://#{self.hostname}/apps/v1/preference/navigation", :body => state.to_json, :headers => {'Cookie' => "ZSession=#{zsession}", 'Content-Type' => 'application/json', "User-Agent" => USER_AGENT})
           output_json = JSON.parse(response.body)
         else
-          if zconnect_accesstoken.blank? && cookies.keys.any? { |x| x.include? "ZConnect"}
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZConnect cookie present matching #{self.hostname}")
-          else
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
-          end
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
         end
       rescue JSON::ParserError => ex
         output_json = {}
@@ -155,21 +124,12 @@ module ZuoraAPI
 
     def refresh_nav(cookies)
       zsession = cookies["ZSession"]
-      zconnect_accesstoken = get_zconnect_accesstoken(cookies)
       begin
         if !zsession.blank?
-          response = HTTParty.post("https://#{self.hostname}/apps/v1/navigation/fetch", :headers => {'Cookie' => "ZSession=#{zsession}", 'Content-Type' => 'application/json'})
-          output_json = JSON.parse(response.body)
-        elsif !zconnect_accesstoken.blank?
-          Rails.logger.info("Using ZConnect cookie in refresh_nav method")
-          response = HTTParty.post("https://#{self.hostname}/apps/zconnectsession/refresh-navbarcache", :headers => {'Cookie' => "#{self.zconnect_provider}=#{zconnect_accesstoken}", 'Content-Type' => 'application/json'})
+          response = HTTParty.post("https://#{self.hostname}/apps/v1/navigation/fetch", :headers => {'Cookie' => "ZSession=#{zsession}", 'Content-Type' => 'application/json', "User-Agent" => USER_AGENT})
           output_json = JSON.parse(response.body)
         else
-          if zconnect_accesstoken.blank? && cookies.keys.any? { |x| x.include? "ZConnect"}
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZConnect cookie present matching #{self.hostname}")
-          else
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
-          end
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
         end
       rescue JSON::ParserError => ex
         output_json = {}
@@ -178,25 +138,17 @@ module ZuoraAPI
       return output_json
     end
 
-    def get_zconnect_accesstoken(cookies)
-      accesstoken = nil
-      self.update_zconnect_provider
-      if !cookies[self.zconnect_provider].nil? && !cookies[self.zconnect_provider].empty?
-        accesstoken = cookies[self.zconnect_provider]
-      end
-      return accesstoken
-    end
-
     def reporting_url(path)
       map = {"US" => {"Sandbox" => "https://zconnectsandbox.zuora.com/api/rest/v1/",
                       "Production" => "https://zconnect.zuora.com/api/rest/v1/",
-                      "Test" => "https://reporting-sbx.zan.0001.sbx.auw2.zuora.com/api/rest/v1/",
+                      "Test" => "https://zconnect-services0001.test.zuora.com/api/rest/v1/",
                       "Staging" => "https://reporting-stg11.zan.svc.auw2.zuora.com/api/rest/v1/",
                       "Performance" => "https://zconnectpt1.zuora.com/api/rest/v1/",
                       "Services" => "https://reporting-svc08.svc.auw2.zuora.com/api/rest/v1/"},
              "EU" => {"Sandbox" => "https://zconnect.sandbox.eu.zuora.com/api/rest/v1/",
                       "Production" => "https://zconnect.eu.zuora.com/api/rest/v1/",
-                      "Services"=> "https://reporting-sbx0000.sbx.aec1.zuora.com/api/rest/v1/"},
+                      "Services"=> "https://reporting-sbx0000.sbx.aec1.zuora.com/api/rest/v1/",
+                      "Test" => "https://zconnect-services0002.test.eu.zuora.com/api/rest/v1/"},
              "NA" => {"Sandbox" => "https://zconnect.sandbox.na.zuora.com/api/rest/v1/",
                       "Production" => "https://zconnect.na.zuora.com/api/rest/v1/",
                       "Services"=> ""}
@@ -208,7 +160,7 @@ module ZuoraAPI
     # 1. Pass in cookies and optionally custom_authorities, name, and description
     # 2. Pass in user_id, entity_ids, client_id, client_secret, and optionally custom_authorities, name, and description
     # https://intranet.zuora.com/confluence/display/Sunburst/Create+an+OAuth+Client+through+API+Gateway#CreateanOAuthClientthroughAPIGateway-ZSession
-    def get_oauth_client (custom_authorities = [], info_name: "No Name", info_desc: "This client was created without a description.", user_id: nil, entity_ids: nil, client_id: nil, client_secret: nil, new_client_id: nil, new_client_secret: nil, cookies: nil)
+    def get_oauth_client (custom_authorities = [], info_name: "No Name", info_desc: "This client was created without a description.", user_id: nil, entity_ids: nil, client_id: nil, client_secret: nil, new_client_id: nil, new_client_secret: nil, cookies: nil, chomp_v1_from_genesis_endpoint: false, use_api_generated_client_secret: false)
       authorization = ""
       new_client_id = SecureRandom.uuid if new_client_id.blank?
       new_client_secret = SecureRandom.hex(10) if new_client_secret.blank?
@@ -227,18 +179,18 @@ module ZuoraAPI
           raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Zuora User ID not provided")
         end
       elsif !client_id.nil? && !client_secret.nil?
-        bearer_response = HTTParty.post("https://#{self.hostname}/oauth/token", :headers => {'Content-Type' => 'application/x-www-form-urlencoded', 'Accept' => 'application/json'}, :body => {'client_id' => client_id, 'client_secret' => URI::encode(client_secret), 'grant_type' => 'client_credentials'})
+        bearer_response = HTTParty.post("https://#{self.hostname}/oauth/token", :headers => {'Content-Type' => 'application/x-www-form-urlencoded', 'Accept' => 'application/json', "User-Agent" => USER_AGENT}, :body => {'client_id' => client_id, 'client_secret' => URI::encode(client_secret), 'grant_type' => 'client_credentials'})
         bearer_hash = JSON.parse(bearer_response.body)
         bearer_token = bearer_hash["access_token"]
         authorization = "Bearer #{bearer_token}"
       end
 
       if !authorization.blank? && !user_id.blank? && !entity_ids.blank?
-        endpoint = self.rest_endpoint("genesis/clients")
-        oauth_response = HTTParty.post(endpoint, :headers => {'authorization' => authorization, 'Content-Type' => 'application/json'}, :body => {'clientId' => new_client_id, 'clientSecret' => new_client_secret, 'userId' => user_id, 'entityIds' => entity_ids, 'customAuthorities' => custom_authorities, 'additionalInformation' => {'description' => info_desc, 'name' => info_name}}.to_json)
+        endpoint = chomp_v1_from_genesis_endpoint ? self.rest_endpoint.chomp("v1/").concat("genesis/clients") : self.rest_endpoint("genesis/clients")
+        oauth_response = HTTParty.post(endpoint, :headers => {'authorization' => authorization, 'Content-Type' => 'application/json', "User-Agent" => USER_AGENT}, :body => {'clientId' => new_client_id, 'clientSecret' => new_client_secret, 'userId' => user_id, 'entityIds' => entity_ids, 'customAuthorities' => custom_authorities, 'additionalInformation' => {'description' => info_desc, 'name' => info_name}}.to_json)
         output_json = JSON.parse(oauth_response.body)
         if oauth_response.code == 201
-          output_json["clientSecret"] = new_client_secret
+          output_json["clientSecret"] = new_client_secret if !use_api_generated_client_secret
           return output_json
         elsif oauth_response.code == 401 && !oauth_response.message.blank?
           raise ZuoraAPI::Exceptions::ZuoraAPIError.new(output_json["message"], oauth_response)
@@ -273,7 +225,8 @@ module ZuoraAPI
               "NA" => {"Sandbox" => "https://sandbox.na.zuora.com/apps/services/a/",
                        "Production" => "https://na.zuora.com/apps/services/a/",
                        "Performance" => "https://pt1.na.zuora.com/apps/services/a/",
-                       "Services" => "https://services347.na.zuora.com/apps/services/a/"}
+                       "Services" => "https://services347.na.zuora.com/apps/services/a/",
+                       "Test" => "https://test.zuora.com/apps/services/a/"}
             }
     end
 
@@ -305,7 +258,7 @@ module ZuoraAPI
     end
 
     def update_environment
-      if !self.url.blank?
+      if !self.hostname.blank?
         case self.hostname
         when /(?<=\.|\/|-|^)(apisandbox|sandbox)(?=\.|\/|-|$)/
           self.environment = 'Sandbox'
@@ -328,13 +281,13 @@ module ZuoraAPI
     end
 
     def update_zconnect_provider
-      region = update_region
-      environment = update_environment
+      update_region if self.region.blank?
+      update_environment if self.environment.blank?
       mappings = {"US" => {"Sandbox" => "ZConnectSbx",   "Services" => "ZConnectSvcUS", "Production" => "ZConnectProd",   "Performance" => "ZConnectPT1", "Test" => "ZConnectTest", "Staging" => "ZConnectQA", "KubeSTG" => "ZConnectDev", "KubeDEV" => "ZConnectDev", "KubePROD" => "ZConnectDev"},
                   "NA" => {"Sandbox" => "ZConnectSbxNA", "Services" => "ZConnectSvcNA", "Production" => "ZConnectProdNA", "Performance" => "ZConnectPT1NA"},
                   "EU" => {"Sandbox" => "ZConnectSbxEU", "Services" => "ZConnectSvcEU", "Production" => "ZConnectProdEU", "Performance" => "ZConnectPT1EU", "Test" => "ZConnectTest"},
                   "Unknown" => {"Unknown" => "Unknown"}}
-      self.zconnect_provider = mappings[region][environment]
+      self.zconnect_provider = mappings[self.region][self.environment]
     end
 
     def aqua_endpoint(url="")
@@ -351,7 +304,7 @@ module ZuoraAPI
       update_environment
       endpoint = url
       url_postfix = {"US" => ".", "EU" => ".eu.", "NA" => ".na."}[self.region]
-    
+
       case self.environment
       when 'Test'
         endpoint = "https://rest.test#{url_postfix}zuora.com"
@@ -374,8 +327,8 @@ module ZuoraAPI
       return domain ? endpoint.concat(prefix).concat(url) : prefix.concat(url)
     end
 
-    def rest_domain
-      return URI(self.rest_endpoint).host
+    def rest_domain(endpoint: self.rest_endpoint)
+      return URI(endpoint).host
     end
 
     def fileURL(url="")
@@ -387,10 +340,41 @@ module ZuoraAPI
     end
 
     def new_session(auth_type: :basic, debug: false, zuora_track_id: nil)
+      retries ||= 2
+      yield
+
+    rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
+      self.status = 'Invalid'
+      self.current_error = ex.message
+      raise
+    rescue ZuoraAPI::Exceptions::ZuoraAPIError  => ex
+      raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(ex.message, ex.response)
+
+    rescue ZuoraAPI::Exceptions::ZuoraAPIInternalServerError => ex
+      raise ex if retries.zero?
+
+      retries -= 1
+      sleep(self.timeout_sleep)
+      retry
+
+    rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
+      self.log(location: "BasicLogin", exception: ex, message: "Timed out", level: :error)
+
+      self.current_error = "Request timed out. Try again"
+      self.status = 'Timeout'
+
+      raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error)
+
+    rescue EOFError
+      if self.url.match?(/.*services\d{1,}.zuora.com*/)
+        self.current_error = "Services tenant '#{self.url.scan(/.*\/\/(services\d{1,}).zuora.com*/).last.first}' is no longer available."
+        self.status = 'Not Available'
+        raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error)
+      end
+
     end
 
     def get_session(prefix: false, auth_type: :basic, zuora_track_id: nil)
-      Rails.logger.debug("Get session for #{auth_type} - #{self.class.to_s}") if Rails.env.to_s == 'development'
       case auth_type
       when :basic
         if self.current_session.blank?
@@ -399,14 +383,13 @@ module ZuoraAPI
             if self.bearer_token.blank? || self.oauth_expired?
               self.new_session(auth_type: :bearer, zuora_track_id: zuora_track_id)
             end
-            self.get_z_session(zuora_track_id: zuora_track_id) if self.status == 'Active'
+            self.get_z_session(zuora_track_id: zuora_track_id)
           when 'ZuoraAPI::Basic'
             self.new_session(auth_type: :basic, zuora_track_id: zuora_track_id)
           else
             self.new_session(auth_type: :basic, zuora_track_id: zuora_track_id)
           end
         end
-        raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error) if self.status != 'Active'
         return prefix ? "ZSession #{self.current_session}" : self.current_session.to_s
       when :bearer
         case self.class.to_s
@@ -419,25 +402,25 @@ module ZuoraAPI
         else
           raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Unknown Login, does not support Authentication of Type: #{auth_type}")
         end
-
-        raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error) if self.status != 'Active'
         return prefix ? "Bearer #{self.bearer_token}" : self.bearer_token.to_s
       end
     end
 
     def soap_call(
-      ns1: 'ns1', 
-      ns2: 'ns2', 
-      batch_size: nil, 
-      single_transaction: false, 
-      debug: false, 
-      zuora_track_id: nil, 
-      errors: [ZuoraAPI::Exceptions::ZuoraAPISessionError].concat(ZUORA_API_ERRORS), 
-      z_session: true, 
-      timeout_retry: false, 
-      timeout: 120,
-      timeout_sleep_interval: self.timeout_sleep, 
+      ns1: 'ns1',
+      ns2: 'ns2',
+      batch_size: nil,
+      headers: {},
+      single_transaction: false,
+      debug: false,
+      zuora_track_id: nil,
+      errors: [ZuoraAPI::Exceptions::ZuoraAPISessionError].concat(ZUORA_API_ERRORS),
+      z_session: true,
+      timeout_retry: false,
+      timeout: 130,
+      timeout_sleep_interval: self.timeout_sleep,
       output_exception_messages: true,
+      skip_session: false,
       **keyword_args)
       tries ||= 2
       xml = Nokogiri::XML::Builder.new do |xml|
@@ -447,17 +430,19 @@ module ZuoraAPI
                                  'xmlns:api' => "http://api.zuora.com/",
                                  "xmlns:#{ns1}" => "http://api.zuora.com/") do
           xml['SOAP-ENV'].Header do
-            xml["#{ns1}"].SessionHeader do
-              xml["#{ns1}"].session self.get_session(prefix: false, auth_type: :basic, zuora_track_id: zuora_track_id)
+            if !skip_session
+              xml["#{ns1}"].SessionHeader do
+                xml["#{ns1}"].session self.get_session(prefix: false, auth_type: :basic, zuora_track_id: zuora_track_id)
+              end
             end
             if single_transaction
               xml["#{ns1}"].CallOptions do
-                xml.useSingleTransaction single_transaction
+                xml["#{ns1}"].useSingleTransaction single_transaction
               end
             end
             if batch_size
               xml["#{ns1}"].QueryOptions do
-                xml.batchSize batch_size
+                xml["#{ns1}"].batchSize batch_size
               end
             end
           end
@@ -466,13 +451,14 @@ module ZuoraAPI
           end
         end
       end
-
       input_xml = Nokogiri::XML(xml.to_xml(:save_with => XML_SAVE_OPTIONS).strip)
       input_xml.xpath('//ns1:session', 'ns1' =>'http://api.zuora.com/').children.remove
       Rails.logger.debug("Request SOAP XML: #{input_xml.to_xml(:save_with => XML_SAVE_OPTIONS).strip}") if debug
 
-      headers = { 'Content-Type' => "text/xml; charset=utf-8", 'Accept' => 'text/xml'}
+      headers.merge!({ 'Content-Type' => "text/xml; charset=utf-8", 'Accept' => 'text/xml'})
       headers['Zuora-Track-Id'] = zuora_track_id if zuora_track_id.present?
+      headers['X-Amzn-Trace-Id'] = zuora_track_id if zuora_track_id.present?
+      headers["User-Agent"] = USER_AGENT
 
       request = HTTParty::Request.new(
         Net::HTTP::Post,
@@ -488,7 +474,11 @@ module ZuoraAPI
       Rails.logger.debug("Response SOAP XML: #{output_xml.to_xml(:save_with => XML_SAVE_OPTIONS).strip}") if debug
 
       raise_errors(type: :SOAP, body: output_xml, response: response)
+
+      return output_xml, input_xml, response
+
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
+      raise if skip_session
       if !tries.zero? && z_session
         tries -= 1
         Rails.logger.debug("SOAP Call - Session Invalid")
@@ -500,39 +490,33 @@ module ZuoraAPI
         end
 
         retry
-      else
-        if errors.include?(ex.class)
-          raise ex
-        else
-          return output_xml, input_xml, response
-        end
       end
+
+      raise ex if errors.include?(ex.class)
+
+      return output_xml, input_xml, response
+
     rescue *ZUORA_API_ERRORS => ex
-      if errors.include?(ex.class)
-        raise ex
-      else
-        response = ex.response unless response
-        return output_xml, input_xml, response
-      end
+      raise ex if errors.include?(ex.class)
+
+      response = ex.response unless response
+      return output_xml, input_xml, response
+
     rescue *CONNECTION_EXCEPTIONS => ex
-      if tries.zero?
-        if output_exception_messages
-          if Rails.logger.class.to_s == "Ougai::Logger"
-            Rails.logger.error("SOAP Call - Timed out will retry after #{timeout_sleep_interval} seconds", ex) 
-          else
-            Rails.logger.error("SOAP Call - #{ex.class} Timed out will retry after #{timeout_sleep_interval} seconds") 
-          end
-        end
-        raise ex 
+      if !tries.zero?
+        tries -= 1
+        self.log(location: "SOAP Call", exception: ex, message: "Timed out will retry after #{timeout_sleep_interval} seconds", level: :debug)
+        sleep(timeout_sleep_interval)
+        retry
       end
 
-      tries -= 1
-      sleep(timeout_sleep_interval)
-      retry
+      self.log(location: "SOAP Call", exception: ex, message: "Timed out", level: :error)  if output_exception_messages
+      raise ex
+
     rescue *CONNECTION_READ_EXCEPTIONS => ex
       if !tries.zero?
         tries -= 1
-
+        self.log(location: "SOAP Call", exception: ex, message: "Timed out will retry after #{timeout_sleep_interval} seconds", level: :debug)
         if ex.is_a?(Errno::ECONNRESET) && ex.message.include?('SSL_connect')
           retry
         elsif timeout_retry
@@ -541,19 +525,79 @@ module ZuoraAPI
         end
       end
 
-      if output_exception_messages
-        if Rails.logger.class.to_s == "Ougai::Logger"
-          Rails.logger.error("SOAP Call - Timed out will retry after #{timeout_sleep_interval} seconds", ex) 
-        else
-          Rails.logger.error("SOAP Call - #{ex.class} Timed out will retry after #{timeout_sleep_interval} seconds") 
-        end
-      end
-      raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received read timeout from #{url}", nil, request) if ex.instance_of?(Net::ReadTimeout)
+      self.log(location: "SOAP Call", exception: ex, message: "Timed out", level: :error)  if output_exception_messages
+      ex = ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received read/write timeout from 'https://#{rest_domain(endpoint: url)}'", nil, request) if ex.is_a?(Timeout::Error) && !ex.instance_of?(ZuoraAPI::Exceptions::ZuoraAPIReadTimeout)
       raise ex
+
     rescue => ex
       raise ex
-    else
-      return output_xml, input_xml, response
+    ensure
+      self.error_logger(ex) if defined?(ex)
+    end
+
+    def error_logger(ex)
+      return unless Rails.logger.is_a? Ougai::Logger
+
+      exception_args = Rails.logger.with_fields.merge(self.exception_args(ex))
+      case ex
+      when ZuoraAPI::Exceptions::ZuoraAPIUnkownError, ZuoraAPI::Exceptions::ZuoraDataIntegrity
+        Rails.logger.error('Zuora Unknown/Integrity Error', ex, exception_args)
+      when ZuoraAPI::Exceptions::ZuoraAPIRequestLimit
+        if ex.logged.nil? || !ex.logged
+          ex.logged = true
+          Rails.logger.info('Zuora APILimit Reached', ex, exception_args)
+        end
+      when *(ZuoraAPI::Login::ZUORA_API_ERRORS-ZuoraAPI::Login::ZUORA_SERVER_ERRORS)
+        #Rails.logger.debug('Zuora API Error', ex, self.exception_args(ex))
+      when *ZuoraAPI::Login::ZUORA_SERVER_ERRORS
+        Rails.logger.error('Zuora Server Error', ex, exception_args)
+      end
+    end
+
+    def log(location: "Rest Call", exception: nil, message: "Timed out will retry after #{self.timeout_sleep} seconds", level: :info )
+      level = :debug if ![:debug, :info, :warn, :error, :fatal].include?(level)
+      if Rails.logger.is_a? Ougai::Logger
+        Rails.logger.send(level.to_sym, "#{location} - #{message}", exception)
+      else
+        Rails.logger.send(level.to_sym, "#{location} - #{exception.class} #{message}")
+      end
+    end
+
+    def exception_args(ex)
+      args = {}
+      if defined?(ex.response) && ex.response.present?
+        args.merge!({
+          url: {full: ex.response.request.path.to_s},
+          request: {
+            method: ex.response.request.http_method.to_s.split("Net::HTTP::").last.upcase,
+            params: ex.response.request.raw_body.to_s,
+            headers: ex.response.request.options[:headers].map{|k,v| [k.to_s, k.to_s.downcase.strip == "authorization" ? "VALUE FILTERED" : v]}.to_h,
+          },
+          response: {
+            status: ex.response.code,
+            params: ex.response.body.to_s,
+            headers: ex.response.headers,
+          },
+          zuora_trace_id: ex.response.headers["zuora-request-id"],
+          zuora_track_id: ex.response.request.options[:headers]["Zuora-Track-Id"],
+        })
+      elsif defined?(ex.request) && ex.request.present?
+        args.merge!({
+          url: {full: ex.request.path.to_s},
+          request: {
+            method: ex.request.http_method.to_s.split("Net::HTTP::").last.upcase,
+            params: ex.request.options[:body],
+            headers: ex.request.options[:headers].map{|k,v| [k.to_s, k.to_s.downcase.strip == "authorization" ? "VALUE FILTERED" : v]}.to_h
+          }
+        })
+        args.merge!({
+          zuora_track_id: ex.request.options[:headers]["Zuora-Track-Id"]
+        }) if ex.request.options[:headers]["Zuora-Track-Id"].present?
+      end
+    rescue => ex
+      Rails.logger.error("Failed to create exception arguments", ex, args)
+    ensure
+      return args
     end
 
     def raise_errors(type: :SOAP, body: nil, response: nil)
@@ -570,24 +614,24 @@ module ZuoraAPI
       end
 
       if [502,503].include?(response.code)
-        raise ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout.new("Received #{response.code} from #{request_uri}", response)
+        raise ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout.new("Received #{response.code} from 'https://#{rest_domain(endpoint: request_uri)}'", response)
       end
 
       # Check failure response code
       case response.code
       when 504
-        raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received 504 from #{request_uri}", response)
+        raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received 504 from 'https://#{rest_domain(endpoint: request_uri)}'", response)
       when 429
         raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("The total number of concurrent requests has exceeded the limit allowed by the system. Please resubmit your request later.", response)
       when 401
-        
+
       else
         if body.class == Hash
           case request_path
           when /^\/v1\/connections$/
-            response_headers = response.headers.to_h      
+            response_headers = response.headers.to_h
             raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new("Missing cookies for authentication call", response) if response_headers['set-cookie'].blank?
-            z_session_cookie = response_headers.fetch('set-cookie', []).select{|x| x.match(/^ZSession=.*/) }.first 
+            z_session_cookie = response_headers.fetch('set-cookie', []).select{|x| x.match(/^ZSession=.*/) }.first
             raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new("Missing ZSession cookie for authentication call", response) if z_session_cookie.blank?
           end
         end
@@ -597,6 +641,10 @@ module ZuoraAPI
       when :SOAP
         error, success, message = get_soap_error_and_message(body)
 
+        if body.xpath('//fns:LoginFault', 'fns' =>'http://fault.api.zuora.com/').present?
+          raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(message, response)
+        end
+
         if body.xpath('//ns1:queryResponse', 'ns1' => 'http://api.zuora.com/').present? &&
            body.xpath(
              '//ns1:records[@xsi:type="ns2:Export"]',
@@ -604,12 +652,20 @@ module ZuoraAPI
            ).present?
           result = body.xpath('//ns2:Status', 'ns2' => 'http://object.api.zuora.com/').text
           if result == 'Failed'
-            reason = body.xpath('//ns2:StatusReason', 'ns2' => 'http://object.api.zuora.com/').text
-            if reason.present?
-              message = body.xpath('//ns2:StatusReason', 'ns2' => 'http://object.api.zuora.com/').text
-              error = message.match(/^[\w\d]{16}\: (Unexpected error.|No HTTP Response|Socket Timeout|There is an internal error, please try again later)/).present? ? 'UNEXPECTED_ERROR' : 'FATAL_ERROR'  
+            message = body.xpath('//ns2:StatusReason', 'ns2' => 'http://object.api.zuora.com/').text
+            error = 'UNEXPECTED_ERROR'
+            if message.present?
+              identifier, new_message = message.scan(/^([\w\d]{16})\: (.*)/).first
+              if new_message.present?
+                if new_message.include?("The query exceeded maximum processing time")
+                  error, message = ['TRANSACTION_FAILED', new_message.concat(" Please see KC for the Max Timeout Specification https://community.zuora.com/t5/Release-Notifications/Upcoming-Change-for-AQuA-and-Data-Source-Export-January-2021/ba-p/35024")]
+                else
+                  error, message = ['UNEXPECTED_ERROR', new_message]
+                end
+              else
+                error, message = ['UNEXPECTED_ERROR', message]
+              end
             else
-              error = 'FATAL_ERROR'
               message = 'Export failed due to unknown reason. Consult api logs.'
             end
           end
@@ -630,19 +686,20 @@ module ZuoraAPI
         end
 
         self.errors_via_content_type(response: response, type: :xml)
-        
+
       when :JSON
         case request_path
         when /^\/query\/jobs.*/  #DataQuery Paths
           return if body.class != Hash
           case match_string
-          when /^GET::200::\/query\/jobs\/([a-zA-Z0-9\-_]+)$/ #Get DQ job, Capture of the id is present if needed in future error responses. 
+          when /^GET::200::\/query\/jobs\/([a-zA-Z0-9\-_]+)$/ #Get DQ job, Capture of the id is present if needed in future error responses.
             if body.dig('data', "errorCode") == "LINK_10000005"
               raise ZuoraAPI::Exceptions::ZuoraAPITemporaryError.new(body.dig('data', "errorMessage"), response)
-            elsif (body.dig('data', "errorMessage").present? || body.dig('data', "queryStatus") == "failed") 
+            elsif (body.dig('data', "errorMessage").present? || body.dig('data', "queryStatus") == "failed")
+              raise ZuoraAPI::Exceptions::ZuoraAPIUnkownError.new("Data query failed for unknown reasons. No error message.", response) if body.dig('data', "errorMessage").blank?
               raise ZuoraAPI::Exceptions::ZuoraAPIError.new(body.dig('data', "errorMessage"), response)
             end
-          when /^GET::404::\/query\/jobs\/([a-zA-Z0-9\-_]+)$/ #Get DQ job not found, capture of the id is present if needed in future error responses. 
+          when /^GET::404::\/query\/jobs\/([a-zA-Z0-9\-_]+)$/ #Get DQ job not found, capture of the id is present if needed in future error responses.
             raise ZuoraAPI::Exceptions::ZuoraAPIError.new(body.dig('message'), response) if body.dig('message').present?
           when /^POST::400::\/query\/jobs$/ #Create DQ job
             raise ZuoraAPI::Exceptions::ZuoraAPIError.new(body.dig('message'), response) if body.dig('message').present?
@@ -658,14 +715,31 @@ module ZuoraAPI
           when /^GET::400::\/api\/rest\/v1\/reports\/(reportlabels\/)?([a-zA-Z0-9\-_]+)\/report-details$/ # Get report, capture of the id is present if needed in future error responses.
             raise ZuoraAPI::Exceptions::ZuoraAPIError.new(reporting_message, response) if reporting_message.present?
           end
+        when /\/objects\/batch\//
+          if body['code'].present? && /61$/.match(body['code'].to_s).present? # if last 2 digits of code are 61
+            raise ZuoraAPI::Exceptions::ZuoraAPITemporaryError.new(body['message'], nil, body['details'])
+          end
+        when /^\/api\/v1\/payment_plans.*/
+           raise ZuoraAPI::Exceptions::ZuoraAPIError.new(body['error'], response) if body['error']
         end
 
         body = body.dig("results").present? ? body["results"] : body if body.class == Hash
-        if body.class == Hash && (!body["success"] || !body["Success"] || response.code != 200)
-          messages_array = body.fetch("reasons", []).map {|error| error['message']}.compact
-          messages_array = messages_array.push(body.dig("error", 'message')).compact if body.dig('error').class == Hash
-          codes_array =    body.fetch("reasons", []).map {|error| error['code']}.compact
-          codes_array = codes_array.push(body.dig("error", 'code')).compact  if body.dig('error').class == Hash
+        if body.class == Hash && (!(body["success"] || body["Success"]) || response.code != 200)
+          reason_keys = %w(reasons errors)
+          message_keys = %w(message title)
+          messages_array, codes_array = [[],[]]
+          reason_keys.each do |rsn_key|
+            message_keys.each do |msg_key|
+              messages_array = body.fetch(rsn_key, []).map {|error| error[msg_key]}.compact
+              break if messages_array.present?
+            end
+            codes_array = body.fetch(rsn_key, []).map {|error| error['code']}.compact
+            break if messages_array.present? && codes_array.present?
+          end
+          if body.dig('error').class == Hash
+            messages_array = messages_array.push(body.dig("error", 'message')).compact
+            codes_array = codes_array.push(body.dig("error", 'code')).compact
+          end
 
           if body['message'] == 'request exceeded limit'
             raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("The total number of concurrent requests has exceeded the limit allowed by the system. Please resubmit your request later.", response)
@@ -688,7 +762,7 @@ module ZuoraAPI
           end
 
           #Oauth Tokens - User deactivated
-          if body['path'] == '/oauth/token' 
+          if body['path'] == '/oauth/token'
             if body['status'] == 403 && response.code == 403
               raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("Forbidden", response)
             elsif body['status'] == 400 && response.code == 400 && body['message'].include?("Invalid client id")
@@ -697,7 +771,11 @@ module ZuoraAPI
           end
 
           if body['error'] == 'Unauthorized' && body['status'] == 401
-            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{messages_array.join(', ')}", response)
+            if body['message'].present?
+              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(body['message'], response)
+            else
+              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{messages_array.join(', ')}", response)
+            end
           end
           #Authentication failed
           if (codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(11) || response.code == 401) && !codes_array.include?(422)
@@ -720,7 +798,7 @@ module ZuoraAPI
           end
           #Internal Server Error
           if codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(60)
-            if messages_array.uniq.size == 1 
+            if messages_array.uniq.size == 1
               if messages_array.first.match(/^Transaction declined.*|^There is an invoice pending tax.*|^The Zuora GetTax call to Avalara.*|^The tax calculation call to Zuora Connect returned the following error: Status Code: 4.*/)
                 raise ZuoraAPI::Exceptions::ZuoraAPIError.new(messages_array.first, response)
               end
@@ -793,18 +871,18 @@ module ZuoraAPI
         self.errors_via_content_type(response: response, type: :json)
 
         #All other errors
-        raise ZuoraAPI::Exceptions::ZuoraAPIError.new(response.body, response) if ![200,201].include?(response.code) 
+        raise ZuoraAPI::Exceptions::ZuoraAPIError.new(response.body, response) if ![200,201].include?(response.code)
       end
     end
 
     def errors_via_content_type(response: nil, type: :xml)
       response_content_types = response.headers.transform_keys(&:downcase).fetch('content-type', []).first || ""
-      
+
       if response_content_types.include?('application/json') && type != :json
         output_json = JSON.parse(response.body)
         self.raise_errors(type: :JSON, body: output_json, response: response)
-      
-      elsif (response_content_types.include?('application/xml') || response_content_types.include?('text/xml')) and type != :xml
+
+      elsif (response_content_types.include?('application/xml') || response_content_types.include?('text/xml') || response_content_types.include?('application/soap+xml')) and type != :xml
         output_xml = Nokogiri::XML(response.body)
         self.raise_errors(type: :SOAP, body: output_xml, response: response)
 
@@ -823,8 +901,12 @@ module ZuoraAPI
           when /Service Unavailable/
             raise ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout.new(error_message, response)
           when /Client sent a bad request./, /Bad Request/, /403 Forbidden/
-            raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(error_message, response)    
-          else 
+            raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(error_message, response)
+          when /414 Request-URI Too Large/
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Request URL is too long", response)
+          when /Not Found/
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("The page you were looking for could not be found. If you believe you reached this page in error, please email support.", response)
+          else
             raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(error_message, response)
           end
         end
@@ -834,7 +916,7 @@ module ZuoraAPI
 
       raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(response.body, response) if response.code == 500
     end
-          
+
 
     def get_soap_error_and_message(body)
       error   = body.xpath('//fns:FaultCode', 'fns' =>'http://fault.api.zuora.com/').text
@@ -850,6 +932,11 @@ module ZuoraAPI
         message = body.xpath('//ns1:Message', 'ns1' =>'http://api.zuora.com/').text
       end
 
+      if error.blank? || message.blank?
+        error   = body.xpath('//soapenv:Value', 'soapenv'=>'http://www.w3.org/2003/05/soap-envelope').text
+        message = body.xpath('//soapenv:Text', 'soapenv'=>'http://www.w3.org/2003/05/soap-envelope').text
+      end
+
       #Update/Create/Delete Calls with multiple requests and responses
       if body.xpath('//ns1:result', 'ns1' =>'http://api.zuora.com/').size > 0 && body.xpath('//ns1:Errors', 'ns1' =>'http://api.zuora.com/').size > 0
         error = []
@@ -893,18 +980,23 @@ module ZuoraAPI
           raise ZuoraAPI::Exceptions::ZuoraAPIUnkownError.new(message, response, errors, success)
         end
         raise ZuoraAPI::Exceptions::ZuoraAPIError.new(message, response, errors, success)
-      when /invalid/, /^DUPLICATE_VALUE/, /^REQUEST_REJECTED/, /INVALID_ID/, /MAX_RECORDS_EXCEEDED/, /INVALID_FIELD/, /MALFORMED_QUERY/, /NO_PERMISSION/, /PDF_QUERY_ERROR/, /MISSING_REQUIRED_VALUE/, /INVALID_TYPE/, /TRANSACTION_FAILED/, /API_DISABLED/, /CANNOT_DELETE/, /ACCOUNTING_PERIOD_CLOSED/
+      when /^EXTENSION_ERROR/, /^INVALID_VERSION/, /invalid/, /^DUPLICATE_VALUE/, /^REQUEST_REJECTED/, /INVALID_ID/, /MAX_RECORDS_EXCEEDED/, /INVALID_FIELD/, /MALFORMED_QUERY/, /NO_PERMISSION/, /PDF_QUERY_ERROR/, /MISSING_REQUIRED_VALUE/, /INVALID_TYPE/, /TRANSACTION_FAILED/, /API_DISABLED/, /CANNOT_DELETE/, /ACCOUNTING_PERIOD_CLOSED/
         raise ZuoraAPI::Exceptions::ZuoraAPIError.new(message, response, errors, success)
       when /.*UNEXPECTED_ERROR/
         raise ZuoraAPI::Exceptions::ZuoraUnexpectedError.new(message, response, errors, success)
       when /.*soapenv:Server.*/
         if /^Invalid value.*for type.*|^Id is invalid|^date string can not be less than 19 charactors$/.match(message).present?
           raise ZuoraAPI::Exceptions::ZuoraAPIError.new(message, response, errors, success)
-        elsif /^Invalid white space character \(.*\) in text to output$|^Invalid null character in text to output$/.match(message).present?
+        elsif /^unknown$|^Invalid white space character \(.*\) in text to output$|^Invalid null character in text to output$/.match(message).present?
           raise ZuoraAPI::Exceptions::ZuoraAPIUnkownError.new(message, response, errors, success)
         end
         raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(message, response, errors, success)
-      else 
+      when /soapenv:Receiver/
+        if /^com.ctc.wstx.exc.WstxUnexpectedCharException: Unexpected character.*$/.match(message).present?
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new(message, response, errors, success)
+        end
+        raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(message, response, errors, success)
+      else
         raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new("Z:#{error}::#{message}", response, errors, success)
       end
     end
@@ -947,13 +1039,42 @@ module ZuoraAPI
       return self.get_file(url: self.aqua_endpoint("file/#{fileId}"))
     end
 
+    def entity_header
+      if self.entity_header_type == :entity_name && self.entity_identifier.present?
+        { "entityName" => self.entity_identifier }
+      elsif self.entity_id.present?
+        { "Zuora-Entity-Ids" => self.entity_id }
+      else
+        {}
+      end
+    end
+
+    def insert_entity_header(destination_headers, lookup_headers: nil)
+      # The entity header may be added to a place other than where we look for it
+      lookup_headers = destination_headers if lookup_headers.nil?
+
+      entity_header_options = %w(zuora-entity-ids entityid entityname)
+      # If the customer doesn't supply an entity header, fill it in
+      if (entity_header_options & lookup_headers.keys.map(&:downcase)).blank?
+        entity_header = self.entity_header
+        if entity_header.present?
+          destination_headers.merge!(entity_header)
+          entity_header_options_to_exclude =
+            entity_header_options.
+              reject { |header| header == entity_header.keys.first&.downcase }
+          destination_headers.delete_if { |key, _| entity_header_options_to_exclude.include?(key.to_s.downcase) }
+        end
+      end
+    end
+
     def describe_call(object = nil, log_errors = true)
       tries ||= 2
-
       base = self.url.include?(".com") ? self.url.split(".com")[0].concat(".com") : self.url.split(".eu")[0].concat(".eu")
-      url = object ? "#{base}/apps/api/describe/#{object}" : "#{base}/apps/api/describe/"
-      headers = self.entity_id.present? ? {"Zuora-Entity-Ids" => self.entity_id, 'Content-Type' => "text/xml; charset=utf-8"} : {'Content-Type' => "text/xml; charset=utf-8"}
-      response = HTTParty.get(url,  headers: {"Authorization" => self.get_session(prefix: true, auth_type: :basic)}.merge(headers), :timeout => 120)
+      version = self.url.scan(/(\d+\.\d)$/).dig(0,0).to_f
+      url = object ? "#{base}/apps/api/#{version}/describe/#{object}" : "#{base}/apps/api/#{version}/describe/"
+
+      headers = { "Content-Type" => "text/xml; charset=utf-8" }.merge(self.entity_header)
+      response = HTTParty.get(url,  headers: {"Authorization" => self.get_session(prefix: true, auth_type: :basic), "User-Agent" => USER_AGENT}.merge(headers), :timeout => 130)
 
       raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error.present? ? self.current_error : 'Describe call 401', response) if response.code == 401
 
@@ -986,35 +1107,31 @@ module ZuoraAPI
         end
         des_hash[:related_objects] = output_xml.xpath(".//related-objects").xpath(".//object").map{ |x| [x.xpath(".//name").text.to_sym, [ [:url, x.attributes["href"].value], [:label, x.xpath(".//name").text ] ].to_h] }.to_h
       end
+
+      return des_hash
     rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
-      if tries.zero?
-        if log_errors
-          if Rails.logger.class.to_s == "Ougai::Logger"
-            Rails.logger.error("Describe - Timed out will retry after #{self.timeout_sleep} seconds", ex) 
-          else
-            Rails.logger.error("Describe - #{ex.class} Timed out will retry after #{self.timeout_sleep} seconds") 
-          end
-        end
-        raise ex 
+      if !tries.zero?
+        tries -= 1
+        self.log(location: "Describe", exception: ex, message: "Timed out will retry after #{self.timeout_sleep} seconds", level: :debug)
+        sleep(self.timeout_sleep)
+        retry
       end
 
-      tries -= 1
-      sleep(self.timeout_sleep)
-      retry
+      self.log(location: "Describe", exception: ex, message: "Timed out", level: :error) if log_errors
+      raise ex
+
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
       if !tries.zero? && self.status == 'Active'
         tries -= 1
         Rails.logger.debug("Describe session expired. Starting new session.")
         self.new_session
         retry
-      else
-        Rails.logger.error("Describe session expired. Starting new session.") if log_errors
-        raise ex
       end
+
+      Rails.logger.error("Describe session expired. Starting new session.") if log_errors
+      raise ex
     rescue => ex
       raise ex
-    else
-      return des_hash
     end
 
     def rest_call(
@@ -1027,11 +1144,12 @@ module ZuoraAPI
       z_session: true,
       session_type: :basic,
       timeout_retry: false,
-      timeout: 120,
-      timeout_sleep_interval: self.timeout_sleep, 
+      timeout: 130,
+      timeout_sleep_interval: self.timeout_sleep,
       multipart: false,
       stream_body: false,
       output_exception_messages: true,
+      zuora_track_id: nil,
       **keyword_args,
       &block
     )
@@ -1041,12 +1159,13 @@ module ZuoraAPI
 
       authentication_headers = {}
       if z_session
-        authentication_headers = {"Authorization" => self.get_session(prefix: true, auth_type: session_type) }
-        if self.entity_id.present?
-          authentication_headers["Zuora-Entity-Ids"] = self.entity_id if headers.dig("Zuora-Entity-Ids").nil?
-          authentication_headers.delete_if { |key, value| ["entityId", "entityName"].include?(key.to_s) }
-        end
+        authentication_headers = {"Authorization" => self.get_session(prefix: true, auth_type: session_type, zuora_track_id: zuora_track_id) }
+
+        self.insert_entity_header(authentication_headers, lookup_headers: headers)
       end
+      headers['Zuora-Track-Id'] = zuora_track_id if zuora_track_id.present?
+      headers['X-Amzn-Trace-Id'] = zuora_track_id if zuora_track_id.present?
+      headers['User-Agent'] = USER_AGENT
 
       modified_headers = {'Content-Type' => "application/json; charset=utf-8"}.merge(authentication_headers).merge(headers)
 
@@ -1072,18 +1191,20 @@ module ZuoraAPI
         Rails.logger.debug("Response JSON: #{output_json}") if debug && output_json.present?
 
         raise_errors(type: :JSON, body: output_json, response: response)
-      rescue
+      rescue => ex
         reset_files(body) if multipart
         raise
       end
+
+      return [output_json, response]
     rescue ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError => ex
       if self.class.to_s == 'ZuoraAPI::Oauth' && ex.message.include?("Authentication type is not supported by this Login")
         session_type = :bearer
         retry
-      else
-        Rails.logger.debug("Rest Call - Session Bad Auth type")
-        raise ex
       end
+      Rails.logger.debug("Rest Call - Session Bad Auth type")
+      raise ex
+
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
       if !tries.zero? && z_session
         tries -= 1
@@ -1096,40 +1217,35 @@ module ZuoraAPI
         end
 
         retry
-      else
-        if errors.include?(ex.class)
-          raise ex
-        else
-          return [output_json, response]
-        end
       end
+
+      raise ex if errors.include?(ex.class)
+      return [output_json, response]
+
     rescue *ZUORA_API_ERRORS => ex
-      if errors.include?(ex.class)
-        raise ex
-      else
-        response = ex.response unless response
-        return [output_json, response]
-      end
+      raise ex if errors.include?(ex.class)
+
+      response = ex.response unless response
+      return [output_json, response]
+
     rescue ZuoraAPI::Exceptions::BadEntityError => ex
       raise ex
     rescue *CONNECTION_EXCEPTIONS => ex
-      if tries.zero?
-        if output_exception_messages
-          if Rails.logger.class.to_s == "Ougai::Logger"
-            Rails.logger.error("Rest Call - Timed out will retry after #{timeout_sleep_interval} seconds", ex) 
-          else
-            Rails.logger.error("Rest Call - #{ex.class} Timed out will retry after #{timeout_sleep_interval} seconds") 
-          end
-        end
-        raise ex 
+      if !tries.zero?
+        tries -= 1
+        self.log(location: "Rest Call", exception: ex, message: "Timed out will retry after #{timeout_sleep_interval} seconds", level: :debug)
+        sleep(timeout_sleep_interval)
+        retry
       end
 
-      tries -= 1
-      sleep(timeout_sleep_interval)
-      retry
+      self.log(location: "Rest Call", exception: ex, message: "Timed out", level: :error) if output_exception_messages
+      raise ex
+
     rescue *CONNECTION_READ_EXCEPTIONS => ex
+
       if !tries.zero?
         tries -= 1
+        self.log(location: "Rest Call", exception: ex, message: "Timed out will retry after #{timeout_sleep_interval} seconds", level: :debug)
         if ex.is_a?(Errno::ECONNRESET) && ex.message.include?('SSL_connect')
           retry
         elsif timeout_retry
@@ -1137,20 +1253,15 @@ module ZuoraAPI
           retry
         end
       end
-   
-      if output_exception_messages
-        if Rails.logger.class.to_s == "Ougai::Logger"
-          Rails.logger.error("Rest Call - Timed out will retry after #{timeout_sleep_interval} seconds", ex) 
-        else
-          Rails.logger.error("Rest Call - #{ex.class} Timed out will retry after #{timeout_sleep_interval} seconds") 
-        end
-      end
-      raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received read timeout from #{url}", nil, request) if ex.instance_of?(Net::ReadTimeout)
+
+      self.log(location: "Rest Call", exception: ex, message: "Timed out", level: :error) if output_exception_messages
+      ex = ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received read/write timeout from 'https://#{rest_domain(endpoint: url)}'", nil, request) if ex.is_a?(Timeout::Error) && !ex.instance_of?(ZuoraAPI::Exceptions::ZuoraAPIReadTimeout)
       raise ex
+
     rescue => ex
       raise ex
-    else
-      return [output_json, response]
+    ensure
+      self.error_logger(ex) if defined?(ex)
     end
 
     def update_create_tenant
@@ -1172,8 +1283,9 @@ module ZuoraAPI
       while !response["nextPage"].blank?
         url = self.rest_endpoint(response["nextPage"].split('/v1/').last)
         Rails.logger.debug("Fetch Catalog URL #{url}")
-        output_json, response = self.rest_call(:debug => false, :url => url, :errors => [ZuoraAPI::Exceptions::ZuoraAPISessionError], :timeout_retry => true )
-        if !output_json['success'] =~ (/(true|t|yes|y|1)$/i) || output_json['success'].class != TrueClass
+        output_json, response = self.rest_call(debug: false, url: url, timeout_retry: true)
+
+        if !/(true|t|yes|y|1)$/.match(output_json['success'].to_s) || output_json['success'].class != TrueClass
           raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Error Getting Catalog: #{output_json}", response)
         end
         output_json["products"].each do |product|
@@ -1199,14 +1311,14 @@ module ZuoraAPI
       return products, catalog_map
     end
 
-    def get_file(url: nil, headers: {}, z_session: true, tempfile: true, output_file_name: nil, zuora_track_id: nil, add_timestamp: true, file_path: defined?(Rails.root.join('tmp')) ? Rails.root.join('tmp') : Pathname.new(Dir.pwd), timeout_retries: 3, timeout: 120, session_type: :basic, **execute_params)
+    def get_file(url: nil, headers: {}, z_session: true, tempfile: true, output_file_name: nil, zuora_track_id: nil, add_timestamp: true, file_path: defined?(Rails.root.join('tmp')) ? Rails.root.join('tmp') : Pathname.new(Dir.pwd), timeout_retries: 3, timeout: 130, session_type: :basic, **execute_params)
       raise "file_path must be of class Pathname" if file_path.class != Pathname
 
       retry_count ||= timeout_retries
 
       #Make sure directory exists
       require 'fileutils'
-      FileUtils.mkdir_p(file_path) unless File.exists?(file_path)
+      FileUtils.mkdir_p(file_path) unless File.exist?(file_path)
 
       status_code = nil
       uri = URI.parse(url)
@@ -1215,10 +1327,13 @@ module ZuoraAPI
       http.use_ssl = true  if !uri.scheme.nil? && uri.scheme.downcase == 'https'
       if z_session
         headers = headers.merge({"Authorization" => self.get_session(prefix: true)})
-        headers = headers.merge({"Zuora-Entity-Ids" => self.entity_id}) if !self.entity_id.blank?
+
+        self.insert_entity_header(headers)
       end
 
       headers['Zuora-Track-Id'] = zuora_track_id if zuora_track_id.present?
+      headers['X-Amzn-Trace-Id'] = zuora_track_id if zuora_track_id.present?
+      headers["User-Agent"] = USER_AGENT
 
       response_save = nil
       http.request_get(uri.request_uri, headers) do |response|
@@ -1226,11 +1341,7 @@ module ZuoraAPI
         status_code = response.code if response
         case response
         when Net::HTTPOK
-          headers = {}
-          response.each_header do |k,v|
-            headers[k] = v
-          end
-          Rails.logger.debug("Headers: #{headers.to_s}")
+          Rails.logger.warn("Headers: #{response.to_hash.to_s}")
           if output_file_name.present?
             file_ending ||= output_file_name.end_with?(".csv.zip") ? ".csv.zip" : File.extname(output_file_name)
             filename ||= File.basename(output_file_name, file_ending)
@@ -1238,15 +1349,16 @@ module ZuoraAPI
 
           size, export_progress = [0, 0]
           encoding, type, full_filename = [nil, nil, nil]
-          if response.header["Content-Disposition"].present?
-            case response.header["Content-Disposition"]
+          if response.get_fields("Content-Disposition").present?
+            content_disposition = response.get_fields("Content-Disposition")[0]
+            case content_disposition
             when /.*; filename\*=.*/
-              full_filename ||= /.*; filename\*=(.*)''(.*)/.match(response.header["Content-Disposition"])[2].strip
-              encoding = /.*; filename\*=(.*)''(.*)/.match(response.header["Content-Disposition"])[1].strip
+              full_filename ||= /.*; filename\*=(.*)''(.*)/.match(content_disposition)[2].strip
+              encoding = /.*; filename\*=(.*)''(.*)/.match(content_disposition)[1].strip
             when /.*; filename=/
-              full_filename ||= /.*; filename=(.*)/.match(response.header["Content-Disposition"])[1].strip
+              full_filename ||= /.*; filename=(.*)/.match(content_disposition)[1].strip
             else
-              raise "Can't parse Content-Disposition header: #{response.header["Content-Disposition"]}"
+              raise "Can't parse Content-Disposition header: #{content_disposition}"
             end
             file_ending ||= full_filename.end_with?(".csv.zip") ? ".csv.zip" : File.extname(full_filename)
             filename ||= File.basename(full_filename, file_ending)
@@ -1256,21 +1368,22 @@ module ZuoraAPI
           file_ending ||= uri.path.end_with?(".csv.zip") ? ".csv.zip" : File.extname(uri.path)
           filename ||= File.basename(uri.path, file_ending)
 
-          if response.header["Content-Type"].present?
-            case response.header["Content-Type"]
+          if response.get_fields("Content-Type").present?
+            content_type = response.get_fields("Content-Type")[0]
+            case content_type
             when /.*;charset=.*/
-              type = /(.*);charset=(.*)/.match(response.header["Content-Type"])[1]
-              encoding = /(.*);charset=(.*)/.match(response.header["Content-Type"])[2]
+              type = /(.*);charset=(.*)/.match(content_type)[1]
+              encoding = /(.*);charset=(.*)/.match(content_type)[2]
             else
-              type = response.header["Content-Type"]
+              type = content_type
               encoding ||= 'UTF-8'
             end
           end
 
-          if response.header["Content-Length"].present?
-            export_size = response.header["Content-Length"].to_i
-          elsif response.header["ContentLength"].present?
-            export_size = response.header["ContentLength"].to_i
+          if response.get_fields("Content-Length").present?
+            export_size = response.get_fields("Content-Length")[0].to_i
+          elsif response.get_fields("ContentLength").present?
+            export_size = response.get_fields("ContentLength")[0].to_i
           end
 
           Rails.logger.info("File: #{filename}#{file_ending}  #{encoding}  #{type} #{export_size}")
@@ -1304,14 +1417,20 @@ module ZuoraAPI
           return file_handle
         when Net::HTTPUnauthorized
           if z_session
-            if !(retry_count -= 1).zero?
+            unless (retry_count -= 1).zero?
               self.new_session
-              raise response.class
-            else
-              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error)
+              raise ZuoraAPI::Exceptions::ZuoraAPISessionError, 'Retrying'
             end
+            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error)
+          end
+          raise
+        when Net::HTTPNotFound
+          if url.include?(self.fileURL)
+            raise ZuoraAPI::Exceptions::FileDownloadError.new(
+              "The current tenant does not have a file with id '#{url.split('/').last}'"
+            )
           else
-            raise
+            raise ZuoraAPI::Exceptions::FileDownloadError.new("File Download Failed #{response.class}")
           end
         else
           raise ZuoraAPI::Exceptions::FileDownloadError.new("File Download Failed #{response.class}")
@@ -1322,133 +1441,79 @@ module ZuoraAPI
       sleep(5)
       if (retry_count -= 1) >= 0
         retry
-      else
-        Rails.logger.error("File Download Failed")
-        raise
       end
+      Rails.logger.error("File Download Failed")
+      raise
     end
 
     def getDataSourceExport(query, extract: true, encrypted: false, zip: true, z_track_id: "")
-      begin
-        tries ||= 3
-        request = Nokogiri::XML::Builder.new do |xml|
-          xml['SOAP-ENV'].Envelope('xmlns:SOAP-ENV' => "http://schemas.xmlsoap.org/soap/envelope/", 'xmlns:ns2' => "http://object.api.zuora.com/", 'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance", 'xmlns:ns1' => "http://api.zuora.com/") do
-            xml['SOAP-ENV'].Header do
-              xml['ns1'].SessionHeader do
-                xml['ns1'].session self.get_session(prefix: false, auth_type: :basic, zuora_track_id: z_track_id)
-              end
-            end
-            xml['SOAP-ENV'].Body do
-              xml['ns1'].create do
-                xml['ns1'].zObjects('xsi:type' => "ns2:Export") do
-                  xml['ns2'].Format 'csv'
-                  xml['ns2'].Zip zip
-                  xml['ns2'].Name 'googman'
-                  xml['ns2'].Query query
-                  xml['ns2'].Encrypted encrypted
-                end
-              end
-            end
+      tries ||= 3
+
+      output_xml, input_xml = self.soap_call(debug: false, timeout_retry: true, zuora_track_id: z_track_id) do |xml|
+        xml['ns1'].create do
+          xml['ns1'].zObjects('xsi:type' => "ns2:Export") do
+            xml['ns2'].Format 'csv'
+            xml['ns2'].Zip zip
+            xml['ns2'].Name 'googman'
+            xml['ns2'].Query query
+            xml['ns2'].Encrypted encrypted
           end
         end
-
-        response_query = HTTParty.post(self.url, body: request.to_xml(:save_with => XML_SAVE_OPTIONS).strip, headers: {'Content-Type' => "application/json; charset=utf-8", "Z-Track-Id" => z_track_id}, :timeout => 120)
-
-        output_xml = Nokogiri::XML(response_query.body)
-        raise_errors(type: :SOAP, body: output_xml, response: response_query) if output_xml.xpath('//ns1:Success', 'ns1' =>'http://api.zuora.com/').text != "true"
-
-        # raise "Export Creation Unsuccessful : #{response_query.code}: #{response_query.parsed_response}" if  output_xml.xpath('//ns1:Success', 'ns1' =>'http://api.zuora.com/').text != "true"
-        
-        id = output_xml.xpath('//ns1:Id', 'ns1' =>'http://api.zuora.com/').text
-
-        confirmRequest = Nokogiri::XML::Builder.new do |xml|
-          xml['SOAP-ENV'].Envelope('xmlns:SOAP-ENV' => "http://schemas.xmlsoap.org/soap/envelope/", 'xmlns:ns2' => "http://object.api.zuora.com/", 'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance", 'xmlns:ns1' => "http://api.zuora.com/") do
-            xml['SOAP-ENV'].Header do
-              xml['ns1'].SessionHeader do
-                xml['ns1'].session self.get_session(prefix: false, auth_type: :basic, zuora_track_id: z_track_id)
-              end
-            end
-            xml['SOAP-ENV'].Body do
-              xml['ns1'].query do
-                xml['ns1'].queryString "SELECT  Id, CreatedById, CreatedDate, Encrypted, FileId, Format, Name, Query, Size, Status, StatusReason, UpdatedById, UpdatedDate, Zip From Export where Id = '#{id}'"
-              end
-            end
+      end
+      id = output_xml.xpath('//ns1:Id', 'ns1' =>'http://api.zuora.com/').text
+
+      result = 'Waiting'
+      while result != "Completed"
+        sleep 3
+        output_xml, input_xml = self.soap_call(debug: false, timeout_retry: true, zuora_track_id: z_track_id) do |xml|
+          xml['ns1'].query do
+            xml['ns1'].queryString "SELECT Id, CreatedById, CreatedDate, Encrypted, FileId, Format, Name, Query, Size, Status, StatusReason, UpdatedById, UpdatedDate, Zip From Export where Id = '#{id}'"
           end
         end
-        result = 'Waiting'
-
-        while result != "Completed"
-          sleep 3
-          response_query = HTTParty.post(self.url, body: confirmRequest.to_xml(:save_with => XML_SAVE_OPTIONS).strip, headers: {'Content-Type' => "application/json; charset=utf-8", "Z-Track-Id" => z_track_id}, :timeout => 120)
-
-          output_xml = Nokogiri::XML(response_query.body)
-          result = output_xml.xpath('//ns2:Status',  'ns2' =>'http://object.api.zuora.com/').text
-          status_code = response_query.code if response_query
-
-          raise_errors(type: :SOAP, body: output_xml, response: response_query) if result.blank? || result == "Failed"
-          # raise "Export Creation Unsuccessful : #{response_query.code}: #{response_query.parsed_response}" if result.blank? || result == "Failed"
-        end
-
-        file_id = output_xml.xpath('//ns2:FileId',  'ns2' =>'http://object.api.zuora.com/').text
-        export_file = get_file(:url => self.fileURL(file_id))
-        export_file_path = export_file.path
-        Rails.logger.debug("=====> Export path #{export_file.path}")
-
-        if extract && zip
-          require "zip"
-          new_path = export_file_path.partition('.zip').first
-          zipped = Zip::File.open(export_file_path)
-          file_handle = zipped.entries.first
-          file_handle.extract(new_path)
-          File.delete(export_file_path)
-          return new_path
-        else
-          return export_file_path
-        end
-      rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
-        if !(tries -= 1).zero?
-          Rails.logger.info("Export call failed - Trace ID: #{z_track_id}")
-          self.new_session
-          retry
-        else
-          raise ex
-        end
-
-      rescue ZuoraAPI::Exceptions::ZuoraUnexpectedError => ex
-        if !(tries -= 1).zero?
-          Rails.logger.info("Trace ID: #{z_track_id} UnexpectedError, will retry after 10 seconds")
-          sleep 10
-          retry
-        else
-          raise ex
-        end
-
-      rescue *ZUORA_API_ERRORS => ex
-        raise ex
-
-      rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
-        if !(tries -= 1).zero?
-          Rails.logger.info("Trace ID: #{z_track_id} Timed out will retry after 5 seconds")
-          sleep 5
-          retry
-        else
-          raise ex
-        end
+        result = output_xml.xpath('//ns2:Status',  'ns2' =>'http://object.api.zuora.com/').text
+      end
 
-      rescue Errno::ECONNRESET => ex
-        if !(tries -= 1).zero? && ex.message.include?('SSL_connect')
-          retry
-        else
-          raise ex
-        end
+      file_id = output_xml.xpath('//ns2:FileId',  'ns2' =>'http://object.api.zuora.com/').text
+      export_file = get_file(:url => self.fileURL(file_id))
+      export_file_path = export_file.path
+
+      if extract && zip
+        require "zip"
+        new_path = export_file_path.partition('.zip').first
+        zipped = Zip::File.open(export_file_path)
+        file_handle = zipped.entries.first
+        file_handle.extract(new_path)
+        File.delete(export_file_path)
+        return new_path
+      else
+        return export_file_path
+      end
+    rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
+      if !(tries -= 1).zero?
+        Rails.logger.info("Export call failed - Trace ID: #{z_track_id}")
+        self.new_session
+        retry
+      end
+      raise ex
 
-      rescue ZuoraAPI::Exceptions::BadEntityError => ex
-        raise ex
+    rescue ZuoraAPI::Exceptions::ZuoraUnexpectedError => ex
+      if !(tries -= 1).zero?
+        Rails.logger.info("Trace ID: #{z_track_id} UnexpectedError, will retry after 10 seconds")
+        sleep(self.timeout_sleep)
+        retry
       end
+      raise ex
+    rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
+      if !(tries -= 1).zero?
+        Rails.logger.info("Trace ID: #{z_track_id} Timed out will retry after 5 seconds")
+        sleep(self.timeout_sleep)
+        retry
+      end
+      raise ex
     end
 
     def query(query, parse = false)
-      output_xml, input_xml = self.soap_call({:debug => false, :timeout_retry => true}) do |xml|
+      output_xml, input_xml = self.soap_call(debug: false, timeout_retry: true) do |xml|
         xml['ns1'].query do
           xml['ns1'].queryString query
         end