HBASE-26764 Implement generic exception support for TraceUtil methods over Callables and Runnables

For the `TraceUtil` methods that accept `Callable` and `Runnable` types, make them generic over a
child of `Throwable`. This allows us to consolidate the two method signatures into a single more
flexible definition.

Signed-off-by: Duo Zhang <zhangduo@apache.org>

hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncConnectionImpl.java

@@ -27,7 +27,6 @@ import static org.apache.hadoop.hbase.client.MetricsConnection.CLIENT_SIDE_METRI
 import static org.apache.hadoop.hbase.client.NonceGenerator.CLIENT_NONCES_ENABLED_KEY;
 import static org.apache.hadoop.hbase.trace.HBaseSemanticAttributes.SERVER_NAME_KEY;
 import static org.apache.hadoop.hbase.util.FutureUtils.addListener;
-
 import io.opentelemetry.api.trace.Span;
 import java.io.IOException;
 import java.util.Optional;
@@ -37,7 +36,6 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Supplier;
 import org.apache.commons.io.IOUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.AuthUtil;
@@ -58,10 +56,8 @@ import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.yetus.audience.InterfaceAudience;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
 import org.apache.hbase.thirdparty.io.netty.util.HashedWheelTimer;
-
 import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.AdminService;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ClientService;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos;
