Polish gh-4753

micrometer-metrics · May 13, 2024 · 394cb20 · 394cb20
1 parent af7093f
commit 394cb20
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 31 deletions.
diff --git a/micrometer-jetty12/src/main/java/io/micrometer/jetty12/server/TimedHandler.java b/micrometer-jetty12/src/main/java/io/micrometer/jetty12/server/TimedHandler.java
@@ -20,14 +20,12 @@
 import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.Timer;
 import org.eclipse.jetty.http.HttpFields;
-import org.eclipse.jetty.io.Content;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.handler.EventsHandler;
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.util.component.Graceful;
 
-import java.nio.ByteBuffer;
 import java.util.concurrent.CompletableFuture;
 
 /**
@@ -66,7 +64,7 @@ public boolean isShutdownDone() {
     private final LongTaskTimer timerRequest;
 
     /**
-     * How many Request are inside handle() calls.
+     * How many Requests are inside handle() calls.
      */
     private final LongTaskTimer timerHandle;
 
@@ -97,11 +95,6 @@ protected void onBeforeHandling(Request request) {
         super.onBeforeHandling(request);
     }
 
-    @Override
-    protected void onRequestRead(Request request, Content.Chunk chunk) {
-        super.onRequestRead(request, chunk);
-    }
-
     @Override
     protected void onAfterHandling(Request request, boolean handled, Throwable failure) {
         stopHandlerTiming(request);
@@ -115,21 +108,6 @@ protected void onResponseBegin(Request request, int status, HttpFields headers)
         super.onResponseBegin(request, status, headers);
     }
 
-    @Override
-    protected void onResponseWrite(Request request, boolean last, ByteBuffer content) {
-        super.onResponseWrite(request, last, content);
-    }
-
-    @Override
-    protected void onResponseWriteComplete(Request request, Throwable failure) {
-        super.onResponseWriteComplete(request, failure);
-    }
-
-    @Override
-    protected void onResponseTrailersComplete(Request request, HttpFields trailers) {
-        super.onResponseTrailersComplete(request, trailers);
-    }
-
     @Override
     protected void onComplete(Request request, Throwable failure) {
         stopRequestTiming(request);

diff --git a/micrometer-jetty12/src/test/java/io/micrometer/jetty12/server/TimedHandlerTest.java b/micrometer-jetty12/src/test/java/io/micrometer/jetty12/server/TimedHandlerTest.java
@@ -87,14 +87,13 @@ public boolean handle(Request request, Response response, Callback callback) {
                     barrier[1].await(5, TimeUnit.SECONDS);
                     response.write(true, BufferUtil.EMPTY_BUFFER, callback);
                 }
-                catch (Exception x) {
+                catch (Exception e) {
                     Thread.currentThread().interrupt();
-                    callback.failed(x);
+                    callback.failed(e);
                 }
                 return true;
             }
         });
-        // server.setDumpAfterStart(true);
         server.start();
 
         try (LocalConnector.LocalEndPoint endpoint1 = connector.connect();
@@ -114,10 +113,10 @@ public boolean handle(Request request, Response response, Callback callback) {
             // Read the two responses to ensure that they are complete
             HttpTester.Response response1 = HttpTester.parseResponse(endpoint1.getResponse());
             assertThat(response1.getStatus()).isEqualTo(HttpStatus.OK_200);
-            assertThat(response1.getContent()).isEqualTo("");
+            assertThat(response1.getContent()).isEmpty();
             HttpTester.Response response2 = HttpTester.parseResponse(endpoint2.getResponse());
             assertThat(response2.getStatus()).isEqualTo(HttpStatus.OK_200);
-            assertThat(response2.getContent()).isEqualTo("");
+            assertThat(response2.getContent()).isEmpty();
 
             assertThat(registry.get("jetty.server.requests")
                 .tag("outcome", Outcome.SUCCESS.name())
@@ -179,7 +178,7 @@ public boolean handle(Request request, Response response, Callback callback) {
             // Read response to ensure it is done
             HttpTester.Response response1 = HttpTester.parseResponse(endpoint.getResponse());
             assertThat(response1.getStatus()).isEqualTo(HttpStatus.OK_200);
-            assertThat(response1.getContent()).isEqualTo("");
+            assertThat(response1.getContent()).isEmpty();
 
             Thread.sleep(delay);
             shutdown.check();

diff --git a/micrometer-jetty12/src/test/resources/logback.xml b/micrometer-jetty12/src/test/resources/logback.xml
@@ -35,6 +35,4 @@
     <logger name="/" level="warn"/>
     <logger name="WireMock" level="warn"/>
     <logger name="ru.lanwen.wiremock" level="warn"/>
-
-    <logger name="org.springframework" level="warn"/>
 </configuration>