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.

Sign up for GitHub

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

Jump to bottom

Support Sidekiq v7.0+ #1615

Merged
merged 1 commit into from
Nov 11, 2022
Merged

Support Sidekiq v7.0+ #1615

merged 1 commit into from
Nov 11, 2022

Conversation

fallwith
Copy link
Contributor

  • Conditionally stop attempting to apply instrumentation to Delayed Extensions, which were dropped in v7.0. Attempting to do so was causing the installation of Sidekiq instrumentation by the agent to fail when used with Sidekiq v7.0.
  • Have the agent's client and server middleware classes inherit from the new Sidekiq v7.0 middleware base classes.

resolves #1567

@fallwith
Support Sidekiq v7.0+
dcb7c3f 
* Conditionally stop attempting to apply instrumentation to Delayed
  Extensions, which were dropped in v7.0. Attempting to do so was
  causing the installation of Sidekiq instrumentation by the agent to
  fail when used with Sidekiq v7.0.
* Have the agent's client and server middleware classes inherit from
  the new Sidekiq v7.0 middleware base classes.
This was referenced Nov 11, 2022
Closed
Closed
@github-actions
Copy link
Contributor

SimpleCov Report

Coverage Threshold
Line 93.26% 93%
Branch 84.25% 84%

tannalynn
tannalynn approved these changes Nov 11, 2022
View reviewed changes
Copy link
Contributor

@tannalynn tannalynn left a comment

Choose a reason for hiding this comment

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

Thanks for getting this working!

@fallwith fallwith merged commit 88c6049 into dev Nov 11, 2022
@fallwith fallwith deleted the support_sidekiq7 branch November 11, 2022 18:27
kaylareopelle
kaylareopelle approved these changes Nov 11, 2022
View reviewed changes
Copy link
Contributor

@kaylareopelle kaylareopelle left a comment

Choose a reason for hiding this comment

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

This looks great! Approved as-is, with two small comments.

CHANGELOG.md Show resolved Hide resolved
lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kaylareopelle kaylareopelle kaylareopelle approved these changes

@tannalynn tannalynn tannalynn approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Investigate: CI failure with Sidekiq 7
3 participants
@fallwith @tannalynn @kaylareopelle