diff --git a/blueocean-pipeline-api-impl/pom.xml b/blueocean-pipeline-api-impl/pom.xml
index cffe3b1200b..66ff717f36f 100644
--- a/blueocean-pipeline-api-impl/pom.xml
+++ b/blueocean-pipeline-api-impl/pom.xml
@@ -152,11 +152,6 @@
jsoup
test
-
- org.jenkins-ci.modules
- instance-identity
- test
-
org.jenkins-ci.plugins
diff --git a/blueocean-rest-impl/pom.xml b/blueocean-rest-impl/pom.xml
index 724d89d3731..c252c669313 100644
--- a/blueocean-rest-impl/pom.xml
+++ b/blueocean-rest-impl/pom.xml
@@ -85,10 +85,6 @@
io.keen
keen-client-api-java
-
- org.jenkins-ci.modules
- instance-identity
-
com.github.ua-parser
diff --git a/blueocean-rest-impl/src/main/java/io/jenkins/blueocean/service/embedded/analytics/AbstractAnalytics.java b/blueocean-rest-impl/src/main/java/io/jenkins/blueocean/service/embedded/analytics/AbstractAnalytics.java
index d36cc1410e5..a4a2ee8a5c6 100644
--- a/blueocean-rest-impl/src/main/java/io/jenkins/blueocean/service/embedded/analytics/AbstractAnalytics.java
+++ b/blueocean-rest-impl/src/main/java/io/jenkins/blueocean/service/embedded/analytics/AbstractAnalytics.java
@@ -8,7 +8,6 @@
import io.jenkins.blueocean.commons.DigestUtils;
import io.jenkins.blueocean.commons.ServiceException;
import org.apache.commons.lang.StringUtils;
-import org.jenkinsci.main.modules.instance_identity.InstanceIdentity;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;
import org.kohsuke.stapler.Stapler;
@@ -50,11 +49,9 @@ public void track(TrackRequest req) {
allProps.putAll(additionalProperties);
}
}
- String server = server();
- allProps.put("jenkins", server);
// Background requests do not have userId
if (Stapler.getCurrentRequest() != null) {
- String identity = identity(server);
+ String identity = identity();
allProps.put("userId", identity);
}
@@ -71,20 +68,9 @@ public void track(TrackRequest req) {
protected abstract void doTrack(String name, Map allProps);
- protected final String server() {
- byte[] identityBytes;
- try {
- identityBytes = InstanceIdentity.get().getPublic().getEncoded();
- } catch (AssertionError e) {
- LOGGER.error("There was a problem identifying this server", e);
- throw new IllegalStateException("There was a problem identifying this server", e);
- }
- return DigestUtils.sha256(identityBytes);
- }
-
- protected final String identity(String server) {
+ protected final String identity() {
User user = User.current();
String username = user == null ? "ANONYMOUS" : user.getId();
- return DigestUtils.sha256(username + server, Charset.defaultCharset());
+ return DigestUtils.sha256(username, Charset.defaultCharset());
}
}
diff --git a/blueocean-rest-impl/src/test/java/io/jenkins/blueocean/service/embedded/analytics/AnalyticsTest.java b/blueocean-rest-impl/src/test/java/io/jenkins/blueocean/service/embedded/analytics/AnalyticsTest.java
index 7293b5e5d55..4b17012c814 100644
--- a/blueocean-rest-impl/src/test/java/io/jenkins/blueocean/service/embedded/analytics/AnalyticsTest.java
+++ b/blueocean-rest-impl/src/test/java/io/jenkins/blueocean/service/embedded/analytics/AnalyticsTest.java
@@ -56,7 +56,6 @@ public void track() {
analytics.track(new TrackRequest("test", props));
Map expectedProps = new HashMap<>(props);
- expectedProps.put("jenkins", analytics.getServer());
Assert.assertEquals("test", analytics.lastName);
Assert.assertEquals( expectedProps, analytics.lastProps);
@@ -70,7 +69,6 @@ public void trackWithoutProps() {
analytics.track(new TrackRequest("test", null));
Map expectedProps = new HashMap();
- expectedProps.put("jenkins", analytics.getServer());
expectedProps.put("jenkinsVersion", j.jenkins.getVersion().toString());
expectedProps.put("blueoceanVersion", Jenkins.get().getPlugin("blueocean-commons").getWrapper().getVersion());
@@ -117,12 +115,8 @@ protected void doTrack(String name, Map allProps) {
lastProps = allProps;
}
- public String getServer() {
- return server();
- }
-
public String getIdentity() {
- return identity(server());
+ return identity();
}
}
}
diff --git a/pom.xml b/pom.xml
index c5e6d81d2db..5676d7184f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -558,14 +558,6 @@
-
-
- org.jenkins-ci.modules
- instance-identity
- 2.2
- provided
-
-
com.github.ua-parser
uap-java