Rename leftover remnants

Author: pawankartik-elastic

x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/EsqlTestUtils.java

@@ -861,12 +861,12 @@ public static <T> T singleValue(Collection<T> collection) {
     }
 
     /**
-     * Errors from remotes are wrapped in RemoteComputeException while the ones from the local cluster
+     * Errors from remotes are wrapped in RemoteException while the ones from the local cluster
      * aren't. This utility method is useful for unwrapping in such cases.
      * @param e Exception to unwrap.
-     * @return Cause of RemoteComputeException, else the error itself.
+     * @return Cause of RemoteException, else the error itself.
      */
-    public static Exception unwrapIfWrappedInRemoteComputeException(Exception e) {
+    public static Exception unwrapIfWrappedInRemoteException(Exception e) {
         if (e instanceof RemoteException rce) {
             return (Exception) rce.getCause();
         } else {

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClusterCancellationIT.java

@@ -164,7 +164,7 @@ public void testCancel() throws Exception {
             SimplePauseFieldPlugin.allowEmitting.countDown();
         }
         Exception error = expectThrows(Exception.class, requestFuture::actionGet);
-        error = EsqlTestUtils.unwrapIfWrappedInRemoteComputeException(error);
+        error = EsqlTestUtils.unwrapIfWrappedInRemoteException(error);
         assertThat(error.getMessage(), containsString("proxy timeout"));
     }
 
@@ -286,7 +286,7 @@ public void testCancelSkipUnavailable() throws Exception {
         }
 
         Exception error = expectThrows(Exception.class, requestFuture::actionGet);
-        error = EsqlTestUtils.unwrapIfWrappedInRemoteComputeException(error);
+        error = EsqlTestUtils.unwrapIfWrappedInRemoteException(error);
         assertThat(error, instanceOf(TaskCancelledException.class));
     }
 }

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClusterQueryIT.java

@@ -817,7 +817,7 @@ public void testRemoteFailureSkipUnavailableTrue() throws IOException {
         String q = Strings.format("FROM %s,cluster-a:%s*", localIndex, remote1Index);
 
         Exception error = expectThrows(Exception.class, () -> runQuery(q, false));
-        error = EsqlTestUtils.unwrapIfWrappedInRemoteComputeException(error);
+        error = EsqlTestUtils.unwrapIfWrappedInRemoteException(error);
 
         assertThat(error, instanceOf(IllegalStateException.class));
         assertThat(error.getMessage(), containsString("Accessing failing field"));

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClusterQueryWithPartialResultsIT.java

@@ -106,7 +106,7 @@ public void testPartialResults() throws Exception {
         {
             request.allowPartialResults(false);
             Exception error = expectThrows(Exception.class, () -> runQuery(request).close());
-            error = EsqlTestUtils.unwrapIfWrappedInRemoteComputeException(error);
+            error = EsqlTestUtils.unwrapIfWrappedInRemoteException(error);
 
             assertThat(error, instanceOf(IllegalStateException.class));
             assertThat(error.getMessage(), containsString("Accessing failing field"));
@@ -194,7 +194,7 @@ public void sendResponse(Exception exception) {
             {
                 request.allowPartialResults(false);
                 Exception error = expectThrows(Exception.class, () -> runQuery(request).close());
-                error = EsqlTestUtils.unwrapIfWrappedInRemoteComputeException(error);
+                error = EsqlTestUtils.unwrapIfWrappedInRemoteException(error);
                 var unwrapped = ExceptionsHelper.unwrap(error, simulatedFailure.getClass());
                 assertNotNull(unwrapped);
                 assertThat(unwrapped.getMessage(), equalTo(simulatedFailure.getMessage()));
@@ -242,7 +242,7 @@ public void testFailToStartRequestOnRemoteCluster() throws Exception {
             {
                 request.allowPartialResults(false);
                 Exception error = expectThrows(Exception.class, () -> runQuery(request).close());
-                error = EsqlTestUtils.unwrapIfWrappedInRemoteComputeException(error);
+                error = EsqlTestUtils.unwrapIfWrappedInRemoteException(error);
                 EsqlTestUtils.assertEsqlFailure(error);
                 var unwrapped = ExceptionsHelper.unwrap(error, simulatedFailure.getClass());
                 assertNotNull(unwrapped);

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/ComputeService.java

@@ -345,8 +345,8 @@ public void execute(
                             /*
                              * At various points, when collecting failures before sending a response, we manually check
                              * if an ex is a transport error and if it is, we unwrap it. Because we're wrapping an ex
-                             * in RemoteComputeException, the checks fail and unwrapping does not happen. We offload
-                             * the unwrapping to here.
+                             * in RemoteException, the checks fail and unwrapping does not happen. We offload the
+                             * unwrapping to here.
                              *
                              * Note: The other error we explicitly check for is TaskCancelledException which is never
                              * wrapped.