zuora_connect 1.7.81t → 1.7.81u

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d918b8a230de303829ea2ae1a180397cc0ebf7a53acba576b03ccdedd54b0df
-  data.tar.gz: 32209283832a75bddfad6852ada8729b97bd627f62fd64d5a3717c196288d806
+  metadata.gz: 1b4bb8191e8f95e03e36b83ea4285544991f3de6884397704dd1a8206d3cd025
+  data.tar.gz: cafeffeea63dd77325f60e0d3ae440fef5dda0d31ebd6fbcc73913a477d3e7fb
 SHA512:
-  metadata.gz: 8b7adb81a0d3db78432213e8efebb70958cdf8fb04f50ab76011ccc523150052c54a3686c87a1a5dfd58afefe63f696094ace43810e16012d0d95c80af145e1d
-  data.tar.gz: 47b8419f2e7f2501ed7bd4a2c7c4264e84d7172979355cae5b7bd7abd7aa729d5dd6741b5a64b562f4ba01d2a922502c4b2b509713f52ba4262020fe80b42f78
+  metadata.gz: dcf949c4cd5b0f2edf450a5b59db433c3103eee0ffa093b01f16447375385b860f50466e50c3b6913795f92d901c01731dff8cbc36360ac6747be7d1ce1e59a6
+  data.tar.gz: d6c26b7ac51022bd0b55197e7af41f9337c194ee451010c038e741f7866e3c7ba24986ab999e163fb7ee8b7e79c350963437b7f678c04b875906b0c40ca331d3

data/config/initializers/resque.rb

@@ -22,10 +22,10 @@ Resque.module_eval do
 end
 
 if defined?(Resque)
-  Resque.logger = ZuoraConnect.custom_logger(name: "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") if defined?(ActionMailer)
+ActionMailer::Base.logger = ZuoraConnect.custom_logger(name: "ActionMailer", type: 'Monologger') if defined?(ActionMailer)

data/lib/logging/connect_formatter.rb

@@ -0,0 +1,39 @@
+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/metrics/net.rb

@@ -162,7 +162,7 @@ class HttpLogger
   end
 
   def format_log_entry(message, dump = nil)
-    if self.class.colorize
+    if self.class.colorize && Rails.configuration.colorize_logging
       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

data/lib/middleware/metrics_middleware.rb

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

data/lib/middleware/request_id_middleware.rb

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

data/lib/resque/plugins/custom_logger.rb

@@ -7,27 +7,8 @@ module Resque
   module Plugins
     module CustomLogger
       def before_perform(*args)
-        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
-        
-        Rails.logger = logger
+        #Rails.logger = custom_logger(name: "RailsWorker", level: Rails.application.config.log_level)
+        Rails.logger.with_fields = { trace_id: SecureRandom.uuid }
         case args.class.to_s
         when "Array"
           if args.first.class == Hash
@@ -38,8 +19,8 @@ module Resque
         when "Hash"
           data = args.merge({:worker_class => self.to_s})
         end
-        Rails.logger.info(data.to_json) if data.present?
+        Rails.logger.info(data.merge({:msg => 'Starting job'})) if data.present?
       end
     end
   end
-end
+end

data/lib/zuora_connect.rb

@@ -9,6 +9,7 @@ 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'
 
@@ -25,24 +26,36 @@ module ZuoraConnect
         @logger ||= custom_logger(name: "Connect", level: Rails.logger.level)
       end
     end
+    require 'ougai'
+    
 
-    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
+    def custom_logger(name: "", level: Rails.logger.present? ? Rails.logger.level : MonoLogger::INFO, type: :ougai)
+      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.before_log = lambda do |data|
+          data[:trace_id] = ZuoraConnect::RequestIdMiddleware.request_id if ZuoraConnect::RequestIdMiddleware.request_id.present?
         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'
-        JSON.dump(
-          name: name,
-          level: serverity,
-          timestamp: datetime.strftime('%FT%T.%6N'),
-          pid: Process.pid,
-          message: name == "ActionMailer" ? msg.strip : msg
-        ) + "\n"
+          require 'json'
+          JSON.dump(
+            name: name,
+            level: serverity,
+            timestamp: datetime.strftime('%FT%T.%6NZ'),
+            pid: Process.pid,
+            message: name == "ActionMailer" ? msg.strip : msg
+          ) + "\n"
+        end
       end
       return logger
     end      

data/lib/zuora_connect/railtie.rb

@@ -1,4 +1,5 @@
 require 'middleware/metrics_middleware'
+require 'middleware/request_id_middleware'
 
 module ZuoraConnect
   class Railtie < Rails::Railtie
@@ -22,24 +23,29 @@ module ZuoraConnect
       end
     end
     initializer "zuora_connect.configure_rails_initialization" do |app|
-      app.middleware.insert_after Rack::Sendfile, Middleware::MetricsMiddleware
+      app.middleware.insert_after Rack::Sendfile, ZuoraConnect::MetricsMiddleware
+      app.middleware.insert_after ActionDispatch::RequestId, ZuoraConnect::RequestIdMiddleware
     end
 
     # hook to process_action
-    ActiveSupport::Notifications.subscribe('process_action.action_controller', Middleware::PageRequest.new)
+    ActiveSupport::Notifications.subscribe('process_action.action_controller', ZuoraConnect::PageRequest.new)
 
     initializer(:rails_stdout_logging, before: :initialize_logger) do
       if Rails.env != 'development' && !ENV['DEIS_APP'].blank?
         require 'lograge'
-        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.logger = ZuoraConnect.custom_logger(name: "Rails") 
+
         Rails.configuration.lograge.enabled = true
-        Rails.configuration.lograge.formatter = Lograge::Formatters::Json.new
+        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: 'Request', request: data }
+            end
+          end
+        end
+        #Rails.configuration.lograge.formatter = Lograge::Formatters::Json.new
         Rails.configuration.lograge.custom_options = lambda do |event|
           exceptions = %w(controller action format id)
           items = {

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.81t"
+  VERSION = "1.7.81u"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.81t
+  version: 1.7.81u
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-22 00:00:00.000000000 Z
+date: 2019-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -24,6 +24,20 @@ 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
@@ -304,9 +318,11 @@ 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