zuora_connect 2.0.45 → 2.0.46a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb6362ea1828b6b6b38e032a6e1ba848045d52f8c9915569fe03b438afbda75a
-  data.tar.gz: 21f29c71fbffa9fba6461055e015ee87a26675bfe9aba992b83ca4fa54299b9c
+  metadata.gz: a34f4afae372d7790b9304b6513451ab159dfebd4aaf4b0ac9d4eb1815a506f2
+  data.tar.gz: 032b9cc5dabbaac3e8a0c873b8511fe273a499909c51a5744ed2c9583db2c965
 SHA512:
-  metadata.gz: 48461b8d413ceb41c6ad199f322cf316c8973011596a8c2b0f29bac04fae4bdfc0c7dcbc0456544b6a924a14594c27b4bf628ae67d5643c4ecad47271c3e3469
-  data.tar.gz: e55b8ea4428428ad126d5374822e2665d4504a2a54f521f85025bddbc902ceb35dc51c5317701306bd30bed8e9c4923c7bbfeed364c2e5cc609d2e15c16bdbf8
+  metadata.gz: 4d3bb428adef914f118c7ffacdaad023fc9bae36d689ea76757a6c244be38f74fc7ff0f3dba8b0e8b5cadc61509ea0e2f7200984a446dfd5f3daaf005aaf80a7
+  data.tar.gz: 06dccc05037fe18c29501d2f9a5db21473e5e7492b80d525fa4c3c1abc1c3cae831ac206e32eea34a3d3022bb37697a8dfe164cfbabfb31c42f1d698f4cfda7f

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

@@ -83,10 +83,15 @@ module Resque
       else 
         return reserve_without_round_robin
       end
+
       
-    rescue Exception => e
-      log "Error reserving job: #{e.inspect}"
-      log e.backtrace.join("\n")
+    rescue Exception => ex
+      if defined?(Ougai::Logger) && Resque.logger.is_a?(Ougai::Logger)
+        log_with_severity :error, "Error reserving job", ex
+      else
+        log_with_severity :error, "Error reserving job: #{ex.inspect}"
+        log_with_severity :error, ex.backtrace.join("\n")
+      end
       raise e
     end
 

data/lib/zuora_connect.rb

@@ -41,16 +41,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(
@@ -86,16 +76,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/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.45"
+  VERSION = "2.0.46a"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.45
+  version: 2.0.46a
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-02 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
@@ -413,9 +414,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: