zuora_connect 1.7.795b → 1.8.71s

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7d651f52d14dcbb8695678a64e4e291ed629c3d9
-  data.tar.gz: ad86506c0fedeffb2fb15915326015f8453303f8
+SHA256:
+  metadata.gz: f47f7dd4479d1fdc48a9b4ad63b1426a11c0da6b438b4a5e9f0d97ea64cba8d5
+  data.tar.gz: 1b5c6f2cd77b5b5122127f2201ac7265a98889f03ccdc796dc5dd0d1e2bb78c4
 SHA512:
-  metadata.gz: 34db2e3e9aadba3d9ade9ec13c710b81277f343f80d2312bf86a8ec9597e17a74f0081b417f9d66318f016391f2ecd640c8d13c28682a6ca8bc4b5c313806d6f
-  data.tar.gz: d39e1c95b580f0cf20ac46ca338a98cd16b8864dd583c51be4ca443f7d2b26572404c174d176d57d81fb7d039d8d4957cb57a0c3caf060c6fb56486992077abd
+  metadata.gz: bb3214541ca5cc6b51f23a46cbdc23f72d118905e6224f23f7ab4ff48d4792f1bd693698baeda046e956eb13b67d4f867d89be817f723d21d4e089321ee0774d
+  data.tar.gz: ecac2c02fff9530cffee1093d1c4a611e855d593d5634b82cd46abcab311946813719dc4e22fd3c63f32e981505fb228afb1d7929d205cfdd37c5ebc75ff995b

data/app/controllers/zuora_connect/api/v1/app_instance_controller.rb

@@ -41,5 +41,18 @@ module ZuoraConnect
 
     end
 
+    def cache_bust
+      if defined?(Redis.current)
+        Redis.current.del("AppInstance:#{@appinstance.id}")
+        respond_to do |format|
+          format.json {render json: {}, status: :ok}
+        end
+      else
+        respond_to do |format|
+          format.json {render json: {}, status: :bad_request}
+        end
+      end
+    end
+
   end
 end

data/app/controllers/zuora_connect/static_controller.rb

@@ -42,8 +42,8 @@ module ZuoraConnect
       rescue
         render json: {
           message: "Failure initializing app instance",
-          status: 400
-        }, status: 400
+          status: 500
+        }, status: 500
       end
     end
 

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)
+      if defined?(ElasticAPM) && ElasticAPM.running?
         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.set_user(self.connect_user)   if defined?(ElasticAPM) && ElasticAPM.running?
       recoverable_session = false
 
       ## DEV MODE TASK DATA MOCKUP
@@ -120,26 +120,26 @@ module ZuoraConnect
 
         if session.empty?
           self.new_session_message = "REFRESHING - Session Empty"
-          Rails.logger.add(log_level, self.new_session_message)
+          ZuoraConnect.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})"
-          Rails.logger.add(log_level, self.new_session_message)
+          ZuoraConnect.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"
-          Rails.logger.add(log_level, self.new_session_message)
+          ZuoraConnect.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
-          Rails.logger.add(log_level, self.new_session_message)
+          ZuoraConnect.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
-          Rails.logger.add(log_level, self.new_session_message)
+          ZuoraConnect.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
-          Rails.logger.add(log_level, self.new_session_message)
+          ZuoraConnect.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?
-        Rails.logger.info("Holding - Expires in #{self.reset_mark_expires_at}. '#{self.new_session_message}'")
+        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])
@@ -171,7 +171,7 @@ module ZuoraConnect
       retry
     rescue => ex 
       if recoverable_session
-        Rails.logger.error("REBUILDING - Using backup expired cache")
+        ZuoraConnect.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
-        Rails.logger.debug("Invalid Locale: #{ex.message}")
+        ZuoraConnect.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) 
+      if defined?(ElasticAPM) && ElasticAPM.running?
         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
 
-      Rails.logger.debug("[#{self.id}] REFRESH TASK - Connect Task Info Request Time #{response_time.round(2).to_s}")
+      ZuoraConnect.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
-        Rails.logger.fatal("[#{self.id}] REFRESH TASK - Failed Code #{response.code}")
+        ZuoraConnect.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
-        Rails.logger.info("[#{self.id}] REFRESH TASK - #{ex.class} Retrying(#{refresh_count})")
+        ZuoraConnect.logger.info("[#{self.id}] REFRESH TASK - #{ex.class} Retrying(#{refresh_count})")
         retry
       else
