[net] Revert adding eclipse.uuid to error reports
This reverts commit 3f0c6dbd637ea526634e98b6aee7cf5a492079ce and commit
96f4a2bed9a1bc2d28213dc22a68bb7bf13f8814.
Bug: 492917
Change-Id: I54215a7412b2936783ed8175ce64b59da9c39389
Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>
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 546cd2f..74f0c2f 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,9 +8,7 @@
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.*;
@@ -101,7 +99,6 @@
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);
@@ -170,7 +167,6 @@
.staleConnectionCheck(true)
.socketTimeout(configuration.getSocketTimeoutMs());
// @formatter:on
- setEclipseUuid(request, target);
Response response = Proxies.proxyAuthentication(executor, target).execute(request);
@@ -206,22 +202,9 @@
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) {
@@ -269,4 +252,5 @@
return UNCONFIRMED;
}
}
+
}
