Merge branch 'main' into renovate/errorprone-packages

Author: laurit

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());
   }
@@ -267,7 +267,7 @@ void verifyRemoteConfigStatusSetter() {
   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 +311,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 +344,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 +359,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);
     }

samplers/README.md

@@ -8,7 +8,7 @@ The following samplers support [declarative configuration](https://opentelemetry
 
 To use:
 
-* Add a dependency on `io.opentelemetry:opentelemetry-sdk-extension-incubator:<version>`
+* Add a dependency on `io.opentelemetry.contrib:opentelemetry-samplers:<version>`
 * Follow the [instructions](https://github.com/open-telemetry/opentelemetry-java/blob/main/sdk-extensions/incubator/README.md#file-configuration) to configure OpenTelemetry with declarative configuration.
 * Configure the `.tracer_provider.sampler` to include the `rule_based_routing` sampler.