Polish

See gh-3800
micrometer-metrics · Jun 28, 2023 · 447c482 · 447c482
1 parent 80e8682
commit 447c482
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/.../io/micrometer/core/instrument/binder/httpcomponents/hc5/ObservationExecChainHandler.java b/.../io/micrometer/core/instrument/binder/httpcomponents/hc5/ObservationExecChainHandler.java
@@ -52,7 +52,8 @@
  *   .addExecInterceptorLast("micrometer", new ObservationExecChainHandler(observationRegistry))
  *   .build();
  * </pre>
- * <p>Note that the {@link ObservationExecChainHandler} must always be inserted after the
+ * <p>
+ * Note that the {@link ObservationExecChainHandler} must always be inserted after the
  * {@link ChainElement#RETRY retry interceptor}, preferably last.
  *
  * @author Brian Clozel
@@ -65,7 +66,6 @@ public class ObservationExecChainHandler implements ExecChainHandler, AsyncExecC
     @Nullable
     private final ApacheHttpClientObservationConvention observationConvention;
 
-
     public ObservationExecChainHandler(ObservationRegistry observationRegistry,
             @Nullable ApacheHttpClientObservationConvention observationConvention) {
         this.observationRegistry = observationRegistry;
@@ -76,21 +76,20 @@ public ObservationExecChainHandler(ObservationRegistry observationRegistry) {
         this(observationRegistry, null);
     }
 
-
     @Override
     public void execute(HttpRequest request, AsyncEntityProducer entityProducer, AsyncExecChain.Scope scope,
             AsyncExecChain chain, AsyncExecCallback asyncExecCallback) throws HttpException, IOException {
         ApacheHttpClientContext observationContext = new ApacheHttpClientContext(request, scope.clientContext);
         Observation observation = ApacheHttpClientObservationDocumentation.DEFAULT
             .observation(observationConvention, DefaultApacheHttpClientObservationConvention.INSTANCE,
-                () -> observationContext, observationRegistry)
+                    () -> observationContext, observationRegistry)
             .start();
         ObervableCancellableDependency cancellable = new ObervableCancellableDependency(observation);
         chain.proceed(request, entityProducer, cancellable.wrapScope(scope), new AsyncExecCallback() {
 
             @Override
             public AsyncDataConsumer handleResponse(HttpResponse response, EntityDetails entityDetails)
-                throws HttpException, IOException {
+                    throws HttpException, IOException {
                 observationContext.setResponse(response);
                 observation.stop();
                 return asyncExecCallback.handleResponse(response, entityDetails);

diff --git a/...core/instrument/binder/httpcomponents/hc5/ObservationExecChainHandlerIntegrationTest.java b/...core/instrument/binder/httpcomponents/hc5/ObservationExecChainHandlerIntegrationTest.java
@@ -174,7 +174,7 @@ void recordProtocolErrorsAsIoErrors(@WiremockResolver.Wiremock WireMockServer se
 
         @Test
         void recordSocketTimeoutAsIoErrors(@WiremockResolver.Wiremock WireMockServer server) throws Exception {
-            server.stubFor(get(urlEqualTo("/delayed")).willReturn(aResponse().withStatus(200).withFixedDelay(2100)));
+            server.stubFor(get(urlEqualTo("/delayed")).willReturn(aResponse().withStatus(200).withFixedDelay(2000)));
             try (CloseableHttpClient client = classicClient()) {
                 assertThatThrownBy(() -> executeClassic(client, new HttpGet(server.baseUrl() + "/delayed")))
                     .isInstanceOf(SocketTimeoutException.class);
@@ -409,8 +409,8 @@ private CloseableHttpAsyncClient asyncClient() {
                 TimeValue.ofMilliseconds(500L));
 
         ConnectionConfig connectionConfig = ConnectionConfig.custom()
-            .setSocketTimeout(2000, TimeUnit.MILLISECONDS)
-            .setConnectTimeout(2000L, TimeUnit.MILLISECONDS)
+            .setSocketTimeout(1000, TimeUnit.MILLISECONDS)
+            .setConnectTimeout(1000, TimeUnit.MILLISECONDS)
             .build();
 
         HttpAsyncClientBuilder clientBuilder = HttpAsyncClients.custom()