svn commit: r1330246 - /accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java

[ecn]

Author: ecn
Date: Wed Apr 25 12:40:50 2012
New Revision: 1330246

URL: http://svn.apache.org/viewvc?rev=1330246&view=rev
Log:
ACCUMULO-559 use instance.getZooKeepers instead of trying to read the site 
configuration

Modified:
    
accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java

Modified: 
accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java?rev=1330246&r1=1330245&r2=1330246&view=diff
==============================================================================
--- 
accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
 (original)
+++ 
accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
 Wed Apr 25 12:40:50 2012
@@ -22,8 +22,6 @@ import java.net.UnknownHostException;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.Instance;
-import org.apache.accumulo.core.conf.AccumuloConfiguration;
-import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.zookeeper.ZooUtil;
 import org.apache.zookeeper.KeeperException;
 
@@ -32,7 +30,6 @@ import cloudtrace.instrument.receivers.Z
 
 public class DistributedTrace {
   public static void enable(Instance instance, String application, String 
address) throws IOException, KeeperException, InterruptedException {
-    String zookeeper = 
AccumuloConfiguration.getSystemConfiguration().get(Property.INSTANCE_ZK_HOST);
     String path = ZooUtil.getRoot(instance) + Constants.ZTRACERS;
     if (address == null) {
       try {
@@ -41,6 +38,6 @@ public class DistributedTrace {
         address = "unknown";
       }
     }
-    Tracer.getInstance().addReceiver(new ZooSpanClient(zookeeper, path, 
address, application, 1000));
+    Tracer.getInstance().addReceiver(new 
ZooSpanClient(instance.getZooKeepers(), path, address, application, 1000));
   }
 }