-        Rails.logger.fatal("[#{self.id}] REFRESH TASK - #{ex.class} Failed #{refresh_count}x")
+        ZuoraConnect.logger.fatal("[#{self.id}] REFRESH TASK - #{ex.class} Failed #{refresh_count}x")
         raise
       end
     rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
       if (refresh_count += 1) < 3
-        Rails.logger.info("[#{self.id}] REFRESH TASK - Failed Retrying(#{refresh_count})")
+        ZuoraConnect.logger.info("[#{self.id}] REFRESH TASK - Failed Retrying(#{refresh_count})")
         if ex.code == 401
           self.refresh_oauth
         end
         retry
       else
-        Rails.logger.fatal("[#{self.id}] REFRESH TASK - Failed #{refresh_count}x")
+        ZuoraConnect.logger.fatal("[#{self.id}] REFRESH TASK - Failed #{refresh_count}x")
         raise
       end
     end
@@ -316,8 +316,8 @@ module ZuoraConnect
           end
         end
       rescue => ex
-        Rails.logger.error("Task Data: #{task_data}") if task_data.present?
-        Rails.logger.error("Task Session: #{session.to_h}") if session.present?
+        ZuoraConnect.logger.error("Task Data: #{task_data}") if task_data.present?
+        ZuoraConnect.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?
-          Rails.logger.debug("[#{self.id}] Before '#{method}' method, Oauth expired")
+          ZuoraConnect.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
-        Rails.logger.info("[#{self.id}] REFRESH OAUTH - In #{response_time.round(2).to_s}")
+        ZuoraConnect.logger.debug("[#{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
-          Rails.logger.fatal("[#{self.id}] REFRESH OAUTH - Failed Code #{response.code}")
+          ZuoraConnect.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
-          Rails.logger.info("[#{self.id}] REFRESH OAUTH - #{ex.class} Retrying(#{refresh_oauth_count})")
+          ZuoraConnect.logger.info("[#{self.id}] REFRESH OAUTH - #{ex.class} Retrying(#{refresh_oauth_count})")
           retry
         else
-          Rails.logger.fatal("[#{self.id}] REFRESH OAUTH - #{ex.class} Failed #{refresh_oauth_count}x")
+          ZuoraConnect.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
-          Rails.logger.info("[#{self.id}] REFRESH OAUTH - Failed Retrying(#{refresh_oauth_count})")
+          ZuoraConnect.logger.info("[#{self.id}] REFRESH OAUTH - Failed Retrying(#{refresh_oauth_count})")
           retry
         else
-          Rails.logger.fatal("[#{self.id}] REFRESH OAUTH - Failed #{refresh_oauth_count}x")
+          ZuoraConnect.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?
-            Rails.logger.debug("[#{self.id}] Cached AppInstance Missing")
+            ZuoraConnect.logger.debug("[#{self.id}] Cached AppInstance Missing")
             return session
           else
-            Rails.logger.debug("[#{self.id}] Cached AppInstance Found")
+            ZuoraConnect.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)
-            Rails.logger.debug("[#{self.id}] Caching AppInstance")
+            ZuoraConnect.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
-            Rails.logger.add(Logger::FATAL, 'Error Decrypting') if log_fatal
+            ZuoraConnect.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
-        Rails.logger.debug("Fetch Catalog")
-        Rails.logger.debug("Zuora Entity: #{entity_id.blank? ? 'default' : entity_id}")
+        ZuoraConnect.logger.debug("Fetch Catalog")
+        ZuoraConnect.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)
-          Rails.logger.debug("Fetch Catalog URL #{url}")
+          ZuoraConnect.logger.debug("Fetch Catalog URL #{url}")
           output_json, response = login.rest_call(:debug => false, :url => url, :errors => [ZuoraAPI::Exceptions::ZuoraAPISessionError], :timeout_retry => true)
-          Rails.logger.debug("Fetch Catalog Response Code #{response.code}")
+          ZuoraConnect.logger.debug("Fetch Catalog Response Code #{response.code}")
 
           if !output_json['success'] =~ (/(true|t|yes|y|1)$/i) || output_json['success'].class != TrueClass
-            Rails.logger.error("Fetch Catalog DATA #{output_json.to_json}")
+            ZuoraConnect.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")
-        Rails.logger.fatal("Method Missing #{method_sym}")
-        Rails.logger.fatal("Instance Data: #{self.task_data}")
-        Rails.logger.fatal("Instance Logins: #{self.logins}")
+        ZuoraConnect.logger.fatal("Method Missing #{method_sym}")
+        ZuoraConnect.logger.fatal("Instance Data: #{self.task_data}")
+        ZuoraConnect.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
-      Rails.logger.debug(self.format_metric_log('Telegraf','Need new connection')) if ZuoraConnect.configuration.telegraf_debug
+      ZuoraConnect.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
-      Rails.logger.warn(self.format_metric_log('Telegraf', "Failed to connect: #{ex.class}"))
+      ZuoraConnect.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
-        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"))
+        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"))
       end
     end
 
@@ -56,14 +56,18 @@ module ZuoraConnect
       self.host.write InfluxDB::PointValue.new({series: series, tags: tags, values: values}).dump 
     rescue => ex
       self.connect
-      Rails.logger.warn(self.format_metric_log('Telegraf',"Failed to write udp: #{ex.class}"))
+      ZuoraConnect.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
-      log_entry
+      if Rails.env == :development
+        log_entry
+      else
+        [message, dump].compact.join(' - ')
+      end
     end
 
     def self.app_name

data/config/initializers/resque.rb

@@ -19,4 +19,13 @@ Resque.module_eval do
 
     Hash[queue_names.zip(sizes)]
   end
-end
+end
+
+if defined?(Resque)
+  Resque.logger = ZuoraConnect.custom_logger(name: "Resque") 
+  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") if defined?(ActionMailer)

data/config/initializers/unicorn.rb

@@ -2,7 +2,8 @@ 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)
-      self.kill_self_old(logger, start_time)
+      @unicorn_logger ||= ZuoraConnect.custom_logger(name: "UnicornKiller")
+      self.kill_self_old(@unicorn_logger, start_time)
       ZuoraConnect::AppInstance.write_to_telegraf(direction: 'Unicorn-Killer', tags: {app_instance: 0}, values: {kill: 1})
     end
   end

data/config/routes.rb

@@ -9,6 +9,7 @@ ZuoraConnect::Engine.routes.draw do
     namespace :v1 do
       resources :app_instance, :only => [:index], defaults: {format: :json} do
           match "drop", via: [:get, :post], on: :collection
+          match "cache_bust", via: [:get, :post], on: :collection
       end
     end
   end

data/lib/metrics/net.rb

@@ -212,7 +212,7 @@ if defined?(Rails)
   if defined?(ActiveSupport) && ActiveSupport.respond_to?(:on_load)
     # Rails3
     ActiveSupport.on_load(:after_initialize) do
-      HttpLogger.logger = Rails.logger unless HttpLogger.logger
+      HttpLogger.logger = ZuoraConnect.logger unless HttpLogger.logger
     end
   end
 end

data/lib/resque/plugins/custom_logger.rb

@@ -27,7 +27,6 @@ module Resque
           ) + "\n"
         end
         
-        Resque.logger = logger
         Rails.logger = logger
         case args.class.to_s
         when "Array"

data/lib/zuora_connect.rb

@@ -15,7 +15,34 @@ require 'metrics/net'
 module ZuoraConnect
   class << self
     attr_accessor :configuration
+    attr_writer :logger
+
+    def logger
+      @logger ||= custom_logger(name: "Connect", level: Rails.logger.level)
+    end
+
+    def custom_logger(name: "", level: Rails.logger.level)
+      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'
+        JSON.dump(
+          name: name,
+          level: serverity,
+          timestamp: datetime.strftime('%FT%T.%6N'),
+          pid: Process.pid,
+          message: msg
+        ) + "\n"
+      end
+      return logger
+    end      
   end
+
   module Controllers
     autoload :Helpers,        'zuora_connect/controllers/helpers'
   end
