Support for Sinatra modular apps #1015
Merged
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
marcotc
added
bug
delner
reviewed
Apr 24, 2020
| @@ -1511,7 +1513,40 @@ get '/' do | |||
| end | |||
| ``` | |||
|
|
|||
| Where `options` is an optional `Hash` that accepts the following parameters: | |||
| #### Modular application | |||
There was a problem hiding this comment.
Improved documentation is nice!
| @@ -32,53 +36,115 @@ def route(verb, action, *) | |||
| end | |||
|
|
|||
| def self.registered(app) | |||
| ::Sinatra::Base.module_eval do | |||
There was a problem hiding this comment.
👍 to getting rid of monkey patches.
| return span if span | ||
|
|
||
| tracer = configuration[:tracer] | ||
| span = tracer.trace( |
There was a problem hiding this comment.
Out of curiosity, why auto-create the span on fetch?
Is this somehow related to if the stack short-circuits before reaching route_eval?
There was a problem hiding this comment.
Yes, this is the part that create the span when we are sure this is the correct middleware layer to instrument.
It can only happen in two cases:
- When a route matches: we create it right before we instrument the route itself. This happens right before
route_eval. - When not route matches: we create it on the
app.aftercallback, before we return from the current middleware.
This was referenced Apr 24, 2020
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.
Fixes #486 and #913
Closes #491 (thank you @jpaulgs!)
This PR adds improved support for Sinatra modular applications.
We already had support for classic applications, but it did not translate correctly to modular apps.
We now support nested modular Sinatra apps, and added a new span measuring the specific application route that was matched for a request (
sinatra.route).To help support modular apps, a new tag (
sinatra.app.name) was added to the existingsinatra.requestspan, to identify which modular app handled to the request.Action shots
The existing
sinatra.requestspan, which measures the total Sinatra middleware time. Now including the application name:The new
sinatra.routespan, which measures only the user application time of a matched route: