From c4610ecab2f75c10b3bd3a623525fafb1f8c19a6 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Fri, 21 Mar 2014 22:46:03 +0000 Subject: [PATCH] HBASE-10746 Bump the version of HTrace to 3.0 git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1580076 13f79535-47bb-0310-9956-ffa450edef68 --- hbase-client/pom.xml | 2 +- .../org/apache/hadoop/hbase/client/AsyncProcess.java | 2 +- .../java/org/apache/hadoop/hbase/ipc/RpcClient.java | 6 +++--- .../hadoop/hbase/zookeeper/RecoverableZooKeeper.java | 4 ++-- hbase-it/pom.xml | 2 +- .../hbase/mapreduce/IntegrationTestImportTsv.java | 2 +- .../hadoop/hbase/mttr/IntegrationTestMTTR.java | 8 ++++---- .../trace/IntegrationTestSendTraceRequests.java | 8 ++++---- hbase-server/pom.xml | 2 +- .../apache/hadoop/hbase/executor/EventHandler.java | 6 +++--- .../apache/hadoop/hbase/io/hfile/HFileReaderV2.java | 4 ++-- .../java/org/apache/hadoop/hbase/ipc/CallRunner.java | 4 ++-- .../org/apache/hadoop/hbase/ipc/RequestContext.java | 2 +- .../java/org/apache/hadoop/hbase/ipc/RpcServer.java | 2 +- .../hadoop/hbase/mapreduce/TableMapReduceUtil.java | 2 +- .../hbase/master/handler/DisableTableHandler.java | 2 +- .../hbase/master/handler/EnableTableHandler.java | 2 +- .../hadoop/hbase/regionserver/MemStoreFlusher.java | 4 ++-- .../apache/hadoop/hbase/regionserver/wal/FSHLog.java | 4 ++-- .../hbase/regionserver/wal/RingBufferTruck.java | 2 +- .../hadoop/hbase/trace/HBaseHTraceConfiguration.java | 2 +- .../apache/hadoop/hbase/trace/SpanReceiverHost.java | 4 ++-- .../apache/hadoop/hbase/trace/TestHTraceHooks.java | 12 ++++++------ hbase-shell/pom.xml | 2 +- hbase-shell/src/main/ruby/shell/commands/trace.rb | 4 ++-- hbase-thrift/pom.xml | 2 +- pom.xml | 4 ++-- src/main/docbkx/tracing.xml | 4 ++-- 28 files changed, 52 insertions(+), 52 deletions(-) diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index 3045b5f25d0..2ef0a6423d9 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -123,7 +123,7 @@ zookeeper - org.cloudera.htrace + org.htrace htrace-core diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java index bf89fe276bd..b31e5e35d44 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java @@ -48,7 +48,7 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.coprocessor.Batch; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; -import org.cloudera.htrace.Trace; +import org.htrace.Trace; import com.google.common.annotations.VisibleForTesting; diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java index 51708b92728..a0b97af25c6 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java @@ -69,9 +69,9 @@ import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.token.Token; import org.apache.hadoop.security.token.TokenIdentifier; import org.apache.hadoop.security.token.TokenSelector; -import org.cloudera.htrace.Span; -import org.cloudera.htrace.Trace; -import org.cloudera.htrace.TraceScope; +import org.htrace.Span; +import org.htrace.Trace; +import org.htrace.TraceScope; import javax.net.SocketFactory; import javax.security.sasl.SaslException; diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java index 565ca3bf666..51aa813c106 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java @@ -45,8 +45,8 @@ import org.apache.zookeeper.data.ACL; import org.apache.zookeeper.data.Stat; import org.apache.zookeeper.proto.CreateRequest; import org.apache.zookeeper.proto.SetDataRequest; -import org.cloudera.htrace.Trace; -import org.cloudera.htrace.TraceScope; +import org.htrace.Trace; +import org.htrace.TraceScope; /** * A zookeeper that can handle 'recoverable' errors. diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index 6bc99b3226a..0d0dffd8cc1 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -192,7 +192,7 @@ commons-lang - org.cloudera.htrace + org.htrace htrace-core diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java index 485891b56a2..cfeb3dc9842 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java @@ -315,7 +315,7 @@ public class IntegrationTestImportTsv implements Configurable, Tool { HBaseTestingUtility.class, // hbase-server-test HBaseCommonTestingUtility.class, // hbase-common-test com.google.common.collect.ListMultimap.class, // Guava - org.cloudera.htrace.Trace.class); // HTrace + org.htrace.Trace.class); // HTrace } /** diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java index 5d2f6ea6eb0..7a6b85b5553 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java @@ -62,10 +62,10 @@ import org.apache.hadoop.hbase.regionserver.NoSuchColumnFamilyException; import org.apache.hadoop.hbase.security.AccessDeniedException; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.LoadTestTool; -import org.cloudera.htrace.Span; -import org.cloudera.htrace.Trace; -import org.cloudera.htrace.TraceScope; -import org.cloudera.htrace.impl.AlwaysSampler; +import org.htrace.Span; +import org.htrace.Trace; +import org.htrace.TraceScope; +import org.htrace.impl.AlwaysSampler; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/trace/IntegrationTestSendTraceRequests.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/trace/IntegrationTestSendTraceRequests.java index 1605325f1ae..dc15a953464 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/trace/IntegrationTestSendTraceRequests.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/trace/IntegrationTestSendTraceRequests.java @@ -35,10 +35,10 @@ import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.util.AbstractHBaseTool; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.util.ToolRunner; -import org.cloudera.htrace.Sampler; -import org.cloudera.htrace.Span; -import org.cloudera.htrace.Trace; -import org.cloudera.htrace.TraceScope; +import org.htrace.Sampler; +import org.htrace.Span; +import org.htrace.Trace; +import org.htrace.TraceScope; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 18d2301889a..60343abe854 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -438,7 +438,7 @@ - org.cloudera.htrace + org.htrace htrace-core diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java index 5452b32789a..d9f78a32546 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java @@ -25,9 +25,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.Server; -import org.cloudera.htrace.Span; -import org.cloudera.htrace.Trace; -import org.cloudera.htrace.TraceScope; +import org.htrace.Span; +import org.htrace.Trace; +import org.htrace.TraceScope; /** * Abstract base class for all HBase event handlers. Subclasses should diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java index 9bf4a892bfd..acfc09d4d32 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java @@ -41,8 +41,8 @@ import org.apache.hadoop.hbase.util.ByteBufferUtils; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.IdLock; import org.apache.hadoop.io.WritableUtils; -import org.cloudera.htrace.Trace; -import org.cloudera.htrace.TraceScope; +import org.htrace.Trace; +import org.htrace.TraceScope; /** * {@link HFile} reader for version 2. diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java index 31484bb5fb4..170ad039c0f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java @@ -27,8 +27,8 @@ import org.apache.hadoop.hbase.security.UserProvider; import org.apache.hadoop.hbase.util.Pair; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.util.StringUtils; -import org.cloudera.htrace.Trace; -import org.cloudera.htrace.TraceScope; +import org.htrace.Trace; +import org.htrace.TraceScope; import com.google.protobuf.Message; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RequestContext.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RequestContext.java index c14600d3218..a6a9903848a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RequestContext.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RequestContext.java @@ -26,7 +26,7 @@ import org.apache.hadoop.hbase.security.User; import com.google.protobuf.BlockingService; import org.apache.hadoop.hbase.util.Bytes; -import org.cloudera.htrace.Trace; +import org.htrace.Trace; import java.net.InetAddress; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java index 46c8d11d109..5458ba7e046 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java @@ -110,7 +110,7 @@ import org.apache.hadoop.security.token.SecretManager; import org.apache.hadoop.security.token.SecretManager.InvalidToken; import org.apache.hadoop.security.token.TokenIdentifier; import org.apache.hadoop.util.StringUtils; -import org.cloudera.htrace.TraceInfo; +import org.htrace.TraceInfo; import org.codehaus.jackson.map.ObjectMapper; import com.google.common.util.concurrent.ThreadFactoryBuilder; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java index e5706fb2f30..51aaf44b869 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java @@ -682,7 +682,7 @@ public class TableMapReduceUtil { org.jboss.netty.channel.ChannelFactory.class, com.google.protobuf.Message.class, com.google.common.collect.Lists.class, - org.cloudera.htrace.Trace.class); + org.htrace.Trace.class); } /** diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java index 78a3c5b2009..bad93e5753f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java @@ -44,7 +44,7 @@ import org.apache.hadoop.hbase.master.TableLockManager; import org.apache.hadoop.hbase.master.RegionState.State; import org.apache.hadoop.hbase.master.TableLockManager.TableLock; import org.apache.zookeeper.KeeperException; -import org.cloudera.htrace.Trace; +import org.htrace.Trace; /** * Handler to run disable of a table. diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java index 0e21a2569aa..237b4af556e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java @@ -48,7 +48,7 @@ import org.apache.hadoop.hbase.master.TableLockManager; import org.apache.hadoop.hbase.master.TableLockManager.TableLock; import org.apache.hadoop.hbase.util.Pair; import org.apache.zookeeper.KeeperException; -import org.cloudera.htrace.Trace; +import org.htrace.Trace; /** * Handler to run enable of a table. diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java index 1e22c46eda3..8a3282772bc 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java @@ -49,8 +49,8 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.HasThread; import org.apache.hadoop.hbase.util.Threads; import org.apache.hadoop.util.StringUtils; -import org.cloudera.htrace.Trace; -import org.cloudera.htrace.TraceScope; +import org.htrace.Trace; +import org.htrace.TraceScope; import org.apache.hadoop.hbase.util.Counter; import com.google.common.base.Preconditions; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java index 6525dc256ae..4c1f7779d41 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java @@ -70,8 +70,8 @@ import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.HasThread; import org.apache.hadoop.hbase.util.Threads; import org.apache.hadoop.util.StringUtils; -import org.cloudera.htrace.Trace; -import org.cloudera.htrace.TraceScope; +import org.htrace.Trace; +import org.htrace.TraceScope; import com.google.common.annotations.VisibleForTesting; import com.lmax.disruptor.BlockingWaitStrategy; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/RingBufferTruck.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/RingBufferTruck.java index 6bddc0049fe..cc9ec22efc7 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/RingBufferTruck.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/RingBufferTruck.java @@ -19,7 +19,7 @@ package org.apache.hadoop.hbase.regionserver.wal; import org.apache.hadoop.classification.InterfaceAudience; -import org.cloudera.htrace.Span; +import org.htrace.Span; import com.lmax.disruptor.EventFactory; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/trace/HBaseHTraceConfiguration.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/trace/HBaseHTraceConfiguration.java index ccac99fa554..b7fa5746e9a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/trace/HBaseHTraceConfiguration.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/trace/HBaseHTraceConfiguration.java @@ -19,7 +19,7 @@ package org.apache.hadoop.hbase.trace; import org.apache.hadoop.conf.Configuration; -import org.cloudera.htrace.HTraceConfiguration; +import org.htrace.HTraceConfiguration; public class HBaseHTraceConfiguration extends HTraceConfiguration { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/trace/SpanReceiverHost.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/trace/SpanReceiverHost.java index e7fdf1bffa2..7440e507878 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/trace/SpanReceiverHost.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/trace/SpanReceiverHost.java @@ -25,8 +25,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.util.ReflectionUtils; -import org.cloudera.htrace.SpanReceiver; -import org.cloudera.htrace.Trace; +import org.htrace.SpanReceiver; +import org.htrace.Trace; /** * This class provides functions for reading the names of SpanReceivers from diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java index dac415673de..859bff2303a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java @@ -28,12 +28,12 @@ import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.Waiter; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; -import org.cloudera.htrace.Sampler; -import org.cloudera.htrace.Span; -import org.cloudera.htrace.Trace; -import org.cloudera.htrace.TraceScope; -import org.cloudera.htrace.TraceTree; -import org.cloudera.htrace.impl.POJOSpanReceiver; +import org.htrace.Sampler; +import org.htrace.Span; +import org.htrace.Trace; +import org.htrace.TraceScope; +import org.htrace.TraceTree; +import org.htrace.impl.POJOSpanReceiver; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml index f9a51791599..3d6eed777a3 100644 --- a/hbase-shell/pom.xml +++ b/hbase-shell/pom.xml @@ -204,7 +204,7 @@ - org.cloudera.htrace + org.htrace htrace-core diff --git a/hbase-shell/src/main/ruby/shell/commands/trace.rb b/hbase-shell/src/main/ruby/shell/commands/trace.rb index ba061957c20..2ce443b70c9 100644 --- a/hbase-shell/src/main/ruby/shell/commands/trace.rb +++ b/hbase-shell/src/main/ruby/shell/commands/trace.rb @@ -16,8 +16,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -HTrace = org.cloudera.htrace.Trace -java_import org.cloudera.htrace.Sampler +HTrace = org.htrace.Trace +java_import org.htrace.Sampler java_import org.apache.hadoop.hbase.trace.SpanReceiverHost module Shell diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index 9ba1a363ec4..990b249955d 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -189,7 +189,7 @@ ${project.version} - org.cloudera.htrace + org.htrace htrace-core diff --git a/pom.xml b/pom.xml index 3408a0e7573..75febab4e77 100644 --- a/pom.xml +++ b/pom.xml @@ -919,7 +919,7 @@ 1.8 1.6.8 4.11 - 2.04 + 3.0.3 1.2.17 1.9.0 2.5.0 @@ -1366,7 +1366,7 @@ test - org.cloudera.htrace + org.htrace htrace-core ${htrace.version} diff --git a/src/main/docbkx/tracing.xml b/src/main/docbkx/tracing.xml index 6614096173a..affede976df 100644 --- a/src/main/docbkx/tracing.xml +++ b/src/main/docbkx/tracing.xml @@ -70,7 +70,7 @@ hbase.trace.spanreceiver.classes - org.cloudera.htrace.impl.LocalFileSpanReceiver + org.htrace.impl.LocalFileSpanReceiver hbase.local-file-span-receiver.path @@ -95,7 +95,7 @@ hbase.trace.spanreceiver.classes - org.cloudera.htrace.impl.ZipkinSpanReceiver + org.htrace.impl.ZipkinSpanReceiver hbase.zipkin.collector-hostname