loga 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5366cef0d19c0384219e570b910635edeced8c13f7d27a7726f76397de78b492
-  data.tar.gz: 1015b91450e060ca3d705a93c50decf6111136a51d4819429f3be45f97687e53
+  metadata.gz: 1c431f4c2be4360f29975cc8434c86647c77cf8a375bcd8fa6e6a0b47bb8a2e8
+  data.tar.gz: 2ec1e76ed48281e99acca8bdc3dd55b3fb6068dee599dd5c4bf92008e1af6eb0
 SHA512:
-  metadata.gz: 151f8dddb93eeaf02ed792e45d51e7c694f349d6d397d18602ac6928953844f7047abaf7ae31b681cfa068f75842799d54eb90a948c75cead9e3b2edd1200175
-  data.tar.gz: 80a2b4f443aaea2403388de748fb181aeea34c81f6e693cc08b50b6b9893a48bcfed447c747d0f241823d99904b28772b64e7495870ac03426b71b0be6991f97
+  metadata.gz: 5c09402cb2b8f7e90bb53ccba07df43c759a9d4cea9cd5a19f8fbfcf332b0ce7914dca1d3c085cd43d9d081e40cc2c4d18452bd5c6b44d10e1df2771c7a88146
+  data.tar.gz: f9f937d8e0a600c05ca50e60c05b084d6756b76158f2b4dcfc7a070ee30ad535ef2df6f0c10d6f61a99152ec2fa2cdb1815b450ce600e4be72e51e797d1165b6

data/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')

data/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

data/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: "../"

data/lib/loga/sidekiq6/job_logger.rb

@@ -10,22 +10,27 @@ module Loga
 
         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)

data/lib/loga/version.rb

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

data/spec/loga/sidekiq6/job_logger_spec.rb

@@ -64,6 +64,7 @@ RSpec.describe Loga::Sidekiq6::JobLogger do
 
         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 @@ RSpec.describe Loga::Sidekiq6::JobLogger do
 
         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)

data/spec/spec_helper.rb

@@ -37,7 +37,7 @@ when /sidekiq(?<version>\d+)/
       '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',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loga
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Funding Circle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-29 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -264,6 +264,7 @@ files:
 - gemfiles/rails70.gemfile
 - gemfiles/sidekiq51.gemfile
 - gemfiles/sidekiq6.gemfile
+- gemfiles/sidekiq61.gemfile
 - gemfiles/sinatra14.gemfile
 - gemfiles/unit.gemfile
 - lib/loga.rb