#30454 normalizing the host values to hostname

dotCMS · Oct 31, 2024 · 0873c42 · 0873c42
1 parent 98b2439
commit 0873c42
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/dotCMS/src/main/java/com/dotcms/analytics/track/collectors/CustomerEventCollector.java b/dotCMS/src/main/java/com/dotcms/analytics/track/collectors/CustomerEventCollector.java
@@ -26,7 +26,7 @@ public CollectorPayloadBean collect(final CollectorContextMap collectorContextMa
         final Host site = (Host) collectorContextMap.get("currentHost");
         final String language = (String)collectorContextMap.get("lang");
         collectorPayloadBean.put("url", uri);
-        collectorPayloadBean.put("host", host);
+        collectorPayloadBean.put("host", Objects.nonNull(site)?site.getHostname():host);
         collectorPayloadBean.put("language", language);
         collectorPayloadBean.put("site", null != site?site.getIdentifier():"unknown");
         final String eventType = (String)collectorContextMap.get("eventType") == null?

diff --git a/dotCMS/src/main/java/com/dotcms/analytics/track/collectors/FilesCollector.java b/dotCMS/src/main/java/com/dotcms/analytics/track/collectors/FilesCollector.java
@@ -63,7 +63,7 @@ public CollectorPayloadBean collect(final CollectorContextMap collectorContextMa
 
         collectorPayloadBean.put("object",  fileObject);
         collectorPayloadBean.put("url", uri);
-        collectorPayloadBean.put("host", host);
+        collectorPayloadBean.put("host", Objects.nonNull(site)?site.getHostname():host);
         collectorPayloadBean.put("language", language);
         collectorPayloadBean.put("site", null != site?site.getIdentifier():"unknown");
         collectorPayloadBean.put("event_type", EventType.FILE_REQUEST.getType());

diff --git a/dotCMS/src/main/java/com/dotcms/analytics/track/collectors/PageDetailCollector.java b/dotCMS/src/main/java/com/dotcms/analytics/track/collectors/PageDetailCollector.java
@@ -86,7 +86,7 @@ public CollectorPayloadBean collect(final CollectorContextMap collectorContextMa
         collectorPayloadBean.put("language", language);
 
         if (Objects.nonNull(site)) {
-            collectorPayloadBean.put("host", site.getIdentifier());
+            collectorPayloadBean.put("host", site.getHostname());
         }
         return collectorPayloadBean;
     }

diff --git a/dotCMS/src/main/java/com/dotcms/analytics/track/collectors/PagesCollector.java b/dotCMS/src/main/java/com/dotcms/analytics/track/collectors/PagesCollector.java
@@ -92,7 +92,7 @@ public CollectorPayloadBean collect(final CollectorContextMap collectorContextMa
         collectorPayloadBean.put("language", language);
 
         if (Objects.nonNull(site)) {
-            collectorPayloadBean.put("host",  site.getIdentifier());
+            collectorPayloadBean.put("host",  site.getHostname());
         }
 
         return collectorPayloadBean;