zuora_connect 1.7.81aa → 1.7.81f

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab13fc8d7e9c36ad2074d2e97b1b27b8d34a261b41f8209bee95bff710fb339c
-  data.tar.gz: e606836efe2c4d8bf36900fc2f782a082e2c6f782495465198754fc2eefb127e
+  metadata.gz: 8489acd67967c1554189fb60596b8df62e6f14a6a5ff5300fe23e1c3cb25ca90
+  data.tar.gz: ec8a76cd042d30c478c82046092e24de9af653768b44f8e6230a5036532d7717
 SHA512:
-  metadata.gz: ec0e65a1878586d729fa737e1608195f25dcd46519637f461014a90bc5ca508dc48691f49889743efede381697cd2a6c4d55d59569077bd154d893817496de93
-  data.tar.gz: c53da17d05089474b3f858e9ab4b46e74621c5ad61748e28342f1e7c2bcf87c15367e8130bd5009c741f738f77df43f47c5ca39daba7a02cd8ab6af4153bb4f5
+  metadata.gz: fa39b30ff89df6a9d3d31c9f6231adadc28c63008b7e71a3fc47dc4f0a4513df93fbbc832a3b7cb2e9bc67506595e60e5fa480fdc97e5fe74cd28df236318f18
+  data.tar.gz: e154e27b14d4d8aac56372dcc942fe0af9098ad8943421342590d536a531b5b63fb961c95d4929fcdd8e2a3bd08233d11de14c4584d55ecdec4288743405cead

data/app/controllers/zuora_connect/static_controller.rb

@@ -26,19 +26,6 @@ module ZuoraConnect
     end
 
     def health
-      if params[:error].present?
-        begin 
-          raise ZuoraConnect::Exceptions::Error.new('This is an error')
-        rescue => ex
-          case params[:error]
-          when 'Log'  
-            Rails.logger.error(ex)
-          when 'Exception'
-            raise
-          end
-        end
-      end
-
       render json: {
         message: "Alive",
         status: 200

data/app/models/zuora_connect/app_instance_base.rb

@@ -27,7 +27,7 @@ module ZuoraConnect
       self.attr_builder("timezone", ZuoraConnect.configuration.default_time_zone)
       self.attr_builder("locale", ZuoraConnect.configuration.default_locale)
       PaperTrail.whodunnit = "Backend" if defined?(PaperTrail)
-      if defined?(ElasticAPM) && ElasticAPM.running?
+      if defined?(ElasticAPM)
         ElasticAPM.set_user("Backend")
         ElasticAPM.set_tag(:app_instance, self.id) 
       end
@@ -93,7 +93,7 @@ module ZuoraConnect
       self.last_refresh = session["#{self.id}::last_refresh"]
       self.connect_user = session["#{self.id}::user::email"] if session["#{self.id}::user::email"].present?
       PaperTrail.whodunnit = self.connect_user if defined?(PaperTrail)
-      ElasticAPM.set_user(self.connect_user)   if defined?(ElasticAPM) && ElasticAPM.running?
+      ElasticAPM.set_user(self.connect_user)   if defined?(ElasticAPM) 
       recoverable_session = false
 
       ## DEV MODE TASK DATA MOCKUP
@@ -120,26 +120,26 @@ module ZuoraConnect
 
         if session.empty?
           self.new_session_message = "REFRESHING - Session Empty"
-          ZuoraConnect.logger.add(log_level, self.new_session_message)
+          Rails.logger.add(log_level, 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.add(log_level, self.new_session_message)
+          Rails.logger.add(log_level, 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.add(log_level, self.new_session_message)
+          Rails.logger.add(log_level, 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.add(log_level, self.new_session_message)
+          Rails.logger.add(log_level, self.new_session_message)
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session: session)
 
@@ -147,7 +147,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.add(log_level, self.new_session_message)
+          Rails.logger.add(log_level, self.new_session_message)
           self.refresh(session: session)
 
         else
@@ -156,14 +156,14 @@ module ZuoraConnect
           else
             self.new_session_message = "REBUILDING - Expires in #{time_expire} seconds"
           end
-          ZuoraConnect.logger.add(log_level, self.new_session_message)
+          Rails.logger.add(log_level, 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}'")
+        Rails.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])
@@ -171,7 +171,7 @@ module ZuoraConnect
       retry
     rescue => ex 
       if recoverable_session
-        ZuoraConnect.logger.error("REBUILDING - Using backup expired cache")
+        Rails.logger.error("REBUILDING - Using backup expired cache")
         self.build_task(task_data: session["#{self.id}::task_data"], session: session)
         return self
       else
@@ -181,12 +181,12 @@ module ZuoraConnect
       begin
         I18n.locale = self.locale
       rescue I18n::InvalidLocale => ex
-        ZuoraConnect.logger.debug("Invalid Locale: #{ex.message}")
+        Rails.logger.debug("Invalid Locale: #{ex.message}")
       end
       Time.zone = self.timezone
       tenants = self.task_data.dig('tenant_ids') || []
       organizations = self.task_data.dig('organizations') || []
-      if defined?(ElasticAPM) && ElasticAPM.running?
+      if defined?(ElasticAPM) 
         ElasticAPM.set_tag(:tenant_id, tenants.first) 
         ElasticAPM.set_tag(:organization, organizations.first) 
       end
@@ -200,33 +200,33 @@ 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("[#{self.id}] REFRESH TASK - Connect Task Info Request Time #{response_time.round(2).to_s}")
+      Rails.logger.debug("[#{self.id}] REFRESH TASK - Connect Task Info Request Time #{response_time.round(2).to_s}")
       if response.code == 200
         self.build_task(task_data: JSON.parse(response.body), session: session)
         self.last_refresh = Time.now.to_i
         self.cache_app_instance
         self.reset_mark_for_refresh
       else
-        ZuoraConnect.logger.fatal("[#{self.id}] REFRESH TASK - Failed Code #{response.code}")
+        Rails.logger.fatal("[#{self.id}] REFRESH TASK - Failed Code #{response.code}")
         raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
       end
     rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS).concat(ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
       if (refresh_count += 1) < 3
-        ZuoraConnect.logger.info("[#{self.id}] REFRESH TASK - #{ex.class} Retrying(#{refresh_count})")
+        Rails.logger.info("[#{self.id}] REFRESH TASK - #{ex.class} Retrying(#{refresh_count})")
         retry
       else
-        ZuoraConnect.logger.fatal("[#{self.id}] REFRESH TASK - #{ex.class} Failed #{refresh_count}x")
+        Rails.logger.fatal("[#{self.id}] REFRESH TASK - #{ex.class} Failed #{refresh_count}x")
         raise
       end
     rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
       if (refresh_count += 1) < 3
-        ZuoraConnect.logger.info("[#{self.id}] REFRESH TASK - Failed Retrying(#{refresh_count})")
+        Rails.logger.info("[#{self.id}] REFRESH TASK - Failed Retrying(#{refresh_count})")
         if ex.code == 401
           self.refresh_oauth
         end
         retry
       else
-        ZuoraConnect.logger.fatal("[#{self.id}] REFRESH TASK - Failed #{refresh_count}x")
+        Rails.logger.fatal("[#{self.id}] REFRESH TASK - Failed #{refresh_count}x")
         raise
       end
     end
@@ -316,8 +316,8 @@ module ZuoraConnect
           end
         end
       rescue => ex
-        ZuoraConnect.logger.error("Task Data: #{task_data}") if task_data.present?
-        ZuoraConnect.logger.error("Task Session: #{session.to_h}") if session.present?
+        Rails.logger.error("Task Data: #{task_data}") if task_data.present?
+        Rails.logger.error("Task Session: #{session.to_h}") if session.present?
         raise
       end
 
@@ -393,7 +393,7 @@ module ZuoraConnect
       def check_oauth_state(method)
         #Refresh token if already expired
         if self.oauth_expired?
-          ZuoraConnect.logger.debug("[#{self.id}] Before '#{method}' method, Oauth expired")
+          Rails.logger.debug("[#{self.id}] Before '#{method}' method, Oauth expired")
           self.refresh_oauth
         end
       end
@@ -412,7 +412,7 @@ module ZuoraConnect
                 }
         response = HTTParty.post("#{ZuoraConnect.configuration.url}/oauth/token",:body => params)
         response_time = Time.now - start
