zuora_connect 1.7.88 → 1.7.710

data/db/migrate/20110413191512_add_new_api_token.rb

@@ -1,4 +1,4 @@
-class AddNewApiToken < ActiveRecord::Migration
+class AddNewApiToken < ActiveRecord::Migration[4.2]
   def change
     add_column :zuora_connect_app_instances, :api_token, :string  unless column_exists? :zuora_connect_app_instances, :api_token
   end

data/db/migrate/20110503003602_add_catalog_data_to_app_instance.rb

@@ -1,4 +1,4 @@
-class AddCatalogDataToAppInstance < ActiveRecord::Migration
+class AddCatalogDataToAppInstance < ActiveRecord::Migration[4.2]
   def change
     add_column :zuora_connect_app_instances, :catalog_updated_at, :datetime  unless column_exists? :zuora_connect_app_instances, :catalog_updated_at
     add_column :zuora_connect_app_instances, :catalog, :jsonb, default: {}  unless column_exists? :zuora_connect_app_instances, :catalog

data/db/migrate/20110503003603_add_catalog_mappings_to_app_instance.rb

@@ -1,4 +1,4 @@
-class AddCatalogMappingsToAppInstance < ActiveRecord::Migration
+class AddCatalogMappingsToAppInstance < ActiveRecord::Migration[4.2]
   def change
     add_column :zuora_connect_app_instances, :catalog_mapping, :jsonb, default: {} unless column_exists? :zuora_connect_app_instances, :catalog_mapping
   end

data/db/migrate/20110503003604_catalog_default.rb

@@ -1,4 +1,4 @@
-class CatalogDefault < ActiveRecord::Migration
+class CatalogDefault < ActiveRecord::Migration[4.2]
   def change
     change_column :zuora_connect_app_instances, :catalog, :jsonb, default: {}
   end

data/db/migrate/20180301052853_add_catalog_attempted_at.rb

@@ -1,4 +1,4 @@
-class AddCatalogAttemptedAt < ActiveRecord::Migration
+class AddCatalogAttemptedAt < ActiveRecord::Migration[4.2]
   def change
     add_column :zuora_connect_app_instances, :catalog_update_attempt_at, :datetime  unless column_exists? :zuora_connect_app_instances, :catalog_update_attempt_at
   end

data/db/migrate/20181206162339_add_fields_to_instance.rb

@@ -1,4 +1,4 @@
-class AddFieldsToInstance < ActiveRecord::Migration
+class AddFieldsToInstance < ActiveRecord::Migration[4.2]
   def change
   	add_column :zuora_connect_app_instances, :name, :string, default: "" unless column_exists? :zuora_connect_app_instances, :name
   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
@@ -53,10 +53,7 @@ module ZuoraConnect
           env['REQUEST_PATH'] = env['REQUEST_PATH'].gsub(Thread.current[:isHallway], '')
 
           #We need the forwarded host header to identify location of tenant
-          whitelist = Regexp.new(".*[\.]zuora[\.]com$|^zuora[\.]com$")
-          if whitelist.match(env['HTTP_X_FORWARDED_HOST']).present?
-            @bad_headers.delete('HTTP_X_FORWARDED_HOST')
-          end
+          @bad_headers.delete('HTTP_X_FORWARDED_HOST')
         else
           Thread.current[:isHallway] = nil
         end

data/lib/resque/plugins/custom_logger.rb

@@ -3,25 +3,42 @@
 # 
 # Monologger supports printing logs in trap block.
 # 
+# Usage: 
+#    require 'resque/plugins/custom_logger'
+#    class ExecuteWorkflowJob
+#      extend Resque::Plugins::CustomLogger
+#      ...
+#    end
+
 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'
-        case args.class.to_s
-        when "Array"
-          if args.first.class == Hash
-            data = args.first.merge({:worker_class => self.to_s})
-          else
-            data = {:worker_class => self.to_s, :args => args}
+      def before_perform(args = nil)
+        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
-        when "Hash"
-          data = args.merge({:worker_class => self.to_s})
+
+          require 'json'
+          JSON.dump(
+            trace_id: marker,
+            level: serverity,
+            timestamp: datetime.strftime('%FT%T.%6N'),
+            pid: Process.pid,
+            msg: msg
+          ) + "\n"
         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?
+        
+        Resque.logger = logger
+        Rails.logger = logger
+        
+        Rails.logger.info(args.to_json) if args.present?
       end
     end
   end
-end
+end

data/lib/zuora_connect/configuration.rb

@@ -24,6 +24,7 @@ module ZuoraConnect
       @enable_metrics = false
       @telegraf_endpoint = 'udp://telegraf-app-metrics.monitoring.svc.cluster.local:8094'
       @telegraf_debug = 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.error("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.error(ex)
+            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.error(ex)
+            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(ex) if !ZuoraConnect::AppInstance::IGNORED_LOCALS.include?(ex.locale.to_s.downcase)
+          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,7 +3,6 @@ require 'zuora_connect'
 require 'apartment'
 require 'httparty'
 require 'zuora_api'
-
 module ZuoraConnect
   class Engine < ::Rails::Engine
     isolate_namespace ZuoraConnect
@@ -16,7 +15,7 @@ module ZuoraConnect
       end
     end
 
-    initializer :append_migrations do |app|
+   initializer :append_migrations do |app|
       unless app.root.to_s.match root.to_s
         config.paths["db/migrate"].expanded.each do |expanded_path|
           app.config.paths["db/migrate"] << expanded_path

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?
+      if true || 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.88"
+  VERSION = "1.7.710"
 end

data/lib/zuora_connect.rb

@@ -9,81 +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?
-          data[:zuora_trace_id] = ZuoraConnect::RequestIdMiddleware.zuora_request_id if ZuoraConnect::RequestIdMiddleware.zuora_request_id.present?
-          #data[:traces] = {amazon_id: data[:trace_id], zuora_id: data[:zuora_trace_id]}
-          if !['ElasticAPM', 'ResqueScheduler', 'ResquePool', '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', 'ResquePool','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
@@ -107,45 +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!({
-      disable_start_message: true,
-      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