traceserver: add more tracing to serializers

They can take seconds to respond, they should be traced to remove knowledge gaps. Signed-off-by: Matthew Khouzam <matthew.khouzam@ericsson.com> Change-Id: Ie2f3982b57331d43d3859d295c0560957fdb6ad9 Reviewed-on: https://git.eclipse.org/r/c/tracecompass.incubator/org.eclipse.tracecompass.incubator/+/200966 Tested-by: Trace Compass Bot <tracecompass-bot@eclipse.org> Reviewed-by: Marco Miller <marco.miller@ericsson.com>
eclipse-tracecompass-incubator · Mar 31, 2023 · 9a19195 · 9a19195
1 parent ff07bb3
commit 9a19195
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 14 deletions.
diff --git a/...ass/incubator/internal/trace/server/jersey/rest/core/webapp/TimeGraphArrowSerializer.java b/...ass/incubator/internal/trace/server/jersey/rest/core/webapp/TimeGraphArrowSerializer.java
@@ -12,9 +12,14 @@
 package org.eclipse.tracecompass.incubator.internal.trace.server.jersey.rest.core.webapp;
 
 import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.tracecompass.common.core.log.TraceCompassLog;
+import org.eclipse.tracecompass.common.core.log.TraceCompassLogUtils.ScopeLog;
 import org.eclipse.tracecompass.tmf.core.model.timegraph.ITimeGraphArrow;
+
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
@@ -30,6 +35,7 @@ public class TimeGraphArrowSerializer extends StdSerializer<@NonNull ITimeGraphA
      * Generated serialVersionUID
      */
     private static final long serialVersionUID = -8967973449240455869L;
+    private static final @NonNull Logger LOGGER = TraceCompassLog.getLogger(TimeGraphArrowSerializer.class);
 
     /**
      * Constructor.
@@ -40,17 +46,19 @@ protected TimeGraphArrowSerializer() {
 
     @Override
     public void serialize(@NonNull ITimeGraphArrow value, JsonGenerator gen, SerializerProvider provider) throws IOException {
-        gen.writeStartObject();
-
-        gen.writeNumberField("start", value.getStartTime()); //$NON-NLS-1$
-        gen.writeNumberField("end", value.getStartTime() + value.getDuration()); //$NON-NLS-1$
-        gen.writeNumberField("sourceId", value.getSourceId()); //$NON-NLS-1$
-        gen.writeNumberField("targetId", value.getDestinationId()); //$NON-NLS-1$
-        if (value.getStyle() != null) {
-            gen.writeObjectField("style", value.getStyle()); //$NON-NLS-1$
-        }
+        try (ScopeLog sl = new ScopeLog(LOGGER, Level.FINE, "TimeGraphArrowSerialize")) { //$NON-NLS-1$
+            gen.writeStartObject();
 
-        gen.writeEndObject();
+            gen.writeNumberField("start", value.getStartTime()); //$NON-NLS-1$
+            gen.writeNumberField("end", value.getStartTime() + value.getDuration()); //$NON-NLS-1$
+            gen.writeNumberField("sourceId", value.getSourceId()); //$NON-NLS-1$
+            gen.writeNumberField("targetId", value.getDestinationId()); //$NON-NLS-1$
+            if (value.getStyle() != null) {
+                gen.writeObjectField("style", value.getStyle()); //$NON-NLS-1$
+            }
+
+            gen.writeEndObject();
+        }
     }
 
 }
diff --git a/.../incubator/internal/trace/server/jersey/rest/core/webapp/TimeGraphRowModelSerializer.java b/.../incubator/internal/trace/server/jersey/rest/core/webapp/TimeGraphRowModelSerializer.java
@@ -11,8 +11,12 @@
 package org.eclipse.tracecompass.incubator.internal.trace.server.jersey.rest.core.webapp;
 
 import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.tracecompass.common.core.log.TraceCompassLog;
+import org.eclipse.tracecompass.common.core.log.TraceCompassLogUtils.ScopeLog;
 import org.eclipse.tracecompass.tmf.core.model.timegraph.TimeGraphRowModel;
 
 import com.fasterxml.jackson.core.JsonGenerator;
@@ -30,6 +34,7 @@ public class TimeGraphRowModelSerializer extends StdSerializer<@NonNull TimeGrap
      * Generated serialVersionUID
      */
     private static final long serialVersionUID = -4359431726167157401L;
+    private static final @NonNull Logger LOGGER = TraceCompassLog.getLogger(TimeGraphRowModelSerializer.class);
 
     /**
      * Constructor.
@@ -40,10 +45,12 @@ protected TimeGraphRowModelSerializer() {
 
     @Override
     public void serialize(TimeGraphRowModel value, JsonGenerator gen, SerializerProvider provider) throws IOException {
-        gen.writeStartObject();
-        gen.writeNumberField("entryId", value.getEntryID()); //$NON-NLS-1$
-        gen.writeObjectField("states", value.getStates()); //$NON-NLS-1$
-        gen.writeEndObject();
+        try (ScopeLog sl = new ScopeLog(LOGGER, Level.FINE, "RowModelSerialize")) { //$NON-NLS-1$
+            gen.writeStartObject();
+            gen.writeNumberField("entryId", value.getEntryID()); //$NON-NLS-1$
+            gen.writeObjectField("states", value.getStates()); //$NON-NLS-1$
+            gen.writeEndObject();
+        }
     }
 
 }