hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1580076 - in /hbase/trunk: ./ hbase-client/ hbase-client/src/main/java/org/apache/hadoop/hbase/client/ hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/ hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ hbase-it/ hbase-it...
Date Fri, 21 Mar 2014 22:46:04 GMT
Author: stack
Date: Fri Mar 21 22:46:03 2014
New Revision: 1580076

URL: http://svn.apache.org/r1580076
Log:
HBASE-10746 Bump the version of HTrace to 3.0

Modified:
    hbase/trunk/hbase-client/pom.xml
    hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
    hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java
    hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java
    hbase/trunk/hbase-it/pom.xml
    hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java
    hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java
    hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/trace/IntegrationTestSendTraceRequests.java
    hbase/trunk/hbase-server/pom.xml
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RequestContext.java
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/RingBufferTruck.java
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/trace/HBaseHTraceConfiguration.java
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/trace/SpanReceiverHost.java
    hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
    hbase/trunk/hbase-shell/pom.xml
    hbase/trunk/hbase-shell/src/main/ruby/shell/commands/trace.rb
    hbase/trunk/hbase-thrift/pom.xml
    hbase/trunk/pom.xml
    hbase/trunk/src/main/docbkx/tracing.xml

Modified: hbase/trunk/hbase-client/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/pom.xml?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/hbase-client/pom.xml (original)
+++ hbase/trunk/hbase-client/pom.xml Fri Mar 21 22:46:03 2014
@@ -123,7 +123,7 @@
       <artifactId>zookeeper</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.cloudera.htrace</groupId>
