Remove retries from Java

Increased the scope of retries in the previous commit.
enso-org · Oct 8, 2024 · b1de982 · b1de982
1 parent 6638f0a
commit b1de982
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 29 deletions.
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP.enso
@@ -130,7 +130,7 @@ type HTTP
                     all_headers = headers + boundary_header_list
                     mapped_headers = all_headers.map on_problems=No_Wrap .to_java_pair
 
-                    response = Response.Value (EnsoSecretHelper.makeRequest self.internal_http_client builder req.uri.to_java_representation mapped_headers (req.method == HTTP_Method.Get))
+                    response = Response.Value (EnsoSecretHelper.makeRequest self.internal_http_client builder req.uri.to_java_representation mapped_headers)
                     if error_on_failure_code.not || response.code.is_success then response else
                         body = response.body.decode_as_text.catch Any _->""
                         message = if body.is_empty then Nothing else body

diff --git a/std-bits/base/src/main/java/org/enso/base/enso_cloud/EnsoSecretHelper.java b/std-bits/base/src/main/java/org/enso/base/enso_cloud/EnsoSecretHelper.java
@@ -1,7 +1,6 @@
 package org.enso.base.enso_cloud;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.http.HttpClient;
@@ -19,8 +18,6 @@
 /** Makes HTTP requests with secrets in either header or query string. */
 public final class EnsoSecretHelper extends SecretValueResolver {
 
-  private static final int MAX_RETRY_ATTEMPTS = 3;
-
   /** Gets a JDBC connection resolving EnsoKeyValuePair into the properties. */
   public static Connection getJDBCConnection(
       String url, List<Pair<String, HideableValue>> properties) throws SQLException {
@@ -61,8 +58,7 @@ public static EnsoHttpResponse makeRequest(
       HttpClient client,
       Builder builder,
       URIWithSecrets uri,
-      List<Pair<String, HideableValue>> headers,
-      Boolean withRetries)
+      List<Pair<String, HideableValue>> headers)
       throws IllegalArgumentException, IOException, InterruptedException {
 
     // Build a new URI with the query arguments.
@@ -92,30 +88,8 @@ public static EnsoHttpResponse makeRequest(
     // Build and Send the request.
     var httpRequest = builder.build();
     var bodyHandler = HttpResponse.BodyHandlers.ofInputStream();
+    var javaResponse = client.send(httpRequest, bodyHandler);
 
-    HttpResponse<InputStream> javaResponse = null;
-    var attempts = 0;
-    IOException failure = null;
-    while (attempts < MAX_RETRY_ATTEMPTS && javaResponse == null) {
-      try {
-        javaResponse = client.send(httpRequest, bodyHandler);
-      } catch (IOException ioe) {
-        if (withRetries) {
-          if (failure == null) {
-            failure = ioe;
-          }
-          attempts += 1;
-          Thread.sleep(Double.valueOf(Math.min(100 * Math.pow(2, attempts - 1), 5000)).longValue());
-        } else {
-          throw ioe;
-        }
-      }
-    }
-    if (attempts == MAX_RETRY_ATTEMPTS) {
-      throw failure;
-    }
-
-    assert javaResponse != null;
     // Extract parts of the response
     return new EnsoHttpResponse(
         renderedURI, javaResponse.headers(), javaResponse.body(), javaResponse.statusCode());