ACCUMULO-898 refactoring and deprecation of old tracing
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6b5f5ef4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6b5f5ef4 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6b5f5ef4 Branch: refs/heads/master Commit: 6b5f5ef474f8df26414da46f7c385072a9f4dbce Parents: db2dda1 Author: Billie Rinaldi <[email protected]> Authored: Thu Nov 6 14:55:32 2014 -0800 Committer: Billie Rinaldi <[email protected]> Committed: Fri Nov 7 14:36:57 2014 -0800 ---------------------------------------------------------------------- assemble/pom.xml | 4 - core/pom.xml | 4 - .../apache/accumulo/core/cli/ClientOpts.java | 2 +- .../core/client/impl/ConditionalWriterImpl.java | 6 +- .../core/client/impl/ConnectorImpl.java | 2 +- .../client/impl/InstanceOperationsImpl.java | 2 +- .../client/impl/NamespaceOperationsImpl.java | 2 +- .../client/impl/ReplicationOperationsImpl.java | 2 +- .../client/impl/SecurityOperationsImpl.java | 2 +- .../core/client/impl/TableOperationsImpl.java | 2 +- .../impl/TabletServerBatchReaderIterator.java | 4 +- .../client/impl/TabletServerBatchWriter.java | 8 +- .../core/client/impl/ThriftScanner.java | 8 +- .../accumulo/core/client/impl/Writer.java | 2 +- .../core/client/impl/thrift/ClientService.java | 800 +++++----- .../org/apache/accumulo/core/conf/Property.java | 2 +- .../core/gc/thrift/GCMonitorService.java | 32 +- .../core/master/thrift/FateService.java | 128 +- .../core/master/thrift/MasterClientService.java | 480 +++--- .../thrift/TabletClientService.java | 960 ++++++------ .../accumulo/core/trace/AsyncSpanReceiver.java | 173 --- .../accumulo/core/trace/CountSampler.java | 23 + .../accumulo/core/trace/DistributedTrace.java | 1 - .../accumulo/core/trace/SendSpansViaThrift.java | 97 -- .../org/apache/accumulo/core/trace/Span.java | 148 ++ .../apache/accumulo/core/trace/SpanTree.java | 77 - .../accumulo/core/trace/SpanTreeVisitor.java | 26 - .../org/apache/accumulo/core/trace/Trace.java | 135 ++ .../apache/accumulo/core/trace/TraceDump.java | 162 -- .../accumulo/core/trace/TraceFormatter.java | 126 -- .../org/apache/accumulo/core/trace/Tracer.java | 35 + .../accumulo/core/trace/ZooTraceClient.java | 123 -- .../accumulo/core/trace/thrift/TInfo.java | 496 +++++++ .../wrappers/RpcClientInvocationHandler.java | 54 + .../wrappers/RpcServerInvocationHandler.java | 53 + .../core/trace/wrappers/TraceCallable.java | 69 + .../trace/wrappers/TraceExecutorService.java | 123 ++ .../core/trace/wrappers/TraceRunnable.java | 79 + .../accumulo/core/trace/wrappers/TraceWrap.java | 57 + .../accumulo/core/util/NamingThreadFactory.java | 2 +- .../apache/accumulo/core/util/ThriftUtil.java | 4 +- core/src/main/scripts/generate-thrift.sh | 4 +- core/src/main/thrift/trace.thrift | 23 + .../accumulo/core/trace/PerformanceTest.java | 51 + examples/simple/pom.xml | 2 +- .../simple/client/TraceDumpExample.java | 4 +- .../impl/MiniAccumuloClusterImpl.java | 2 +- server/base/pom.xml | 4 - .../accumulo/server/client/BulkImporter.java | 4 +- .../server/client/ClientServiceHandler.java | 2 +- .../accumulo/server/master/LiveTServerSet.java | 2 +- .../server/master/balancer/TabletBalancer.java | 2 +- .../org/apache/accumulo/server/util/Admin.java | 2 +- .../apache/accumulo/server/util/RpcWrapper.java | 4 +- .../server/util/VerifyTabletAssignments.java | 4 +- server/gc/pom.xml | 4 - .../gc/GarbageCollectWriteAheadLogs.java | 6 +- .../accumulo/gc/GarbageCollectionAlgorithm.java | 4 +- .../accumulo/gc/SimpleGarbageCollector.java | 8 +- .../CloseWriteAheadLogReferences.java | 4 +- .../accumulo/gc/SimpleGarbageCollectorTest.java | 2 +- server/master/pom.xml | 4 - .../accumulo/master/FateServiceHandler.java | 2 +- .../java/org/apache/accumulo/master/Master.java | 2 +- .../master/MasterClientServiceHandler.java | 2 +- .../master/metrics/ReplicationMetrics.java | 2 +- .../master/replication/ReplicationDriver.java | 4 +- .../master/replication/StatusMaker.java | 4 +- .../accumulo/master/replication/WorkMaker.java | 4 +- .../accumulo/master/tableOps/BulkImport.java | 4 +- .../accumulo/master/tableOps/TraceRepo.java | 8 +- server/monitor/pom.xml | 2 +- .../org/apache/accumulo/monitor/Monitor.java | 4 +- .../monitor/servlets/TServersServlet.java | 2 +- .../accumulo/monitor/servlets/trace/Basic.java | 2 +- .../monitor/servlets/trace/ListType.java | 4 +- .../monitor/servlets/trace/ShowTrace.java | 12 +- .../servlets/trace/ShowTraceLinkType.java | 4 +- .../monitor/servlets/trace/Summary.java | 4 +- .../accumulo/monitor/ShowTraceLinkTypeTest.java | 4 +- server/tracer/pom.xml | 50 +- .../tracer/src/main/findbugs/exclude-filter.xml | 21 + .../accumulo/tracer/AsyncSpanReceiver.java | 174 +++ .../accumulo/tracer/SendSpansViaThrift.java | 97 ++ .../org/apache/accumulo/tracer/SpanTree.java | 76 + .../apache/accumulo/tracer/SpanTreeVisitor.java | 25 + .../org/apache/accumulo/tracer/TraceDump.java | 162 ++ .../apache/accumulo/tracer/TraceFormatter.java | 126 ++ .../org/apache/accumulo/tracer/TraceServer.java | 9 +- .../apache/accumulo/tracer/ZooTraceClient.java | 124 ++ .../accumulo/tracer/thrift/Annotation.java | 502 +++++++ .../accumulo/tracer/thrift/RemoteSpan.java | 1384 ++++++++++++++++++ .../accumulo/tracer/thrift/SpanReceiver.java | 588 ++++++++ .../accumulo/tracer/thrift/TestService.java | 1084 ++++++++++++++ .../tracer/src/main/scripts/generate-thrift.sh | 24 + server/tracer/src/main/thrift/tracer.thrift | 47 + .../org/apache/accumulo/tracer/TracerTest.java | 234 +++ server/tserver/pom.xml | 4 - .../apache/accumulo/tserver/TabletServer.java | 6 +- .../tserver/TabletServerResourceManager.java | 2 +- .../mastermessage/SplitReportMessage.java | 2 +- .../mastermessage/TabletStatusMessage.java | 2 +- .../replication/AccumuloReplicaSystem.java | 4 +- .../accumulo/tserver/tablet/Compactor.java | 4 +- .../tserver/tablet/DatafileManager.java | 4 +- .../tserver/tablet/MinorCompactionTask.java | 4 +- .../apache/accumulo/tserver/tablet/Tablet.java | 4 +- shell/pom.xml | 2 +- .../accumulo/shell/commands/TraceCommand.java | 6 +- .../apache/accumulo/test/GetMasterStats.java | 2 +- .../org/apache/accumulo/test/VerifyIngest.java | 2 +- .../apache/accumulo/test/WrongTabletTest.java | 2 +- .../test/continuous/ContinuousIngest.java | 4 +- .../continuous/ContinuousStatsCollector.java | 2 +- .../test/continuous/ContinuousWalk.java | 4 +- .../accumulo/test/functional/ZombieTServer.java | 4 +- .../test/performance/thrift/NullTserver.java | 2 +- .../test/randomwalk/concurrent/Shutdown.java | 2 +- .../test/randomwalk/concurrent/StartAll.java | 2 +- .../accumulo/test/ConditionalWriterIT.java | 8 +- .../functional/BalanceAfterCommsFailureIT.java | 2 +- .../test/functional/DynamicThreadPoolsIT.java | 2 +- .../test/functional/MetadataMaxFiles.java | 2 +- .../functional/SimpleBalancerFairnessIT.java | 2 +- trace/pom.xml | 64 +- trace/src/main/findbugs/exclude-filter.xml | 21 - .../trace/instrument/CloudtraceSpan.java | 3 +- .../accumulo/trace/instrument/CountSampler.java | 3 +- .../accumulo/trace/instrument/Sampler.java | 3 +- .../apache/accumulo/trace/instrument/Span.java | 122 +- .../apache/accumulo/trace/instrument/Trace.java | 105 +- .../trace/instrument/TraceCallable.java | 69 - .../trace/instrument/TraceExecutorService.java | 123 -- .../trace/instrument/TraceRunnable.java | 79 - .../accumulo/trace/instrument/Tracer.java | 35 - .../thrift/RpcClientInvocationHandler.java | 54 - .../thrift/RpcServerInvocationHandler.java | 53 - .../trace/instrument/thrift/TraceWrap.java | 57 - .../accumulo/trace/thrift/Annotation.java | 502 ------- .../accumulo/trace/thrift/RemoteSpan.java | 1384 ------------------ .../accumulo/trace/thrift/SpanReceiver.java | 588 -------- .../org/apache/accumulo/trace/thrift/TInfo.java | 481 +----- .../accumulo/trace/thrift/TestService.java | 1084 -------------- trace/src/main/scripts/generate-thrift.sh | 24 - trace/src/main/thrift/trace.thrift | 51 - .../trace/instrument/CountSamplerTest.java | 39 - .../trace/instrument/PerformanceTest.java | 51 - .../accumulo/trace/instrument/TracerTest.java | 232 --- 148 files changed, 7440 insertions(+), 7327 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/assemble/pom.xml ---------------------------------------------------------------------- diff --git a/assemble/pom.xml b/assemble/pom.xml index c764091..0999555 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -114,10 +114,6 @@ </dependency> <dependency> <groupId>org.apache.accumulo</groupId> - <artifactId>accumulo-trace</artifactId> - </dependency> - <dependency> - <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-tracer</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 1cbc6df..5fc7a6e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -79,10 +79,6 @@ <artifactId>accumulo-start</artifactId> </dependency> <dependency> - <groupId>org.apache.accumulo</groupId> - <artifactId>accumulo-trace</artifactId> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-math</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java index 10a5e08..a6a5e81 100644 --- a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java +++ b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java @@ -41,9 +41,9 @@ import org.apache.accumulo.core.conf.DefaultConfiguration; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.ColumnVisibility; +import org.apache.accumulo.core.trace.Trace; import org.apache.accumulo.core.volume.VolumeConfiguration; import org.apache.accumulo.core.zookeeper.ZooUtil; -import org.apache.accumulo.trace.instrument.Trace; import org.apache.commons.configuration.PropertiesConfiguration; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java index a896be8..cb0b90e 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java @@ -69,6 +69,9 @@ import org.apache.accumulo.core.security.VisibilityEvaluator; import org.apache.accumulo.core.security.VisibilityParseException; import org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException; import org.apache.accumulo.core.tabletserver.thrift.TabletClientService; +import org.apache.accumulo.core.trace.Trace; +import org.apache.accumulo.core.trace.Tracer; +import org.apache.accumulo.core.trace.thrift.TInfo; import org.apache.accumulo.core.util.BadArgumentException; import org.apache.accumulo.core.util.ByteBufferUtil; import org.apache.accumulo.core.util.LoggingRunnable; @@ -78,9 +81,6 @@ import org.apache.accumulo.core.zookeeper.ZooUtil; import org.apache.accumulo.fate.zookeeper.ZooCacheFactory; import org.apache.accumulo.fate.zookeeper.ZooLock; import org.apache.accumulo.fate.zookeeper.ZooUtil.LockID; -import org.apache.accumulo.trace.instrument.Trace; -import org.apache.accumulo.trace.instrument.Tracer; -import org.apache.accumulo.trace.thrift.TInfo; import org.apache.commons.collections.map.LRUMap; import org.apache.commons.lang.mutable.MutableLong; import org.apache.hadoop.io.Text; http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java index 62ab6a4..2d077d9 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java @@ -44,7 +44,7 @@ import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode; import org.apache.accumulo.core.master.state.tables.TableState; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.Credentials; -import org.apache.accumulo.trace.instrument.Tracer; +import org.apache.accumulo.core.trace.Tracer; public class ConnectorImpl extends Connector { private final Instance instance; http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java index 30c15ed..9848612 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java @@ -40,12 +40,12 @@ import org.apache.accumulo.core.master.thrift.MasterClientService; import org.apache.accumulo.core.security.Credentials; import org.apache.accumulo.core.tabletserver.thrift.TabletClientService; import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Client; +import org.apache.accumulo.core.trace.Tracer; import org.apache.accumulo.core.util.AddressUtil; import org.apache.accumulo.core.util.ThriftUtil; import org.apache.accumulo.core.zookeeper.ZooUtil; import org.apache.accumulo.fate.zookeeper.ZooCache; import org.apache.accumulo.fate.zookeeper.ZooCacheFactory; -import org.apache.accumulo.trace.instrument.Tracer; import org.apache.thrift.TException; import org.apache.thrift.transport.TTransport; import org.apache.thrift.transport.TTransportException; http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java index 7087ac5..f756ef1 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java @@ -48,8 +48,8 @@ import org.apache.accumulo.core.iterators.SortedKeyValueIterator; import org.apache.accumulo.core.master.thrift.FateOperation; import org.apache.accumulo.core.master.thrift.MasterClientService; import org.apache.accumulo.core.security.Credentials; +import org.apache.accumulo.core.trace.Tracer; import org.apache.accumulo.core.util.OpTimer; -import org.apache.accumulo.trace.instrument.Tracer; import org.apache.log4j.Level; import org.apache.log4j.Logger; http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java index cd57c2f..e45bcc9 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java @@ -51,8 +51,8 @@ import org.apache.accumulo.core.replication.proto.Replication.Status; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.Credentials; import org.apache.accumulo.core.tabletserver.log.LogEntry; +import org.apache.accumulo.core.trace.Tracer; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.trace.instrument.Tracer; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/client/impl/SecurityOperationsImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/SecurityOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/SecurityOperationsImpl.java index e9c057e..8a17a77 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/SecurityOperationsImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/SecurityOperationsImpl.java @@ -36,8 +36,8 @@ import org.apache.accumulo.core.security.Credentials; import org.apache.accumulo.core.security.NamespacePermission; import org.apache.accumulo.core.security.SystemPermission; import org.apache.accumulo.core.security.TablePermission; +import org.apache.accumulo.core.trace.Tracer; import org.apache.accumulo.core.util.ByteBufferUtil; -import org.apache.accumulo.trace.instrument.Tracer; public class SecurityOperationsImpl implements SecurityOperations { http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java index 9204965..3c450c3 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java @@ -95,6 +95,7 @@ import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.Credentials; import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException; import org.apache.accumulo.core.tabletserver.thrift.TabletClientService; +import org.apache.accumulo.core.trace.Tracer; import org.apache.accumulo.core.util.ByteBufferUtil; import org.apache.accumulo.core.util.CachedConfiguration; import org.apache.accumulo.core.util.LocalityGroupUtil; @@ -106,7 +107,6 @@ import org.apache.accumulo.core.util.TextUtil; import org.apache.accumulo.core.util.ThriftUtil; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.core.volume.VolumeConfiguration; -import org.apache.accumulo.trace.instrument.Tracer; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java index e0aa30a..0cb9f7f 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java @@ -60,11 +60,11 @@ import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.Credentials; import org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException; import org.apache.accumulo.core.tabletserver.thrift.TabletClientService; +import org.apache.accumulo.core.trace.wrappers.TraceRunnable; +import org.apache.accumulo.core.trace.Tracer; import org.apache.accumulo.core.util.ByteBufferUtil; import org.apache.accumulo.core.util.OpTimer; import org.apache.accumulo.core.util.ThriftUtil; -import org.apache.accumulo.trace.instrument.TraceRunnable; -import org.apache.accumulo.trace.instrument.Tracer; import org.apache.hadoop.io.Text; import org.apache.log4j.Level; import org.apache.log4j.Logger; http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java index 475d04d..a73fdec 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java @@ -62,12 +62,12 @@ import org.apache.accumulo.core.tabletserver.thrift.ConstraintViolationException import org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException; import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException; import org.apache.accumulo.core.tabletserver.thrift.TabletClientService; +import org.apache.accumulo.core.trace.Span; +import org.apache.accumulo.core.trace.Trace; +import org.apache.accumulo.core.trace.Tracer; +import org.apache.accumulo.core.trace.thrift.TInfo; import org.apache.accumulo.core.util.SimpleThreadPool; import org.apache.accumulo.core.util.ThriftUtil; -import org.apache.accumulo.trace.instrument.Span; -import org.apache.accumulo.trace.instrument.Trace; -import org.apache.accumulo.trace.instrument.Tracer; -import org.apache.accumulo.trace.thrift.TInfo; import org.apache.hadoop.io.Text; import org.apache.log4j.Logger; import org.apache.thrift.TApplicationException; http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java index c49330e..8e601d2 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java @@ -55,12 +55,12 @@ import org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException; import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException; import org.apache.accumulo.core.tabletserver.thrift.TabletClientService; import org.apache.accumulo.core.tabletserver.thrift.TooManyFilesException; +import org.apache.accumulo.core.trace.Span; +import org.apache.accumulo.core.trace.Trace; +import org.apache.accumulo.core.trace.Tracer; +import org.apache.accumulo.core.trace.thrift.TInfo; import org.apache.accumulo.core.util.OpTimer; import org.apache.accumulo.core.util.ThriftUtil; -import org.apache.accumulo.trace.instrument.Span; -import org.apache.accumulo.trace.instrument.Trace; -import org.apache.accumulo.trace.instrument.Tracer; -import org.apache.accumulo.trace.thrift.TInfo; import org.apache.hadoop.io.Text; import org.apache.log4j.Level; import org.apache.log4j.Logger; http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java b/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java index a38822b..7b307d8 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java @@ -33,9 +33,9 @@ import org.apache.accumulo.core.tabletserver.thrift.ConstraintViolationException import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException; import org.apache.accumulo.core.tabletserver.thrift.TDurability; import org.apache.accumulo.core.tabletserver.thrift.TabletClientService; +import org.apache.accumulo.core.trace.Tracer; import org.apache.accumulo.core.util.ThriftUtil; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.trace.instrument.Tracer; import org.apache.hadoop.io.Text; import org.apache.log4j.Logger; import org.apache.thrift.TException;