+      <groupId>org.htrace</groupId>
       <artifactId>htrace-core</artifactId>
     </dependency>
     <dependency>

Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
(original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
Fri Mar 21 22:46:03 2014
@@ -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;
 

Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java Fri
Mar 21 22:46:03 2014
@@ -69,9 +69,9 @@ import org.apache.hadoop.security.UserGr
 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;

Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java
(original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java
Fri Mar 21 22:46:03 2014
@@ -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.

Modified: hbase/trunk/hbase-it/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-it/pom.xml?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/hbase-it/pom.xml (original)
+++ hbase/trunk/hbase-it/pom.xml Fri Mar 21 22:46:03 2014
@@ -192,7 +192,7 @@
       <artifactId>commons-lang</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.cloudera.htrace</groupId>
+      <groupId>org.htrace</groupId>
       <artifactId>htrace-core</artifactId>
     </dependency>
   </dependencies>

Modified: hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java
(original)
+++ hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java
Fri Mar 21 22:46:03 2014
@@ -315,7 +315,7 @@ public class IntegrationTestImportTsv im
       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
   }
 
   /**

Modified: hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java
(original)
+++ hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java
Fri Mar 21 22:46:03 2014
@@ -62,10 +62,10 @@ import org.apache.hadoop.hbase.regionser
 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;

Modified: hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/trace/IntegrationTestSendTraceRequests.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/trace/IntegrationTestSendTraceRequests.java?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/trace/IntegrationTestSendTraceRequests.java
(original)
+++ hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/trace/IntegrationTestSendTraceRequests.java
Fri Mar 21 22:46:03 2014
@@ -35,10 +35,10 @@ import org.apache.hadoop.hbase.client.Sc
 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;

Modified: hbase/trunk/hbase-server/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/pom.xml?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/hbase-server/pom.xml (original)
+++ hbase/trunk/hbase-server/pom.xml Fri Mar 21 22:46:03 2014
@@ -438,7 +438,7 @@
     </dependency>
     <!-- tracing Dependencies -->
     <dependency>
-      <groupId>org.cloudera.htrace</groupId>
+      <groupId>org.htrace</groupId>
       <artifactId>htrace-core</artifactId>
     </dependency>
     <dependency>

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java
(original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java
Fri Mar 21 22:46:03 2014
@@ -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

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java
(original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java
Fri Mar 21 22:46:03 2014
@@ -41,8 +41,8 @@ import org.apache.hadoop.hbase.util.Byte
 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.

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java Fri
Mar 21 22:46:03 2014
@@ -27,8 +27,8 @@ import org.apache.hadoop.hbase.security.
 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;
 

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RequestContext.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RequestContext.java?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RequestContext.java
(original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RequestContext.java
Fri Mar 21 22:46:03 2014
@@ -26,7 +26,7 @@ import org.apache.hadoop.hbase.security.
 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;
 

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java Fri
Mar 21 22:46:03 2014
@@ -110,7 +110,7 @@ import org.apache.hadoop.security.token.
 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;

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
(original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
Fri Mar 21 22:46:03 2014
@@ -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);
   }
 
   /**

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java
(original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java
Fri Mar 21 22:46:03 2014
@@ -44,7 +44,7 @@ import org.apache.hadoop.hbase.master.Ta
 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.

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java
(original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java
Fri Mar 21 22:46:03 2014
@@ -48,7 +48,7 @@ import org.apache.hadoop.hbase.master.Ta
 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.

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
(original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
Fri Mar 21 22:46:03 2014
@@ -49,8 +49,8 @@ import org.apache.hadoop.hbase.util.Envi
 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;

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java
(original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java
Fri Mar 21 22:46:03 2014
@@ -70,8 +70,8 @@ import org.apache.hadoop.hbase.util.FSUt
 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;

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/RingBufferTruck.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/RingBufferTruck.java?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/RingBufferTruck.java
(original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/RingBufferTruck.java
Fri Mar 21 22:46:03 2014
@@ -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;
 

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/trace/HBaseHTraceConfiguration.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/trace/HBaseHTraceConfiguration.java?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/trace/HBaseHTraceConfiguration.java
(original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/trace/HBaseHTraceConfiguration.java
Fri Mar 21 22:46:03 2014
@@ -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 {
 

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/trace/SpanReceiverHost.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/trace/SpanReceiverHost.java?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/trace/SpanReceiverHost.java
(original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/trace/SpanReceiverHost.java
Fri Mar 21 22:46:03 2014
@@ -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

Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
(original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
Fri Mar 21 22:46:03 2014
@@ -28,12 +28,12 @@ import org.apache.hadoop.hbase.MediumTes
 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;

Modified: hbase/trunk/hbase-shell/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-shell/pom.xml?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/hbase-shell/pom.xml (original)
+++ hbase/trunk/hbase-shell/pom.xml Fri Mar 21 22:46:03 2014
@@ -204,7 +204,7 @@
     </dependency>
     <!-- Test Dependencies -->
     <dependency>
-      <groupId>org.cloudera.htrace</groupId>
+      <groupId>org.htrace</groupId>
       <artifactId>htrace-core</artifactId>
    </dependency>
   </dependencies>

Modified: hbase/trunk/hbase-shell/src/main/ruby/shell/commands/trace.rb
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-shell/src/main/ruby/shell/commands/trace.rb?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/hbase-shell/src/main/ruby/shell/commands/trace.rb (original)
+++ hbase/trunk/hbase-shell/src/main/ruby/shell/commands/trace.rb Fri Mar 21 22:46:03 2014
@@ -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

Modified: hbase/trunk/hbase-thrift/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-thrift/pom.xml?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/hbase-thrift/pom.xml (original)
+++ hbase/trunk/hbase-thrift/pom.xml Fri Mar 21 22:46:03 2014
@@ -189,7 +189,7 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.cloudera.htrace</groupId>
+      <groupId>org.htrace</groupId>
       <artifactId>htrace-core</artifactId>
     </dependency>
     <dependency>

Modified: hbase/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/pom.xml?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Fri Mar 21 22:46:03 2014
@@ -919,7 +919,7 @@
     <jersey.version>1.8</jersey.version>
     <jruby.version>1.6.8</jruby.version>
     <junit.version>4.11</junit.version>
-    <htrace.version>2.04</htrace.version>
+    <htrace.version>3.0.3</htrace.version>
     <log4j.version>1.2.17</log4j.version>
     <mockito-all.version>1.9.0</mockito-all.version>
     <protobuf.version>2.5.0</protobuf.version>
@@ -1366,7 +1366,7 @@
         <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>org.cloudera.htrace</groupId>
+        <groupId>org.htrace</groupId>
         <artifactId>htrace-core</artifactId>
         <version>${htrace.version}</version>
       </dependency>

Modified: hbase/trunk/src/main/docbkx/tracing.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/docbkx/tracing.xml?rev=1580076&r1=1580075&r2=1580076&view=diff
==============================================================================
--- hbase/trunk/src/main/docbkx/tracing.xml (original)
+++ hbase/trunk/src/main/docbkx/tracing.xml Fri Mar 21 22:46:03 2014
@@ -70,7 +70,7 @@
 <programlisting><![CDATA[
   <property>
     <name>hbase.trace.spanreceiver.classes</name>
-    <value>org.cloudera.htrace.impl.LocalFileSpanReceiver</value>
+    <value>org.htrace.impl.LocalFileSpanReceiver</value>
   </property>
   <property>
     <name>hbase.local-file-span-receiver.path</name>
@@ -95,7 +95,7 @@
 <programlisting><![CDATA[
   <property>
     <name>hbase.trace.spanreceiver.classes</name>
-    <value>org.cloudera.htrace.impl.ZipkinSpanReceiver</value>
+    <value>org.htrace.impl.ZipkinSpanReceiver</value>
   </property> 
   <property>
     <name>hbase.zipkin.collector-hostname</name>



Mime
View raw message