From: Ben Soares <b.soares@dundee.ac.uk>
Date: Fri, 30 Jun 2023 01:40:31 +0000 (+0100)
Subject: JAL-4001 Added a random id to User-Agent to ensure separate visits recorded in Plausi... 
X-Git-Tag: Release_2_11_2_7~2^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b1bc235742d0a5028a561e5c796b0ff7edf943fe;p=jalview.git

JAL-4001 Added a random id to User-Agent to ensure separate visits recorded in Plausible.  Changed default URL to self-hosted site
---

diff --git a/src/jalview/analytics/Plausible.java b/src/jalview/analytics/Plausible.java
index 87b23e0..d9d1503 100644
--- a/src/jalview/analytics/Plausible.java
+++ b/src/jalview/analytics/Plausible.java
@@ -19,6 +19,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Random;
 
 import jalview.bin.Cache;
 import jalview.bin.Console;
@@ -27,19 +28,20 @@ import jalview.util.HttpUtils;
 
 public class Plausible
 {
-  private static final String USER_AGENT = HttpUtils.getUserAgent(
-          MethodHandles.lookup().lookupClass().getCanonicalName());
+  private static final String USER_AGENT;
 
   private static final String JALVIEW_ID = "Jalview Desktop";
 
   private static final String DOMAIN = "jalview.org";
 
-  private static final String CONFIG_API_BASE_URL = "https://www.jalview.org/services/analytics/config/url";
+  private static final String CONFIG_API_BASE_URL = "https://www.jalview.org/services/config/analytics/url";
 
-  private static final String DEFAULT_API_BASE_URL = "https://plausible.io/api/event";
+  private static final String DEFAULT_API_BASE_URL = "https://analytics.jalview.org/api/event";
 
   private static final String API_BASE_URL;
 
+  private static final String clientId;
+
   public static final String APPLICATION_BASE_URL = "desktop://localhost";
 
   private List<Map.Entry<String, String>> queryStringValues;
@@ -96,6 +98,13 @@ public class Plausible
 
     // ascertain the API_BASE_URL
     API_BASE_URL = getAPIBaseURL();
+
+    // random clientId to make User-Agent unique (to register analytic)
+    clientId = String.format("%08x", new Random().nextInt());
+
+    USER_AGENT = HttpUtils.getUserAgent(
+            MethodHandles.lookup().lookupClass().getCanonicalName() + " "
+                    + clientId);
   }
 
   private Plausible()