Repository: incubator-htrace Updated Branches: refs/heads/master cec039de5 -> feaccb807
HTRACE-51. addendum: fix nanoseconds / milliseconds mixup in logging timeout Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/feaccb80 Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/feaccb80 Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/feaccb80 Branch: refs/heads/master Commit: feaccb807e2b21376dfb7ffdcc0d4b5a227c3e76 Parents: cec039d Author: Colin P. Mccabe <[email protected]> Authored: Fri Jan 30 15:28:52 2015 -0800 Committer: Colin P. Mccabe <[email protected]> Committed: Fri Jan 30 15:28:52 2015 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/htrace/impl/HTracedRESTReceiver.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/feaccb80/htrace-htraced/src/main/java/org/apache/htrace/impl/HTracedRESTReceiver.java ---------------------------------------------------------------------- diff --git a/htrace-htraced/src/main/java/org/apache/htrace/impl/HTracedRESTReceiver.java b/htrace-htraced/src/main/java/org/apache/htrace/impl/HTracedRESTReceiver.java index 38279f6..35cd332 100644 --- a/htrace-htraced/src/main/java/org/apache/htrace/impl/HTracedRESTReceiver.java +++ b/htrace-htraced/src/main/java/org/apache/htrace/impl/HTracedRESTReceiver.java @@ -236,13 +236,15 @@ public class HTracedRESTReceiver implements SpanReceiver { return this.queue.isEmpty(); } + private static long WARN_TIMEOUT_MS = 300000; + @Override public void receiveSpan(Span span) { if (!this.queue.offer(span)) { // TODO: If failed the offer, run the background thread now. I can't block though? - long now = System.nanoTime(); + long now = System.nanoTime() / 1000000L; // Only log every 5 minutes. Any more than this for a guest process is obnoxious - if ((now / 1000000) - lastAtCapacityWarningLog > 300000) { + if (now - lastAtCapacityWarningLog > WARN_TIMEOUT_MS) { LOG.warn("At capacity"); this.lastAtCapacityWarningLog = now; }
