wrap exceptions thrown by async transport implementations in IOException

Signed-off-by: Andrew Parmet <[email protected]>

java-client/src/main/java/org/opensearch/client/transport/aws/AwsSdk2Transport.java

@@ -194,17 +194,11 @@ public <RequestT, ResponseT, ErrorT> ResponseT performRequest(
             try {
                 return executeAsync((SdkAsyncHttpClient) httpClient, clientReq, requestBody, endpoint, options).get();
             } catch (ExecutionException e) {
-                Throwable cause = e.getCause();
-                if (cause != null) {
-                    if (cause instanceof IOException) {
-                        throw (IOException) cause;
-                    }
-                    if (cause instanceof RuntimeException) {
-                        throw (RuntimeException) cause;
-                    }
-                    throw new RuntimeException(cause);
+                if (e.getCause() instanceof IOException) {
+                    throw (IOException) e.getCause();
+                } else {
+                    throw new IOException(e.getCause());
                 }
-                throw new RuntimeException(e);
             } catch (InterruptedException e) {
                 throw new IOException("HttpRequest was interrupted", e);
             }

java-client/src/main/java/org/opensearch/client/transport/httpclient5/ApacheHttpClient5Transport.java

@@ -143,9 +143,7 @@ public <RequestT, ResponseT, ErrorT> ResponseT performRequest(
         try {
             return performRequestAsync(request, endpoint, options).join();
         } catch (final CompletionException ex) {
-            if (ex.getCause() instanceof RuntimeException) {
-                throw (RuntimeException) ex.getCause();
-            } else if (ex.getCause() instanceof IOException) {
+            if (ex.getCause() instanceof IOException) {
                 throw (IOException) ex.getCause();
             } else {
                 throw new IOException(ex.getCause());

java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractAsyncStracktraceIT.java

@@ -0,0 +1,20 @@
+package org.opensearch.client.opensearch.integTest;
+
+import org.apache.logging.log4j.core.util.Throwables;
+import org.junit.Test;
+
+public abstract class AbstractAsyncStracktraceIT extends OpenSearchJavaClientTestCase {
+    @Test
+    public void testFailureFromClientPreservesStacktraceOfCaller() throws Exception {
+        var thrown = assertThrows(Exception.class, () -> javaClient().indices().get(g -> g.index("nonexisting-index")));
+
+        var stacktraceElements = Throwables.toStringList(thrown);
+
+        stacktraceElements.forEach(System.out::println);
+
+        var someElementContainsCallerMethodName =
+                stacktraceElements.stream().anyMatch(it -> it.contains("testFailureFromClientPreservesStacktraceOfCaller"));
+
+        assertTrue(someElementContainsCallerMethodName);
+    }
+}

java-client/src/test/java/org/opensearch/client/opensearch/integTest/aws/AwsSdk2AsyncStacktraceIT.java

@@ -0,0 +1,6 @@
+package org.opensearch.client.opensearch.integTest.aws;
+
+import org.opensearch.client.opensearch.integTest.AbstractAsyncStracktraceIT;
+
+public class AwsSdk2AsyncStacktraceIT extends AbstractAsyncStracktraceIT implements AwsSdk2AsyncTransportSupport {
+}

java-client/src/test/java/org/opensearch/client/opensearch/integTest/aws/AwsSdk2AsyncTransportSupport.java

@@ -0,0 +1,46 @@
+package org.opensearch.client.opensearch.integTest.aws;
+
+import org.apache.hc.core5.http.HttpHost;
+import org.opensearch.client.opensearch.integTest.OpenSearchTransportSupport;
+import org.opensearch.client.transport.OpenSearchTransport;
+import org.opensearch.client.transport.aws.AwsSdk2Transport;
+import org.opensearch.client.transport.aws.AwsSdk2TransportOptions;
+import org.opensearch.common.settings.Settings;
+import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
+import software.amazon.awssdk.http.crt.AwsCrtAsyncHttpClient;
+import software.amazon.awssdk.regions.Region;
+
+import java.io.IOException;
+
+interface AwsSdk2AsyncTransportSupport extends OpenSearchTransportSupport {
+    @Override
+    default OpenSearchTransport buildTransport(Settings settings, HttpHost[] hosts) throws IOException {
+        return new AwsSdk2Transport(
+                getAsyncHttpClient(),
+                getTestClusterHost(),
+                getTestClusterServiceName(),
+                getTestClusterRegion(),
+                getTransportOptions().build());
+    }
+
+    private String getTestClusterHost() {
+        return System.getProperty("tests.awsSdk2support.domainHost");
+    }
+
+    private String getTestClusterServiceName() {
+        return System.getProperty("tests.awsSdk2support.serviceName");
+    }
+
+    private Region getTestClusterRegion() {
+        String region = System.getProperty("tests.awsSdk2support.domainRegion");
+        return region != null ? Region.of(region) : Region.US_EAST_1;
+    }
+
+    private AwsSdk2TransportOptions.Builder getTransportOptions() {
+        return AwsSdk2TransportOptions.builder();
+    }
+
+    private SdkAsyncHttpClient getAsyncHttpClient() {
+        return AwsCrtAsyncHttpClient.create();
+    }
+}

java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/AsyncStacktraceIT.java

@@ -0,0 +1,6 @@
+package org.opensearch.client.opensearch.integTest.httpclient5;
+
+import org.opensearch.client.opensearch.integTest.AbstractAsyncStracktraceIT;
+
+public class AsyncStacktraceIT extends AbstractAsyncStracktraceIT implements HttpClient5TransportSupport {
+}