applicaster-logger 0.6.7 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfb0e5868ce7eebc1be17ad406fd1ae407041afe
-  data.tar.gz: 5cc7d9abaa15b4684c596917e515d2d13297e239
+  metadata.gz: 14eb9fb38934bed703677d907edb9a25dbf3c6fa
+  data.tar.gz: a99a2cb2212f1d8d3846fb3790b254d030b9afbc
 SHA512:
-  metadata.gz: d733913840fdc1a3ea3b5cf88db2c17ba46e6c676c9551b0283b0bf0b9897248e13aaf20dcd2eb5b4e0fb46280d54b5e5bdcbbea1585be922fb8085d00c05373
-  data.tar.gz: 172c7c97467d0d898938bffa9d470cab4a840733a369630fd71435d3000bd05d4aeb636c8a63ea9123384d182dff71a5b64cb4703adde41ade4dc4371b7eb34f
+  metadata.gz: 7240f155356278285e8fd0a7c6c2523acf49dfeb78eab01ffaf66a27c4fa5484b6f32946e902e07f17754780ed2d34bd8d17c85e93d503c0531f4b20873afb43
+  data.tar.gz: 89a300fbbf6c3eb294c0408a7d64178443354061d718ca37e35cfa2f571a9c76266ccc1d17f30e18980df90b04fa38af194e7c3445f6ec7b78c9264e14e20477

data/lib/applicaster-logger.rb

@@ -1,3 +1,5 @@
 require 'applicaster/logger'
 require "applicaster/rack/request_data"
 require "applicaster/sidekiq/middleware"
+require "applicaster/sidekiq/job_logger"
+require "applicaster/sidekiq/exception_logger"

data/lib/applicaster/logger.rb

@@ -38,12 +38,22 @@ module Applicaster
       end
 
       if defined?(::Sidekiq)
-        require 'sidekiq/api'
-
         ::Sidekiq.configure_server do |config|
-          config.server_middleware do |chain|
-            chain.remove ::Sidekiq::Middleware::Server::Logging
-            chain.add Applicaster::Sidekiq::Middleware::Server::LogstashLogging
+          config.error_handlers.delete_if { |h| h.is_a?(::Sidekiq::ExceptionHandler::Logger) }
+          ::Sidekiq.error_handlers << Applicaster::Sidekiq::ExceptionLogger.new
+
+          if Gem::Version.new(::Sidekiq::VERSION) < Gem::Version.new("5.0")
+            require 'sidekiq/api'
+            config.server_middleware do |chain|
+              chain.remove ::Sidekiq::Middleware::Server::Logging
+              chain.add Applicaster::Sidekiq::Middleware::Server::LogstashLogging
+            end
+          else
+            logger = LogStashLogger.new(logstash_config)
+            logger.level = app.config.applicaster_logger.level
+            logger.formatter = Applicaster::Logger::Formatter.new(facility: "sidekiq")
+            ::Sidekiq::Logging.logger = logger
+            ::Sidekiq.options[:job_logger] = ::Applicaster::Sidekiq::JobLogger
           end
         end
       end
@@ -68,5 +78,37 @@ module Applicaster
     def self.current_thread_data
       Thread.current[:logger_thread_data] || {}
     end
+
+    # Truncates +text+ to at most <tt>bytesize</tt> bytes in length without
+    # breaking string encoding by splitting multibyte characters or breaking
+    # grapheme clusters ("perceptual characters") by truncating at combining
+    # characters.
+    # Code taken from activesupport/lib/active_support/core_ext/string/filters.rb
+    def self.truncate_bytes(text, truncate_at, omission: "...")
+      omission ||= ""
+
+      case
+      when text.bytesize <= truncate_at
+        text.dup
+      when omission.bytesize > truncate_at
+        raise ArgumentError, "Omission #{omission.inspect} is #{omission.bytesize}, larger than the truncation length of #{truncate_at} bytes"
+      when omission.bytesize == truncate_at
+        omission.dup
+      else
+        text.class.new.tap do |cut|
+          cut_at = truncate_at - omission.bytesize
+
+          text.scan(/\X/) do |grapheme|
+            if cut.bytesize + grapheme.bytesize <= cut_at
+              cut << grapheme
+            else
+              break
+            end
+          end
+
+          cut << omission
+        end
+      end
+    end
   end
 end

data/lib/applicaster/logger/version.rb

@@ -1,5 +1,5 @@
 module Applicaster
   module Logger
-    VERSION = "0.6.7"
+    VERSION = "0.7.0"
   end
 end

data/lib/applicaster/sidekiq/exception_logger.rb

@@ -0,0 +1,27 @@
+module Applicaster
+  module Sidekiq
+    class ExceptionLogger
+      def call(exception, ctxHash)
+        item = ctxHash[:job]
+        queue = item[:queue]
+
+        event = log_context(item, queue).merge({
+          message: "Fail: #{item['class']} JID-#{item['jid']}",
+          exception_class: exception.class.to_s,
+          exception_message: Applicaster::Logger.truncate_bytes(exception.message.to_s, 500),
+        })
+        logger.info(event)
+      end
+
+      private
+
+      def log_context(item, queue)
+        Applicaster::Sidekiq::JobLogger.log_context(item, queue)
+      end
+
+      def logger
+        ::Sidekiq.logger
+      end
+    end
+  end
+end

data/lib/applicaster/sidekiq/job_logger.rb

@@ -0,0 +1,50 @@
+module Applicaster
+  module Sidekiq
+    class JobLogger
+      def call(item, queue)
+        puts "JobLogger"
+        start = Time.now
+        event = log_context(item, queue).merge({
+          message: "Start: #{item['class']} JID-#{item['jid']}",
+        })
+        logger.info(event)
+        yield
+        event = log_context(item, queue).merge({
+          message: "Done: #{item['class']} JID-#{item['jid']}",
+        })
+        event[:sidekiq][:duration] = elapsed(start)
+        logger.info(event)
+      end
+
+      private
+
+      def elapsed(start)
+        (Time.now - start).round(3)
+      end
+
+      def logger
+        ::Sidekiq.logger
+      end
+
+      def log_context(item, queue)
+        self.class.log_context(item, queue)
+      end
+
+      def self.sidekiq_context
+        ::Thread.current[:sidekiq_context]
+      end
+
+      def self.log_context(item, queue)
+        {
+          sidekiq: {
+            jid: item['jid'],
+            context: sidekiq_context,
+            worker: item['class'].to_s,
+            queue: queue,
+            args: item['args'].inspect,
+          }
+        }
+      end
+    end
+  end
+end

data/lib/applicaster/sidekiq/middleware.rb

@@ -48,8 +48,7 @@ module Applicaster
                   args: item['args'].inspect,
                   runtime: elapsed(start),
                   exception_class: e.class.to_s,
-                  exception_message: e.message,
-                  backtrace: e.backtrace.join("\n"),
+                  exception_message: Applicaster::Logger.truncate_bytes(e.message.to_s, 500),
                   memory: memory
                 }))
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: applicaster-logger
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.0
 platform: ruby
 authors:
 - Vitaly Gorodetsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2018-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-logger
@@ -85,6 +85,8 @@ files:
 - lib/applicaster/logger/railtie.rb
 - lib/applicaster/logger/version.rb
 - lib/applicaster/rack/request_data.rb
+- lib/applicaster/sidekiq/exception_logger.rb
+- lib/applicaster/sidekiq/job_logger.rb
 - lib/applicaster/sidekiq/middleware.rb
 homepage: ''
 licenses:
@@ -106,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Configures loggers to send logs to logstash