@@ -39,4 +66,44 @@ 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, :enable_apm, :telegraf_endpoint, :telegraf_debug, :custom_prometheus_update_block, :silencer_resque_finish, :blpop_queue
+    attr_accessor :enable_metrics, :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,7 +24,6 @@ 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.set_tag(:trace_id, request.uuid) if defined?(ElasticAPM) && ElasticAPM.running?
 
         start_time = Time.now
         if request.headers["API-Token"].present?
           @appinstance = ZuoraConnect::AppInstance.where(:api_token => request.headers["API-Token"]).first
-          Rails.logger.debug("[#{@appinstance.id}] API REQUEST - API token") if @appinstance.present?
+          ZuoraConnect.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
-            Rails.logger.debug("[#{@appinstance.id}] API REQUEST - Basic Auth") if @appinstance.present?
+            ZuoraConnect.logger.debug("[#{@appinstance.id}] API REQUEST - Basic Auth") if @appinstance.present?
             check_instance
           end
         end
         if @appinstance.present?
-          Rails.logger.debug("[#{@appinstance.id}] Authenticate App API Request Completed In - #{(Time.now - start_time).round(2)}s")
+          ZuoraConnect.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
-          Rails.logger.debug("Error parsing Instance ID's: #{ex.message}")
+          ZuoraConnect.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.set_tag(:trace_id, request.uuid) if defined?(ElasticAPM) && ElasticAPM.running?
         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
-                Rails.logger.fatal("Launch Error: Param Instance didnt match session data")
+                ZuoraConnect.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
-            Rails.logger.fatal("Launch Error: #{ex.message}")
+            ZuoraConnect.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
-            Rails.logger.fatal("Launch Error: #{ex.message}")
+            ZuoraConnect.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.set_user(session["#{@appinstance.id}::user::email"])  if defined?(ElasticAPM) && ElasticAPM.running?
           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
-          Rails.logger.error("Invalid Locale: #{ex.message}")
+          ZuoraConnect.logger.error("Invalid Locale: #{ex.message}")
         end
         Time.zone = session["#{@appinstance.id}::user::timezone"] ? session["#{@appinstance.id}::user::timezone"] : @appinstance.timezone
-        Rails.logger.debug("[#{@appinstance.blank? ? "N/A" : @appinstance.id}] Authenticate App Request Completed In - #{(Time.now - start_time).round(2)}s")
+        ZuoraConnect.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,7 +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}")
+        ZuoraConnect.logger.debug("Data: #{values.to_json}")
         if values["param_data"]
           values["param_data"].each do |k ,v|
             params[k] = v
@@ -185,7 +185,7 @@ module ZuoraConnect
           session["#{values["appInstance"]}::user::email"] = values["current_user"]["email"]
         end
 
-        Rails.logger.debug("App Params: #{values.to_json}}") if Rails.env != "production"
+        ZuoraConnect.logger.debug("App Params: #{values.to_json}}") if Rails.env != "production"
 
         @appinstance = ZuoraConnect::AppInstance.where(:id => values["appInstance"].to_i).first
         if @appinstance.blank?
@@ -193,7 +193,7 @@ module ZuoraConnect
           begin
             Apartment::Tenant.create(values["appInstance"].to_s)
           rescue Apartment::TenantExists => ex
-            Rails.logger.debug("Tenant Already Exists")
+            ZuoraConnect.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)
@@ -250,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.set_user("API User")  if defined?(ElasticAPM) && ElasticAPM.running?
           return true
         else
           render text: "Access Denied", status: :unauthorized

data/lib/zuora_connect/engine.rb

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

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.795b"
-end
+  VERSION = "1.8.71s"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.795b
+  version: 1.8.71s
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2019-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -28,56 +28,42 @@ dependencies:
   name: zuora_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.21
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.21
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.21
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.16.4
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.16.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.4
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.16.4
-- !ruby/object:Gem::Dependency
-  name: elastic-apm
-  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'
+        version: 0.16.4
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -299,7 +285,6 @@ 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
@@ -395,8 +380,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Summary of Connect.

data/config/initializers/elastic_apm.rb

@@ -1,25 +0,0 @@
-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