Merge pull request #1562 from willbengtson/add-useragent-to-metadata-calls

aws-java-sdk-core: EC2MetadataClient.java - Adds sending of a User-Ag…

Author: varunnvs92

aws-java-sdk-core/src/main/java/com/amazonaws/internal/EC2CredentialsUtils.java

@@ -31,6 +31,7 @@
 import com.amazonaws.retry.internal.CredentialsEndpointRetryPolicy;
 import com.amazonaws.util.IOUtils;
 import com.amazonaws.util.json.Jackson;
+import com.amazonaws.util.VersionInfoUtils;
 import com.fasterxml.jackson.databind.JsonNode;
 
 @SdkInternalApi
@@ -42,6 +43,8 @@ public final class EC2CredentialsUtils {
 
     private final ConnectionUtils connectionUtils;
 
+    private static final String USER_AGENT = String.format("aws-sdk-java/%s", VersionInfoUtils.getVersion());
+
     private EC2CredentialsUtils() {
         this(ConnectionUtils.getInstance());
     }
@@ -76,7 +79,12 @@ public static EC2CredentialsUtils getInstance() {
      *             If the requested service is not found.
      */
     public String readResource(URI endpoint) throws IOException {
-        return readResource(endpoint, CredentialsEndpointRetryPolicy.NO_RETRY, new HashMap<String, String>());
+        Map<String, String> headers = new HashMap<String, String>();
+        headers.put("User-Agent", USER_AGENT);
+        headers.put("Accept", "*/*");
+        headers.put("Connection", "keep-alive");
+
+        return readResource(endpoint, CredentialsEndpointRetryPolicy.NO_RETRY, headers);
     }
 
     /**

aws-java-sdk-core/src/main/java/com/amazonaws/internal/EC2MetadataClient.java

@@ -26,6 +26,7 @@
 
 import com.amazonaws.SdkClientException;
 import com.amazonaws.util.EC2MetadataUtils;
+import com.amazonaws.util.VersionInfoUtils;
 
 /**
  * Simple client for accessing the Amazon EC2 Instance Metadata Service.
@@ -43,6 +44,9 @@ public class EC2MetadataClient {
 
     private static final Log log = LogFactory.getLog(EC2MetadataClient.class);
 
+    /** User-Agent for requests to the metadata service **/
+    private static final String USER_AGENT = String.format("aws-sdk-java/%s", VersionInfoUtils.getVersion());
+
     /**
      * Connects to the Amazon EC2 Instance Metadata Service to retrieve the
      * default credential information (if any).
@@ -91,6 +95,7 @@ public String readResource(String resourcePath) throws IOException, SdkClientExc
         connection.setReadTimeout(1000 * 5);
         connection.setRequestMethod("GET");
         connection.setDoOutput(true);
+        connection.addRequestProperty("User-Agent", USER_AGENT);
         connection.connect();
 
         return readResponse(connection);