zuora_connect 3.0.0.pre.s → 3.0.0.pre.t

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96eb85d1f22f9e43e77f9dab8a187ce092e6e5bebfc8a40805d42b914ff1b7ad
-  data.tar.gz: 5f77076744852fed16f83b33c098a9e2be0754cb70ba01ef9c6e8495891a86a3
+  metadata.gz: 81197d2fca3e19e8602342a820948d21963735397119b0c992cb316452e25bba
+  data.tar.gz: 43466f6d39c34bb60fa13e63a57c70dc23b9466c0a15a21b9f404a368e4efef1
 SHA512:
-  metadata.gz: 11651fbf9c9407ef28b58090bec1b2a3fa6fd83316f6c7ee1036cb7b169cd4604b4e28a582caeb5c17e71ca23a1465d3dbaafc99fd885df83c5584adbd43606a
-  data.tar.gz: 7131be1a495b2e47b892f900c55a88a3a798e296661427de47247f0bda17b0a6d73ee6bcb5b0568c7bc82d5e919adb0fc6aaeb76ecb29bacfd34a305c1c06a8b
+  metadata.gz: 6265d548693f0ff43e39ea5cbec79db9245023f4bc0891ab9c6f7772b795927ef071fd06cadc67043effc0fdab05ecbca7c8dec6064004fa28723617521593f8
+  data.tar.gz: e1ab4768c5037e459b0111ae1a711c04f0163d061c2460e6e5a6c14e383f5f27ed5eb188d6b891ceb6942784d2e73c03f384896a81799d0e1252ebdfb00a34cd

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.s
+  version: 3.0.0.pre.t
 platform: ruby
 authors:
 - Connect Team