You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2014/11/21 21:52:49 UTC
accumulo git commit: ACCUMULO-3351 Remove use of deprecated trace
code in 1.7.x
Repository: accumulo
Updated Branches:
refs/heads/master 89d049971 -> 6166406f9
ACCUMULO-3351 Remove use of deprecated trace code in 1.7.x
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6166406f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6166406f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6166406f
Branch: refs/heads/master
Commit: 6166406f99430e509f1b66d8fc8e8f6a783b8f58
Parents: 89d0499
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Nov 21 15:52:09 2014 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Nov 21 15:52:09 2014 -0500
----------------------------------------------------------------------
.../accumulo/test/TracerRecoversAfterOfflineTableIT.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6166406f/test/src/test/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java b/test/src/test/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java
index e32ec16..96b4a14 100644
--- a/test/src/test/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java
@@ -25,13 +25,12 @@ import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.trace.DistributedTrace;
+import org.apache.accumulo.core.trace.Span;
+import org.apache.accumulo.core.trace.Trace;
import org.apache.accumulo.core.util.UtilWaitThread;
-import org.apache.accumulo.fate.zookeeper.ZooReader;
import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl;
import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
import org.apache.accumulo.test.functional.ConfigurableMacIT;
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
import org.apache.accumulo.tracer.TraceDump;
import org.apache.accumulo.tracer.TraceDump.Printer;
import org.apache.accumulo.tracer.TraceServer;
@@ -74,7 +73,7 @@ public class TracerRecoversAfterOfflineTableIT extends ConfigurableMacIT {
log.info("Start a distributed trace span");
- DistributedTrace.enable(conn.getInstance(), new ZooReader(conn.getInstance().getZooKeepers(), 30 * 1000), "testTrace", "localhost");
+ DistributedTrace.enable("localhost", "testTrace");
Span root = Trace.on("traceTest");
BatchWriter bw = conn.createBatchWriter(tableName, null);
Mutation m = new Mutation("m");