Send JVM and OS statistics in User-Agent fixes #291

Author: germanattanasio

src/main/java/com/ibm/watson/developer_cloud/service/WatsonService.java

@@ -140,7 +140,7 @@ private Call createCall(Request request) {
       builder.url(RequestUtils.replaceEndPoint(request.url().toString(), getEndPoint()));
     }
 
-    String userAgent = getUserAgent();
+    String userAgent = RequestUtils.getUserAgent();
 
     if (defaultHeaders != null) {
       for (String key : defaultHeaders.names()) {
@@ -304,16 +304,6 @@ public String getName() {
   }
 
 
-  /**
-   * Gets the user agent.
-   * 
-   * 
-   * @return the user agent
-   */
-  private String getUserAgent() {
-    return "watson-apis-java-sdk/3.0.0-RC1";
-  }
-
   /**
    * Sets the API key.
    * 

src/main/java/com/ibm/watson/developer_cloud/util/RequestUtils.java

@@ -37,6 +37,11 @@ public class RequestUtils {
    */
   public static final String DEFAULT_ENDPOINT = "http://do.not.use";
 
+  private static final String SDK_VERSION = "3.0.0-RC1";
+  private static final String[] properties =
+      new String[] {"java.vendor", "java.version", "os.arch", "os.name", "os.version"};
+  private static String userAgent;
+
   /**
    * Encode a string into a valid URL string.
    *
@@ -122,7 +127,7 @@ public static String replaceEndPoint(String url, String endPoint) {
   /**
    * Creates a String of all elements of an iterable, separated by a separator.
    *
-   * @param iterable  the iterable
+   * @param iterable the iterable
    * @param separator the separator
    * @return the joined String
    */
@@ -141,4 +146,38 @@ public static String join(Iterable<?> iterable, String separator) {
 
     return sb.toString();
   }
+
+  /**
+   * Gets the user agent.
+   *
+   * @return the user agent
+   */
+  public static String getUserAgent() {
+    if (userAgent == null) {
+      userAgent = buildUserAgent();
+    }
+    return userAgent;
+  }
+
+  /**
+   * Builds the user agent using System properties
+   *
+   * @return the string that represents the user agent
+   */
+  private static String buildUserAgent() {
+    StringBuilder stringBuilder = new StringBuilder();
+    stringBuilder.append("watson-apis-java-sdk/");
+    stringBuilder.append(SDK_VERSION);
+    stringBuilder.append(" (");
+    for (String propertyName : properties) {
+      stringBuilder.append(propertyName);
+      stringBuilder.append("=");
+      stringBuilder.append(System.getProperty(propertyName));
+      stringBuilder.append("; ");
+    }
+    stringBuilder.append(")");
+
+    return stringBuilder.toString();
+  }
+
 }

src/test/java/com/ibm/watson/developer_cloud/service/GenericServiceTest.java

@@ -14,6 +14,7 @@
 package com.ibm.watson.developer_cloud.service;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -234,7 +235,7 @@ public void testCustomUserAgent() throws InterruptedException {
     service.setDefaultHeaders(headers);
     service.getProfile(sampleText).execute();
     final RecordedRequest request = checkRequest();
-    assertEquals("watson-apis-java-sdk/3.0.0-RC1 foo-bar", request.getHeader(HttpHeaders.USER_AGENT));
+    assertTrue(request.getHeader(HttpHeaders.USER_AGENT).endsWith("foo-bar"));
     service.setDefaultHeaders(null);
   }