Merge pull request Netflix#1152 from elandau/improve_logging

qiangdavidliu · web-flow · commit 44bf4cabe268 · 2018-11-12T09:52:40.000-08:00
Improved logging
diff --git a/eureka-client/src/main/java/com/netflix/discovery/TimedSupervisorTask.java b/eureka-client/src/main/java/com/netflix/discovery/TimedSupervisorTask.java
@@ -25,6 +25,7 @@
 public class TimedSupervisorTask extends TimerTask {
     private static final Logger logger = LoggerFactory.getLogger(TimedSupervisorTask.class);
 
+    private final Counter successCounter;
     private final Counter timeoutCounter;
     private final Counter rejectedCounter;
     private final Counter throwableCounter;
@@ -48,6 +49,7 @@ public TimedSupervisorTask(String name, ScheduledExecutorService scheduler, Thre
         this.maxDelay = timeoutMillis * expBackOffBound;
 
         // Initialize the counters and register.
+        successCounter = Monitors.newCounter("success");
         timeoutCounter = Monitors.newCounter("timeouts");
         rejectedCounter = Monitors.newCounter("rejectedExecutions");
         throwableCounter = Monitors.newCounter("throwables");
@@ -64,6 +66,7 @@ public void run() {
             future.get(timeoutMillis, TimeUnit.MILLISECONDS);  // block until done or timeout
             delay.set(timeoutMillis);
             threadPoolLevelGauge.set((long) executor.getActiveCount());
+            successCounter.increment();
         } catch (TimeoutException e) {
             logger.warn("task supervisor timed out", e);
             timeoutCounter.increment();
diff --git a/eureka-client/src/main/java/com/netflix/discovery/provider/DiscoveryJerseyProvider.java b/eureka-client/src/main/java/com/netflix/discovery/provider/DiscoveryJerseyProvider.java
@@ -104,10 +104,10 @@ public Object readFrom(Class serializableClass, Type type,
         } catch (Throwable e) {
             if (e instanceof Error) { // See issue: https://github.com/Netflix/eureka/issues/72 on why we catch Error here.
                 closeInputOnError(inputStream);
-                throw new WebApplicationException(createErrorReply(500, e, mediaType));
+                throw new WebApplicationException(e, createErrorReply(500, e, mediaType));
             }
             LOGGER.debug("Cannot parse request body", e);
-            throw new WebApplicationException(createErrorReply(400, "cannot parse request body", mediaType));
+            throw new WebApplicationException(e, createErrorReply(400, "cannot parse request body", mediaType));
         }
     }
 
diff --git a/eureka-client/src/main/java/com/netflix/discovery/shared/transport/decorator/RedirectingEurekaHttpClient.java b/eureka-client/src/main/java/com/netflix/discovery/shared/transport/decorator/RedirectingEurekaHttpClient.java
@@ -80,15 +80,15 @@ protected <R> EurekaHttpResponse<R> execute(RequestExecutor<R> requestExecutor)
                 TransportUtils.shutdown(delegateRef.getAndSet(currentEurekaClientRef.get()));
                 return response;
             } catch (Exception e) {
-                logger.error("Request execution error", e);
+                logger.error("Request execution error. endpoint={}", serviceEndpoint, e);
                 TransportUtils.shutdown(currentEurekaClientRef.get());
                 throw e;
             }
         } else {
             try {
                 return requestExecutor.execute(currentEurekaClient);
             } catch (Exception e) {
-                logger.error("Request execution error", e);
+                logger.error("Request execution error. endpoint={}", serviceEndpoint, e);
                 delegateRef.compareAndSet(currentEurekaClient, null);
                 currentEurekaClient.shutdown();
                 throw e;

Original file line number	Diff line number	Diff line change
`@@ -104,10 +104,10 @@ public Object readFrom(Class serializableClass, Type type,`
`104`	`104`	`} catch (Throwable e) {`
`105`	`105`	`if (e instanceof Error) { // See issue: https://github.com/Netflix/eureka/issues/72 on why we catch Error here.`
`106`	`106`	`closeInputOnError(inputStream);`
`107`		`- throw new WebApplicationException(createErrorReply(500, e, mediaType));`
	`107`	`+ throw new WebApplicationException(e, createErrorReply(500, e, mediaType));`
`108`	`108`	`}`
`109`	`109`	`LOGGER.debug("Cannot parse request body", e);`
`110`		`- throw new WebApplicationException(createErrorReply(400, "cannot parse request body", mediaType));`
	`110`	`+ throw new WebApplicationException(e, createErrorReply(400, "cannot parse request body", mediaType));`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`