zuora_connect 2.0.46 → 2.0.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d335470621186c6b48bdd31e22827c74715f1a95f20f98bd1dff32500da61df6
-  data.tar.gz: 9861e3a42038aa63fa43068ef508863ff5a4ca786485a13161bf2a5f21736921
+  metadata.gz: 06f1b41fdad8b24c386edeb2dfc564a6da47f357ace69b4efd4bc7b0943cf9db
+  data.tar.gz: dfe171d402ebf4163bf23661f7ab8a2e9c72b9f5c95b74ef49cb72c5e16c20f6
 SHA512:
-  metadata.gz: 787b3c48a98332f504687623a0cba9aae789017edcbce071c33ef22f23bed87ada8a03b902b907f48227a2338206e5608e5c2cf2602590666cb96bcc888a2eaa
-  data.tar.gz: e2329782315fe2aad8cf032cff21b26e0282cc9ecd5ec98a9815af4b750f84efebca61eb4c423345cdc8d1287e85655648624ca09a14388f86e138c5a59f556e
+  metadata.gz: 58a94c74ddc5f4412decd99adb337c0caecfdc2f708d22983c3e76733820eff8b4809f353bdd52f68a37b3484692a8f6347df3d07672af8ad22145690f2aad7d
+  data.tar.gz: b01d9688693cc196bb30618c39364dc5558dd91dcc3433fbef6332199eb1ef7ca3a8eba87f6e5c0cab1f025cbc132b539ced41fd1cbf62e1613a2818d04ef601

data/app/models/zuora_connect/app_instance_base.rb

@@ -56,6 +56,13 @@ module ZuoraConnect
         raise "The instance refresh window cannot be greater than the instance cache period"
       end
       self.apartment_switch(nil, false)
+
+      if ZuoraConnect.logger.is_a?(Ougai::Logger)
+        ZuoraConnect.logger.with_fields.merge!(default_ougai_items)
+      end
+      if Rails.logger.is_a?(Ougai::Logger)
+        Rails.logger.with_fields.merge!(default_ougai_items)
+      end
     end
 
     def initialize_redis_placeholders
@@ -121,7 +128,7 @@ module ZuoraConnect
     end
 
     def default_ougai_items
-      return {app_instance_id: self.id}
+      return {app_instance_id: self.id, tenant_ids: self.zuora_tenant_ids, organization: self.organizations, environment: self.environment}
     end
 
     def new_session(session: self.data_lookup, username: self.access_token, password: self.refresh_token, holding_pattern: false, **args)
@@ -159,26 +166,26 @@ module ZuoraConnect
 
         if session.empty?
           self.new_session_message = "REFRESHING - Session Empty"
-          ZuoraConnect.logger.debug(self.new_session_message, self.default_ougai_items)
+          ZuoraConnect.logger.debug(self.new_session_message)
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session: session)
 
         elsif (self.id != session["appInstance"].to_i)
           self.new_session_message = "REFRESHING - AppInstance ID(#{self.id}) does not match session id(#{session["appInstance"].to_i})"
-          ZuoraConnect.logger.debug(self.new_session_message, self.default_ougai_items)
+          ZuoraConnect.logger.debug(self.new_session_message)
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session: session)
 
         elsif session["#{self.id}::task_data"].blank?
           self.new_session_message = "REFRESHING - Task Data Blank"
-          ZuoraConnect.logger.debug(self.new_session_message, self.default_ougai_items)
+          ZuoraConnect.logger.debug(self.new_session_message)
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session: session)
 
         elsif session["#{self.id}::last_refresh"].blank?
           self.new_session_message = "REFRESHING - No Time on Cookie"
           recoverable_session = true
-          ZuoraConnect.logger.debug(self.new_session_message, self.default_ougai_items)
+          ZuoraConnect.logger.debug(self.new_session_message)
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session: session)
 
@@ -186,7 +193,7 @@ module ZuoraConnect
         elsif (session["#{self.id}::last_refresh"].to_i < INSTANCE_REFRESH_WINDOW.ago.to_i) && self.mark_for_refresh
           self.new_session_message = "REFRESHING - Session Old by #{time_expire.abs} second"
           recoverable_session = true
-          ZuoraConnect.logger.debug(self.new_session_message, self.default_ougai_items)
+          ZuoraConnect.logger.debug(self.new_session_message)
           self.refresh(session: session)
 
         else
