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: fix tests for sidekiq to support inline lua changes #1011

Merged
merged 2 commits into from Nov 9, 2021

Conversation

ericmustin
Copy link
Contributor

Summary

Sidekiq cut a 6.3 release over the weekend, which has some fancy new and improved inline Lua sidekiq/sidekiq#5044. While slick, it also happens to use a slightly different redis client method that ends up breaking some of our test assumptions about what gets traced in redis from our sidekiq poller instrumentation. Our CI is now failing as a result(failed run example here: https://github.com/open-telemetry/opentelemetry-ruby/runs/4144038824?check_suite_focus=true).

This PR updates the sidekiq instrumentation test suite to only expect that poller redis instrumentation when sidekiq < 6.3x.

Not exactly the prettiest solution but ought to work? long term i think further evidence that a canary build or some pessimistic version constraints can help us avoid this sort of brittleness open-telemetry/opentelemetry-ruby-contrib#373

@arielvalentin
Copy link
Contributor

Do we expect to support 6.3? Should there be a separate appraisal for it?

https://github.com/ericmustin/opentelemetry-ruby/blob/fix_sidekiq_tests/instrumentation/sidekiq/Appraisals

@ericmustin
Copy link
Contributor Author

@arielvalentin i think that makes sense, updated, good catch

@mwear mwear merged commit a8082e6 into open-telemetry:main Nov 9, 2021
schanjr added a commit to schanjr/opentelemetry-ruby that referenced this pull request Nov 20, 2021
* initial code complete

* chore: fix tests for sidekiq to support inline lua changes (open-telemetry#1011)

* chore: fix tests for sidekiq to support inline lua changes to redis calls

* chore: add additional sidekiq appraisal

* feat: add dalli obfuscation for db_statement (open-telemetry#1013)

* feat: add dalli obfuscation for db_statement

* chore: linting

* Link to website spec pages (open-telemetry#1018)

Co-authored-by: Matthew Wear <matthew.wear@gmail.com>

* Feat: Add custom getters to common (open-telemetry#1006)

Co-authored-by: Matthew Wear <matthew.wear@gmail.com>

Co-authored-by: Eric Mustin <eric.mustin@shopify.com>
Co-authored-by: Patrice Chalin <chalin@users.noreply.github.com>
Co-authored-by: Matthew Wear <matthew.wear@gmail.com>
Co-authored-by: Robert <robertlaurin@users.noreply.github.com>
schanjr added a commit to schanjr/opentelemetry-ruby that referenced this pull request Nov 20, 2021
* initial code complete

* chore: fix tests for sidekiq to support inline lua changes (open-telemetry#1011)

* chore: fix tests for sidekiq to support inline lua changes to redis calls

* chore: add additional sidekiq appraisal

* feat: add dalli obfuscation for db_statement (open-telemetry#1013)

* feat: add dalli obfuscation for db_statement

* chore: linting

* Link to website spec pages (open-telemetry#1018)

Co-authored-by: Matthew Wear <matthew.wear@gmail.com>

* Feat: Add custom getters to common (open-telemetry#1006)

Co-authored-by: Matthew Wear <matthew.wear@gmail.com>

Co-authored-by: Eric Mustin <eric.mustin@shopify.com>
Co-authored-by: Patrice Chalin <chalin@users.noreply.github.com>
Co-authored-by: Matthew Wear <matthew.wear@gmail.com>
Co-authored-by: Robert <robertlaurin@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants