root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Start Observation before scope open for Scheduled operation 

When ScheduledAnnotationReactiveSupport adds the Observation to the
context, Reactor opens a scope through the Context Propagation API.
This happens before TrackingSubscriber would start the Observation and
opening a scope without starting an Observation is invalid.

This change moves the Observation start before the scope opening.

Closes gh-33349
This commit is contained in:
Jonatan Ivanov 2024-08-07 17:35:33 -07:00 committed by Stéphane Nicoll
parent 6c74fee5e8
commit 38a3d18256
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationReactiveSupport.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2023 the original author or authors. * Copyright 2002-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -244,6 +244,7 @@ abstract class ScheduledAnnotationReactiveSupport {
private void subscribe(TrackingSubscriber subscriber, Observation observation) { private void subscribe(TrackingSubscriber subscriber, Observation observation) {
this.subscriptionTrackerRegistry.add(subscriber); this.subscriptionTrackerRegistry.add(subscriber);
if (reactorPresent) { if (reactorPresent) {
observation.start();
Flux.from(this.publisher) Flux.from(this.publisher)
.contextWrite(context -> context.put(ObservationThreadLocalAccessor.KEY, observation)) .contextWrite(context -> context.put(ObservationThreadLocalAccessor.KEY, observation))
.subscribe(subscriber); .subscribe(subscriber);
@ -300,7 +301,6 @@ abstract class ScheduledAnnotationReactiveSupport {
@Override @Override
public void onSubscribe(Subscription subscription) { public void onSubscribe(Subscription subscription) {
this.subscription = subscription; this.subscription = subscription;
this.observation.start();
subscription.request(Integer.MAX_VALUE); subscription.request(Integer.MAX_VALUE);
} }