-
Notifications
You must be signed in to change notification settings - Fork 853
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
Fix Ratpack server context propagation and enable its concurrency test #2910
Merged
trask
merged 2 commits into
open-telemetry:main
from
agoallikmaa:ratpack-concurrency-fix
May 6, 2021
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,6 +11,7 @@ | |
import io.opentelemetry.api.trace.SpanKind; | ||
import io.opentelemetry.context.Scope; | ||
import io.opentelemetry.instrumentation.netty.v4_1.AttributeKeys; | ||
import io.opentelemetry.javaagent.instrumentation.api.Java8BytecodeBridge; | ||
import ratpack.handling.Context; | ||
import ratpack.handling.Handler; | ||
|
||
|
@@ -23,9 +24,14 @@ public void handle(Context ctx) { | |
ctx.getDirectChannelAccess().getChannel().attr(AttributeKeys.SERVER_SPAN); | ||
io.opentelemetry.context.Context serverSpanContext = spanAttribute.get(); | ||
|
||
// Relying on executor instrumentation to assume the netty span is in context as the parent. | ||
// Must use context from channel, as executor instrumentation is not accurate - Ratpack | ||
// internally queues events and then drains them in batches, causing executor instrumentation to | ||
// attach the same context to a batch of events from different requests. | ||
Comment on lines
+27
to
+29
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍 |
||
io.opentelemetry.context.Context parentContext = | ||
serverSpanContext != null ? serverSpanContext : Java8BytecodeBridge.currentContext(); | ||
|
||
io.opentelemetry.context.Context ratpackContext = | ||
tracer().startSpan("ratpack.handler", SpanKind.INTERNAL); | ||
tracer().startSpan(parentContext, "ratpack.handler", SpanKind.INTERNAL); | ||
ctx.getExecution().add(ratpackContext); | ||
|
||
ctx.getResponse() | ||
|
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -92,6 +92,15 @@ protected Boolean computeValue(Class<?> taskClass) { | |
return false; | ||
} | ||
|
||
if (taskClass.getName().startsWith("ratpack.exec.internal.")) { | ||
// Context is passed through Netty channels in Ratpack as executor instrumentation is | ||
// not suitable. As the context that would be propagated via executor would be | ||
// incorrect, skip the propagation. Not checking for concrete class names as this covers | ||
// anonymous classes from ratpack.exec.internal.DefaultExecution and | ||
// ratpack.exec.internal.DefaultExecController. | ||
Comment on lines
+96
to
+100
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍 |
||
return false; | ||
} | ||
|
||
return true; | ||
} | ||
}; | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could drop
newTask
and just assign totask
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.