diff --git a/htrace-core/src/main/java/org/apache/htrace/core/Span.java b/htrace-core/src/main/java/org/apache/htrace/core/Span.java index 4971983..e63d414 100644 --- a/htrace-core/src/main/java/org/apache/htrace/core/Span.java +++ b/htrace-core/src/main/java/org/apache/htrace/core/Span.java @@ -78,7 +78,9 @@ public interface Span { /** * Create a child span of this span with the given description + * @deprecated Since 4.0.0. Use {@link MilliSpan.Builder} */ + @Deprecated Span child(String description); @Override diff --git a/htrace-core/src/main/java/org/apache/htrace/core/TraceScope.java b/htrace-core/src/main/java/org/apache/htrace/core/TraceScope.java index b04d785..05a053e 100644 --- a/htrace-core/src/main/java/org/apache/htrace/core/TraceScope.java +++ b/htrace-core/src/main/java/org/apache/htrace/core/TraceScope.java @@ -17,14 +17,11 @@ package org.apache.htrace.core; import java.io.Closeable; -import java.lang.Thread; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +/** + * Create a new TraceScope at major transitions. Hosts current tracing context. + */ public class TraceScope implements Closeable { - private static final Log LOG = LogFactory.getLog(TraceScope.class); - /** * The tracer to use for this scope. */ @@ -112,7 +109,6 @@ public class TraceScope implements Closeable { @Override public void close() { tracer.closeScope(this); - } public void addKVAnnotation(String key, String value) { diff --git a/htrace-core/src/main/java/org/apache/htrace/core/Tracer.java b/htrace-core/src/main/java/org/apache/htrace/core/Tracer.java index 7c4cc82..2a6d31e 100644 --- a/htrace-core/src/main/java/org/apache/htrace/core/Tracer.java +++ b/htrace-core/src/main/java/org/apache/htrace/core/Tracer.java @@ -17,7 +17,6 @@ package org.apache.htrace.core; import java.io.Closeable; -import java.lang.System; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; @@ -26,22 +25,22 @@ import java.util.LinkedList; import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; -import java.util.concurrent.ThreadLocalRandom; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; /** - * A Tracer provides the implementation for collecting and distributing Spans - * within a process. + * Use a Tracer instance inside a 'process' to collect and distribute its trace Spans. + * Example processes are an HDFS DataNode or an HBase RegionServer. A Tracer instance is your + * one-stop shop for all things tracing. + * + *
*/
public class Tracer implements Closeable {
private static final Log LOG = LogFactory.getLog(Tracer.class);
- public final static String SPAN_RECEIVER_CLASSES_KEY =
- "span.receiver.classes";
- public final static String SAMPLER_CLASSES_KEY =
- "sampler.classes";
+ public final static String SPAN_RECEIVER_CLASSES_KEY = "span.receiver.classes";
+ public final static String SAMPLER_CLASSES_KEY = "sampler.classes";
public static class Builder {
private String name;
@@ -50,9 +49,23 @@ public class Tracer implements Closeable {
Builder.class.getClassLoader();
private TracerPool tracerPool = TracerPool.GLOBAL;
+ /**
+ * @deprecated Since 4.0.0. Use Constructor that takes a name argument instead
+ */
+ @Deprecated
public Builder() {
}
+ public Builder(final String name) {
+ name(name);
+ }
+
+ /**
+ * @param name
+ * @return This
+ * @deprecated Since 4.0.0. Use Constructor that takes a name argument instead.
+ */
+ @Deprecated
public Builder name(String name) {
this.name = name;
return this;
@@ -141,7 +154,6 @@ public class Tracer implements Closeable {
if (name == null) {
throw new RuntimeException("You must specify a name for this Tracer.");
}
- LinkedList