accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bil...@apache.org
Subject accumulo git commit: ACCUMULO-3630 update docs for org.apache.htrace tracing
Date Tue, 03 Mar 2015 23:39:05 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master 76ce7d926 -> 4a9cabea5


ACCUMULO-3630 update docs for org.apache.htrace tracing


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4a9cabea
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4a9cabea
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4a9cabea

Branch: refs/heads/master
Commit: 4a9cabea59c73dd340a27ad7b097746a5419d2a6
Parents: 76ce7d9
Author: Billie Rinaldi <billie.rinaldi@gmail.com>
Authored: Tue Mar 3 15:38:51 2015 -0800
Committer: Billie Rinaldi <billie.rinaldi@gmail.com>
Committed: Tue Mar 3 15:38:51 2015 -0800

----------------------------------------------------------------------
 docs/src/main/asciidoc/chapters/administration.txt       | 11 ++++++-----
 docs/src/main/resources/distributedTracing.html          |  6 +++---
 .../apache/accumulo/trace/instrument/CountSampler.java   |  2 +-
 .../org/apache/accumulo/trace/instrument/Sampler.java    |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4a9cabea/docs/src/main/asciidoc/chapters/administration.txt
----------------------------------------------------------------------
diff --git a/docs/src/main/asciidoc/chapters/administration.txt b/docs/src/main/asciidoc/chapters/administration.txt
index f3da34a..275ed0e 100644
--- a/docs/src/main/asciidoc/chapters/administration.txt
+++ b/docs/src/main/asciidoc/chapters/administration.txt
@@ -549,9 +549,9 @@ DistributedTrace.disable();
 Once tracing has been enabled, a client can wrap an operation in a trace.
 
 [source,java]
-import org.htrace.Sampler;
-import org.htrace.Trace;
-import org.htrace.TraceScope;
+import org.apache.htrace.Sampler;
+import org.apache.htrace.Trace;
+import org.apache.htrace.TraceScope;
 ...
 TraceScope scope = Trace.startSpan("Client Scan", Sampler.ALWAYS);
 BatchScanner scanner = conn.createBatchScanner(...);
@@ -601,9 +601,10 @@ operations for tracing. As seen below, the CountSampler can be used to
 help enable tracing for 1-in-1000 operations
 
 [source,java]
-import org.htrace.impl.CountSampler;
+import org.apache.htrace.impl.CountSampler;
 ...
-Sampler sampler = new CountSampler(1000);
+Sampler sampler = new CountSampler(HTraceConfiguration.fromMap(
+    Collections.singletonMap(CountSampler.SAMPLER_FREQUENCY_CONF_KEY, "1000")));
 ...
 TraceScope readScope = Trace.startSpan("Read", sampler);
 ...

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4a9cabea/docs/src/main/resources/distributedTracing.html
----------------------------------------------------------------------
diff --git a/docs/src/main/resources/distributedTracing.html b/docs/src/main/resources/distributedTracing.html
index 98438da..2afe991 100644
--- a/docs/src/main/resources/distributedTracing.html
+++ b/docs/src/main/resources/distributedTracing.html
@@ -31,9 +31,9 @@ distributed, and the typical lookup is fast.</p>
 
 <pre>
    import org.apache.accumulo.core.trace.DistributedTrace;
-   import org.htrace.Sampler;
-   import org.htrace.Trace;
-   import org.htrace.TraceScope;
+   import org.apache.htrace.Sampler;
+   import org.apache.htrace.Trace;
+   import org.apache.htrace.TraceScope;
    ...
 
    DistributedTrace.enable(hostname, "myApplication");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4a9cabea/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java
index 05d9acb..ad3acfc 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java
@@ -21,7 +21,7 @@ import org.apache.htrace.HTraceConfiguration;
 import java.util.Collections;
 
 /**
- * @deprecated since 1.7, use org.htrace.impl.CountSampler instead
+ * @deprecated since 1.7, use org.apache.htrace.impl.CountSampler instead
  */
 @Deprecated
 public class CountSampler extends org.apache.htrace.impl.CountSampler implements Sampler
{

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4a9cabea/trace/src/main/java/org/apache/accumulo/trace/instrument/Sampler.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/Sampler.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/Sampler.java
index b82d72f..11208b2 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/Sampler.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/Sampler.java
@@ -17,7 +17,7 @@
 package org.apache.accumulo.trace.instrument;
 
 /**
- * @deprecated since 1.7, use org.htrace.Sampler instead
+ * @deprecated since 1.7, use org.apache.htrace.Sampler instead
  */
 @Deprecated
 public interface Sampler extends org.apache.htrace.Sampler<Object> {


Mime
View raw message