sonnet 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d7c9190a2c3b30088666a05896be4b39951cc028d9231cf9b11de55531c03bb
-  data.tar.gz: cf736f790ca819802faece8bd735c6a7e0d7aac4feaefce821e3c528c367f08e
+  metadata.gz: 37fe52c625a9e9652eb886216565a9ea485f3f309650881d3576690e979bd1ab
+  data.tar.gz: d50175a894ac543914f9547bf9ddd6b601863a6124fd8fec0c6545f5619634b7
 SHA512:
-  metadata.gz: effec6afdf604f2dc9ed8dac4e18a67d45f44df8760e415600a555f7052fa7ef606674818e4a858ce5d51bd23ad7a9591348f45029836b570758726a672101f5
-  data.tar.gz: a667b7bdf7a12bfc8b1447cc32a688e8d62aedbda9494be3288e43ab0a130fc133a8e60ea891746369a3eef6acdfa9f498ecdbd9e4dae0f164c82d4c8b7c4c49
+  metadata.gz: 38d76037845898e166536ad70e5fc0fb9c6544462c5fe04a5c3bcadf1b48a2915b4a639ad543dbea16b9c8857b3c6c72bcf40d202f25be4c2194dacf77d99f77
+  data.tar.gz: 9378241dcd507f983cbe7ab2b5954780c3d2aafd676cde6aed02c3795e03af44ffc4ecd11110ae48571c2c7754c7b6b9a601c0799a8c7bc166467d13a5e791fd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sonnet (0.1.0)
+    sonnet (0.1.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/sonnet/formatter.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "sonnet/serializer"
+
 module Sonnet
   class Formatter
     TIMESTAMP_FORMAT = "%FT%T.%LZ"
@@ -26,7 +28,7 @@ module Sonnet
     def data
       case @data
       when Exception
-        serialize_exception(@data)
+        Serializer.serialize_exception(@data)
       when Hash
         @data
       else
@@ -42,14 +44,6 @@ module Sonnet
     #   @hostname || Socket.gethostname.force_encoding('UTF-8')
     # end
 
-    def serialize_exception(exception)
-      {
-        kind: exception.class.name,
-        message: exception.to_s,
-        stack: exception.backtrace&.slice(0, 3)
-      }
-    end
-
     def serialize_string(string)
       { message: string.to_s }
     end

data/lib/sonnet/serializer.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Sonnet
+  module Serializer
+    def self.serialize_exception(exception)
+      {
+        kind: exception.class.name,
+        message: exception.to_s,
+        stack: exception.backtrace&.slice(0, 3)
+      }
+    end
+  end
+end

data/lib/sonnet/sidekiq/exception_handler.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "sidekiq/exception_handler"
+require "sonnet/serializer"
+
+module Sonnet
+  module Sidekiq
+    module ExceptionHandler
+      def self.extended(base)
+        ::Sidekiq::ExceptionHandler::Logger.prepend(Logger)
+      end
+
+      module Logger
+        def call(ex, ctxHash)
+          ::Sidekiq.logger.warn(
+            exception: ex,
+            message: ctxHash["context"],
+            job: ctxHash[:job]
+          )
+        end
+      end
+    end
+  end
+end

data/lib/sonnet/sidekiq/job_logger.rb

@@ -2,18 +2,18 @@
 
 require "sidekiq/job_logger"
 
-module Album
+module Sonnet
   module Sidekiq
     class JobLogger < ::Sidekiq::JobLogger
       def call(item, queue)
         ::Sidekiq::Logging.with_context(source: item['class']) do
           begin
             start = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
-            logger.debug(:start)
+            logger.debug(message: "start")
             yield
-            logger.debug(:done, duration: elapsed(start))
+            logger.debug(message: "done", duration: elapsed(start))
           rescue
-            logger.debug(:failure, duration: elapsed(start))
+            logger.debug(message: "failure", duration: elapsed(start))
             raise
           end
         end

data/lib/sonnet/version.rb

@@ -1,3 +1,3 @@
 module Sonnet
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/test/sonnet_test.rb

@@ -2,16 +2,31 @@ require "test_helper"
 require "logger"
 
 class SonnetTest < Minitest::Test
+  Error = Class.new(StandardError)
+
   def test_that_it_has_a_version_number
     refute_nil ::Sonnet::VERSION
   end
 
   def test_json_logging
-    io = StringIO.new
-    logger = Logger.new(io)
-    logger.extend(Sonnet::Logger)
     logger.info("What's the story, morning glory?")
-    line = JSON.parse(io.string)
-    assert_equal line.fetch("message"), "What's the story, morning glory?"
+    assert_equal log[0].fetch("message"), "What's the story, morning glory?"
+  end
+
+  def test_exception_logging
+    logger.error(Error.new("something went wrong"))
+    assert_equal log[0]["message"], "something went wrong"
+  end
+
+  def logger
+    @logger ||= Logger.new(io).tap { |logger| logger.extend(Sonnet::Logger) }
+  end
+
+  def io
+    @io ||= StringIO.new
+  end
+
+  def log
+    io.string.each_line.map { |line| JSON.parse(line) }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sonnet
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Cory Kaufman-Schofield
@@ -86,6 +86,8 @@ files:
 - lib/sonnet/logger.rb
 - lib/sonnet/monkeypatch.rb
 - lib/sonnet/rails.rb
+- lib/sonnet/serializer.rb
+- lib/sonnet/sidekiq/exception_handler.rb
 - lib/sonnet/sidekiq/job_logger.rb
 - lib/sonnet/version.rb
 - sonnet.gemspec