Debug log serializable objects (#1795)

getsentry · Nov 8, 2021 · ba1d4c2 · ba1d4c2
1 parent 23913ee
commit ba1d4c2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 6.x.x
 
 * Ref: Bind external properties to a dedicated class. (#1750)
+* Ref: Debug log serializable objects (#1795)
 
 Breaking changes:
 

diff --git a/sentry/src/main/java/io/sentry/JsonSerializer.java b/sentry/src/main/java/io/sentry/JsonSerializer.java
@@ -138,13 +138,11 @@ public <T> void serialize(@NotNull T entity, @NotNull Writer writer) throws IOEx
     Objects.requireNonNull(writer, "The Writer object is required.");
 
     if (options.getLogger().isEnabled(SentryLevel.DEBUG)) {
-      options.getLogger().log(SentryLevel.DEBUG, "Serializing object: %s", entity);
-    }
-
-    if (entity instanceof JsonSerializable) {
-      JsonObjectWriter jsonObjectWriter = new JsonObjectWriter(writer, options.getMaxDepth());
-      ((JsonSerializable) entity).serialize(jsonObjectWriter, options.getLogger());
+      String serialized = serializeToString(entity, true);
+      options.getLogger().log(SentryLevel.DEBUG, "Serializing object: %s", serialized);
     }
+    JsonObjectWriter jsonObjectWriter = new JsonObjectWriter(writer, options.getMaxDepth());
+    jsonObjectWriter.value(options.getLogger(), entity);
     writer.flush();
   }
 
@@ -188,9 +186,18 @@ public void serialize(@NotNull SentryEnvelope envelope, @NotNull OutputStream ou
 
   @Override
   public @NotNull String serialize(@NotNull Map<String, Object> data) throws Exception {
+    return serializeToString(data, false);
+  }
+
+  // Helper
+
+  private @NotNull String serializeToString(Object object, boolean pretty) throws IOException {
     StringWriter stringWriter = new StringWriter();
     JsonObjectWriter jsonObjectWriter = new JsonObjectWriter(stringWriter, options.getMaxDepth());
-    jsonObjectWriter.value(options.getLogger(), data);
+    if (pretty) {
+      jsonObjectWriter.setIndent("\t");
+    }
+    jsonObjectWriter.value(options.getLogger(), object);
     return stringWriter.toString();
   }
 }