Merge pull request #127 from FundingCircle/fix-sidekiq-compatibility

Fix sidekiq6 compatibility

Author: bliof-fc

Appraisals

@@ -34,6 +34,10 @@ if Gem::Version.new(RUBY_VERSION) > Gem::Version.new('2.5.0')
   appraise 'sidekiq6' do
     gem 'sidekiq', '~> 6.0'
   end
+
+  appraise 'sidekiq61' do
+    gem 'sidekiq', '~> 6.1.0'
+  end
 end
 
 if Gem::Version.new(RUBY_VERSION) > Gem::Version.new('2.7.0')

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.6.1] - 2022-02-22
+### Fixed
+- Fix compatibility with sidekiq 6.4.1
+
 ## [2.6.0] - 2021-12-22
 ### Added
 - Allow using the gem with rails 7

gemfiles/sidekiq61.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sidekiq", "~> 6.1.0"
+
+group :test do
+  gem "simplecov", "~> 0.17.0"
+end
+
+gemspec path: "../"

lib/loga/sidekiq6/job_logger.rb

@@ -10,22 +10,27 @@ def call(item, _queue)
 
         yield
 
-        with_elapsed_time_context(start) do
-          loga_log(
-            message: "#{item['class']} with jid: '#{item['jid']}' done", item: item,
-          )
-        end
+        ::Sidekiq::Context.current[:elapsed] = elapsed(start)
+
+        loga_log(message: "#{item['class']} with jid: '#{item['jid']}' done", item: item)
       rescue Exception => e # rubocop:disable Lint/RescueException
-        with_elapsed_time_context(start) do
-          loga_log(
-            message: "#{item['class']} with jid: '#{item['jid']}' fail", item: item,
-            exception: e
-          )
-        end
+        ::Sidekiq::Context.current[:elapsed] = elapsed(start)
+
+        loga_log(
+          message: "#{item['class']} with jid: '#{item['jid']}' fail", item: item,
+          exception: e
+        )
 
         raise
       end
 
+      def prepare(job_hash, &block)
+        super
+      ensure
+        # For sidekiq version < 6.4
+        Thread.current[:sidekiq_context] = nil
+      end
+
       private
 
       def loga_log(message:, item:, exception: nil)

lib/loga/version.rb

@@ -1,3 +1,3 @@
 module Loga
-  VERSION = '2.6.0'.freeze
+  VERSION = '2.6.1'.freeze
 end

spec/loga/sidekiq6/job_logger_spec.rb

@@ -64,6 +64,7 @@
 
         aggregate_failures do
           expect(json_line).to include(expected_body)
+          expect(json_line['_duration']).to be_a(Float)
           expect(json_line['timestamp']).to be_a(Float)
           expect(json_line['host']).to be_a(String)
           expect(json_line['short_message']).to match(/HardWorker with jid:*/)
@@ -110,6 +111,7 @@
 
         aggregate_failures do
           expect(&failed_job).to raise_error(StandardError)
+          expect(json_line['_duration']).to be_a(Float)
           expect(json_line).to include(expected_body)
           expect(json_line['timestamp']).to be_a(Float)
           expect(json_line['host']).to be_a(String)

spec/spec_helper.rb

@@ -37,7 +37,7 @@
       'spec/loga/sidekiq5/**/*_spec.rb',
       'spec/loga/sidekiq_spec.rb',
     ].join(',')
-  when '6'
+  when '6', '61'
     rspec_pattern = [
       'spec/integration/sidekiq6_spec.rb',
       'spec/loga/sidekiq6/**/*_spec.rb',