Repository: incubator-htrace Updated Branches: refs/heads/master 97e26a590 -> 817742a0a
HTRACE-113. Add more log4j messages to htrace SamplerBuilder, SpanReceiverBuilder, etc. (cmccabe) Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/817742a0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/817742a0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/817742a0 Branch: refs/heads/master Commit: 817742a0a8012e10fcf3805bee3076aeb35711f7 Parents: 97e26a5 Author: Colin P. Mccabe <[email protected]> Authored: Mon Feb 23 15:41:08 2015 -0800 Committer: Colin P. Mccabe <[email protected]> Committed: Mon Feb 23 19:04:28 2015 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/htrace/SamplerBuilder.java | 9 +++++++++ .../java/org/apache/htrace/SpanReceiverBuilder.java | 12 +++++++++++- .../org/apache/htrace/impl/LocalFileSpanReceiver.java | 6 +++++- .../java/org/apache/htrace/impl/ProbabilitySampler.java | 7 +++++++ .../org/apache/htrace/impl/StandardOutSpanReceiver.java | 5 +++++ .../org/apache/htrace/impl/HTracedRESTReceiver.java | 7 ++++++- .../org/apache/htrace/impl/TestHTracedRESTReceiver.java | 1 - 7 files changed, 43 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/817742a0/htrace-core/src/main/java/org/apache/htrace/SamplerBuilder.java ---------------------------------------------------------------------- diff --git a/htrace-core/src/main/java/org/apache/htrace/SamplerBuilder.java b/htrace-core/src/main/java/org/apache/htrace/SamplerBuilder.java index ed7e9b6..4364671 100644 --- a/htrace-core/src/main/java/org/apache/htrace/SamplerBuilder.java +++ b/htrace-core/src/main/java/org/apache/htrace/SamplerBuilder.java @@ -44,6 +44,15 @@ public class SamplerBuilder { } public Sampler build() { + Sampler sampler = newSampler(); + if (LOG.isTraceEnabled()) { + LOG.trace("Created new sampler of type " + + sampler.getClass().getName(), new Exception()); + } + return sampler; + } + + private Sampler newSampler() { String str = conf.get(SAMPLER_CONF_KEY); if (str == null || str.isEmpty()) { return NeverSampler.INSTANCE; http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/817742a0/htrace-core/src/main/java/org/apache/htrace/SpanReceiverBuilder.java ---------------------------------------------------------------------- diff --git a/htrace-core/src/main/java/org/apache/htrace/SpanReceiverBuilder.java b/htrace-core/src/main/java/org/apache/htrace/SpanReceiverBuilder.java index c9d9df5..da01c6d 100644 --- a/htrace-core/src/main/java/org/apache/htrace/SpanReceiverBuilder.java +++ b/htrace-core/src/main/java/org/apache/htrace/SpanReceiverBuilder.java @@ -86,6 +86,16 @@ public class SpanReceiverBuilder { } public SpanReceiver build() { + SpanReceiver spanReceiver = newSpanReceiver(); + if (LOG.isTraceEnabled()) { + LOG.trace("Created new span receiver of type " + + ((spanReceiver == null) ? "(none)" : + spanReceiver.getClass().getName())); + } + return spanReceiver; + } + + private SpanReceiver newSpanReceiver() { if ((this.spanReceiverClass == null) || this.spanReceiverClass.isEmpty()) { LOG.debug("No span receiver class specified."); @@ -125,4 +135,4 @@ public class SpanReceiverBuilder { return null; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/817742a0/htrace-core/src/main/java/org/apache/htrace/impl/LocalFileSpanReceiver.java ---------------------------------------------------------------------- diff --git a/htrace-core/src/main/java/org/apache/htrace/impl/LocalFileSpanReceiver.java b/htrace-core/src/main/java/org/apache/htrace/impl/LocalFileSpanReceiver.java index 190d575..07e4a81 100644 --- a/htrace-core/src/main/java/org/apache/htrace/impl/LocalFileSpanReceiver.java +++ b/htrace-core/src/main/java/org/apache/htrace/impl/LocalFileSpanReceiver.java @@ -45,7 +45,7 @@ import java.util.concurrent.locks.ReentrantLock; * Writes the spans it receives to a local file. */ public class LocalFileSpanReceiver implements SpanReceiver { - public static final Log LOG = LogFactory.getLog(LocalFileSpanReceiver.class); + private static final Log LOG = LogFactory.getLog(LocalFileSpanReceiver.class); public static final String PATH_KEY = "local-file-span-receiver.path"; public static final String CAPACITY_KEY = "local-file-span-receiver.capacity"; public static final int CAPACITY_DEFAULT = 5000; @@ -89,6 +89,10 @@ public class LocalFileSpanReceiver implements SpanReceiver { } this.bufferedSpans = new byte[capacity][]; this.bufferedSpansIndex = 0; + if (LOG.isDebugEnabled()) { + LOG.debug("Created new LocalFileSpanReceiver with path = " + path + + ", capacity = " + capacity); + } } /** http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/817742a0/htrace-core/src/main/java/org/apache/htrace/impl/ProbabilitySampler.java ---------------------------------------------------------------------- diff --git a/htrace-core/src/main/java/org/apache/htrace/impl/ProbabilitySampler.java b/htrace-core/src/main/java/org/apache/htrace/impl/ProbabilitySampler.java index 035a845..3c08c84 100644 --- a/htrace-core/src/main/java/org/apache/htrace/impl/ProbabilitySampler.java +++ b/htrace-core/src/main/java/org/apache/htrace/impl/ProbabilitySampler.java @@ -16,6 +16,8 @@ */ package org.apache.htrace.impl; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.htrace.HTraceConfiguration; import org.apache.htrace.Sampler; @@ -26,12 +28,17 @@ import java.util.Random; * configuring a {@code double} value for {@link #SAMPLER_FRACTION_CONF_KEY}. */ public class ProbabilitySampler implements Sampler<Object> { + private static final Log LOG = LogFactory.getLog(ProbabilitySampler.class); public final double threshold; private Random random = new Random(); public final static String SAMPLER_FRACTION_CONF_KEY = "sampler.fraction"; public ProbabilitySampler(HTraceConfiguration conf) { this.threshold = Double.parseDouble(conf.get(SAMPLER_FRACTION_CONF_KEY)); + if (LOG.isTraceEnabled()) { + LOG.trace("Created new ProbabilitySampler with threshold = " + + threshold + "."); + } } @Override http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/817742a0/htrace-core/src/main/java/org/apache/htrace/impl/StandardOutSpanReceiver.java ---------------------------------------------------------------------- diff --git a/htrace-core/src/main/java/org/apache/htrace/impl/StandardOutSpanReceiver.java b/htrace-core/src/main/java/org/apache/htrace/impl/StandardOutSpanReceiver.java index 014f32b..f88af7f 100644 --- a/htrace-core/src/main/java/org/apache/htrace/impl/StandardOutSpanReceiver.java +++ b/htrace-core/src/main/java/org/apache/htrace/impl/StandardOutSpanReceiver.java @@ -16,6 +16,8 @@ */ package org.apache.htrace.impl; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.htrace.HTraceConfiguration; import org.apache.htrace.Span; import org.apache.htrace.SpanReceiver; @@ -26,7 +28,10 @@ import java.io.IOException; * Used for testing. Simply prints to standard out any spans it receives. */ public class StandardOutSpanReceiver implements SpanReceiver { + private static final Log LOG = LogFactory.getLog(StandardOutSpanReceiver.class); + public StandardOutSpanReceiver(HTraceConfiguration conf) { + LOG.trace("Created new StandardOutSpanReceiver."); } @Override http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/817742a0/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 d730a17..ae1cfed 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 @@ -196,6 +196,11 @@ public class HTracedRESTReceiver implements SpanReceiver { this.postSpansThread.setDaemon(true); this.postSpansThread.setName("PostSpans"); this.postSpansThread.start(); + if (LOG.isDebugEnabled()) { + LOG.debug("Created new HTracedRESTReceiver with timeout=" + timeout + + ", capacity=" + capacity + ", url=" + url + ", periodInMs=" + + periodInMs + ", maxToSendAtATime=" + maxToSendAtATime); + } } /** @@ -314,7 +319,7 @@ public class HTracedRESTReceiver implements SpanReceiver { @Override public void close() throws IOException { - LOG.info("Closing HTracedRESTReceiver."); + LOG.info("Closing HTracedRESTReceiver(" + url + ")."); lock.lock(); try { this.shutdown = true; http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/817742a0/htrace-htraced/src/test/java/org/apache/htrace/impl/TestHTracedRESTReceiver.java ---------------------------------------------------------------------- diff --git a/htrace-htraced/src/test/java/org/apache/htrace/impl/TestHTracedRESTReceiver.java b/htrace-htraced/src/test/java/org/apache/htrace/impl/TestHTracedRESTReceiver.java index b1f1b11..676e348 100644 --- a/htrace-htraced/src/test/java/org/apache/htrace/impl/TestHTracedRESTReceiver.java +++ b/htrace-htraced/src/test/java/org/apache/htrace/impl/TestHTracedRESTReceiver.java @@ -77,7 +77,6 @@ public class TestHTracedRESTReceiver { @Override public String get(String key, String defaultValue) { if (key.equals(HTracedRESTReceiver.HTRACED_REST_URL_KEY)) { - LOG.info("WATERMELON2: got request for htraced.rest.url. Returning " + this.restServerUrl.toString()); return this.restServerUrl.toString(); } return defaultValue;
