feat!(action_pack): Use ActiveSupport instead of patches #703
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xuan-cao-swi
commented
Oct 20, 2023
|
|
||
| # from rails 6.1, the request will be added to payload | ||
| request = payload[:request] | ||
| request = payload[:headers].instance_variable_get(:@req) if ::ActionPack.version < Gem::Version.new('6.1.0') |
There was a problem hiding this comment.
This can be removed once the rails 6.0 is no longer supported
There was a problem hiding this comment.
Please remove the Rails 6.0 logic and I will merge this PR for you.
xuan-cao-swi
requested review from
fbogsany,
mwear,
robertlaurin,
dazuma,
ericmustin,
arielvalentin,
ahayworth,
plantfansam,
robbkidd,
simi and
kaylareopelle
as code owners
...tion/action_pack/lib/opentelemetry/instrumentation/action_pack/handlers/action_controller.rb
Show resolved
Hide resolved
...tion/action_pack/lib/opentelemetry/instrumentation/action_pack/handlers/action_controller.rb
Show resolved
Hide resolved
arielvalentin
approved these changes
Nov 21, 2023
There was a problem hiding this comment.
Hi @xuan-cao-swi, nice work! I have some documentation suggestions.
Tests using the example trace_demonstration.ru output essentially identical content before and after the change! 🎉
...tion/action_pack/lib/opentelemetry/instrumentation/action_pack/handlers/action_controller.rb
Outdated
Show resolved
Hide resolved
instrumentation/action_pack/lib/opentelemetry/instrumentation/action_pack/handlers.rb
Outdated
Show resolved
Hide resolved
instrumentation/action_pack/lib/opentelemetry/instrumentation/action_pack/handlers.rb
Outdated
Show resolved
Hide resolved
...tion/action_pack/lib/opentelemetry/instrumentation/action_pack/handlers/action_controller.rb
Outdated
Show resolved
Hide resolved
Co-authored-by: Kayla Reopelle (she/her) <87386821+kaylareopelle@users.noreply.github.com>
Co-authored-by: Kayla Reopelle (she/her) <87386821+kaylareopelle@users.noreply.github.com>
Co-authored-by: Kayla Reopelle (she/her) <87386821+kaylareopelle@users.noreply.github.com>
…action_pack/handlers/action_controller.rb Co-authored-by: Kayla Reopelle (she/her) <87386821+kaylareopelle@users.noreply.github.com>
…action_pack/handlers.rb Co-authored-by: Kayla Reopelle (she/her) <87386821+kaylareopelle@users.noreply.github.com>
…action_pack/handlers/action_controller.rb Co-authored-by: Kayla Reopelle (she/her) <87386821+kaylareopelle@users.noreply.github.com>
kaylareopelle
requested changes
Dec 6, 2023
instrumentation/action_pack/lib/opentelemetry/instrumentation/action_pack/handlers.rb
Outdated
Show resolved
Hide resolved
...tion/action_pack/lib/opentelemetry/instrumentation/action_pack/handlers/action_controller.rb
Outdated
Show resolved
Hide resolved
...tion/action_pack/lib/opentelemetry/instrumentation/action_pack/handlers/action_controller.rb
Outdated
Show resolved
Hide resolved
...tion/action_pack/lib/opentelemetry/instrumentation/action_pack/handlers/action_controller.rb
Outdated
Show resolved
Hide resolved
…action_pack/handlers/action_controller.rb Co-authored-by: Kayla Reopelle (she/her) <87386821+kaylareopelle@users.noreply.github.com>
…action_pack/handlers/action_controller.rb Co-authored-by: Kayla Reopelle (she/her) <87386821+kaylareopelle@users.noreply.github.com>
…action_pack/handlers/action_controller.rb Co-authored-by: Kayla Reopelle (she/her) <87386821+kaylareopelle@users.noreply.github.com>
…action_pack/handlers.rb Co-authored-by: Kayla Reopelle (she/her) <87386821+kaylareopelle@users.noreply.github.com>
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Use ActiveSupport::Notification to subscribe the log from action controller, then modify the rack span. Remove the patch on function
dispatchfrom metal.rbRelated to #638, #667, issue #218, #635
Test
Added test assertion that focus on error handling.
Tested with rails 6.1.7.1 and 7.1.* that made sure this change has consistent behaviour as original patching.
Tested on basic test suite.