Skip to content

ServiceBusSessionReactorReceiver: Replace the use of DirectProcessor with Sinks. #43764

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.

Sign up for GitHub

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

Merged
anuchandy merged 2 commits into from
Jan 15, 2025
Merged

ServiceBusSessionReactorReceiver: Replace the use of DirectProcessor with Sinks. #43764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
caecfc1
ServiceBusSessionReactorReceiver: Replace the use of DirectProcessor …
anuchandy Jan 11, 2025
c05405b
Adding tests for ServiceBusSessionReactorReceiver
anuchandy Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 10 additions & 13 deletions ...icebus/src/main/java/com/azure/messaging/servicebus/ServiceBusSessionReactorReceiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
import org.apache.qpid.proton.message.Message;
import reactor.core.Disposable;
import reactor.core.Disposables;
import reactor.core.publisher.DirectProcessor;
import reactor.core.publisher.Flux;
import reactor.core.publisher.FluxSink;
import reactor.core.publisher.Mono;
import reactor.core.publisher.Sinks;

Expand All @@ -29,10 +27,8 @@ final class ServiceBusSessionReactorReceiver implements AmqpReceiveLink {
private final String sessionId;
private final AmqpReceiveLink sessionLink;
private final boolean hasIdleTimeout;
private final Sinks.Empty<Void> idleTimeoutSink = Sinks.empty();
// TODO (anu|connie|liudmila); Discuss DirectProcessor is deprecated.
private final DirectProcessor<Boolean> idleTimerProcessor = DirectProcessor.create();
private final FluxSink<Boolean> idleTimerSink = idleTimerProcessor.sink(FluxSink.OverflowStrategy.BUFFER);
private final Sinks.Many<Boolean> nextItemIdleTimeoutSink = Sinks.many().multicast().onBackpressureBuffer();
private final Sinks.Empty<Void> terminateEndpointStatesSink = Sinks.empty();
private final Disposable.Composite disposables = Disposables.composite();

ServiceBusSessionReactorReceiver(ClientLogger logger, ServiceBusTracer tracer,
Expand All @@ -43,11 +39,12 @@ final class ServiceBusSessionReactorReceiver implements AmqpReceiveLink {
this.hasIdleTimeout = sessionIdleTimeout != null;
if (hasIdleTimeout) {
this.disposables
.add(Flux.switchOnNext(idleTimerProcessor.map(__ -> Mono.delay(sessionIdleTimeout))).subscribe(v -> {
withLinkInfo(logger.atInfo()).addKeyValue("timeout", sessionIdleTimeout)
.log("Did not a receive message within timeout.");
idleTimeoutSink.emitEmpty(Sinks.EmitFailureHandler.FAIL_FAST);
}));
.add(Flux.switchOnNext(nextItemIdleTimeoutSink.asFlux().map(__ -> Mono.delay(sessionIdleTimeout)))
.subscribe(v -> {
withLinkInfo(logger.atInfo()).addKeyValue("timeout", sessionIdleTimeout)
.log("Did not a receive message within timeout.");
terminateEndpointStatesSink.emitEmpty(Sinks.EmitFailureHandler.FAIL_FAST);
}));
}
this.disposables.add(session.beginLockRenew(tracer, maxSessionLockRenew));
}
Expand Down Expand Up @@ -80,7 +77,7 @@ public String getEntityPath() {
public Flux<AmqpEndpointState> getEndpointStates() {
final Flux<AmqpEndpointState> endpointStates;
if (hasIdleTimeout) {
endpointStates = sessionLink.getEndpointStates().takeUntilOther(idleTimeoutSink.asMono());
endpointStates = sessionLink.getEndpointStates().takeUntilOther(terminateEndpointStatesSink.asMono());
} else {
endpointStates = sessionLink.getEndpointStates();
}
Expand All @@ -94,7 +91,7 @@ public Flux<AmqpEndpointState> getEndpointStates() {
public Flux<Message> receive() {
if (hasIdleTimeout) {
return sessionLink.receive().doOnNext(m -> {
idleTimerSink.next(true);
nextItemIdleTimeoutSink.emitNext(true, Sinks.EmitFailureHandler.FAIL_FAST);
});
} else {
return sessionLink.receive();
Expand Down
173 changes: 173 additions & 0 deletions ...us/src/test/java/com/azure/messaging/servicebus/ServiceBusSessionReactorReceiverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

package com.azure.messaging.servicebus;

import com.azure.core.amqp.AmqpEndpointState;
import com.azure.core.util.logging.ClientLogger;
import com.azure.messaging.servicebus.implementation.ServiceBusReceiveLink;
import com.azure.messaging.servicebus.implementation.instrumentation.ServiceBusTracer;
import org.apache.qpid.proton.message.Message;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import reactor.core.Disposable;
import reactor.core.Disposables;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.core.scheduler.Schedulers;
import reactor.test.StepVerifier;
import reactor.test.publisher.TestPublisher;

import java.time.Duration;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

/**
* Tests {@link ServiceBusSessionReactorReceiver}.
*/
public class ServiceBusSessionReactorReceiverTest {
private static final String NAMESPACE = "contoso.servicebus.windows.net";
private static final String ENTITY_PATH = "queue0";
private static final String SESSION_ID = "1";
private static final String LINK_NAME = "queue0-session-1";
private static final ClientLogger LOGGER = new ClientLogger(ServiceBusSessionReceiverTest.class);

private final TestPublisher<AmqpEndpointState> endpointStates = TestPublisher.createCold();
private final TestPublisher<Message> messagePublisher = TestPublisher.createCold();
private AutoCloseable autoCloseable;

@Mock
private ServiceBusReceiveLink sessionLink;

@BeforeEach
public void beforeEach() {
autoCloseable = MockitoAnnotations.openMocks(this);
when(sessionLink.receive()).thenReturn(messagePublisher.flux().publishOn(Schedulers.single()));
when(sessionLink.getHostname()).thenReturn(NAMESPACE);
when(sessionLink.getEntityPath()).thenReturn(ENTITY_PATH);
when(sessionLink.getLinkName()).thenReturn(LINK_NAME);
when(sessionLink.getEndpointStates()).thenReturn(endpointStates.flux());
when(sessionLink.addCredits(anyInt())).thenReturn(Mono.empty());
when(sessionLink.closeAsync()).thenReturn(Mono.empty());
endpointStates.next(AmqpEndpointState.ACTIVE);
}

@AfterEach
public void afterEach() throws Exception {
if (autoCloseable != null) {
autoCloseable.close();
}
Mockito.framework().clearInlineMock(this);
}

@Test
public void properties() {
// Arrange
final Disposable lockRenewDisposable = Disposables.single();
doNothing().when(sessionLink).dispose();
final ServiceBusSessionAcquirer.Session session = mock(ServiceBusSessionAcquirer.Session.class);
when(session.getId()).thenReturn(SESSION_ID);
when(session.getLink()).thenReturn(sessionLink);
when(session.beginLockRenew(any(ServiceBusTracer.class), any(Duration.class))).thenReturn(lockRenewDisposable);
final ServiceBusSessionReactorReceiver receiver = new ServiceBusSessionReactorReceiver(LOGGER,
mock(ServiceBusTracer.class), session, null, Duration.ofSeconds(1));

// Act and assert
try {
Assertions.assertEquals(SESSION_ID, receiver.getSessionId());
Assertions.assertEquals(NAMESPACE, receiver.getHostname());
Assertions.assertEquals(LINK_NAME, receiver.getLinkName());
Assertions.assertEquals(ENTITY_PATH, receiver.getEntityPath());
} finally {
receiver.dispose();
}
}

@Test
public void disposeResources() {
// Arrange
final Disposable lockRenewDisposable = Disposables.single();
doNothing().when(sessionLink).dispose();
final ServiceBusSessionAcquirer.Session session = mock(ServiceBusSessionAcquirer.Session.class);
when(session.getId()).thenReturn(SESSION_ID);
when(session.getLink()).thenReturn(sessionLink);
when(session.beginLockRenew(any(ServiceBusTracer.class), any(Duration.class))).thenReturn(lockRenewDisposable);
final ServiceBusSessionReactorReceiver receiver = new ServiceBusSessionReactorReceiver(LOGGER,
mock(ServiceBusTracer.class), session, null, Duration.ofSeconds(1));

// Act
receiver.dispose();

// Assert
verify(sessionLink).dispose();
Assertions.assertTrue(lockRenewDisposable.isDisposed());
}

@Test
public void receivesThenCompletes() {
// Arrange
doNothing().when(sessionLink).dispose();
final ServiceBusSessionAcquirer.Session session = mock(ServiceBusSessionAcquirer.Session.class);
when(session.getId()).thenReturn(SESSION_ID);
when(session.getLink()).thenReturn(sessionLink);
when(session.beginLockRenew(any(ServiceBusTracer.class), any(Duration.class))).thenReturn(Disposables.single());
final Message message0 = mock(Message.class);
final Message message1 = mock(Message.class);
final ServiceBusSessionReactorReceiver receiver = new ServiceBusSessionReactorReceiver(LOGGER,
mock(ServiceBusTracer.class), session, null, Duration.ofSeconds(1));

// Act and assert
try {
final Flux<Message> messages = receiver.receive();
StepVerifier.create(messages)
.then(() -> messagePublisher.next(message0, message1))
.then(messagePublisher::complete)
.assertNext(m -> assertEquals(message0, m))
.assertNext(m -> assertEquals(message1, m))
.expectComplete()
.verify(Duration.ofSeconds(5));
} finally {
receiver.dispose();
}
}

@Test
public void completesOnIdleTimeout() {
// Arrange
final Duration idleTimeout = Duration.ofSeconds(3);
doNothing().when(sessionLink).dispose();
final ServiceBusSessionAcquirer.Session session = mock(ServiceBusSessionAcquirer.Session.class);
when(session.getId()).thenReturn(SESSION_ID);
when(session.getLink()).thenReturn(sessionLink);
when(session.beginLockRenew(any(ServiceBusTracer.class), any(Duration.class))).thenReturn(Disposables.single());
final Message message0 = mock(Message.class);
final Message message1 = mock(Message.class);
final ServiceBusSessionReactorReceiver receiver = new ServiceBusSessionReactorReceiver(LOGGER,
mock(ServiceBusTracer.class), session, idleTimeout, Duration.ofSeconds(1));

// Act and assert
try {
final Flux<Message> messages = receiver.receive();
final Flux<AmqpEndpointState> states = receiver.getEndpointStates();
StepVerifier.create(messages.takeUntilOther(states.then()))
.then(() -> messagePublisher.next(message0, message1))
.assertNext(m -> assertEquals(message0, m))
.assertNext(m -> assertEquals(message1, m))
.expectComplete()
.verify(Duration.ofSeconds(15));
} finally {
receiver.dispose();
}
}
}
Loading