zuora_connect 3.0.0.pre.s → 3.0.0.pre.x

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96eb85d1f22f9e43e77f9dab8a187ce092e6e5bebfc8a40805d42b914ff1b7ad
-  data.tar.gz: 5f77076744852fed16f83b33c098a9e2be0754cb70ba01ef9c6e8495891a86a3
+  metadata.gz: 8f102da5d3b8eacf86f53c79a69e2b0ab306cadfdd67a510b92de93788d02868
+  data.tar.gz: 7d3f89da30883780fc07725ce24159e02eed059f68c9579582f1287fd84d0857
 SHA512:
-  metadata.gz: 11651fbf9c9407ef28b58090bec1b2a3fa6fd83316f6c7ee1036cb7b169cd4604b4e28a582caeb5c17e71ca23a1465d3dbaafc99fd885df83c5584adbd43606a
-  data.tar.gz: 7131be1a495b2e47b892f900c55a88a3a798e296661427de47247f0bda17b0a6d73ee6bcb5b0568c7bc82d5e919adb0fc6aaeb76ecb29bacfd34a305c1c06a8b
+  metadata.gz: 2ebaffa1df592eb2982b690c40bd9e2db671f52ad8f302005a7b72152ff0327bfe61f8554f22e2d4c49b2fbfc57ca280e407cb048b3457d2ee5426e51b38bcec
+  data.tar.gz: 5fb9cb8bffc0b6f0327f2191d663b2574068f50d568c38728570bdb55130b3bbc7e626f6f1060db861467455195c49c6fcf78a4981bffa85a66716e059fc9b79

data/config/initializers/resque.rb

@@ -5,6 +5,10 @@ if defined?(Resque::Worker)
   Resque::Job.send(:include, Resque::SelfLookup)
 end
 
+if ENV['PROCESS_TYPE'] == 'worker'
+  Rails.logger = ZuoraObservability::Logger.custom_logger(name: 'RailsWorker', level: Logger::INFO)
+end
+
 Resque.module_eval do
   # Returns a hash, mapping queue names to queue sizes
   def queue_sizes

data/config/initializers/zuora_observability.rb

@@ -1,21 +1,24 @@
+# frozen_string_literal: true
+
 ZuoraObservability.configure do |config|
   config.zecs_service_hook = lambda do |controller|
     custom_payload = {}
-    if controller.instance_variable_defined?(:@appinstance)
-      appinstance = controller.instance_variable_get(:@appinstance)
-      if appinstance.logitems.present? && appinstance.logitems.class == Hash
-        ActiveSupport::Deprecation.warn("logitems is deprecated, please use zecs_service_hook. See 'https://gitlab.zeta.tools/extension-products/incubating-projects/zuora_observability/-/blob/master/doc/logging.md' for more details.")
-        custom_payload.merge!(appinstance.logitems)
-      end
+    appinstance = controller.instance_variable_get(:@appinstance)
+
+    if appinstance&.logitems.present? && appinstance.logitems.class == Hash
+      ActiveSupport::Deprecation.warn("logitems is deprecated, please use zecs_service_hook. See 'https://gitlab.zeta.tools/extension-products/incubating-projects/zuora_observability/-/blob/master/doc/logging.md' for more details.")
+      custom_payload.merge!(appinstance.logitems)
     end
+
     custom_payload
   end
+
   config.add_custom_payload_hook do |controller|
     custom_payload = {}
-    if controller.instance_variable_defined?(:@appinstance)
-      appinstance = controller.instance_variable_get(:@appinstance)
-      custom_payload.merge!({ email: appinstance.connect_user })
-    end
+    appinstance = controller.instance_variable_get(:@appinstance)
+
+    custom_payload.merge!({ email: appinstance.connect_user }) if appinstance
+
     custom_payload
   end
 end

data/lib/resque/plugins/app_instance_job.rb

@@ -2,24 +2,25 @@ module Resque
   module Plugins
     module AppInstanceJob
       def around_perform(args)
-        case args.class.to_s
+        case args.class.name
         when "Array"
-          if args.first.class == Hash
+          if args.first.is_a?(Hash)
             data = args.first.merge({:worker_class => self.to_s})
           else
-            data = {:worker_class => self.to_s, :args => args}
+            data = {:worker_class => self.to_s, :args => args.to_json}
           end
         when "Hash"
           data = args.merge({:worker_class => self.to_s})
         end
+
         if Rails.logger.is_a?(Ougai::Logger) && !Rails.env.development?
-          Rails.logger.with_fields = {job: data, trace_id: SecureRandom.uuid, name: "RailsWorker"}
+          Rails.logger.with_fields = { zecs_service: data.transform_keys(&:to_sym), trace_id: SecureRandom.uuid }
         end
 
         begin
           connection_count ||= 0
           @appinstance = ZuoraConnect::AppInstance.find(args['app_instance_id'].to_i)
-          job_start_log(args)
+          job_start_log
 
           @appinstance.new_session(holding_pattern: true)
         rescue ActiveRecord::RecordNotFound => exception
@@ -69,8 +70,8 @@ module Resque
         Rails.logger.flush if Rails.logger.methods.include?(:flush)
       end
 
-      def job_start_log(args)
-       Rails.logger.info("Starting job")
+      def job_start_log
+        Rails.logger.info('Starting job')
       end
     end
   end

data/lib/resque/plugins/custom_logger.rb

@@ -7,25 +7,24 @@ module Resque
   module Plugins
     module CustomLogger
       def before_perform(*args)
-        case args.class.to_s
+        case args.class.name
         when "Array"
-          if args.first.class == Hash
+          if args.first.is_a?(Hash)
             data = args.first.merge({:worker_class => self.to_s})
           else
-            data = {:worker_class => self.to_s, :args => args}
+            data = {:worker_class => self.to_s, :args => args.to_json}
           end
         when "Hash"
           data = args.merge({:worker_class => self.to_s})
         end
+
         if Rails.logger.is_a?(Ougai::Logger) && !Rails.env.development?
-          Rails.logger.with_fields = {job: data, trace_id: SecureRandom.uuid, name: "RailsWorker"}
-        end
-        data = {:msg => 'Starting job', :job => data}
-        if data.dig(:job, 'app_instance_id').present?
-          data[:app_instance_id] = data.dig(:job, 'app_instance_id')
+          Rails.logger.with_fields = { zecs_service: data.transform_keys(&:to_sym), trace_id: SecureRandom.uuid }
         end
 
-        Rails.logger.info(data) if data.present?
+        if data.present?
+          Rails.logger.info('Starting job')
+        end
       end
     end
   end

data/lib/zuora_connect/controllers/helpers.rb

@@ -550,11 +550,11 @@ module ZuoraConnect
             final_error = output_xml.xpath('//fns:FaultCode', 'fns' =>'http://fault.api.zuora.com/').text
             session.clear
             if final_error.blank?
-              ZuoraConnect.logger.warn("UI Authorization Error", ex, zuora: zuora_details.merge({:error => response.body}))
+              ZuoraConnect.logger.warn("UI Authorization Error", ex, response_body: response.body)
             elsif final_error != "INVALID_SESSION"
-              ZuoraConnect.logger.warn("UI Authorization Error", ex, zuora: zuora_details.merge({:error => final_error}))
+              ZuoraConnect.logger.warn("UI Authorization Error", ex, response_body: final_error)
             else
-              ZuoraConnect.logger.info("UI Authorization Error", ex, zuora: zuora_details.merge({:error => final_error}))
+              ZuoraConnect.logger.info("UI Authorization Error", ex, response_body: final_error)
             end
             redirect_to "https://#{zuora_host}/apps/newlogin.do?retURL=#{request.fullpath}"
             return

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "3.0.0-s"
+  VERSION = "3.0.0-x"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.s
+  version: 3.0.0.pre.x
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-07 00:00:00.000000000 Z
+date: 2021-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment