Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Add upper bound to sidekiq instrumentation #300

Merged
merged 1 commit into from
May 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/instana/activators/sidekiq_client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ module Instana
module Activators
class SidekiqClient < Activator
def can_instrument?
defined?(::Sidekiq) && ::Sidekiq.respond_to?(:configure_client) && ::Instana.config[:'sidekiq-client'][:enabled]
defined?(::Sidekiq) && ::Sidekiq.respond_to?(:configure_client) && ::Instana.config[:'sidekiq-client'][:enabled] &&
Gem::Specification.find_by_name('sidekiq').version < Gem::Version.new('5.3')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question: Just out of curiosity: Do we ever log something if can_instrument? returns false? This is probably out of scope for this PR, but it might be valuable to log this at least at debug level.

end

def instrument
Expand Down
3 changes: 2 additions & 1 deletion lib/instana/activators/sidekiq_worker.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ module Instana
module Activators
class SidekiqWorker < Activator
def can_instrument?
defined?(::Sidekiq) && ::Sidekiq.respond_to?(:configure_server) && ::Instana.config[:'sidekiq-worker'][:enabled]
defined?(::Sidekiq) && ::Sidekiq.respond_to?(:configure_server) && ::Instana.config[:'sidekiq-worker'][:enabled] &&
Gem::Specification.find_by_name('sidekiq').version < Gem::Version.new('5.3')
end

def instrument
Expand Down
Loading