TEST

Author: trask

opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/impl/OpampClientImplTest.java

@@ -209,7 +209,7 @@ void onSuccess_withChangesToReport_notifyCallbackOnMessage() {
     requestService.sendRequest();
 
     // Await for onMessage call
-    await().atMost(Duration.ofSeconds(1)).until(() -> callbacks.onMessageCalls.get() == 1);
+    await().atMost(Duration.ofSeconds(5)).until(() -> callbacks.onMessageCalls.get() == 1);
 
     verify(callbacks).onMessage(MessageData.builder().setRemoteConfig(remoteConfig).build());
   }
@@ -249,25 +249,22 @@ void verifyAgentDescriptionSetter() {
   @Test
   void verifyRemoteConfigStatusSetter() {
     initializeClient();
-    RemoteConfigStatus remoteConfigStatus =
-        getRemoteConfigStatus(RemoteConfigStatuses.RemoteConfigStatuses_APPLYING);
+    RemoteConfigStatus status = RemoteConfigStatus.builder().lastRemoteConfigHash("abcd").build();
 
     // Update when changed
-    enqueueServerToAgentResponse(new ServerToAgent.Builder().build());
-    client.setRemoteConfigStatus(remoteConfigStatus);
+    client.setRemoteConfigStatus(status);
     assertThat(takeRequest()).isNotNull();
 
     // Ignore when the provided value is the same as the current one
-    enqueueServerToAgentResponse(new ServerToAgent.Builder().build());
-    client.setRemoteConfigStatus(remoteConfigStatus);
+    client.setRemoteConfigStatus(status);
     assertThat(takeRequest()).isNull();
   }
 
   @Test
   void onConnectionSuccessful_notifyCallback() {
     initializeClient();
 
-    await().atMost(Duration.ofSeconds(1)).until(() -> callbacks.onConnectCalls.get() == 1);
+    await().atMost(Duration.ofSeconds(5)).until(() -> callbacks.onConnectCalls.get() == 1);
 
     verify(callbacks).onConnect();
     verify(callbacks, never()).onConnectFailed(any());
@@ -311,7 +308,7 @@ void onFailedResponse_withServerErrorData_notifyCallback() {
     // Force request
     requestService.sendRequest();
 
-    await().atMost(Duration.ofSeconds(1)).until(() -> callbacks.onErrorResponseCalls.get() == 1);
+    await().atMost(Duration.ofSeconds(5)).until(() -> callbacks.onErrorResponseCalls.get() == 1);
 
     verify(callbacks).onErrorResponse(errorResponse);
     verify(callbacks, never()).onMessage(any());
@@ -344,7 +341,7 @@ void whenServerProvidesNewInstanceUid_useIt() {
     enqueueServerToAgentResponse(response);
     requestService.sendRequest();
 
-    await().atMost(Duration.ofSeconds(1)).until(() -> state.instanceUid.get() != initialUid);
+    await().atMost(Duration.ofSeconds(5)).until(() -> state.instanceUid.get() != initialUid);
 
     assertThat(state.instanceUid.get()).isEqualTo(serverProvidedUid);
   }
@@ -359,7 +356,7 @@ private static AgentToServer getAgentToServerMessage(RecordedRequest request) {
 
   private RecordedRequest takeRequest() {
     try {
-      return server.takeRequest(1, TimeUnit.SECONDS);
+      return server.takeRequest(5, TimeUnit.SECONDS);
     } catch (InterruptedException e) {
       throw new RuntimeException(e);
     }