-        ZuoraConnect.logger.debug("[#{self.id}] REFRESH OAUTH - In #{response_time.round(2).to_s}")
+        Rails.logger.info("[#{self.id}] REFRESH OAUTH - In #{response_time.round(2).to_s}")
 
         if response.code == 200
           response_body = JSON.parse(response.body)
@@ -422,15 +422,15 @@ module ZuoraConnect
           self.oauth_expires_at = Time.at(response_body["created_at"].to_i) + response_body["expires_in"].seconds
           self.save(:validate => false)
         else
-          ZuoraConnect.logger.fatal("[#{self.id}] REFRESH OAUTH - Failed Code #{response.code}")
+          Rails.logger.fatal("[#{self.id}] REFRESH OAUTH - Failed Code #{response.code}")
           raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Refreshing Access Token", response.body, response.code)
         end
       rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS).concat(ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
         if (refresh_oauth_count += 1) < 3
-          ZuoraConnect.logger.info("[#{self.id}] REFRESH OAUTH - #{ex.class} Retrying(#{refresh_oauth_count})")
+          Rails.logger.info("[#{self.id}] REFRESH OAUTH - #{ex.class} Retrying(#{refresh_oauth_count})")
           retry
         else
-          ZuoraConnect.logger.fatal("[#{self.id}] REFRESH OAUTH - #{ex.class} Failed #{refresh_oauth_count}x")
+          Rails.logger.fatal("[#{self.id}] REFRESH OAUTH - #{ex.class} Failed #{refresh_oauth_count}x")
           raise
         end
       rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
@@ -441,10 +441,10 @@ module ZuoraConnect
         return if !self.oauth_expired?
 
         if (refresh_oauth_count += 1) < 3
-          ZuoraConnect.logger.info("[#{self.id}] REFRESH OAUTH - Failed Retrying(#{refresh_oauth_count})")
+          Rails.logger.info("[#{self.id}] REFRESH OAUTH - Failed Retrying(#{refresh_oauth_count})")
           retry
         else
-          ZuoraConnect.logger.fatal("[#{self.id}] REFRESH OAUTH - Failed #{refresh_oauth_count}x")
+          Rails.logger.fatal("[#{self.id}] REFRESH OAUTH - Failed #{refresh_oauth_count}x")
           raise
         end
       end
@@ -494,10 +494,10 @@ module ZuoraConnect
             end
           end
           if cached_instance.blank?
-            ZuoraConnect.logger.debug("[#{self.id}] Cached AppInstance Missing")
+            Rails.logger.debug("[#{self.id}] Cached AppInstance Missing")
             return session
           else
-            ZuoraConnect.logger.debug("[#{self.id}] Cached AppInstance Found")
+            Rails.logger.debug("[#{self.id}] Cached AppInstance Found")
             return decrypt_data(data: cached_instance, rescue_return: session).merge(session)
           end
         else
@@ -509,7 +509,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("[#{self.id}] Caching AppInstance")
+            Rails.logger.debug("[#{self.id}] Caching AppInstance")
             Redis.current.setex("AppInstance:#{self.id}", INSTANCE_REDIS_CACHE_PERIOD.to_i, self.encrypt_data(data: self.save_data))
           end
         end
@@ -570,7 +570,7 @@ module ZuoraConnect
           begin 
             return JSON.parse(encryptor.decrypt_and_verify(CGI::unescape(data)))
           rescue ActiveSupport::MessageVerifier::InvalidSignature => ex
-            ZuoraConnect.logger.add(Logger::FATAL, 'Error Decrypting') if log_fatal
+            Rails.logger.add(Logger::FATAL, 'Error Decrypting') if log_fatal
             return rescue_return
           rescue JSON::ParserError => ex
             return encryptor.decrypt_and_verify(CGI::unescape(data))
@@ -632,8 +632,8 @@ module ZuoraConnect
         self.update_column(:catalog_update_attempt_at, Time.now.utc)
 
         entity_reference = entity_id.blank? ? 'Default' : entity_id
-        ZuoraConnect.logger.debug("Fetch Catalog")
-        ZuoraConnect.logger.debug("Zuora Entity: #{entity_id.blank? ? 'default' : entity_id}")
+        Rails.logger.debug("Fetch Catalog")
+        Rails.logger.debug("Zuora Entity: #{entity_id.blank? ? 'default' : entity_id}")
 
         login = zuora_login.client(entity_reference)
 
@@ -644,12 +644,12 @@ module ZuoraConnect
         response = {'nextPage' => login.rest_endpoint("catalog/products?pageSize=#{page_size}")}
         while !response["nextPage"].blank?
           url = login.rest_endpoint(response["nextPage"].split('/v1/').last)
-          ZuoraConnect.logger.debug("Fetch Catalog URL #{url}")
+          Rails.logger.debug("Fetch Catalog URL #{url}")
           output_json, response = login.rest_call(:debug => false, :url => url, :errors => [ZuoraAPI::Exceptions::ZuoraAPISessionError], :timeout_retry => true)
-          ZuoraConnect.logger.debug("Fetch Catalog Response Code #{response.code}")
+          Rails.logger.debug("Fetch Catalog Response Code #{response.code}")
 
           if !output_json['success'] =~ (/(true|t|yes|y|1)$/i) || output_json['success'].class != TrueClass
-            ZuoraConnect.logger.error("Fetch Catalog DATA #{output_json.to_json}")
+            Rails.logger.error("Fetch Catalog DATA #{output_json.to_json}")
             raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Error Getting Catalog: #{output_json}")
           end
 
@@ -939,9 +939,9 @@ module ZuoraConnect
 
     def method_missing(method_sym, *arguments, &block)
       if method_sym.to_s.include?("login")
-        ZuoraConnect.logger.fatal("Method Missing #{method_sym}")
-        ZuoraConnect.logger.fatal("Instance Data: #{self.task_data}")
-        ZuoraConnect.logger.fatal("Instance Logins: #{self.logins}")
+        Rails.logger.fatal("Method Missing #{method_sym}")
+        Rails.logger.fatal("Instance Data: #{self.task_data}")
+        Rails.logger.fatal("Instance Logins: #{self.logins}")
       end
       super
     end

data/app/models/zuora_connect/telegraf.rb

@@ -12,14 +12,14 @@ module ZuoraConnect
     end
 
     def connect
-      ZuoraConnect.logger.debug(self.format_metric_log('Telegraf','Need new connection')) if ZuoraConnect.configuration.telegraf_debug
+      Rails.logger.debug(self.format_metric_log('Telegraf','Need new connection')) if ZuoraConnect.configuration.telegraf_debug
       uri = URI.parse(ZuoraConnect.configuration.telegraf_endpoint)
       self.host = UDPSocket.new.tap do |socket|
         socket.connect uri.host, uri.port
       end
     rescue => ex
       self.host = nil
-      ZuoraConnect.logger.warn(self.format_metric_log('Telegraf', "Failed to connect: #{ex.class}"))
+      Rails.logger.warn(self.format_metric_log('Telegraf', "Failed to connect: #{ex.class}"))
     end
 
     def write(direction: 'Unknown', tags: {}, values: {})
@@ -44,9 +44,9 @@ module ZuoraConnect
         end
       end
       if ZuoraConnect.configuration.telegraf_debug
-        ZuoraConnect.logger.debug(self.format_metric_log('Telegraf', tags.to_s))
-        ZuoraConnect.logger.debug(self.format_metric_log('Telegraf', values.to_s))
-        ZuoraConnect.logger.debug(self.format_metric_log('Telegraf', "Writing '#{direction.capitalize}': #{time.real.round(5)} ms"))
+        Rails.logger.debug(self.format_metric_log('Telegraf', tags.to_s))
+        Rails.logger.debug(self.format_metric_log('Telegraf', values.to_s))
+        Rails.logger.debug(self.format_metric_log('Telegraf', "Writing '#{direction.capitalize}': #{time.real.round(5)} ms"))
       end
     end
 
@@ -56,18 +56,14 @@ module ZuoraConnect
       self.host.write InfluxDB::PointValue.new({series: series, tags: tags, values: values}).dump 
     rescue => ex
       self.connect
-      ZuoraConnect.logger.warn(self.format_metric_log('Telegraf',"Failed to write udp: #{ex.class}"))
+      Rails.logger.warn(self.format_metric_log('Telegraf',"Failed to write udp: #{ex.class}"))
     end
 
     def format_metric_log(message, dump = nil)
       message_color, dump_color = "1;91", "0;1"
       log_entry = "  \e[#{message_color}m#{message}\e[0m   "
       log_entry << "\e[#{dump_color}m%#{String === dump ? 's' : 'p'}\e[0m" % dump if dump
-      if Rails.env == :development
-        log_entry
-      else
-        [message, dump].compact.join(' - ')
-      end
+      log_entry
     end
 
     def self.app_name

data/config/initializers/elastic_apm.rb

@@ -0,0 +1,25 @@
+if defined?(ElasticAPM)
+  if ZuoraConnect.configuration.enable_apm && !defined?(Rails::Console)
+    ElasticAPM.agent.config.disable_send = false
+  else
+    ElasticAPM.agent.config.disable_send = true
+  end
+  case Rails.env.to_s
+  when 'production'
+    ElasticAPM.agent.config.server_url = "http://apm-server.logging:8200"
+    ElasticAPM.agent.config.transaction_sample_rate = 0.20
+    ElasticAPM.agent.config.capture_body = false
+  when 'staging'
+    ElasticAPM.agent.config.server_url = "http://apm-server.logging:8200"
+    ElasticAPM.agent.config.transaction_sample_rate = 1.0
+  when 'development'
+    ElasticAPM.agent.config.server_url = "http://logging.0.ecc.auw2.zuora:8200"
+    ElasticAPM.agent.config.transaction_sample_rate = 1.0
+  end
+  ElasticAPM.agent.config.pool_size = 1
+  ElasticAPM.agent.config.transaction_max_spans = 500
+  ElasticAPM.agent.config.ignore_url_patterns = ['^\/admin\/resque.*', '^\/admin\/redis.*', '^\/admin\/peek.*', '^\/peek.*']
+  ElasticAPM.agent.config.verify_server_cert = false
+  ElasticAPM.agent.config.log_level = Logger::INFO
+  ElasticAPM.agent.config.service_name = ::ZuoraConnect::Telegraf.app_name
+end

data/config/initializers/resque.rb

@@ -19,13 +19,4 @@ Resque.module_eval do
 
     Hash[queue_names.zip(sizes)]
   end
-end
-
-if defined?(Resque)
-  Resque.logger = ZuoraConnect.custom_logger(name: "Resque", type: 'Monologger') 
-  Resque::Scheduler.logger = ZuoraConnect.custom_logger(name: "ResqueScheduler") if defined?(Resque::Scheduler)
-end
-
-Makara::Logging::Logger.logger = ZuoraConnect.custom_logger(name: "Makara") if defined?(Makara)
-ElasticAPM.agent.config.logger = ZuoraConnect.custom_logger(name: "ElasticAPM", level: MonoLogger::WARN) if defined?(ElasticAPM) && ElasticAPM.running?
-ActionMailer::Base.logger = ZuoraConnect.custom_logger(name: "ActionMailer", type: 'Monologger') if defined?(ActionMailer)
+end

data/config/initializers/unicorn.rb

@@ -2,8 +2,7 @@ if defined?(Unicorn::WorkerKiller)
   Unicorn::WorkerKiller.module_eval do
     self.singleton_class.send(:alias_method, :kill_self_old, :kill_self)
     def self.kill_self(logger, start_time)
-      @unicorn_logger ||= ZuoraConnect.custom_logger(name: "UnicornKiller")
-      self.kill_self_old(@unicorn_logger, start_time)
+      self.kill_self_old(logger, start_time)
       ZuoraConnect::AppInstance.write_to_telegraf(direction: 'Unicorn-Killer', tags: {app_instance: 0}, values: {kill: 1})
     end
   end

data/lib/metrics/net.rb

@@ -162,7 +162,7 @@ class HttpLogger
   end
 
   def format_log_entry(message, dump = nil)
-    if self.class.colorize && Rails.configuration.colorize_logging
+    if self.class.colorize
       message_color, dump_color = "4;32;1", "0;1"
       log_entry = "  \e[#{message_color}m#{message}\e[0m   "
       log_entry << "\e[#{dump_color}m%#{String === dump ? 's' : 'p'}\e[0m" % dump if dump
@@ -212,7 +212,7 @@ if defined?(Rails)
   if defined?(ActiveSupport) && ActiveSupport.respond_to?(:on_load)
     # Rails3
     ActiveSupport.on_load(:after_initialize) do
-      HttpLogger.logger = ZuoraConnect.logger unless HttpLogger.logger
+      HttpLogger.logger = Rails.logger unless HttpLogger.logger
     end
   end
 end

data/lib/middleware/metrics_middleware.rb

@@ -1,4 +1,4 @@
-module ZuoraConnect
+module Middleware
   require 'uri'
 
   # Object of this class is passed to the ActiveSupport::Notification hook

data/lib/resque/plugins/custom_logger.rb

@@ -7,7 +7,28 @@ module Resque
   module Plugins
     module CustomLogger
       def before_perform(*args)
-        Rails.logger.with_fields = { trace_id: SecureRandom.uuid, name: "RailsWorker"} if Rails.logger.class.to_s == 'Ougai::Logger'
+        marker = SecureRandom.uuid
+        
+        logger = MonoLogger.new(STDOUT)
+        logger.level = Rails.application.config.log_level
+        logger.formatter = proc do |serverity, datetime, progname, msg|
+          begin
+            msg = JSON.parse(msg)
+          rescue JSON::ParserError => ex
+          end
+
+          require 'json'
+          JSON.dump(
+            trace_id: marker,
+            level: serverity,
+            timestamp: datetime.strftime('%FT%T.%6N'),
+            pid: Process.pid,
+            msg: msg
+          ) + "\n"
+        end
+        
+        Resque.logger = logger
+        Rails.logger = logger
         case args.class.to_s
         when "Array"
           if args.first.class == Hash
@@ -18,10 +39,8 @@ module Resque
         when "Hash"
           data = args.merge({:worker_class => self.to_s})
         end
-        data = {:msg => 'Starting job', :job => data}
-        data.merge!({:app_instance_id => data.dig(:job, 'app_instance_id')}) if data.dig(:job, 'app_instance_id').present?
-        Rails.logger.info(data) if data.present?
+        Rails.logger.info(data.to_json) if data.present?
       end
     end
   end
-end
+end

data/lib/zuora_connect.rb

@@ -9,79 +9,13 @@ require 'resque/dynamic_queues'
 require 'resque/silence_done'
 require 'resque/self_lookup'
 require 'resque/plugins/custom_logger'
-require 'logging/connect_formatter'
 require 'metrics/influx/point_value'
 require 'metrics/net'
 
 module ZuoraConnect
   class << self
     attr_accessor :configuration
-    attr_writer :logger
-
-    def logger
-      case Rails.env.to_s
-      when 'development'
-        Rails.logger
-      else
-        @logger ||= custom_logger(name: "Connect", level: Rails.logger.level)
-      end
-    end    
-
-    def custom_logger(name: "", level: Rails.logger.present? ? Rails.logger.level : MonoLogger::INFO, type: :ougai)
-      #puts name + ' - ' + {Logger::WARN => 'Logger::WARN', Logger::ERROR => 'Logger::ERROR', Logger::DEBUG => 'Logger::DEBUG', Logger::INFO => 'Logger::INFO' }[level] + ' - '
-      if type == :ougai
-        require 'ougai'
-        #logger = Ougai::Logger.new(MonoLogger.new(STDOUT))
-        logger = Ougai::Logger.new(STDOUT) 
-        logger.formatter = Ougai::Formatters::ConnectFormatter.new(name)
-        logger.level = level
-        logger.before_log = lambda do |data|
-          data[:trace_id] = ZuoraConnect::RequestIdMiddleware.request_id if ZuoraConnect::RequestIdMiddleware.request_id.present?
-          if !['ElasticAPM', 'ResqueScheduler', 'Resque', 'Makara'].include?(name) 
-            if Thread.current[:appinstance].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 = MonoLogger.new(STDOUT)
-        logger.level = level
-        logger.formatter =  proc do |serverity, datetime, progname, msg|
-          begin
-            msg = JSON.parse(msg)
-          rescue JSON::ParserError => ex
-          end
-
-          require 'json'
-          store = {
-            name: name,
-            level: serverity,
-            timestamp: datetime.strftime('%FT%T.%6NZ'),
-            pid: Process.pid,
-            message: name == "ActionMailer" ? msg.strip : msg
-          }
-          if !['ElasticAPM', 'ResqueScheduler', 'Resque', 'Makara'].include?(name) 
-            if Thread.current[:appinstance].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"
-        end
-      end
-      return logger
-    end      
   end
-
   module Controllers
     autoload :Helpers,        'zuora_connect/controllers/helpers'
   end
@@ -105,44 +39,4 @@ module ZuoraConnect
 
     return configuration
   end
-
-  def self.elastic_apm_defaults
-    defaults = {}
-    case Rails.env.to_s
-    when 'production'
-      defaults = {
-        server_url: "http://apm-server.logging:8200",
-        transaction_sample_rate: 0.20,
-        capture_body: 'errors'
-      }
-    when 'staging'
-      defaults = {
-        server_url: "http://apm-server.logging:8200",
-        transaction_sample_rate: 1.0
-      }
-    when 'development'
-      defaults = {
-        server_url: "http://logging.0.ecc.auw2.zuora:8200",
-        transaction_sample_rate: 1.0
-      }
-    when 'test'
-      defaults = {
-        active: false, 
-        disable_send: true
-      }
-    end
-
-    defaults.merge!({
-      pool_size: 1, 
-      transaction_max_spans: 500, 
-      ignore_url_patterns: ['^\/admin\/resque.*', '^\/admin\/redis.*', '^\/admin\/peek.*', '^\/peek.*'], 
-      verify_server_cert: false,
-      log_level: Logger::INFO,
-      service_name: ENV['DEIS_APP'].present? ? ENV['DEIS_APP'] : Rails.application.class.parent_name,
-      logger: ZuoraConnect.custom_logger(name: "ElasticAPM", level: MonoLogger::WARN)
-    })
-    defaults.merge!({disable_send: true}) if defined?(Rails::Console)
-    
-    return defaults
-  end
 end

data/lib/zuora_connect/configuration.rb

@@ -3,7 +3,7 @@ module ZuoraConnect
 
     attr_accessor :default_locale, :default_time_zone, :url, :mode, :delayed_job,:private_key, :additional_apartment_models
 
-    attr_accessor :enable_metrics, :telegraf_endpoint, :telegraf_debug, :custom_prometheus_update_block, :silencer_resque_finish, :blpop_queue
+    attr_accessor :enable_metrics, :enable_apm, :telegraf_endpoint, :telegraf_debug, :custom_prometheus_update_block, :silencer_resque_finish, :blpop_queue
 
     attr_accessor :oauth_client_id, :oauth_client_secret, :oauth_client_redirect_uri
 
@@ -24,6 +24,7 @@ module ZuoraConnect
       @enable_metrics = false
       @telegraf_endpoint = 'udp://telegraf-app-metrics.monitoring.svc.cluster.local:8094'
       @telegraf_debug = false
+      @enable_apm = false
       # OAuth Settings
       @oauth_client_id = ""
       @oauth_client_secret = ""

data/lib/zuora_connect/controllers/helpers.rb

@@ -8,23 +8,23 @@ module ZuoraConnect
         #Skip session for api requests
         Thread.current[:appinstance] = nil
         request.session_options[:skip] = true
-        ElasticAPM.set_tag(:trace_id, request.uuid) if defined?(ElasticAPM) && ElasticAPM.running?
+        ElasticAPM.set_tag(:trace_id, request.uuid) if defined?(ElasticAPM)
 
         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?
+          Rails.logger.debug("[#{@appinstance.id}] API REQUEST - API token") if @appinstance.present?
           check_instance
         else
           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?
+            Rails.logger.debug("[#{@appinstance.id}] API REQUEST - Basic Auth") if @appinstance.present?
             check_instance
           end
         end
         if @appinstance.present?
-          ZuoraConnect.logger.debug("[#{@appinstance.id}] Authenticate App API Request Completed In - #{(Time.now - start_time).round(2)}s")
+          Rails.logger.debug("[#{@appinstance.id}] Authenticate App API Request Completed In - #{(Time.now - start_time).round(2)}s")
         end
       end
 
@@ -66,13 +66,13 @@ module ZuoraConnect
             render "zuora_connect/static/invalid_launch_request"
           end
         rescue => ex
-          ZuoraConnect.logger.debug("Error parsing Instance ID's: #{ex.message}")
+          Rails.logger.debug("Error parsing Instance ID's: #{ex.message}")
           render "zuora_connect/static/invalid_launch_request"
         end
       end
 
       def authenticate_connect_app_request
-        ElasticAPM.set_tag(:trace_id, request.uuid) if defined?(ElasticAPM) && ElasticAPM.running?
+        ElasticAPM.set_tag(:trace_id, request.uuid) if defined?(ElasticAPM)
         Thread.current[:appinstance] = nil
         if params[:app_instance_ids].present? && !params[:app_instance_id].present?
           begin
@@ -86,7 +86,7 @@ module ZuoraConnect
                 @appinstance.cache_app_instance
                 session["appInstance"] = app_instance_ids[0]
               else
-                ZuoraConnect.logger.fatal("Launch Error: Param Instance didnt match session data")
+                Rails.logger.fatal("Launch Error: Param Instance didnt match session data")
                 render "zuora_connect/static/invalid_launch_request"
                 return
               end
@@ -95,7 +95,7 @@ module ZuoraConnect
               return
             end
           rescue => ex
-            ZuoraConnect.logger.fatal("Launch Error: #{ex.message}")
+            Rails.logger.fatal("Launch Error: #{ex.message}")
             render "zuora_connect/static/invalid_launch_request"
             return
           end
@@ -113,7 +113,7 @@ module ZuoraConnect
               return
             end
           rescue => ex
-            ZuoraConnect.logger.fatal("Launch Error: #{ex.message}")
+            Rails.logger.fatal("Launch Error: #{ex.message}")
             render "zuora_connect/static/invalid_launch_request"
             return
           end
@@ -136,16 +136,16 @@ module ZuoraConnect
           end
         end
         if session["#{@appinstance.id}::user::email"].present? 
-          ElasticAPM.set_user(session["#{@appinstance.id}::user::email"])  if defined?(ElasticAPM) && ElasticAPM.running?
+          ElasticAPM.set_user(session["#{@appinstance.id}::user::email"])  if defined?(ElasticAPM) 
           PaperTrail.whodunnit =  session["#{@appinstance.id}::user::email"] if defined?(PaperTrail)
         end
         begin
           I18n.locale = session["#{@appinstance.id}::user::locale"] ?  session["#{@appinstance.id}::user::locale"] : @appinstance.locale
         rescue I18n::InvalidLocale => ex
-          ZuoraConnect.logger.error("Invalid Locale: #{ex.message}")
+          Rails.logger.error("Invalid Locale: #{ex.message}")
         end
         Time.zone = session["#{@appinstance.id}::user::timezone"] ? session["#{@appinstance.id}::user::timezone"] : @appinstance.timezone
-        ZuoraConnect.logger.debug("[#{@appinstance.blank? ? "N/A" : @appinstance.id}] Authenticate App Request Completed In - #{(Time.now - start_time).round(2)}s")
+        Rails.logger.debug("[#{@appinstance.blank? ? "N/A" : @appinstance.id}] Authenticate App Request Completed In - #{(Time.now - start_time).round(2)}s")
       end
 
       def persist_connect_app_session
@@ -170,6 +170,7 @@ module ZuoraConnect
       def setup_instance_via_data
         session.clear
         values = JSON.parse(ZuoraConnect::AppInstance.decrypt_response(Base64.urlsafe_decode64(request["data"])))
+        Rails.logger.debug("Data: #{values.to_json}")
         if values["param_data"]
           values["param_data"].each do |k ,v|
             params[k] = v
@@ -184,7 +185,7 @@ module ZuoraConnect
           session["#{values["appInstance"]}::user::email"] = values["current_user"]["email"]
         end
 
-        ZuoraConnect.logger.debug({msg: 'Setup values', connect: values}) if Rails.env != "production"
+        Rails.logger.debug("App Params: #{values.to_json}}") if Rails.env != "production"
 
         @appinstance = ZuoraConnect::AppInstance.where(:id => values["appInstance"].to_i).first
         if @appinstance.blank?
@@ -192,7 +193,7 @@ module ZuoraConnect
           begin
             Apartment::Tenant.create(values["appInstance"].to_s)
           rescue Apartment::TenantExists => ex
-            ZuoraConnect.logger.debug("Tenant Already Exists")
+            Rails.logger.debug("Tenant Already Exists")
           end
           @appinstance = ZuoraConnect::AppInstance.new(:api_token =>  values[:api_token],:id => values["appInstance"].to_i, :access_token => values["access_token"].blank? ? values["user"] : values["access_token"], :token => values["refresh_token"]  , :refresh_token => values["refresh_token"].blank? ? values["key"] : values["refresh_token"], :oauth_expires_at => values["expires"])
           @appinstance.save(:validate => false)
@@ -249,7 +250,7 @@ module ZuoraConnect
           end
           Thread.current[:appinstance] = @appinstance
           PaperTrail.whodunnit = "API User" if defined?(PaperTrail)
-          ElasticAPM.set_user("API User")  if defined?(ElasticAPM) && ElasticAPM.running?
+          ElasticAPM.set_user("API User")  if defined?(ElasticAPM) 
           return true
         else
           render text: "Access Denied", status: :unauthorized

data/lib/zuora_connect/engine.rb

@@ -3,6 +3,7 @@ require 'zuora_connect'
 require 'apartment'
 require 'httparty'
 require 'zuora_api'
+# require 'elastic_apm'
 
 module ZuoraConnect
   class Engine < ::Rails::Engine

data/lib/zuora_connect/railtie.rb

@@ -1,5 +1,4 @@
 require 'middleware/metrics_middleware'
-require 'middleware/request_id_middleware'
 
 module ZuoraConnect
   class Railtie < Rails::Railtie
@@ -23,38 +22,33 @@ module ZuoraConnect
       end
     end
     initializer "zuora_connect.configure_rails_initialization" do |app|
-      app.middleware.insert_after Rack::Sendfile, ZuoraConnect::MetricsMiddleware
-      app.middleware.insert_after ActionDispatch::RequestId, ZuoraConnect::RequestIdMiddleware
+      app.middleware.insert_after Rack::Sendfile, Middleware::MetricsMiddleware
     end
 
     # hook to process_action
-    ActiveSupport::Notifications.subscribe('process_action.action_controller', ZuoraConnect::PageRequest.new)
+    ActiveSupport::Notifications.subscribe('process_action.action_controller', Middleware::PageRequest.new)
 
     initializer(:rails_stdout_logging, before: :initialize_logger) do
       if Rails.env != 'development' && !ENV['DEIS_APP'].blank?
         require 'lograge'
-  
-        Rails.configuration.logger = ZuoraConnect.custom_logger(name: "Rails") 
-
+        logger           = ActiveSupport::Logger.new(STDOUT)
+        logger.formatter = ::Logger::Formatter.new
+        # logger.formatter  = proc do |severity, datetime, progname, msg|
+        #   {severity: severity, time: datetime.strftime('%FT%T.%6N'), process_id: Process.pid, message: msg }.to_json
+        # end
+        Rails.configuration.logger = ActiveSupport::TaggedLogging.new(logger)
+        Rails.configuration.log_tags = [:uuid]
         Rails.configuration.lograge.enabled = true
-        Rails.configuration.colorize_logging = false
-        if Rails.configuration.logger.class.to_s == 'Ougai::Logger'
-          Rails.configuration.lograge.formatter = Class.new do |fmt|
-            def fmt.call(data)
-              { msg: 'Rails Request', request: data }
-            end
-          end
-        end
-        #Rails.configuration.lograge.formatter = Lograge::Formatters::Json.new
+        Rails.configuration.lograge.formatter = Lograge::Formatters::Json.new
         Rails.configuration.lograge.custom_options = lambda do |event|
           exceptions = %w(controller action format id)
           items = {
             #time: event.time.strftime('%FT%T.%6N'),  
-            params: event.payload[:params].except(*exceptions).to_json.to_s
+            params: event.payload[:params].except(*exceptions),
+            exception: event.payload[:exception],
+            exception_object: event.payload[:exception_object],
+            process_id: Process.pid
           }
-          items.merge!({exception_object: event.payload[:exception_object]}) if event.payload[:exception_object].present?
-          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})
             if Thread.current[:appinstance].logitems.present? && Thread.current[:appinstance].logitems.class == Hash

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.81aa"
-end
+  VERSION = "1.7.81f"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.81aa
+  version: 1.7.81f
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-26 00:00:00.000000000 Z
+date: 2019-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ougai
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: zuora_api
   requirement: !ruby/object:Gem::Requirement
