[net] Add eclipse.uuid to error reports

Bug: 492917
Change-Id: I985311a09f3b9faff49aba152b9e310fc5a2bfb7
Signed-off-by: Marcel Bruch <marcel.bruch@codetrails.com>

1 files changed, 17 insertions, 1 deletions

diff --git a/bundles/org.eclipse.epp.logging.aeri.ide/src/org/eclipse/epp/internal/logging/aeri/ide/server/mars/IO.java b/bundles/org.eclipse.epp.logging.aeri.ide/src/org/eclipse/epp/internal/logging/aeri/ide/server/mars/IO.java
index 74f0c2f0e..f370e811b 100644
--- a/bundles/org.eclipse.epp.logging.aeri.ide/src/org/eclipse/epp/internal/logging/aeri/ide/server/mars/IO.java
+++ b/bundles/org.eclipse.epp.logging.aeri.ide/src/org/eclipse/epp/internal/logging/aeri/ide/server/mars/IO.java
@@ -8,7 +8,9 @@
 package org.eclipse.epp.internal.logging.aeri.ide.server.mars;
 
 import static com.google.common.base.Charsets.UTF_8;
+import static java.lang.System.getProperty;
 import static org.apache.commons.lang3.ArrayUtils.contains;
+import static org.apache.commons.lang3.StringUtils.*;
 import static org.eclipse.epp.internal.logging.aeri.ide.server.Proxies.*;
 import static org.eclipse.epp.internal.logging.aeri.ide.server.mars.ServerResponse.KEYWORD_NEEDINFO;
 import static org.eclipse.epp.logging.aeri.core.ProblemStatus.*;
@@ -99,6 +101,7 @@ public class IO {
         Request request = Request.Post(target).viaProxy(getProxyHost(target).orNull()).body(entity)
                 .connectTimeout(configuration.getConnectTimeoutMs()).staleConnectionCheck(true)
                 .socketTimeout(configuration.getSocketTimeoutMs());
+        setEclipseUuid(request, target);
         String response = proxyAuthentication(executor, target).execute(request).returnContent().asString();
         ServerResponse raw = Json.deserialize(response, ServerResponse.class);
 
@@ -166,6 +169,7 @@ public class IO {
                 .connectTimeout(configuration.getConnectTimeoutMs())
                 .staleConnectionCheck(true)
                 .socketTimeout(configuration.getSocketTimeoutMs());
+        setEclipseUuid(request,target);
         // @formatter:on
 
         Response response = Proxies.proxyAuthentication(executor, target).execute(request);
@@ -202,9 +206,22 @@ public class IO {
         int socketTimeout = (int) TimeUnit.SECONDS.toMillis(10);
         Request request = Request.Get(target).viaProxy(getProxyHost(target).orNull()).connectTimeout(connectTimeout)
                 .staleConnectionCheck(true).socketTimeout(socketTimeout);
+        setEclipseUuid(request, target);
         return proxyAuthentication(executor, target).execute(request);
     }
 
+    private static void setEclipseUuid(Request request, URI target) {
+        try {
+            if (!endsWith(target.getHost(), "eclipse.org")) {
+                return;
+            }
+            String eclipseUuid = defaultIfBlank(getProperty("eclipse.uuid"), "unknownUUID");
+            request.setHeader("eclipse.uuid", eclipseUuid);
+        } catch (Exception e) {
+            Logs.warn("Failed to set eclipse.uuid", e);
+        }
+    }
+
     @VisibleForTesting
     public static ProblemStatus tryParse(ServerResponse response) {
 
@@ -252,5 +269,4 @@ public class IO {
             return UNCONFIRMED;
         }
     }
-
 }