SAK-50590 SiteStats exception when persisting an eventRef longer than…

… 512 chars (sakaiproject#12954)
axxter99 · Oct 9, 2024 · 6772755 · 6772755
1 parent 9c708ac
commit 6772755
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 16 deletions.
diff --git a/search/elasticsearch/util/pom.xml b/search/elasticsearch/util/pom.xml
@@ -68,6 +68,10 @@
             <groupId>org.sakaiproject.search</groupId>
             <artifactId>search-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <resources>

diff --git a/...ch/util/src/java/org/sakaiproject/search/elasticsearch/BaseElasticSearchIndexBuilder.java b/...ch/util/src/java/org/sakaiproject/search/elasticsearch/BaseElasticSearchIndexBuilder.java
@@ -43,6 +43,9 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -1063,10 +1066,11 @@ public SearchResponse search(String searchTerms, List<String> references, List<S
         try {
             SearchResponse response = client.search(searchRequest, RequestOptions.DEFAULT);
             log.debug("Search request from index builder [{}] took: {}", getName(), response.getTook().getMillis());
+            String minified = getMinifiedJson(searchRequest.source().query().toString());
             eventTrackingService.post(
                     eventTrackingService.newEvent(
                             SearchService.EVENT_SEARCH,
-                            SearchService.EVENT_SEARCH_REF + searchRequest.source().query().toString(),
+                            SearchService.EVENT_SEARCH_REF + minified,
                             true,
                             NotificationService.PREF_IMMEDIATE));
             return response;
@@ -1076,6 +1080,17 @@ public SearchResponse search(String searchTerms, List<String> references, List<S
         return null;
     }
 
+    private static String getMinifiedJson(String json) {
+        try {
+            ObjectMapper mapper = new ObjectMapper();
+            JsonNode jsonNode = mapper.readTree(json);
+            return mapper.writeValueAsString(jsonNode);
+        } catch (JsonProcessingException e) {
+            log.warn("Could not minify json [{}], {}", json, e.toString());
+        }
+        return json;
+    }
+
     @Override
     public SearchResponse search(String searchTerms, List<String> references, List<String> siteIds, List<String> toolIds, int start, int end, Map<String,String> additionalSearchInformation) {
         // additional information will be used in specific indexes,

diff --git a/sitestats/sitestats-impl-hib/pom.xml b/sitestats/sitestats-impl-hib/pom.xml
@@ -29,6 +29,10 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest</artifactId>

diff --git a/sitestats/sitestats-impl-hib/src/java/org/sakaiproject/sitestats/impl/DetailedEventImpl.java b/sitestats/sitestats-impl-hib/src/java/org/sakaiproject/sitestats/impl/DetailedEventImpl.java
@@ -18,35 +18,40 @@
 import java.io.Serializable;
 import java.util.Date;
 
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.StringUtils;
 import org.sakaiproject.sitestats.api.event.detailed.DetailedEvent;
 
 /**
  * @author plukasew
  */
-public class DetailedEventImpl implements DetailedEvent, Serializable
-{
-	@Getter @Setter private long id;
-	@Getter @Setter private String siteId;
-	@Getter @Setter private String userId;
-	@Getter @Setter private String eventId;
-	@Getter @Setter private String eventRef;
-	@Getter @Setter private Date eventDate;
+@Data
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
+public class DetailedEventImpl implements DetailedEvent, Serializable {
+	@EqualsAndHashCode.Include
+	private long id;
+	private String siteId;
+	private String userId;
+	private String eventId;
+	private String eventRef;
+	private Date eventDate;
 
-	public DetailedEventImpl()
-	{
+	public DetailedEventImpl() {
 		this(0, "", "", "", "", new Date());
 	}
 
-	public DetailedEventImpl(long id, String siteId, String userId, String eventId, String eventRef, Date date)
-	{
+	public DetailedEventImpl(long id, String siteId, String userId, String eventId, String eventRef, Date date) {
 		this.id = id;
 		this.siteId = siteId;
 		this.userId = userId;
 		this.eventId = eventId;
-		this.eventRef = eventRef;
 		this.eventDate = date;
+		setEventRef(eventRef);
+	}
+
+	public void setEventRef(String eventRef) {
+		this.eventRef = StringUtils.abbreviate(eventRef, 512);
 	}
 }