fix: replace Span.makeCurrent() with Span.asContextElement()
#1237
Conversation
This file contains hidden or 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
lauzadis
added
no-changelog
This comment has been minimized.
This comment has been minimized.
3 similar comments
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Affected ArtifactsChanged in size
|
ianbotsf
approved these changes
Feb 25, 2025
0marperez
approved these changes
Feb 25, 2025
| @@ -71,7 +71,7 @@ public suspend inline fun <R> withSpan( | |||
| // or else traces may be disconnected from their parent | |||
| val updatedCtx = coroutineContext[TelemetryProviderContext]?.provider?.contextManager?.current() | |||
| val telemetryCtxElement = (updatedCtx?.let { TelemetryContextElement(it) } ?: coroutineContext[TelemetryContextElement]) ?: EmptyCoroutineContext | |||
| withContext(context + TraceSpanContext(span) + telemetryCtxElement) { | |||
| withContext(context + TraceSpanContext(span) + telemetryCtxElement + span.asContextElement()) { | |||
There was a problem hiding this comment.
Should we set up tests to confirm this is working as expected?
There was a problem hiding this comment.
This is a very complex setup, involving two Docker containers and a lot of visual inspection. I'm not sure setting up unit tests would be worth the effort
| "type": "bugfix", | ||
| "description": "Fix OpenTelemetry span concurrency by using Span.asContextElement() instead of Span.makeCurrent()", | ||
| "issues": [ | ||
| "https://github.com/smithy-lang/smithy-kotlin/issues/1211" |
There was a problem hiding this comment.
Nit: We could mention the issue in the pull request description as well
No we don't, because Micrometer doesn't have a |
1 task
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.
Issue #
Description of changes
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.