@@ -195,14 +202,14 @@ module ZuoraConnect
           else
             self.new_session_message = "REBUILDING - Expires in #{time_expire} seconds"
           end
-          ZuoraConnect.logger.debug(self.new_session_message, self.default_ougai_items)
+          ZuoraConnect.logger.debug(self.new_session_message)
           self.build_task(task_data: session["#{self.id}::task_data"], session: session)
         end
       end
       return self
     rescue ZuoraConnect::Exceptions::HoldingPattern => ex
       while self.marked_for_refresh?
-        ZuoraConnect.logger.info("Holding - Expires in #{self.reset_mark_expires_at}. '#{self.new_session_message}'", self.default_ougai_items)
+        ZuoraConnect.logger.info("Holding - Expires in #{self.reset_mark_expires_at}. '#{self.new_session_message}'")
         sleep(HOLDING_PATTERN_SLEEP)
       end
       self.reload_attributes([:refresh_token, :oauth_expires_at, :access_token])
@@ -211,17 +218,17 @@ module ZuoraConnect
     rescue ZuoraConnect::Exceptions::MissMatch => ex
       self.delete_app_instance
       session = {}
-      ZuoraConnect.logger.error(ex, self.default_ougai_items.merge({app_instance_id_new: self.task_data['id']}))
+      ZuoraConnect.logger.error(ex, app_instance_id_new: self.task_data['id'])
       retry
     rescue ZuoraConnect::Exceptions::InvalidCredentialSet => ex
       raise
     rescue => ex
       if recoverable_session
-        ZuoraConnect.logger.warn("REBUILDING - Using backup expired cache", ex, self.default_ougai_items)
+        ZuoraConnect.logger.warn("REBUILDING - Using backup expired cache", ex)
         self.build_task(task_data: session["#{self.id}::task_data"], session: session)
         return self
       else
-        ZuoraConnect.logger.error("Failed new session", ex, self.default_ougai_items)
+        ZuoraConnect.logger.error("Failed new session", ex)
         raise
       end
     ensure
@@ -243,19 +250,18 @@ module ZuoraConnect
             ElasticAPM.set_label(:organization, organizations.first)
           end
         end
-        self.logitem(item: {tenant_ids: tenants, organization: organizations})
 
         params = {
-          :name => self.task_data.dig('name'), 
-          :zuora_entity_ids => (self.task_data.dig(LOGIN_TENANT_DESTINATION,'entities') || []).map{|e| e['id']}.uniq,
-          :zuora_tenant_ids => tenants.map(&:to_s).uniq,
+          name: self.task_data.dig('name'), 
+          zuora_entity_ids: (self.task_data.dig(LOGIN_TENANT_DESTINATION,'entities') || []).map{|e| e['id']}.uniq,
+          zuora_tenant_ids: tenants.map(&:to_s).uniq,
+          organizations: organizations
         }
         if self.methods.include?(LOGIN_TENANT_DESTINATION.to_sym)
           client = self.send(LOGIN_TENANT_DESTINATION).client
           if defined?(client.rest_domain)
-            zuora_domain = client.rest_domain 
-            ZuoraConnect::RequestIdMiddleware.zuora_rest_domain = zuora_domain
-            params.merge!({:zuora_domain => zuora_domain }) 
+            ZuoraConnect::RequestIdMiddleware.zuora_rest_domain = client.rest_domain
+            params.merge!({zuora_domain: client.rest_domain, environment: client.environment }) 
           end
         end
         params = params.reject{|k,v| !self.attributes.keys.member?(k.to_s) || self[k] == v}
@@ -274,7 +280,7 @@ module ZuoraConnect
           response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json",:body => {:access_token => self.access_token})
           response_time = Time.now - start
 
-          ZuoraConnect.logger.debug("REFRESH TASK - Connect Task Info Request Time #{response_time.round(2).to_s}", self.default_ougai_items)
+          ZuoraConnect.logger.debug("REFRESH TASK - Connect Task Info Request Time #{response_time.round(2).to_s}")
           if response.code == 200
             begin
               parsed_json = JSON.parse(response.body)
@@ -306,26 +312,26 @@ module ZuoraConnect
         refresh_count += 1
         if refresh_count < 3
           sleep(10)
-          ZuoraConnect.logger.debug("REFRESH TASK - Connection Failure Retrying(#{refresh_count})", ex, self.default_ougai_items)
+          ZuoraConnect.logger.debug("REFRESH TASK - Connection Failure Retrying(#{refresh_count})", ex)
           retry
         else
-          ZuoraConnect.logger.fatal("REFRESH TASK - Connection Failed", ex, self.default_ougai_items)
+          ZuoraConnect.logger.fatal("REFRESH TASK - Connection Failed", ex)
           raise
         end
       rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
         refresh_count += 1
         if refresh_count < 3
-          ZuoraConnect.logger.debug("REFRESH TASK - Communication Failure Retrying(#{refresh_count})", ex, self.default_ougai_items)
+          ZuoraConnect.logger.debug("REFRESH TASK - Communication Failure Retrying(#{refresh_count})", ex)
           self.refresh_oauth if ex.code == 401
           retry
         else
-          ZuoraConnect.logger.fatal("REFRESH TASK - Communication Failed #{ex.code}", ex, self.default_ougai_items)
+          ZuoraConnect.logger.fatal("REFRESH TASK - Communication Failed #{ex.code}", ex)
           raise
         end
       end
     rescue => ex
       if self['zuora_logins'].present?
-        ZuoraConnect.logger.warn("REFRESH TASK - Fallback to local encrypted store", ex, self.default_ougai_items)
+        ZuoraConnect.logger.warn("REFRESH TASK - Fallback to local encrypted store", ex)
         skip_connect = true
         retry
       end
@@ -637,7 +643,7 @@ module ZuoraConnect
       def check_oauth_state(method=nil)
         #Refresh token if already expired
         if self.oauth_expired?
-          ZuoraConnect.logger.debug("Before '#{method}' method, Oauth expired", self.default_ougai_items)
+          ZuoraConnect.logger.debug("Before '#{method}' method, Oauth expired")
           self.refresh_oauth
         end
       end
@@ -656,7 +662,7 @@ module ZuoraConnect
                 }
         response = HTTParty.post("#{ZuoraConnect.configuration.url}/oauth/token",:body => params)
         response_time = Time.now - start
-        ZuoraConnect.logger.debug("REFRESH OAUTH - In #{response_time.round(2).to_s}", self.default_ougai_items)
+        ZuoraConnect.logger.debug("REFRESH OAUTH - In #{response_time.round(2).to_s}")
 
         if response.code == 200
           response_body = JSON.parse(response.body)
@@ -671,10 +677,10 @@ module ZuoraConnect
       rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS + ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
         if (refresh_oauth_count += 1) < 3
           sleep(5)
-          ZuoraConnect.logger.debug("REFRESH OAUTH - Connection Failure Retrying(#{refresh_oauth_count})", ex, self.default_ougai_items)
+          ZuoraConnect.logger.debug("REFRESH OAUTH - Connection Failure Retrying(#{refresh_oauth_count})", ex)
           retry
         else
-          ZuoraConnect.logger.fatal("REFRESH OAUTH - Connection Failed", ex, self.default_ougai_items)
+          ZuoraConnect.logger.fatal("REFRESH OAUTH - Connection Failed", ex)
           raise
         end
       rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
@@ -685,10 +691,10 @@ module ZuoraConnect
         return if !self.oauth_expired?
 
         if (refresh_oauth_count += 1) < 3
-          ZuoraConnect.logger.debug("REFRESH OAUTH - Communication Failure Retrying(#{refresh_oauth_count})", ex, self.default_ougai_items)
+          ZuoraConnect.logger.debug("REFRESH OAUTH - Communication Failure Retrying(#{refresh_oauth_count})", ex)
           retry
         else
-          ZuoraConnect.logger.fatal("REFRESH OAUTH - Communication Failed #{ex.code}", ex, self.default_ougai_items)
+          ZuoraConnect.logger.fatal("REFRESH OAUTH - Communication Failed #{ex.code}", ex)
           raise
         end
       end
@@ -738,10 +744,10 @@ module ZuoraConnect
             end
           end
           if cached_instance.blank?
-            ZuoraConnect.logger.debug("Cached AppInstance Missing", self.default_ougai_items)
+            ZuoraConnect.logger.debug("Cached AppInstance Missing")
             return session
           else
-            ZuoraConnect.logger.debug("Cached AppInstance Found", self.default_ougai_items)
+            ZuoraConnect.logger.debug("Cached AppInstance Found")
             return decrypt_data(data: cached_instance, rescue_return: session).merge(session)
           end
         else
@@ -757,7 +763,7 @@ module ZuoraConnect
         if defined?(Redis.current)
           #Task data must be present and the last refresh cannot be old. We dont want to overwite new cache data with old
           if self.task_data.present? &&  (self.last_refresh.to_i > INSTANCE_REFRESH_WINDOW.ago.to_i)
-            ZuoraConnect.logger.debug("Caching AppInstance", self.default_ougai_items)
+            ZuoraConnect.logger.debug("Caching AppInstance")
             Redis.current.setex("AppInstance:#{self.id}", INSTANCE_REDIS_CACHE_PERIOD.to_i, self.encrypt_data(data: self.save_data))
           end
         end
@@ -821,10 +827,10 @@ module ZuoraConnect
           begin
             return JSON.parse(encryptor.decrypt_and_verify(CGI::unescape(data)))
           rescue ActiveSupport::MessageVerifier::InvalidSignature => ex
-            ZuoraConnect.logger.error("Error Decrypting", ex, self.default_ougai_items) if log_fatal
+            ZuoraConnect.logger.error("Error Decrypting", ex) if log_fatal
             return rescue_return
           rescue JSON::ParserError => ex
-            ZuoraConnect.logger.error("JSON Parse Error", ex, self.default_ougai_items) if log_fatal
+            ZuoraConnect.logger.error("JSON Parse Error", ex) if log_fatal
             return encryptor.decrypt_and_verify(CGI::unescape(data))
           end
         end
@@ -1185,7 +1191,7 @@ module ZuoraConnect
 
     def method_missing(method_sym, *arguments, &block)
       if method_sym.to_s.include?("login")
-        ZuoraConnect.logger.fatal("Method Missing #{method_sym}. Instance Data: #{self.task_data} Instance Logins: #{self.logins}", self.default_ougai_items)
+        ZuoraConnect.logger.fatal("Method Missing #{method_sym}. Instance Data: #{self.task_data} Instance Logins: #{self.logins}")
       end
       super
     end

data/db/migrate/20190520232224_add_environment_fields.rb

@@ -0,0 +1,13 @@
+class AddEnvironmentFields < ActiveRecord::Migration[5.0]
+  def change
+  	unless column_exists? :zuora_connect_app_instances, :environment
+      add_column :zuora_connect_app_instances, :environment, :text, default: ""
+    end 
+    unless column_exists? :zuora_connect_app_instances, :organizations
+      add_column :zuora_connect_app_instances, :organizations, :jsonb, default: [] 
+    end
+    if column_exists? :zuora_connect_app_instances, :organizations
+      change_column :zuora_connect_app_instances, :organizations, :jsonb, default: [] 
+    end
+  end
+end

data/lib/logging/connect_formatter.rb

@@ -23,12 +23,17 @@ module Ougai
       end
 
       def _call(severity, time, progname, data)
+        data.merge!({message: data.delete(:msg)})
+        if data[:timestamp].present?
+          time = data[:timestamp]
+          data.delete(:timestamp)
+        end
         dump({
           name: progname || @app_name,
           pid: $$,
           level: severity,
           timestamp: time.utc.strftime('%FT%T.%6NZ'),
-        }.merge(data.merge({message: data.delete(:msg)})))
+        }.merge(data))
       end
 
       def convert_time(data)

data/lib/resque/plugins/app_instance_job.rb

@@ -0,0 +1,69 @@
+module Resque
+  module Plugins
+    module AppInstanceJob
+      def around_perform(args)
+        case args.class.to_s
+        when "Array"
+          if args.first.class == Hash
+            data = args.first.merge({:worker_class => self.to_s})
+          else
+            data = {:worker_class => self.to_s, :args => args}
+          end
+        when "Hash"
+          data = args.merge({:worker_class => self.to_s})
+        end
+        if Rails.logger.is_a?(Ougai::Logger) 
+          Rails.logger.with_fields = {job: data, trace_id: SecureRandom.uuid, name: "RailsWorker"}
+        end
+
+        begin
+          connection_count ||= 0 
+          @appinstance = ZuoraConnect::AppInstance.find(args['app_instance_id'].to_i)
+          Rails.logger.info('Starting job') 
+
+          @appinstance.new_session(holding_pattern: true)
+        rescue ActiveRecord::RecordNotFound => exception
+          # If we can't find app_instance let make sure we cleanup
+          Rails.logger.info("No instance found, purge")
+          ZuoraConnect::AppInstance.new(id: args['app_instance_id'].to_i).prune_data
+          return
+        rescue ActiveRecord::StatementInvalid => exception
+          if (connection_count += 1) <= 3 &&
+            (
+              exception.message.include?("PG::UnableToSend: no connection to the server") ||
+              exception.message.include?("PG::ConnectionBad: PQconsumeInput()") ||
+              exception.message.include?("PG::ConnectionBad: PQsocket()") ||
+              exception.message.include?("PG::UnableToSend: SSL SYSCALL")
+            )
+
+            sleep 30
+            ActiveRecord::Base.establish_connection
+            retry
+          else
+            raise
+          end
+        rescue PG::ConnectionBad => exception
+          Rails.logger.info("Bad Connection Restart")
+          Resque.enqueue_to(self.job.queue, self.job.payload['class'], args)
+          return
+        rescue ZuoraConnect::Exceptions::ConnectCommunicationError => exception
+          Rails.logger.warn("Enqueue Job Again ~ 2 mins", exception)
+          @appinstance.queue_pause(time: 2.minutes.to_i) 
+          Resque.enqueue_to(self.job.queue, self.job.payload['class'], args)
+          return
+        rescue Net::ReadTimeout, Net::OpenTimeout, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError => exception
+          Rails.logger.warn("Enqueue Job Again ~ 2 mins", exception)
+          @appinstance.queue_pause(time: 2.minutes.to_i) 
+          Resque.enqueue_to(self.job.queue, self.job.payload['class'], args)
+          return
+        end
+        yield
+      rescue
+        raise
+      ensure
+        @appinstance.cache_app_instance if defined?(@appinstance)
+        Rails.logger.flush if Rails.logger.methods.include?(:flush)
+      end
+    end
+  end
+end

data/lib/resque/plugins/custom_logger.rb

@@ -17,15 +17,12 @@ module Resque
         when "Hash"
           data = args.merge({:worker_class => self.to_s})
         end
-        Rails.logger.with_fields = {job: data, trace_id: SecureRandom.uuid, name: "RailsWorker"} if Rails.logger.class.to_s == 'Ougai::Logger' && ZuoraConnect.configuration.json_logging
-
+        if Rails.logger.is_a?(Ougai::Logger) 
+          Rails.logger.with_fields = {job: data, trace_id: SecureRandom.uuid, name: "RailsWorker"}
+        end
         data = {:msg => 'Starting job', :job => data}
-
-        app_instance_id = data.dig(:job, 'app_instance_id')
-        if app_instance_id.present?
-          Rails.logger.before_log = lambda do |data|
-            data[:app_instance_id] = app_instance_id
-          end
+        if data.dig(:job, 'app_instance_id').present?
+          data[:app_instance_id] = data.dig(:job, 'app_instance_id')
         end
 
         Rails.logger.info(data) if data.present?

data/lib/zuora_connect.rb

@@ -8,6 +8,7 @@ require 'resque/dynamic_queues'
 require 'resque/silence_done'
 require 'resque/self_lookup'
 require 'resque/plugins/custom_logger'
+require 'resque/plugins/app_instance_job'
 require 'logging/connect_formatter'
 require 'metrics/influx/point_value'
 require 'metrics/net'
@@ -41,16 +42,6 @@ module ZuoraConnect
             data[:trace_id] = ZuoraConnect::RequestIdMiddleware.request_id if ZuoraConnect::RequestIdMiddleware.request_id.present?
             data[:zuora_trace_id] = ZuoraConnect::RequestIdMiddleware.zuora_request_id if ZuoraConnect::RequestIdMiddleware.zuora_request_id.present?
             #data[:traces] = {amazon_id: data[:trace_id], zuora_id: data[:zuora_trace_id]}
-            if !['ElasticAPM', 'ResqueScheduler', 'ResquePool', 'Resque', 'Makara'].include?(name)
-              if Thread.current[:appinstance].present? && Thread.current[:appinstance].id.present?
-                data[:app_instance_id] = Thread.current[:appinstance].id
-                logitems = Thread.current[:appinstance].logitems
-                if logitems.present? && logitems.class == Hash
-                  data[:tenant_ids] = logitems[:tenant_ids] if logitems[:tenant_ids].present?
-                  data[:organization] = logitems[:organization] if logitems[:organization].present?
-                end
-              end
-            end
           end
         else
           logger.formatter = Ougai::Formatters::Customizable.new(
@@ -60,6 +51,7 @@ module ZuoraConnect
               "  #{err[:name]} (#{err[:message]})\n #{err[:stack]}"
             end,
             format_data: proc do |data|
+              data.delete(:app_instance_id); data.delete(:tenant_ids); data.delete(:organization); data.delete(:environment)
               format('%s %s: %s', 'DATA'.ljust(6), Time.now.strftime('%FT%T.%6NZ'), "#{data.to_json}") if data.present?
             end,
             format_msg: proc do |severity, datetime, _progname, data|
@@ -86,16 +78,6 @@ module ZuoraConnect
               pid: Process.pid,
               message: name == "ActionMailer" ? msg.strip : msg
             }
-            if !['ElasticAPM', 'ResqueScheduler', 'ResquePool','Resque', 'Makara'].include?(name)
-              if Thread.current[:appinstance].present? && Thread.current[:appinstance].id.present?
-                store[:app_instance_id] = Thread.current[:appinstance].id
-                logitems = Thread.current[:appinstance].logitems
-                if logitems.present? && logitems.class == Hash
-                  store[:tenant_ids] = logitems[:tenant_ids] if logitems[:tenant_ids].present?
-                  store[:organization] = logitems[:organization] if logitems[:organization].present?
-                end
-              end
-            end
             JSON.dump(store) + "\n"
           else
             format('%s %s: %s', serverity.ljust(6), datetime, msg) + "\n"

data/lib/zuora_connect/controllers/helpers.rb

@@ -6,8 +6,11 @@ module ZuoraConnect
 
       def authenticate_app_api_request
         #Skip session for api requests
-        Thread.current[:appinstance] = nil
         request.session_options[:skip] = true
+
+        Thread.current[:appinstance] = nil
+        if ZuoraConnect.logger.is_a?(Ougai::Logger); ZuoraConnect.logger.with_fields = {}; end
+        if Rails.logger.is_a?(Ougai::Logger); Rails.logger.with_fields = {}; end
         if defined?(ElasticAPM) && ElasticAPM.running?
           if ElasticAPM.respond_to?(:set_label)
             ElasticAPM.set_label(:trace_id, request.uuid) if defined?(ElasticAPM) && ElasticAPM.running?
@@ -17,8 +20,8 @@ module ZuoraConnect
         end
         start_time = Time.now
         if request.headers["API-Token"].present?
-          @appinstance = ZuoraConnect::AppInstance.where(:api_token => request.headers["API-Token"]).first
-          ZuoraConnect.logger.debug("[#{@appinstance.id}] API REQUEST - API token") if @appinstance.present?
+          @appinstance = ZuoraConnect::AppInstance.find_by(:api_token => request.headers["API-Token"])
+          ZuoraConnect.logger.debug("API REQUEST - API token") if @appinstance.present?
           check_instance
         elsif ZuoraConnect::AppInstance::INTERNAL_HOSTS.include?(request.headers.fetch("HOST", nil))
           zuora_host, zuora_entity_id, zuora_instance_id = [request.headers['zuora-host'], (request.headers['zuora-entity-ids'] || "").gsub('-',''), request.headers['zuora-instance-id']]
@@ -53,9 +56,9 @@ module ZuoraConnect
       
         elsif request.headers.fetch("Authorization", "").include?("Basic ")
           authenticate_or_request_with_http_basic do |username, password|
-            @appinstance = ZuoraConnect::AppInstance.where(:token => password).first
-            @appinstance ||= ZuoraConnect::AppInstance.where(:api_token => password).first
-            ZuoraConnect.logger.debug("[#{@appinstance.id}] API REQUEST - Basic Auth") if @appinstance.present?
+            @appinstance = ZuoraConnect::AppInstance.find_by(:token => password)
+            @appinstance ||= ZuoraConnect::AppInstance.find_by(:api_token => password)
+            ZuoraConnect.logger.debug("API REQUEST - Basic Auth") if @appinstance.present?
             check_instance
           end
         else
@@ -63,7 +66,7 @@ module ZuoraConnect
         end
         
         if @appinstance.present?
-          ZuoraConnect.logger.debug("[#{@appinstance.id}] Authenticate App API Request Completed In - #{(Time.now - start_time).round(2)}s")
+          ZuoraConnect.logger.debug("Authenticate App API Request Completed In - #{(Time.now - start_time).round(2)}s")
         end
       end
 
@@ -85,6 +88,9 @@ module ZuoraConnect
       end
 
       def authenticate_connect_app_request
+        Thread.current[:appinstance] = nil
+        if ZuoraConnect.logger.is_a?(Ougai::Logger); ZuoraConnect.logger.with_fields = {}; end
+        if Rails.logger.is_a?(Ougai::Logger); Rails.logger.with_fields = {}; end
         if defined?(ElasticAPM) && ElasticAPM.running?
           if ElasticAPM.respond_to?(:set_label)
             ElasticAPM.set_label(:trace_id, request.uuid)
@@ -92,7 +98,6 @@ module ZuoraConnect
             ElasticAPM.set_label(:trace_id, request.uuid)
           end
         end
-        Thread.current[:appinstance] = nil
         start_time = Time.now
 
         if ZuoraConnect.configuration.mode == "Production"
@@ -134,7 +139,7 @@ module ZuoraConnect
           ZuoraConnect.logger.error(ex) 
         end
 
-        ZuoraConnect.logger.debug("[#{@appinstance.blank? ? "N/A" : @appinstance.id}] Authenticate App Request Completed In - #{(Time.now - start_time).round(2)}s")
+        ZuoraConnect.logger.debug("Authenticate App Request Completed In - #{(Time.now - start_time).round(2)}s")
 
       rescue ZuoraConnect::Exceptions::InvalidCredentialSet => ex
         id = @appinstance.id
@@ -491,7 +496,7 @@ module ZuoraConnect
 
           ZuoraConnect.logger.debug({msg: 'Setup values', connect: values}) if Rails.env != "production"
 
-          @appinstance = ZuoraConnect::AppInstance.where(:id => values["appInstance"].to_i).first
+          @appinstance = ZuoraConnect::AppInstance.find_by(:id => values["appInstance"].to_i)
 
           if @appinstance.blank?
             Apartment::Tenant.switch!("public")
@@ -514,7 +519,7 @@ module ZuoraConnect
           end 
         else
           if session["appInstance"].present?
-            @appinstance = ZuoraConnect::AppInstance.where(:id => session["appInstance"]).first 
+            @appinstance = ZuoraConnect::AppInstance.find_by(:id => session["appInstance"]) 
           else
             raise ZuoraConnect::Exceptions::AccessDenied.new("No application state or session found.")
           end
@@ -526,7 +531,7 @@ module ZuoraConnect
         user = ZuoraConnect.configuration.dev_mode_user
         key = ZuoraConnect.configuration.dev_mode_pass
         values = {:user => user , :key => key, :appinstance => session["appInstance"]}
-        @appinstance = ZuoraConnect::AppInstance.where(:id => values[:appinstance].to_i).first
+        @appinstance = ZuoraConnect::AppInstance.find_by(:id => values[:appinstance].to_i)
         if @appinstance.blank?
           Apartment::Tenant.switch!("public")
           begin

data/lib/zuora_connect/railtie.rb

@@ -62,7 +62,7 @@ module ZuoraConnect
           items.merge!({exception: event.payload[:exception]}) if event.payload[:exception].present?
 
           if Thread.current[:appinstance].present? 
-            items.merge!({appinstance_id: Thread.current[:appinstance].id, connect_user: Thread.current[:appinstance].connect_user, new_session: Thread.current[:appinstance].new_session_message})
+            items.merge!({connect_user: Thread.current[:appinstance].connect_user, new_session: Thread.current[:appinstance].new_session_message})
             if Thread.current[:appinstance].logitems.present? && Thread.current[:appinstance].logitems.class == Hash
               items.merge!(Thread.current[:appinstance].logitems)
             end

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.46"
+  VERSION = "2.0.47"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.46
+  version: 2.0.47
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -338,6 +338,7 @@ files:
 - db/migrate/20190520232221_add_zuora_user_table_and_alter_app_instance_id_table.rb
 - db/migrate/20190520232222_add_unique_index.rb
 - db/migrate/20190520232223_add_provisioning_fields.rb
+- db/migrate/20190520232224_add_environment_fields.rb
 - lib/logging/connect_formatter.rb
 - lib/metrics/influx/point_value.rb
 - lib/metrics/net.rb
@@ -347,6 +348,7 @@ files:
 - lib/middleware/request_id_middleware.rb
 - lib/resque/additions.rb
 - lib/resque/dynamic_queues.rb
+- lib/resque/plugins/app_instance_job.rb
 - lib/resque/plugins/custom_logger.rb
 - lib/resque/self_lookup.rb
 - lib/resque/silence_done.rb