@@ -405,13 +401,7 @@ public class AsyncConnectionImpl implements AsyncConnection {
 
   @Override
   public Hbck getHbck(ServerName masterServer) {
-    return TraceUtil.trace(new Supplier<Hbck>() {
-
-      @Override
-      public Hbck get() {
-        return getHbckInternal(masterServer);
-      }
-    }, "AsyncConnection.getHbck");
+    return TraceUtil.trace(() -> getHbckInternal(masterServer), "AsyncConnection.getHbck");
   }
 
   @Override

hbase-client/src/main/java/org/apache/hadoop/hbase/client/HRegionLocator.java

@@ -157,14 +157,14 @@ public class HRegionLocator implements RegionLocator {
     return regions;
   }
 
-  private <T> T tracedLocationFuture(
-    TraceUtil.IOExceptionCallable<T> action,
-    Function<T, List<String>> getRegionNames,
+  private <R, T extends Throwable> R tracedLocationFuture(
+    TraceUtil.ThrowingCallable<R, T> action,
+    Function<R, List<String>> getRegionNames,
     Supplier<Span> spanSupplier
-  ) throws IOException {
+  ) throws T {
     final Span span = spanSupplier.get();
     try (Scope ignored = span.makeCurrent()) {
-      final T result = action.call();
+      final R result = action.call();
       final List<String> regionNames = getRegionNames.apply(result);
       if (!CollectionUtils.isEmpty(regionNames)) {
         span.setAttribute(REGION_NAMES_KEY, regionNames);
@@ -172,7 +172,7 @@ public class HRegionLocator implements RegionLocator {
       span.setStatus(StatusCode.OK);
       span.end();
       return result;
-    } catch (IOException e) {
+    } catch (Throwable e) {
       TraceUtil.setError(span, e);
       span.end();
       throw e;

hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java

@@ -530,7 +530,7 @@ public class HTable implements Table {
     final Supplier<Span> supplier = new TableOperationSpanBuilder(connection)
       .setTableName(tableName)
       .setOperation(delete);
-    TraceUtil.traceWithIOException(() -> {
+    TraceUtil.trace(() -> {
       ClientServiceCallable<Void> callable =
         new ClientServiceCallable<Void>(this.connection, getName(), delete.getRow(),
           this.rpcControllerFactory.newController(), delete.getPriority()) {
@@ -573,7 +573,7 @@ public class HTable implements Table {
     final Supplier<Span> supplier = new TableOperationSpanBuilder(connection)
       .setTableName(tableName)
       .setOperation(put);
-    TraceUtil.traceWithIOException(() -> {
+    TraceUtil.trace(() -> {
       validatePut(put);
       ClientServiceCallable<Void> callable =
         new ClientServiceCallable<Void>(this.connection, getName(), put.getRow(),
@@ -1116,7 +1116,7 @@ public class HTable implements Table {
       .setName("HTable.close")
       .setTableName(tableName)
       .setSpanKind(SpanKind.INTERNAL);
-    TraceUtil.traceWithIOException(() -> {
+    TraceUtil.trace(() -> {
       if (this.closed) {
         return;
       }

hbase-common/src/main/java/org/apache/hadoop/hbase/trace/TraceUtil.java

@@ -24,8 +24,8 @@ import io.opentelemetry.api.trace.StatusCode;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import java.io.IOException;
 import java.util.List;
+import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Supplier;
 import org.apache.hadoop.hbase.Version;
@@ -84,7 +84,7 @@ public final class TraceUtil {
     Supplier<Span> spanSupplier
   ) {
     Span span = spanSupplier.get();
-    try (Scope scope = span.makeCurrent()) {
+    try (Scope ignored = span.makeCurrent()) {
       CompletableFuture<T> future = action.get();
       endSpan(future, span);
       return future;
@@ -97,7 +97,7 @@ public final class TraceUtil {
   public static <T> CompletableFuture<T> tracedFuture(Supplier<CompletableFuture<T>> action,
     String spanName) {
     Span span = createSpan(spanName);
-    try (Scope scope = span.makeCurrent()) {
+    try (Scope ignored = span.makeCurrent()) {
       CompletableFuture<T> future = action.get();
       endSpan(future, span);
       return future;
@@ -113,7 +113,7 @@ public final class TraceUtil {
     Supplier<Span> spanSupplier
   ) {
     Span span = spanSupplier.get();
-    try (Scope scope = span.makeCurrent()) {
+    try (Scope ignored = span.makeCurrent()) {
       List<CompletableFuture<T>> futures = action.get();
       endSpan(CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])), span);
       return futures;
@@ -139,70 +139,27 @@ public final class TraceUtil {
     });
   }
 
-  public static void trace(Runnable action, String spanName) {
-    trace(action, () -> createSpan(spanName));
-  }
-
-  public static void trace(Runnable action, Supplier<Span> creator) {
-    Span span = creator.get();
-    try (Scope scope = span.makeCurrent()) {
-      action.run();
-      span.setStatus(StatusCode.OK);
-    } catch (Throwable e) {
-      setError(span, e);
-      throw e;
-    } finally {
-      span.end();
-    }
-  }
-
-  public static <T> T trace(Supplier<T> action, String spanName) {
-    Span span = createSpan(spanName);
-    try (Scope scope = span.makeCurrent()) {
-      T ret = action.get();
-      span.setStatus(StatusCode.OK);
-      return ret;
-    } catch (Throwable e) {
-      setError(span, e);
-      throw e;
-    } finally {
-      span.end();
-    }
-  }
-
+  /**
+   * A {@link Runnable} that may also throw.
+   * @param <T> the type of {@link Throwable} that can be produced.
+   */
   @FunctionalInterface
-  public interface IOExceptionCallable<V> {
-    V call() throws IOException;
+  public interface ThrowingRunnable<T extends Throwable> {
+    void run() throws T;
   }
 
-  public static <T> T trace(IOExceptionCallable<T> callable, String spanName) throws IOException {
-    return trace(callable, () -> createSpan(spanName));
+  public static <T extends Throwable> void trace(
+    final ThrowingRunnable<T> runnable,
+    final String spanName) throws T {
+    trace(runnable, () -> createSpan(spanName));
   }
 
-  public static <T> T trace(IOExceptionCallable<T> callable, Supplier<Span> creator)
-    throws IOException {
-    Span span = creator.get();
-    try (Scope scope = span.makeCurrent()) {
-      T ret = callable.call();
-      span.setStatus(StatusCode.OK);
-      return ret;
-    } catch (Throwable e) {
-      setError(span, e);
-      throw e;
-    } finally {
-      span.end();
-    }
-  }
-
-  @FunctionalInterface
-  public interface IOExceptionRunnable {
-    void run() throws IOException;
-  }
-
-  public static void traceWithIOException(IOExceptionRunnable runnable,
-    Supplier<Span> creator) throws IOException {
-    Span span = creator.get();
-    try (Scope scope = span.makeCurrent()) {
+  public static <T extends Throwable> void trace(
+    final ThrowingRunnable<T> runnable,
+    final Supplier<Span> spanSupplier
+  ) throws T {
+    Span span = spanSupplier.get();
+    try (Scope ignored = span.makeCurrent()) {
       runnable.run();
       span.setStatus(StatusCode.OK);
     } catch (Throwable e) {
@@ -212,4 +169,38 @@ public final class TraceUtil {
       span.end();
     }
   }
+
+  /**
+   * A {@link Callable} that may also throw.
+   * @param <R> the result type of method call.
+   * @param <T> the type of {@link Throwable} that can be produced.
+   */
+  @FunctionalInterface
+  public interface ThrowingCallable<R, T extends Throwable> {
+    R call() throws T;
+  }
+
+  public static <R, T extends Throwable> R trace(
+    final ThrowingCallable<R, T> callable,
+    final String spanName
+  ) throws T {
+    return trace(callable, () -> createSpan(spanName));
+  }
+
+  public static <R, T extends Throwable> R trace(
+    final ThrowingCallable<R, T> callable,
+    final Supplier<Span> spanSupplier
+  ) throws T {
+    Span span = spanSupplier.get();
+    try (Scope ignored = span.makeCurrent()) {
+      final R ret = callable.call();
+      span.setStatus(StatusCode.OK);
+      return ret;
+    } catch (Throwable e) {
+      setError(span, e);
+      throw e;
+    } finally {
+      span.end();
+    }
+  }
 }

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java

@@ -561,18 +561,12 @@ public abstract class AbstractFSWAL<W extends WriterBase> implements WAL {
 
   @Override
   public final void sync(boolean forceSync) throws IOException {
-    TraceUtil.trace(() -> {
-      doSync(forceSync);
-      return null;
-    }, () -> createSpan("WAL.sync"));
+    TraceUtil.trace(() -> doSync(forceSync), () -> createSpan("WAL.sync"));
   }
 
   @Override
   public final void sync(long txid, boolean forceSync) throws IOException {
-    TraceUtil.trace(() -> {
-      doSync(txid, forceSync);
-      return null;
-    }, () -> createSpan("WAL.sync"));
+    TraceUtil.trace(() -> doSync(txid, forceSync), () -> createSpan("WAL.sync"));
   }
 
   protected abstract void doSync(boolean forceSync) throws IOException;