From 6c2c1b53d10c5568a17e5e98cecc050415ee0280 Mon Sep 17 00:00:00 2001
From: Oleg Smelov <oleg.smelov@exactpro.com>
Date: Wed, 12 Jun 2024 12:52:02 +0400
Subject: [PATCH] after review

---
 perftest/perftest.md                                 |  9 +--------
 src/main/java/com/exactpro/th2/estore/ProtoUtil.java | 11 ++++++++++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/perftest/perftest.md b/perftest/perftest.md
index 4efbbac..17d7046 100644
--- a/perftest/perftest.md
+++ b/perftest/perftest.md
@@ -84,13 +84,6 @@ spec:
         -XX:MaxDirectMemorySize=50M
         -Ddatastax-java-driver.advanced.connection.init-query-timeout="5000 milliseconds"
         -Ddatastax-java-driver.basic.request.timeout="3 seconds"
-        -Dcom.sun.management.jmxremote
-        -Dcom.sun.management.jmxremote.port=1099
-        -Dcom.sun.management.jmxremote.rmi.port=1099
-        -Dcom.sun.management.jmxremote.ssl=false
-        -Dcom.sun.management.jmxremote.authenticate=false
-        -Dcom.sun.management.jmxremote.local.only=false
-        -Djava.rmi.server.hostname=127.0.0.1
     resources:
       limits:
         cpu: 2500m
@@ -124,7 +117,7 @@ spec:
 | RAM         | 433 MB   | 1.93 GB    | 3.8 GB    |
 
 ## Computation resources th2-estore metrics
-![th2-estore resources](estore_res.png)
+![th2-estore resources](estore_res.png)\
 ![th2-estore heap usage](estore_heap.png)
 
 ## Computation resources RabbitMQ metrics
diff --git a/src/main/java/com/exactpro/th2/estore/ProtoUtil.java b/src/main/java/com/exactpro/th2/estore/ProtoUtil.java
index 72bb2d4..6c3c67a 100644
--- a/src/main/java/com/exactpro/th2/estore/ProtoUtil.java
+++ b/src/main/java/com/exactpro/th2/estore/ProtoUtil.java
@@ -25,7 +25,9 @@
 import com.exactpro.th2.common.grpc.MessageIDOrBuilder;
 import com.exactpro.th2.common.util.StorageUtils;
 import com.google.common.base.Strings;
+import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.Timestamp;
+import com.google.protobuf.util.JsonFormat;
 
 import java.util.Collection;
 import java.util.Comparator;
@@ -48,7 +50,14 @@ public static StoredMessageId toStoredMessageId(MessageIDOrBuilder messageId) {
     public static StoredTestEventId toCradleEventID(EventIDOrBuilder protoEventID) {
         String id = protoEventID.getId();
         if (Strings.isNullOrEmpty(id)) {
-            throw new IllegalArgumentException("No unique identifier specified for event: " + protoEventID);
+            String eventString;
+            try {
+                eventString = JsonFormat.printer().print(protoEventID);
+            } catch (InvalidProtocolBufferException e) {
+                eventString = protoEventID.toString();
+            }
+
+            throw new IllegalArgumentException("No unique identifier specified for event: " + eventString);
         }
 
         return new StoredTestEventId(