@@ -299,6 +285,7 @@ files:
 - app/views/zuora_connect/static/session_error.html.erb
 - config/initializers/apartment.rb
 - config/initializers/aws.rb
+- config/initializers/elastic_apm.rb
 - config/initializers/object_method_hooks.rb
 - config/initializers/postgresql_adapter.rb
 - config/initializers/prometheus.rb
@@ -318,11 +305,9 @@ files:
 - db/migrate/20110503003604_catalog_default.rb
 - db/migrate/20180301052853_add_catalog_attempted_at.rb
 - db/migrate/20181206162339_add_fields_to_instance.rb
-- lib/logging/connect_formatter.rb
 - lib/metrics/influx/point_value.rb
 - lib/metrics/net.rb
 - lib/middleware/metrics_middleware.rb
-- lib/middleware/request_id_middleware.rb
 - lib/resque/additions.rb
 - lib/resque/dynamic_queues.rb
 - lib/resque/plugins/custom_logger.rb

data/lib/logging/connect_formatter.rb

@@ -1,39 +0,0 @@
-require 'ougai/formatters/base'
-require 'ougai/formatters/for_json'
-
-module Ougai
-  module Formatters
-    # A JSON formatter compatible with node-bunyan
-    class ConnectFormatter < Base
-      include ForJson
-
-      # Intialize a formatter
-      # @param [String] app_name application name (execution program name if nil)
-      # @param [String] hostname hostname (hostname if nil)
-      # @param [Hash] opts the initial values of attributes
-      # @option opts [String] :trace_indent (2) the value of trace_indent attribute
-      # @option opts [String] :trace_max_lines (100) the value of trace_max_lines attribute
-      # @option opts [String] :serialize_backtrace (true) the value of serialize_backtrace attribute
-      # @option opts [String] :jsonize (true) the value of jsonize attribute
-      # @option opts [String] :with_newline (true) the value of with_newline attribute
-      def initialize(app_name = nil, hostname = nil, opts = {})
-        aname, hname, opts = Base.parse_new_params([app_name, hostname, opts])
-        super(aname, hname, opts)
-        init_opts_for_json(opts)
-      end
-
-      def _call(severity, time, progname, data)
-        dump({
-          name: progname || @app_name,
-          pid: $$,
-          level: severity,
-          timestamp: time.utc.strftime('%FT%T.%6NZ'),
-        }.merge(data.merge({message: data.delete(:msg)})))
-      end
-
-      def convert_time(data)
-        #data[:timestamp] = format_datetime(data[:time])
-      end
-    end
-  end
-end

data/lib/middleware/request_id_middleware.rb

@@ -1,14 +0,0 @@
-module ZuoraConnect
-  class RequestIdMiddleware
-    mattr_accessor :request_id
-
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      self.request_id = env['action_dispatch.request_id']
-      @app.call(env)
-    end
-  end
-end