Context is empty if retrieved in RetrySpec since version 3.4.25

[pascalgosselin]

The following code was working with reactor-core 3.4.24, but it does not work anymore with version 3.4.25.
ReactiveSecurityContextHolder.getContext() now returns empty.

@Component
public class BusinessClass {

  private static final Logger LOGGER =
      LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
  private final ComponentClass componentClass;

  public BusinessClass(ComponentClass componentClass) {
    this.componentClass = componentClass;
  }

  public RetrySpec getRetrySpec() {
    return Retry.max(1)
        .doBeforeRetryAsync(
            retrySignal ->
                ReactiveSecurityContextHolder.getContext()
                    .doOnSuccess(
                        securityContext ->
                            LOGGER.info(
                                "The securityContext is null : " + Objects.isNull(securityContext)))
                    .flatMap(securityContext -> componentClass.doBeforeRetry()));
  }
}

@Component
public class ComponentClass {

  public Mono<String> getValue() {
    return Mono.just("String value");
  }

  public Mono<Void> doBeforeRetry() {
    return Mono.empty();
  }
}

@ExtendWith(MockitoExtension.class)
class BusinessClassTest {

  @Mock ComponentClass componentClass;
  @Mock SecurityContext securityContext;

  @InjectMocks BusinessClass businessClass;

  @Test
  @DisplayName("doBusinessLogic should call 'doBeforeRetry' before retry")
  void doBusinessLogic() {

    PublisherProbe<Void> doBeforeRetryProbe = PublisherProbe.empty();
    Context context = ReactiveSecurityContextHolder.withSecurityContext(Mono.just(securityContext));

    given(componentClass.getValue())
        .willReturn(Mono.error(new RuntimeException()))
        .willReturn(Mono.just("someValue"));
    given(componentClass.doBeforeRetry()).willReturn(doBeforeRetryProbe.mono());

    StepVerifier.create(
            Mono.defer(() -> componentClass.getValue())
                .retryWhen(businessClass.getRetrySpec())
                .contextWrite(context))
        .expectNext("someValue")
        .verifyComplete();

    doBeforeRetryProbe.assertWasSubscribed();
  }
}

We first faced the problem when we migrated from spring-boot 2.7.5 to 2.7.6. But it works with spring-boot 2.7.6 by simply downgrading to reactor-core 3.4.24

It could be this change: https://github.com/reactor/reactor-core/pull/3262/files#diff-a5639cea15f6765fecf7b44413831dc92cc0c8f45c1314ae8f4fb2959c60a623, but I'm really not sure.

Thanks in advance

Your Environment

• Reactor version(s) used: succeed with reactor-core 3.4.24, failed with reactor-core 3.4.25
• Other relevant libraries versions (eg. netty, ...): spring-boot 2.7.6
• JVM version (java -version): 11 and 17

[chemicL]

@pascalgosselin thank you for the report. We will investigate, it is possible it is a regression caused by precisely the change you point to. @OlegDokuka will most probably have a closer look.