Return-Path: X-Original-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3351D9AA1 for ; Wed, 30 Nov 2011 18:49:50 +0000 (UTC) Received: (qmail 80797 invoked by uid 500); 30 Nov 2011 18:49:50 -0000 Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org Received: (qmail 80768 invoked by uid 500); 30 Nov 2011 18:49:50 -0000 Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: accumulo-dev@incubator.apache.org Delivered-To: mailing list accumulo-commits@incubator.apache.org Received: (qmail 80761 invoked by uid 99); 30 Nov 2011 18:49:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Nov 2011 18:49:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Nov 2011 18:49:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D2266238899C; Wed, 30 Nov 2011 18:49:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1208694 - /incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java Date: Wed, 30 Nov 2011 18:49:25 -0000 To: accumulo-commits@incubator.apache.org From: ecn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111130184925.D2266238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ecn Date: Wed Nov 30 18:49:25 2011 New Revision: 1208694 URL: http://svn.apache.org/viewvc?rev=1208694&view=rev Log: ACCUMULO-194: use existing convenience method to configure distributed tracing Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1208694&r1=1208693&r2=1208694&view=diff ============================================================================== --- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java (original) +++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java Wed Nov 30 18:49:25 2011 @@ -81,13 +81,13 @@ import org.apache.accumulo.core.iterator import org.apache.accumulo.core.iterators.FilteringIterator; import org.apache.accumulo.core.iterators.GrepIterator; import org.apache.accumulo.core.iterators.IteratorUtil; +import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope; import org.apache.accumulo.core.iterators.NoLabelIterator; import org.apache.accumulo.core.iterators.OptionDescriber; +import org.apache.accumulo.core.iterators.OptionDescriber.IteratorOptions; import org.apache.accumulo.core.iterators.RegExIterator; import org.apache.accumulo.core.iterators.SortedKeyIterator; import org.apache.accumulo.core.iterators.VersioningIterator; -import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope; -import org.apache.accumulo.core.iterators.OptionDescriber.IteratorOptions; import org.apache.accumulo.core.iterators.aggregation.conf.AggregatorConfiguration; import org.apache.accumulo.core.iterators.filter.AgeOffFilter; import org.apache.accumulo.core.iterators.filter.RegExFilter; @@ -99,15 +99,16 @@ import org.apache.accumulo.core.security import org.apache.accumulo.core.security.thrift.AuthInfo; import org.apache.accumulo.core.security.thrift.SecurityErrorCode; import org.apache.accumulo.core.tabletserver.thrift.ConstraintViolationException; +import org.apache.accumulo.core.trace.DistributedTrace; import org.apache.accumulo.core.trace.TraceDump; import org.apache.accumulo.core.trace.TraceDump.Printer; import org.apache.accumulo.core.util.BadArgumentException; +import org.apache.accumulo.core.util.BulkImportHelper.AssignmentStats; import org.apache.accumulo.core.util.ColumnFQ; import org.apache.accumulo.core.util.Duration; import org.apache.accumulo.core.util.LocalityGroupUtil; import org.apache.accumulo.core.util.TextUtil; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.core.util.BulkImportHelper.AssignmentStats; import org.apache.accumulo.core.util.format.DefaultFormatter; import org.apache.accumulo.core.util.format.DeleterFormatter; import org.apache.accumulo.core.util.format.Formatter; @@ -134,8 +135,6 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; import cloudtrace.instrument.Trace; -import cloudtrace.instrument.Tracer; -import cloudtrace.instrument.receivers.ZooSpanClient; /** * A convenient console interface to perform basic accumulo functions Includes auto-complete, help, and quoted strings with escape sequences @@ -290,9 +289,7 @@ public class Shell { byte[] pass; try { if (!cl.hasOption(fakeOption.getLongOpt())) { - String localhost = InetAddress.getLocalHost().getHostName(); - String path = ZooUtil.getRoot(instance) + Constants.ZTRACERS; - Tracer.getInstance().addReceiver(new ZooSpanClient(instance.getZooKeepers(), path, localhost, "shell", 1000)); + DistributedTrace.enable(instance, "shell", InetAddress.getLocalHost().getHostName()); } this.reader = new ConsoleReader();