Reduced timeout and log output for IMDS timeout (#192)

* reduced timeout and log output for imds * separated read and connect timeouts
aws · Aug 10, 2020 · 3d2c733 · 3d2c733
1 parent a460106
commit 3d2c733
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/plugins/EC2MetadataFetcher.java b/aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/plugins/EC2MetadataFetcher.java
@@ -25,6 +25,7 @@
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.ProtocolException;
+import java.net.SocketTimeoutException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
@@ -46,7 +47,8 @@ enum EC2Metadata {
         AMI_ID,
     }
 
-    private static final int TIMEOUT_MILLIS = 2000;
+    private static final int CONNECT_TIMEOUT_MILLIS = 100;
+    private static final int READ_TIMEOUT_MILLIS = 1000;
     private static final String DEFAULT_IMDS_ENDPOINT = "169.254.169.254";
 
     private final URL identityDocumentUrl;
@@ -142,8 +144,8 @@ private static String fetchString(String httpMethod, URL url, String token, bool
             return "";
         }
 
-        connection.setConnectTimeout(TIMEOUT_MILLIS);
-        connection.setReadTimeout(TIMEOUT_MILLIS);
+        connection.setConnectTimeout(CONNECT_TIMEOUT_MILLIS);
+        connection.setReadTimeout(READ_TIMEOUT_MILLIS);
 
         if (includeTtl) {
             connection.setRequestProperty("X-aws-ec2-metadata-token-ttl-seconds", "60");
@@ -156,7 +158,11 @@ private static String fetchString(String httpMethod, URL url, String token, bool
         try {
             responseCode = connection.getResponseCode();
         } catch (Exception e) {
-            logger.warn("Error connecting to IMDS.", e);
+            if (e instanceof SocketTimeoutException) {
+                logger.debug("Timed out trying to connect to IMDS, likely not operating in EC2 environment");
+            } else {
+                logger.warn("Error connecting to IMDS.", e);
+            }
             return "";
         }