Use new propagation context API #281
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
graemerocher
pushed a commit
to micronaut-projects/micronaut-core
that referenced
this pull request
May 17, 2023
Initial version of the propagation API. Main points: - The propagated context is always immutable and consist of different propagated elements similar to Kotlin Coroutines context - Propagated element can implement `ThreadPropagatedContextElement` to setup/restore thread locals - The propagated state is never captured but the context needs to be extended and pushed down the downstream - The capturing API is not needed anymore, this should eliminate a lot of overhead from the reactive code - The context is automatically propagated to the Kotlin coroutines - In the Reactor context should be propagated as whole with utility method to extract/extend it (The Reactor context needs to be modified manually) - The implementation is using try-resources to propagate the contest without extra overhead, this might change in the future to support scoped local, but at this moment, I think this is the best solution. I want to merge this first PR to have the orther work mergable. Next PRs will remove the existing instrumentation propagation, add docs etc. There are already examples how it should be used: - Tracing micronaut-projects/micronaut-tracing#281 - Micronaut Data micronaut-projects/micronaut-data#2189 (This is a big PR because of the changes in the TX management and removal of forked Spring TX code)
|
The build is failing locally with: |
graemerocher
requested changes
May 19, 2023
Comment on lines
98
to
112
| // Optional<?> body = response.getBody(); | ||
| // if (body.isPresent()) { | ||
| // Object o = body.get(); | ||
| // if (Publishers.isConvertibleToPublisher(o)) { | ||
| // Class<?> type = o.getClass(); | ||
| // Publisher<?> resultPublisher = Publishers.convertPublisher(conversionService, o, Publisher.class); | ||
| // Publisher<?> scopedPublisher = new ScopePropagationPublisher<>( | ||
| // resultPublisher, | ||
| // openTracer, | ||
| // openTracer.activeSpan() | ||
| // ); | ||
| // | ||
| // response.body(Publishers.convertPublisher(conversionService, scopedPublisher, type)); | ||
| // } | ||
| // } |
There was a problem hiding this comment.
delete this code if it is not needed
| @@ -14,4 +14,4 @@ | |||
| # limitations under the License. | |||
| # | |||
|
|
|||
| Args = --initialize-at-run-time=io.micronaut.tracing.instrument.kotlin.HttpCoroutineTracingDispatcherFactory | |||
| Args = --initialize-at-run-time=io.micronaut.tracing.brave.http.HttpTracingFactor | |||
There was a problem hiding this comment.
this file can be deleted
tracing-brave-http/src/test/groovy/io/micronaut/tracing/brave/BraveTracerFactorySpec.groovy
Show resolved
Hide resolved
| @@ -14,4 +14,4 @@ | |||
| # limitations under the License. | |||
| # | |||
|
|
|||
| Args = --initialize-at-run-time=io.micronaut.tracing.brave.BraveTracerFactory,io.micronaut.tracing.brave.instrument.http.HttpTracingFactory,io.micronaut.tracing.brave.log.Slf4jCurrentTraceContextFactory,io.micronaut.tracing.brave.sender.HttpClientSenderFactory | |||
| Args = --initialize-at-run-time=io.micronaut.tracing.brave.BraveTracerFactory,io.micronaut.tracing.brave.log.Slf4jCurrentTraceContextFactory,io.micronaut.tracing.brave.sender.HttpClientSenderFactory | |||
There was a problem hiding this comment.
this file can be deleted
n0tl3ss
reviewed
May 22, 2023
| @@ -802,15 +808,15 @@ class HttpTracingSpec extends Specification { | |||
| spanCustomizer.activeSpan()?.setBaggageItem('foo', 'bar') | |||
| Flux.from(tracedClient.continuedRx(name)) | |||
| .flatMap({ String res -> | |||
| assert spanCustomizer.activeSpan()?.getBaggageItem('foo') == 'bar' | |||
| // assert spanCustomizer.activeSpan()?.getBaggageItem('foo') == 'bar' | |||
There was a problem hiding this comment.
Does this validation needs to be present or deleted?
| return tracedClient.nestedReactive2(res) | ||
| }) | ||
| } | ||
|
|
||
| @Get('/nestedReactive2/{name}') | ||
| @SingleResult | ||
| Publisher<Integer> nestedReactive2(String name) { | ||
| assert spanCustomizer.activeSpan()?.getBaggageItem('foo') == 'bar' | ||
| // assert spanCustomizer.activeSpan()?.getBaggageItem('foo') == 'bar' |
There was a problem hiding this comment.
Does this validation needs to be present or deleted?
|
SonarCloud Quality Gate failed. |
sdelamo
added a commit
to micronaut-projects/micronaut-core
that referenced
this pull request
May 23, 2023
sdelamo
added a commit
to micronaut-projects/micronaut-core
that referenced
this pull request
May 23, 2023
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.
The PR is moving to the new propagation API introduced in Micronaut 4.
Also: