Merge pull request cloudera#4 from weichiu/hac-271

Hac 271

Author: ajfabbri

hadoop-common-project/hadoop-common/pom.xml

@@ -274,7 +274,6 @@
           <groupId>com.squareup.okhttp3</groupId>
           <artifactId>okhttp</artifactId>
         </exclusion>
-
       </exclusions>
     </dependency>
 

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSOutputSummer.java

@@ -199,7 +199,7 @@ protected DataChecksum getDataChecksum() {
     return sum;
   }
 
-  protected TraceScope createWriteTraceScope() {
+  protected io.opentracing.Scope createWriteTraceScope() {
     return null;
   }
 
@@ -209,7 +209,7 @@ protected TraceScope createWriteTraceScope() {
   private void writeChecksumChunks(byte b[], int off, int len)
   throws IOException {
     sum.calculateChunkedSums(b, off, len, checksum, 0);
-    TraceScope scope = createWriteTraceScope();
+    io.opentracing.Scope scope = createWriteTraceScope();
     try {
       for (int i = 0; i < len; i += sum.getBytesPerChecksum()) {
         int chunkLen = Math.min(sum.getBytesPerChecksum(), len - i);
@@ -219,7 +219,7 @@ private void writeChecksumChunks(byte b[], int off, int len)
       }
     } finally {
       if (scope != null) {
-        scope.close();
+        //scope.close();
       }
     }
   }

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java

@@ -223,7 +223,7 @@ public boolean accept(final Path file) {
   private final Configuration conf;
   private final UserGroupInformation ugi;
   final boolean resolveSymlinks;
-  private final Tracer tracer;
+  private final io.opentracing.Tracer tracer;
 
   private FileContext(final AbstractFileSystem defFs,
                       final Configuration aConf) {
@@ -2780,7 +2780,7 @@ public Collection<? extends BlockStoragePolicySpi> getAllStoragePolicies()
     return defaultFS.getAllStoragePolicies();
   }
 
-  Tracer getTracer() {
+  io.opentracing.Tracer getTracer() {
     return tracer;
   }
 }

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java

@@ -3280,9 +3280,11 @@ public static Class<? extends FileSystem> getFileSystemClass(String scheme,
    */
   private static FileSystem createFileSystem(URI uri, Configuration conf)
       throws IOException {
-    Tracer tracer = FsTracer.get(conf);
-    try(TraceScope scope = tracer.newScope("FileSystem#createFileSystem")) {
-      scope.addKVAnnotation("scheme", uri.getScheme());
+    io.opentracing.Tracer tracer = FsTracer.get(conf);
+//    try(TraceScope scope = tracer.newScope("FileSystem#createFileSystem")) {
+    try(io.opentracing.Scope scope =
+        tracer.buildSpan("FileSystem#createFileSystem").startActive(true)) {
+      // scope.addKVAnnotation("scheme", uri.getScheme());
       Class<?> clazz = getFileSystemClass(uri.getScheme(), conf);
       FileSystem fs = (FileSystem)ReflectionUtils.newInstance(clazz, conf);
       fs.initialize(uri, conf);

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java

@@ -307,14 +307,17 @@ public int run(String argv[]) throws Exception {
         conf(TraceUtils.wrapHadoopConf(SHELL_HTRACE_PREFIX, getConf())).
         build();*/
 
-    io.opentracing.Tracer tracer =
+    /*io.opentracing.Tracer tracer =
         new com.uber.jaeger.Configuration(
             "FsShell",
             new com.uber.jaeger.Configuration.SamplerConfiguration("const", 1),
             new com.uber.jaeger.Configuration.ReporterConfiguration(
                 false, "va1022.halxg.cloudera.com", 6831, 1000, 10000)
         ).getTracer();
-    GlobalTracer.register(tracer);
+    if (!GlobalTracer.isRegistered()) {
+      GlobalTracer.register(tracer);
+    }*/
+    io.opentracing.Tracer tracer = FsTracer.get(getConf());
 
     int exitCode = -1;
     if (argv.length < 1) {

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsTracer.java

@@ -35,14 +35,24 @@
 @InterfaceAudience.Private
 @InterfaceStability.Unstable
 public final class FsTracer {
-  private static Tracer instance;
+  private static io.opentracing.Tracer instance;
 
-  public static synchronized Tracer get(Configuration conf) {
+  public static synchronized io.opentracing.Tracer get(Configuration conf) {
     if (instance == null) {
-      instance = new Tracer.Builder("FSClient").
-          conf(TraceUtils.wrapHadoopConf(CommonConfigurationKeys.
-              FS_CLIENT_HTRACE_PREFIX, conf)).
-          build();
+//      instance = new Tracer.Builder("FSClient").
+//          conf(TraceUtils.wrapHadoopConf(CommonConfigurationKeys.
+//              FS_CLIENT_HTRACE_PREFIX, conf)).
+//          build();
+
+      io.opentracing.Tracer tempInstance =
+          new com.uber.jaeger.Configuration(
+              "FSClient",
+              new com.uber.jaeger.Configuration.SamplerConfiguration("const", 1),
+              new com.uber.jaeger.Configuration.ReporterConfiguration(
+                  false, "va1022.halxg.cloudera.com", 6831, 1000, 10000)
+          ).getTracer();
+      instance = tempInstance;
+      return instance;
     }
     return instance;
   }
@@ -53,7 +63,7 @@ public static synchronized void clear() {
       return;
     }
     try {
-      instance.close();
+//      instance.close();
     } finally {
       instance = null;
     }

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Globber.java

@@ -41,7 +41,7 @@ class Globber {
   private final FileContext fc;
   private final Path pathPattern;
   private final PathFilter filter;
-  private final Tracer tracer;
+  private final io.opentracing.Tracer tracer;
 
   public Globber(FileSystem fs, Path pathPattern, PathFilter filter) {
     this.fs = fs;
@@ -143,12 +143,13 @@ private String authorityFromPath(Path path) throws IOException {
   }
 
   public FileStatus[] glob() throws IOException {
-    TraceScope scope = tracer.newScope("Globber#glob");
-    scope.addKVAnnotation("pattern", pathPattern.toUri().getPath());
-    try {
+//    TraceScope scope = tracer.newScope("Globber#glob");
+//    scope.addKVAnnotation("pattern", pathPattern.toUri().getPath());
+    try (io.opentracing.Scope scope =
+        tracer.buildSpan("Globber#glob").startActive(true)){
       return doGlob();
     } finally {
-      scope.close();
+//      scope.close();
     }
   }
 

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java

@@ -778,9 +778,11 @@ private synchronized void setupIOstreams(
         if (LOG.isDebugEnabled()) {
           LOG.debug("Connecting to "+server);
         }
-        Span span = Tracer.getCurrentSpan();
+        //Span span = Tracer.getCurrentSpan();
+        io.opentracing.Span span = io.opentracing.util.GlobalTracer.get().activeSpan();
         if (span != null) {
-          span.addTimelineAnnotation("IPC client connecting to " + server);
+          //span.addTimelineAnnotation("IPC client connecting to " + server);
+          span.log("IPC client connecting to " + server);
         }
         short numRetries = 0;
         Random rand = null;
@@ -843,9 +845,11 @@ public AuthMethod run()
           // update last activity time
           touch();
 
-          span = Tracer.getCurrentSpan();
+          //span = Tracer.getCurrentSpan();
+          span = io.opentracing.util.GlobalTracer.get().activeSpan();
           if (span != null) {
-            span.addTimelineAnnotation("IPC client connected to " + server);
+            //span.addTimelineAnnotation("IPC client connected to " + server);
+            span.log("IPC client connected to " + server);
           }
 
           // start the receiver thread after the socket connection has been set

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java

@@ -33,6 +33,7 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import io.opentracing.Tracer;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;