Use ClientReleasesManager when deciding whether to add client version tags

service/src/test/java/org/whispersystems/textsecuregcm/controllers/MessageControllerTest.java

@@ -81,7 +81,6 @@ import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount;
 import org.whispersystems.textsecuregcm.auth.DisabledPermittedAuthenticatedAccount;
 import org.whispersystems.textsecuregcm.auth.OptionalAccess;
 import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicConfiguration;
-import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicDeliveryLatencyConfiguration;
 import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicInboundMessageByteLimitConfiguration;
 import org.whispersystems.textsecuregcm.entities.AccountMismatchedDevices;
 import org.whispersystems.textsecuregcm.entities.AccountStaleDevices;
@@ -112,6 +111,7 @@ import org.whispersystems.textsecuregcm.push.ReceiptSender;
 import org.whispersystems.textsecuregcm.spam.ReportSpamTokenProvider;
 import org.whispersystems.textsecuregcm.storage.Account;
 import org.whispersystems.textsecuregcm.storage.AccountsManager;
+import org.whispersystems.textsecuregcm.storage.ClientReleaseManager;
 import org.whispersystems.textsecuregcm.storage.DeletedAccounts;
 import org.whispersystems.textsecuregcm.storage.Device;
 import org.whispersystems.textsecuregcm.storage.DynamicConfigurationManager;
@@ -179,7 +179,7 @@ class MessageControllerTest {
       .addResource(
           new MessageController(rateLimiters, messageSender, receiptSender, accountsManager, deletedAccounts,
               messagesManager, pushNotificationManager, reportMessageManager, multiRecipientMessageExecutor,
-              messageDeliveryScheduler, ReportSpamTokenProvider.noop(), dynamicConfigurationManager))
+              messageDeliveryScheduler, ReportSpamTokenProvider.noop(), mock(ClientReleaseManager.class), dynamicConfigurationManager))
       .build();
 
   @BeforeEach
