Add debug logging and increase timeouts for flaky OpAMP client tests

- Increase takeRequest timeout from 1s to 5s
- Increase await timeouts from 1s to 5s
- Add detailed debug logging to failing test methods
- This should help identify the root cause of sporadic test failures

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());
   }
@@ -231,50 +231,67 @@ void onSuccess_withNoChangesToReport_doNotNotifyCallbackOnMessage() {
 
   @Test
   void verifyAgentDescriptionSetter() {
+    System.out.println("DEBUG: Starting verifyAgentDescriptionSetter test");
     initializeClient();
     AgentDescription agentDescription =
         getAgentDescriptionWithOneIdentifyingValue("service.name", "My service");
 
     // Update when changed
+    System.out.println("DEBUG: Setting agent description and expecting request...");
     enqueueServerToAgentResponse(new ServerToAgent.Builder().build());
     client.setAgentDescription(agentDescription);
-    assertThat(takeRequest()).isNotNull();
+    RecordedRequest firstRequest = takeRequest();
+    System.out.println("DEBUG: First request result: " + (firstRequest != null));
+    assertThat(firstRequest).isNotNull();
 
     // Ignore when the provided value is the same as the current one
+    System.out.println("DEBUG: Setting same agent description and expecting no request...");
     enqueueServerToAgentResponse(new ServerToAgent.Builder().build());
     client.setAgentDescription(agentDescription);
-    assertThat(takeRequest()).isNull();
+    RecordedRequest secondRequest = takeRequest();
+    System.out.println("DEBUG: Second request result: " + (secondRequest != null));
+    assertThat(secondRequest).isNull();
+    System.out.println("DEBUG: verifyAgentDescriptionSetter test completed");
   }
 
   @Test
   void verifyRemoteConfigStatusSetter() {
+    System.out.println("DEBUG: Starting verifyRemoteConfigStatusSetter test");
     initializeClient();
     RemoteConfigStatus remoteConfigStatus =
         getRemoteConfigStatus(RemoteConfigStatuses.RemoteConfigStatuses_APPLYING);
 
     // Update when changed
+    System.out.println("DEBUG: Setting remote config status and expecting request...");
     enqueueServerToAgentResponse(new ServerToAgent.Builder().build());
     client.setRemoteConfigStatus(remoteConfigStatus);
-    assertThat(takeRequest()).isNotNull();
+    RecordedRequest firstRequest = takeRequest();
+    System.out.println("DEBUG: First request result: " + (firstRequest != null));
+    assertThat(firstRequest).isNotNull();
 
     // Ignore when the provided value is the same as the current one
+    System.out.println("DEBUG: Setting same remote config status and expecting no request...");
     enqueueServerToAgentResponse(new ServerToAgent.Builder().build());
     client.setRemoteConfigStatus(remoteConfigStatus);
-    assertThat(takeRequest()).isNull();
+    RecordedRequest secondRequest = takeRequest();
+    System.out.println("DEBUG: Second request result: " + (secondRequest != null));
+    assertThat(secondRequest).isNull();
+    System.out.println("DEBUG: verifyRemoteConfigStatusSetter test completed");
   }
 
   @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());
   }
 
   @Test
   void onFailedResponse_keepFieldsForNextRequest() {
+    System.out.println("DEBUG: Starting onFailedResponse_keepFieldsForNextRequest test");
     initializeClient();
 
     // Mock failed request
@@ -283,22 +300,35 @@ void onFailedResponse_keepFieldsForNextRequest() {
     // Adding a non-constant field
     AgentDescription agentDescription =
         getAgentDescriptionWithOneIdentifyingValue("service.namespace", "something");
+    System.out.println("DEBUG: Setting agent description and expecting first request...");
     client.setAgentDescription(agentDescription);
 
     // Assert first request contains it
-    assertThat(getAgentToServerMessage(takeRequest()).agent_description)
+    RecordedRequest firstRequest = takeRequest();
+    System.out.println("DEBUG: First request agent_description: " + 
+        (getAgentToServerMessage(firstRequest).agent_description != null ? "present" : "null"));
+    assertThat(getAgentToServerMessage(firstRequest).agent_description)
         .isEqualTo(agentDescription);
 
     // Since it failed, send the agent description field in the next request
+    System.out.println("DEBUG: Sending request after failure, expecting agent description to be kept...");
     enqueueServerToAgentResponse(new ServerToAgent.Builder().build());
     requestService.sendRequest();
-    assertThat(getAgentToServerMessage(takeRequest()).agent_description)
+    RecordedRequest secondRequest = takeRequest();
+    System.out.println("DEBUG: Second request agent_description: " + 
+        (getAgentToServerMessage(secondRequest).agent_description != null ? "present" : "null"));
+    assertThat(getAgentToServerMessage(secondRequest).agent_description)
         .isEqualTo(agentDescription);
 
     // When there's no failure, do not keep it.
+    System.out.println("DEBUG: Sending request after success, expecting agent description to be null...");
     enqueueServerToAgentResponse(new ServerToAgent.Builder().build());
     requestService.sendRequest();
-    assertThat(getAgentToServerMessage(takeRequest()).agent_description).isNull();
+    RecordedRequest thirdRequest = takeRequest();
+    System.out.println("DEBUG: Third request agent_description: " + 
+        (getAgentToServerMessage(thirdRequest).agent_description != null ? "present" : "null"));
+    assertThat(getAgentToServerMessage(thirdRequest).agent_description).isNull();
+    System.out.println("DEBUG: onFailedResponse_keepFieldsForNextRequest test completed");
   }
 
   @Test
@@ -311,7 +341,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 +374,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,8 +389,12 @@ private static AgentToServer getAgentToServerMessage(RecordedRequest request) {
 
   private RecordedRequest takeRequest() {
     try {
-      return server.takeRequest(1, TimeUnit.SECONDS);
+      System.out.println("DEBUG: Attempting to take request with 5 second timeout...");
+      RecordedRequest request = server.takeRequest(5, TimeUnit.SECONDS);
+      System.out.println("DEBUG: Request received: " + (request != null ? request.getRequestLine() : "null"));
+      return request;
     } catch (InterruptedException e) {
+      System.out.println("DEBUG: takeRequest interrupted");
       throw new RuntimeException(e);
     }
   }