zuora_connect 3.0.0.pre.r → 3.0.0.pre.w

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b3516f74913531168adf62cf95a28fe805018ab49ec723c9083d8f80064c158
-  data.tar.gz: 78e7f843dcfdd421d3dd80eb868afba810c68f6b85783a5efb645f93bf3c6097
+  metadata.gz: ed4e56e9b8a6f0f2754499b3028838a0d92124512ef2a2245a24be0025a6fa71
+  data.tar.gz: 5f955b8f077522059306ed1ede3e50b2812e2c99e7acb3b513cbfb0cae40053b
 SHA512:
-  metadata.gz: e6760f6ae414ea0362a93f4ed28d6345d3cf2247e9bac4bcb4e927159da124507fb342ba3a8237176885aa9a8d1fd389a8c629c1cedf97914d6d48757e9d95b0
-  data.tar.gz: 7b92aebfc8426957e86dec98a6f8251e124094deee5b55776e65c6e5bd2d3d6615bc08740d9658766d7164d10d4193f8591d096702a2c605c4426d2c07cf4f53
+  metadata.gz: 5ca5517bfe7fe1b4519ce1e08667c8f9da100d94c498e83911d713c985def89e840fe5fda9bf758de922e20e1760c222c598bdd0e907b471a52c6238f5d498c6
+  data.tar.gz: dab92de50bde980687c88820a1953de9a9d5f86d2fefc9f38ce2e4c3dbfbf0479db7a8300a987dcc3ff3740d2b95e5ac88fd646f62b9e79ac4cf177337af93e3

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

@@ -19,6 +19,9 @@ module ZuoraConnect
               ElasticAPM.set_label(:trace_id, request.uuid) if defined?(ElasticAPM) && ElasticAPM.running?
             end
           end
+
+          ZuoraConnect::ZuoraUser.current_user_id = request.headers["Zuora-User-Id"]
+
           if request.headers["API-Token"].present?
             @appinstance = ZuoraConnect::AppInstance.find_by(:api_token => request.headers["API-Token"])
             ZuoraConnect.logger.debug("API REQUEST - API token") if @appinstance.present?
@@ -408,7 +411,7 @@ module ZuoraConnect
               appinstances ||= ZuoraConnect::AppInstance.where("zuora_entity_ids ?& array[:entities] = true AND zuora_domain = :host", entities: [zuora_entity_id], host: zuora_client.rest_domain).pluck(:id, :name)
             end
 
-            zuora_user_id = cookies['Zuora-User-Id'] || session["ZuoraCurrentIdentity"]['userId']
+            zuora_user_id = cookies['Zuora-User-Id'] || session["ZuoraCurrentIdentity"]['userId'] || request.headers["Zuora-User-Id"]
 
             if appinstances.size == 1
               ZuoraConnect.logger.debug("Instance is #{appinstances.to_h.keys.first}")
@@ -547,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, err: { name: final_error })
             else
-              ZuoraConnect.logger.info("UI Authorization Error", ex, zuora: zuora_details.merge({:error => final_error}))
+              ZuoraConnect.logger.info("UI Authorization Error", ex, err: { name: 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-r"
+  VERSION = "3.0.0-w"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.r
+  version: 3.0.0.pre.w
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-12 00:00:00.000000000 Z
+date: 2021-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -430,7 +430,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Summary of Connect.