@@ -209,16 +209,12 @@ class MessageControllerTest {
     when(accountsManager.getByServiceIdentifier(new PniServiceIdentifier(MULTI_DEVICE_PNI))).thenReturn(Optional.of(multiDeviceAccount));
     when(accountsManager.getByServiceIdentifier(new AciServiceIdentifier(INTERNATIONAL_UUID))).thenReturn(Optional.of(internationalAccount));
 
-    final DynamicDeliveryLatencyConfiguration deliveryLatencyConfiguration = mock(DynamicDeliveryLatencyConfiguration.class);
-    when(deliveryLatencyConfiguration.instrumentedVersions()).thenReturn(Collections.emptyMap());
-
     final DynamicInboundMessageByteLimitConfiguration inboundMessageByteLimitConfiguration =
         mock(DynamicInboundMessageByteLimitConfiguration.class);
 
     when(inboundMessageByteLimitConfiguration.enforceInboundLimit()).thenReturn(false);
 
     final DynamicConfiguration dynamicConfiguration = mock(DynamicConfiguration.class);
-    when(dynamicConfiguration.getDeliveryLatencyConfiguration()).thenReturn(deliveryLatencyConfiguration);
     when(dynamicConfiguration.getInboundMessageByteLimitConfiguration()).thenReturn(inboundMessageByteLimitConfiguration);
 
     when(dynamicConfigurationManager.getConfiguration()).thenReturn(dynamicConfiguration);

service/src/test/java/org/whispersystems/textsecuregcm/metrics/UserAgentTagUtilTest.java

@@ -6,6 +6,9 @@
 package org.whispersystems.textsecuregcm.metrics;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import com.vdurmont.semver4j.Semver;
 import io.micrometer.core.instrument.Tag;
@@ -17,6 +20,7 @@ import java.util.stream.Stream;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.whispersystems.textsecuregcm.storage.ClientReleaseManager;
 import org.whispersystems.textsecuregcm.util.ua.ClientPlatform;
 
 class UserAgentTagUtilTest {
@@ -49,26 +53,21 @@ class UserAgentTagUtilTest {
   @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
   @ParameterizedTest
   @MethodSource
-  void getClientVersionTag(final String userAgent, final Map<ClientPlatform, Set<Semver>> taggedVersions, final Optional<Tag> expectedTag) {
-    assertEquals(expectedTag, UserAgentTagUtil.getClientVersionTag(userAgent, taggedVersions));
+  void getClientVersionTag(final String userAgent, final boolean isVersionLive, final Optional<Tag> expectedTag) {
+    final ClientReleaseManager clientReleaseManager = mock(ClientReleaseManager.class);
+    when(clientReleaseManager.isVersionActive(any(), any())).thenReturn(isVersionLive);
+
+    assertEquals(expectedTag, UserAgentTagUtil.getClientVersionTag(userAgent, clientReleaseManager));
   }
 
   private static Stream<Arguments> getClientVersionTag() {
     return Stream.of(
         Arguments.of("Signal-Android/1.2.3 (Android 9)",
-            Map.of(ClientPlatform.ANDROID, Set.of(new Semver("1.2.3"))),
+            true,
             Optional.of(Tag.of(UserAgentTagUtil.VERSION_TAG, "1.2.3"))),
 
         Arguments.of("Signal-Android/1.2.3 (Android 9)",
-            Collections.emptyMap(),
-            Optional.empty()),
-
-        Arguments.of("Signal-Android/1.2.3.0-bobsbootlegclient",
-            Map.of(ClientPlatform.ANDROID, Set.of(new Semver("1.2.3"))),
-            Optional.empty()),
-
-        Arguments.of("Signal-Desktop/1.2.3",
-            Map.of(ClientPlatform.ANDROID, Set.of(new Semver("1.2.3"))),
+            false,
             Optional.empty())
     );
   }

service/src/test/java/org/whispersystems/textsecuregcm/push/PushLatencyManagerTest.java

@@ -9,47 +9,28 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 import java.time.Clock;
 import java.time.Instant;
 import java.time.ZoneId;
-import java.util.Collections;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Stream;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicConfiguration;
-import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicPushLatencyConfiguration;
 import org.whispersystems.textsecuregcm.push.PushLatencyManager.PushRecord;
 import org.whispersystems.textsecuregcm.push.PushLatencyManager.PushType;
 import org.whispersystems.textsecuregcm.redis.RedisClusterExtension;
-import org.whispersystems.textsecuregcm.storage.DynamicConfigurationManager;
+import org.whispersystems.textsecuregcm.storage.ClientReleaseManager;
 
 class PushLatencyManagerTest {
 
   @RegisterExtension
   static final RedisClusterExtension REDIS_CLUSTER_EXTENSION = RedisClusterExtension.builder().build();
 
-  private DynamicConfigurationManager<DynamicConfiguration> dynamicConfigurationManager;
-
-  @BeforeEach
-  void setUp() {
-    //noinspection unchecked
-    dynamicConfigurationManager = mock(DynamicConfigurationManager.class);
-    final DynamicConfiguration dynamicConfiguration = mock(DynamicConfiguration.class);
-    final DynamicPushLatencyConfiguration dynamicPushLatencyConfiguration = mock(DynamicPushLatencyConfiguration.class);
-
-    when(dynamicConfigurationManager.getConfiguration()).thenReturn(dynamicConfiguration);
-    when(dynamicConfiguration.getPushLatencyConfiguration()).thenReturn(dynamicPushLatencyConfiguration);
-    when(dynamicPushLatencyConfiguration.instrumentedVersions()).thenReturn(Collections.emptyMap());
-  }
-
   @ParameterizedTest
   @MethodSource
   void testTakeRecord(final boolean isVoip, final boolean isUrgent) throws ExecutionException, InterruptedException {
@@ -59,7 +40,7 @@ class PushLatencyManagerTest {
     final Instant pushTimestamp = Instant.now();
 
     final PushLatencyManager pushLatencyManager = new PushLatencyManager(REDIS_CLUSTER_EXTENSION.getRedisCluster(),
-        dynamicConfigurationManager, Clock.fixed(pushTimestamp, ZoneId.systemDefault()));
+        mock(ClientReleaseManager.class), Clock.fixed(pushTimestamp, ZoneId.systemDefault()));
 
     assertNull(pushLatencyManager.takePushRecord(accountUuid, deviceId).get());
 

service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionIntegrationTest.java

@@ -25,7 +25,6 @@ import java.io.IOException;
 import java.time.Clock;
 import java.time.Duration;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
@@ -45,15 +44,13 @@ import org.junit.jupiter.params.provider.CsvSource;
 import org.mockito.ArgumentCaptor;
 import org.mockito.stubbing.Answer;
 import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount;
-import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicConfiguration;
-import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicDeliveryLatencyConfiguration;
 import org.whispersystems.textsecuregcm.entities.MessageProtos;
 import org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope;
 import org.whispersystems.textsecuregcm.push.ReceiptSender;
 import org.whispersystems.textsecuregcm.redis.RedisClusterExtension;
 import org.whispersystems.textsecuregcm.storage.Account;
+import org.whispersystems.textsecuregcm.storage.ClientReleaseManager;
 import org.whispersystems.textsecuregcm.storage.Device;
-import org.whispersystems.textsecuregcm.storage.DynamicConfigurationManager;
 import org.whispersystems.textsecuregcm.storage.DynamoDbExtension;
 import org.whispersystems.textsecuregcm.storage.DynamoDbExtensionSchema.Tables;
 import org.whispersystems.textsecuregcm.storage.MessagesCache;
@@ -83,7 +80,7 @@ class WebSocketConnectionIntegrationTest {
   private Device device;
   private WebSocketClient webSocketClient;
   private Scheduler messageDeliveryScheduler;
-  private DynamicConfigurationManager<DynamicConfiguration> dynamicConfigurationManager;
+  private ClientReleaseManager clientReleaseManager;
 
   private long serialTimestamp = System.currentTimeMillis();
 
@@ -102,15 +99,7 @@ class WebSocketConnectionIntegrationTest {
     account = mock(Account.class);
     device = mock(Device.class);
     webSocketClient = mock(WebSocketClient.class);
-
-    final DynamicDeliveryLatencyConfiguration deliveryLatencyConfiguration = mock(DynamicDeliveryLatencyConfiguration.class);
-    when(deliveryLatencyConfiguration.instrumentedVersions()).thenReturn(Collections.emptyMap());
-
-    final DynamicConfiguration dynamicConfiguration = mock(DynamicConfiguration.class);
-    when(dynamicConfiguration.getDeliveryLatencyConfiguration()).thenReturn(deliveryLatencyConfiguration);
-
-    dynamicConfigurationManager = mock(DynamicConfigurationManager.class);
-    when(dynamicConfigurationManager.getConfiguration()).thenReturn(dynamicConfiguration);
+    clientReleaseManager = mock(ClientReleaseManager.class);
 
     when(account.getNumber()).thenReturn("+18005551234");
     when(account.getUuid()).thenReturn(UUID.randomUUID());
@@ -140,7 +129,8 @@ class WebSocketConnectionIntegrationTest {
         device,
         webSocketClient,
         scheduledExecutorService,
-        messageDeliveryScheduler, dynamicConfigurationManager);
+        messageDeliveryScheduler,
+        clientReleaseManager);
 
     final List<MessageProtos.Envelope> expectedMessages = new ArrayList<>(persistedMessageCount + cachedMessageCount);
 
@@ -224,7 +214,8 @@ class WebSocketConnectionIntegrationTest {
         device,
         webSocketClient,
         scheduledExecutorService,
-        messageDeliveryScheduler, dynamicConfigurationManager);
+        messageDeliveryScheduler,
+        clientReleaseManager);
 
     final int persistedMessageCount = 207;
     final int cachedMessageCount = 173;
@@ -291,7 +282,7 @@ class WebSocketConnectionIntegrationTest {
         100, // use a very short timeout, so that this test completes quickly
         scheduledExecutorService,
         messageDeliveryScheduler,
-        dynamicConfigurationManager);
+        clientReleaseManager);
 
     final int persistedMessageCount = 207;
     final int cachedMessageCount = 173;

service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionTest.java

@@ -33,7 +33,6 @@ import io.lettuce.core.RedisException;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
-import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -53,16 +52,14 @@ import org.junit.jupiter.api.Test;
 import org.mockito.stubbing.Answer;
 import org.whispersystems.textsecuregcm.auth.AccountAuthenticator;
 import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount;
-import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicConfiguration;
-import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicDeliveryLatencyConfiguration;
 import org.whispersystems.textsecuregcm.identity.AciServiceIdentifier;
 import org.whispersystems.textsecuregcm.push.ClientPresenceManager;
 import org.whispersystems.textsecuregcm.push.PushNotificationManager;
 import org.whispersystems.textsecuregcm.push.ReceiptSender;
 import org.whispersystems.textsecuregcm.storage.Account;
 import org.whispersystems.textsecuregcm.storage.AccountsManager;
+import org.whispersystems.textsecuregcm.storage.ClientReleaseManager;
 import org.whispersystems.textsecuregcm.storage.Device;
-import org.whispersystems.textsecuregcm.storage.DynamicConfigurationManager;
 import org.whispersystems.textsecuregcm.storage.MessagesManager;
 import org.whispersystems.textsecuregcm.util.Pair;
 import org.whispersystems.websocket.WebSocketClient;
@@ -93,7 +90,7 @@ class WebSocketConnectionTest {
   private ReceiptSender receiptSender;
   private ScheduledExecutorService retrySchedulingExecutor;
   private Scheduler messageDeliveryScheduler;
-  private DynamicConfigurationManager<DynamicConfiguration> dynamicConfigurationManager;
+  private ClientReleaseManager clientReleaseManager;
 
   @BeforeEach
   void setup() {
@@ -107,15 +104,7 @@ class WebSocketConnectionTest {
     receiptSender = mock(ReceiptSender.class);
     retrySchedulingExecutor = mock(ScheduledExecutorService.class);
     messageDeliveryScheduler = Schedulers.newBoundedElastic(10, 10_000, "messageDelivery");
-
-    final DynamicDeliveryLatencyConfiguration deliveryLatencyConfiguration = mock(DynamicDeliveryLatencyConfiguration.class);
-    when(deliveryLatencyConfiguration.instrumentedVersions()).thenReturn(Collections.emptyMap());
-
-    final DynamicConfiguration dynamicConfiguration = mock(DynamicConfiguration.class);
-    when(dynamicConfiguration.getDeliveryLatencyConfiguration()).thenReturn(deliveryLatencyConfiguration);
-
-    dynamicConfigurationManager = mock(DynamicConfigurationManager.class);
-    when(dynamicConfigurationManager.getConfiguration()).thenReturn(dynamicConfiguration);
+    clientReleaseManager = mock(ClientReleaseManager.class);
   }
 
   @AfterEach
@@ -129,7 +118,7 @@ class WebSocketConnectionTest {
     WebSocketAccountAuthenticator webSocketAuthenticator = new WebSocketAccountAuthenticator(accountAuthenticator);
     AuthenticatedConnectListener connectListener = new AuthenticatedConnectListener(receiptSender, messagesManager,
         mock(PushNotificationManager.class), mock(ClientPresenceManager.class),
-        retrySchedulingExecutor, messageDeliveryScheduler, dynamicConfigurationManager);
+        retrySchedulingExecutor, messageDeliveryScheduler, clientReleaseManager);
     WebSocketSessionContext sessionContext = mock(WebSocketSessionContext.class);
 
     when(accountAuthenticator.authenticate(eq(new BasicCredentials(VALID_USER, VALID_PASSWORD))))
@@ -209,7 +198,7 @@ class WebSocketConnectionTest {
         });
 
     WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager,
-        auth, device, client, retrySchedulingExecutor, Schedulers.immediate(), dynamicConfigurationManager);
+        auth, device, client, retrySchedulingExecutor, Schedulers.immediate(), clientReleaseManager);
 
     connection.start();
     verify(client, times(3)).sendRequest(eq("PUT"), eq("/api/v1/message"), any(List.class),
@@ -237,7 +226,7 @@ class WebSocketConnectionTest {
   public void testOnlineSend() {
     final WebSocketClient client = mock(WebSocketClient.class);
     final WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, auth, device, client,
-        retrySchedulingExecutor, Schedulers.immediate(), dynamicConfigurationManager);
+        retrySchedulingExecutor, Schedulers.immediate(), clientReleaseManager);
 
     final UUID accountUuid = UUID.randomUUID();
 
@@ -357,7 +346,7 @@ class WebSocketConnectionTest {
         });
 
     WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager,
-        auth, device, client, retrySchedulingExecutor, Schedulers.immediate(), dynamicConfigurationManager);
+        auth, device, client, retrySchedulingExecutor, Schedulers.immediate(), clientReleaseManager);
 
     connection.start();
 
@@ -381,7 +370,7 @@ class WebSocketConnectionTest {
   void testProcessStoredMessageConcurrency() {
     final WebSocketClient client = mock(WebSocketClient.class);
     final WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, auth, device, client,
-        retrySchedulingExecutor, Schedulers.immediate(), dynamicConfigurationManager);
+        retrySchedulingExecutor, Schedulers.immediate(), clientReleaseManager);
 
     when(account.getNumber()).thenReturn("+18005551234");
     when(account.getUuid()).thenReturn(UUID.randomUUID());
@@ -446,7 +435,7 @@ class WebSocketConnectionTest {
   void testProcessStoredMessagesMultiplePages() {
     final WebSocketClient client = mock(WebSocketClient.class);
     final WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, auth, device, client,
-        retrySchedulingExecutor, Schedulers.immediate(), dynamicConfigurationManager);
+        retrySchedulingExecutor, Schedulers.immediate(), clientReleaseManager);
 
     when(account.getNumber()).thenReturn("+18005551234");
     final UUID accountUuid = UUID.randomUUID();
@@ -498,7 +487,7 @@ class WebSocketConnectionTest {
   void testProcessStoredMessagesContainsSenderUuid() {
     final WebSocketClient client = mock(WebSocketClient.class);
     final WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, auth, device, client,
-        retrySchedulingExecutor, Schedulers.immediate(), dynamicConfigurationManager);
+        retrySchedulingExecutor, Schedulers.immediate(), clientReleaseManager);
 
     when(account.getNumber()).thenReturn("+18005551234");
     final UUID accountUuid = UUID.randomUUID();
@@ -560,7 +549,7 @@ class WebSocketConnectionTest {
   void testProcessStoredMessagesSingleEmptyCall() {
     final WebSocketClient client = mock(WebSocketClient.class);
     final WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, auth, device, client,
-        retrySchedulingExecutor, Schedulers.immediate(), dynamicConfigurationManager);
+        retrySchedulingExecutor, Schedulers.immediate(), clientReleaseManager);
 
     final UUID accountUuid = UUID.randomUUID();
 
@@ -589,7 +578,7 @@ class WebSocketConnectionTest {
   public void testRequeryOnStateMismatch() {
     final WebSocketClient client = mock(WebSocketClient.class);
     final WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, auth, device, client,
-        retrySchedulingExecutor, Schedulers.immediate(), dynamicConfigurationManager);
+        retrySchedulingExecutor, Schedulers.immediate(), clientReleaseManager);
     final UUID accountUuid = UUID.randomUUID();
 
     when(account.getNumber()).thenReturn("+18005551234");
@@ -645,7 +634,7 @@ class WebSocketConnectionTest {
   void testProcessCachedMessagesOnly() {
     final WebSocketClient client = mock(WebSocketClient.class);
     final WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, auth, device, client,
-        retrySchedulingExecutor, Schedulers.immediate(), dynamicConfigurationManager);
+        retrySchedulingExecutor, Schedulers.immediate(), clientReleaseManager);
 
     final UUID accountUuid = UUID.randomUUID();
 
@@ -677,7 +666,7 @@ class WebSocketConnectionTest {
   void testProcessDatabaseMessagesAfterPersist() {
     final WebSocketClient client = mock(WebSocketClient.class);
     final WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, auth, device, client,
-        retrySchedulingExecutor, Schedulers.immediate(), dynamicConfigurationManager);
+        retrySchedulingExecutor, Schedulers.immediate(), clientReleaseManager);
 
     final UUID accountUuid = UUID.randomUUID();
 
@@ -724,7 +713,7 @@ class WebSocketConnectionTest {
     when(client.isOpen()).thenReturn(true);
 
     WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, auth, device, client,
-        retrySchedulingExecutor, Schedulers.immediate(), dynamicConfigurationManager);
+        retrySchedulingExecutor, Schedulers.immediate(), clientReleaseManager);
     connection.start();
 
     verify(retrySchedulingExecutor, times(WebSocketConnection.MAX_CONSECUTIVE_RETRIES)).schedule(any(Runnable.class),
@@ -748,7 +737,7 @@ class WebSocketConnectionTest {
     when(client.isOpen()).thenReturn(false);
 
     WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, auth, device, client,
-        retrySchedulingExecutor, Schedulers.immediate(), dynamicConfigurationManager);
+        retrySchedulingExecutor, Schedulers.immediate(), clientReleaseManager);
     connection.start();
 
     verify(retrySchedulingExecutor, never()).schedule(any(Runnable.class), anyLong(), any());
@@ -782,7 +771,7 @@ class WebSocketConnectionTest {
         CompletableFuture.completedFuture(Optional.empty()));
 
     WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, auth, device, client,
-        retrySchedulingExecutor, messageDeliveryScheduler, dynamicConfigurationManager);
+        retrySchedulingExecutor, messageDeliveryScheduler, clientReleaseManager);
 
     connection.start();
 
@@ -839,7 +828,7 @@ class WebSocketConnectionTest {
         CompletableFuture.completedFuture(Optional.empty()));
 
     WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, auth, device, client,
-        retrySchedulingExecutor, Schedulers.immediate(), dynamicConfigurationManager);
+        retrySchedulingExecutor, Schedulers.immediate(), clientReleaseManager);
 
     connection.start();