JAL-4001 Rationalise user-agent string into HttpUtils

[jalview.git] / src / jalview / analytics / Plausible.java

diff --git a/src/jalview/analytics/Plausible.java b/src/jalview/analytics/Plausible.java
index 0d6cd65..f0ba59e 100644 (file)
--- a/src/jalview/analytics/Plausible.java
+++ b/src/jalview/analytics/Plausible.java
@@ -24,13 +24,12 @@ import jalview.bin.Cache;
 import jalview.bin.Console;
 import jalview.bin.Jalview;
 import jalview.util.ChannelProperties;
+import jalview.util.HttpUtils;
 
 public class Plausible
 {
-  private static final String USER_AGENT = ChannelProperties
-          .getProperty("app_name", "Jalview") + " "
-          + Cache.getDefault("VERSION", "Unknown") + " "
-          + MethodHandles.lookup().lookupClass() + " help@jalview.org";
+  private static final String USER_AGENT = HttpUtils.getUserAgent(
+          MethodHandles.lookup().lookupClass().getCanonicalName());
 
   private static final String JALVIEW_ID = "Jalview Desktop";
 
@@ -187,6 +186,10 @@ public class Plausible
 
       Console.debug(
               "Plausible: HTTP Request is: '" + urlSb.toString() + "'");
+      if (DEBUG)
+      {
+        Console.debug("Plausible: User-Agent is: '" + USER_AGENT + "'");
+      }
       Console.debug("Plausible: POSTed JSON is:\n" + jsonString);
 
       byte[] jsonBytes = jsonString.getBytes(StandardCharsets.UTF_8);
@@ -226,7 +229,7 @@ public class Plausible
           sb.append(response);
         }
         String body = sb.toString();
-        Console.debug("Plausible response content; " + body);
+        Console.debug("Plausible response content:\n" + body);
       }
     } catch (MalformedURLException e)
     {