Skip to content

Commit 22c545a

Browse files
committed
0.8.1: Compatibility with Sidekiq 6.2.2+
Fixes #24 See sidekiq/sidekiq#4971 (formerly sidekiq/sidekiq#4955)
1 parent 4ffad77 commit 22c545a

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
77

88
## Unreleased
99

10+
## 0.8.1 - 2021-08-24
11+
12+
### Fixed
13+
14+
- Compatibility with Sidekiq 6.2.2+ due to renamings in Sidekiq's undocumented API that yabeda-sidekiq uses. See [mperham/sidekiq#4971](https://github.com/mperham/sidekiq/discussions/4971). [@Envek]
15+
1016
## 0.8.0 - 2021-05-12
1117

1218
### Added

lib/yabeda/sidekiq/server_middleware.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,16 @@ module Yabeda
44
module Sidekiq
55
# Sidekiq worker middleware
66
class ServerMiddleware
7+
# See https://github.com/mperham/sidekiq/discussions/4971
8+
JOB_RECORD_CLASS = defined?(::Sidekiq::JobRecord) ? ::Sidekiq::JobRecord : ::Sidekiq::Job
9+
710
# rubocop: disable Metrics/AbcSize, Metrics/MethodLength:
811
def call(worker, job, queue)
912
custom_tags = Yabeda::Sidekiq.custom_tags(worker, job).to_h
1013
labels = Yabeda::Sidekiq.labelize(worker, job, queue).merge(custom_tags)
1114
start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
1215
begin
13-
job_instance = ::Sidekiq::Job.new(job)
16+
job_instance = JOB_RECORD_CLASS.new(job)
1417
Yabeda.sidekiq_job_latency.measure(labels, job_instance.latency)
1518
Yabeda::Sidekiq.jobs_started_at[labels][job["jid"]] = start
1619
Yabeda.with_tags(**custom_tags) do

lib/yabeda/sidekiq/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
module Yabeda
44
module Sidekiq
5-
VERSION = "0.8.0"
5+
VERSION = "0.8.1"
66
end
77
end

0 commit comments

Comments
 (0)