Attribute.flattened

Author: adinauer

sentry/api/sentry.api

@@ -1250,6 +1250,7 @@ public final class io/sentry/JsonObjectWriter : io/sentry/ObjectWriter {
 }
 
 public final class io/sentry/JsonReflectionObjectSerializer {
+	public fun <init> (I)V
 	public fun serialize (Ljava/lang/Object;Lio/sentry/ILogger;)Ljava/lang/Object;
 	public fun serializeObject (Ljava/lang/Object;Lio/sentry/ILogger;)Ljava/util/Map;
 }
@@ -2661,6 +2662,9 @@ public final class io/sentry/SentryAppStartProfilingOptions$JsonKeys {
 public final class io/sentry/SentryAttribute {
 	public static fun booleanAttribute (Ljava/lang/String;Ljava/lang/Boolean;)Lio/sentry/SentryAttribute;
 	public static fun doubleAttribute (Ljava/lang/String;Ljava/lang/Double;)Lio/sentry/SentryAttribute;
+	public static fun flattened (Ljava/lang/String;Ljava/lang/Object;)Lio/sentry/SentryAttribute;
+	public static fun flattened (Ljava/lang/String;Ljava/lang/Object;I)Lio/sentry/SentryAttribute;
+	public fun getFlattenDepth ()I
 	public fun getName ()Ljava/lang/String;
 	public fun getType ()Lio/sentry/SentryAttributeType;
 	public fun getValue ()Ljava/lang/Object;

sentry/src/main/java/io/sentry/JsonReflectionObjectSerializer.java

@@ -33,7 +33,7 @@ public final class JsonReflectionObjectSerializer {
   private final Set<Object> visiting = new HashSet<>();
   private final int maxDepth;
 
-  JsonReflectionObjectSerializer(int maxDepth) {
+  public JsonReflectionObjectSerializer(int maxDepth) {
     this.maxDepth = maxDepth;
   }
 

sentry/src/main/java/io/sentry/SentryAttribute.java

@@ -8,14 +8,17 @@ public final class SentryAttribute {
   private final @NotNull String name;
   private final @Nullable SentryAttributeType type;
   private final @Nullable Object value;
+  private final int flattenDepth;
 
   private SentryAttribute(
       final @NotNull String name,
       final @Nullable SentryAttributeType type,
-      final @Nullable Object value) {
+      final @Nullable Object value,
+      final int flattenDepth) {
     this.name = name;
     this.type = type;
     this.value = value;
+    this.flattenDepth = flattenDepth;
   }
 
   public @NotNull String getName() {
@@ -30,28 +33,42 @@ private SentryAttribute(
     return value;
   }
 
+  public int getFlattenDepth() {
+    return flattenDepth;
+  }
+
   public static @NotNull SentryAttribute named(
       final @NotNull String name, final @Nullable Object value) {
-    return new SentryAttribute(name, null, value);
+    return new SentryAttribute(name, null, value, 0);
+  }
+
+  public static @NotNull SentryAttribute flattened(
+      final @NotNull String name, final @Nullable Object value) {
+    return new SentryAttribute(name, null, value, 1);
+  }
+
+  public static @NotNull SentryAttribute flattened(
+      final @NotNull String name, final @Nullable Object value, final int flattenDepth) {
+    return new SentryAttribute(name, null, value, flattenDepth);
   }
 
   public static @NotNull SentryAttribute booleanAttribute(
       final @NotNull String name, final @Nullable Boolean value) {
-    return new SentryAttribute(name, SentryAttributeType.BOOLEAN, value);
+    return new SentryAttribute(name, SentryAttributeType.BOOLEAN, value, 0);
   }
 
   public static @NotNull SentryAttribute integerAttribute(
       final @NotNull String name, final @Nullable Integer value) {
-    return new SentryAttribute(name, SentryAttributeType.INTEGER, value);
+    return new SentryAttribute(name, SentryAttributeType.INTEGER, value, 0);
   }
 
   public static @NotNull SentryAttribute doubleAttribute(
       final @NotNull String name, final @Nullable Double value) {
-    return new SentryAttribute(name, SentryAttributeType.DOUBLE, value);
+    return new SentryAttribute(name, SentryAttributeType.DOUBLE, value, 0);
   }
 
   public static @NotNull SentryAttribute stringAttribute(
       final @NotNull String name, final @Nullable String value) {
-    return new SentryAttribute(name, SentryAttributeType.STRING, value);
+    return new SentryAttribute(name, SentryAttributeType.STRING, value, 0);
   }
 }

sentry/src/main/java/io/sentry/logger/LoggerApi.java

@@ -3,6 +3,7 @@
 import io.sentry.HostnameCache;
 import io.sentry.IScope;
 import io.sentry.ISpan;
+import io.sentry.JsonReflectionObjectSerializer;
 import io.sentry.PropagationContext;
 import io.sentry.Scopes;
 import io.sentry.SentryAttribute;
@@ -20,6 +21,7 @@
 import io.sentry.util.Platform;
 import io.sentry.util.TracingUtils;
 import java.util.HashMap;
+import java.util.Map;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -170,7 +172,9 @@ private void captureLog(
         final @Nullable Object value = attribute.getValue();
         final @NotNull SentryAttributeType type =
             attribute.getType() == null ? getType(value) : attribute.getType();
-        attributes.put(attribute.getName(), new SentryLogEventAttributeValue(type, value));
+        final @Nullable Object convertedValue =
+            maybeConvertValue(attribute.getName(), value, attribute.getFlattenDepth(), attributes);
+        attributes.put(attribute.getName(), new SentryLogEventAttributeValue(type, convertedValue));
       }
     }
 
@@ -216,6 +220,37 @@ private void captureLog(
     return attributes;
   }
 
+  private @Nullable Object maybeConvertValue(
+      final @Nullable Object name,
+      final @Nullable Object value,
+      final int flattenDepth,
+      final @NotNull HashMap<String, SentryLogEventAttributeValue> attributes) {
+    if (value == null) {
+      return null;
+    }
+
+    if (flattenDepth > 0) {
+      JsonReflectionObjectSerializer serializer = new JsonReflectionObjectSerializer(1);
+      try {
+        Map<String, Object> stringObjectMap =
+            serializer.serializeObject(value, scopes.getOptions().getLogger());
+        for (final @NotNull Map.Entry<String, Object> entry : stringObjectMap.entrySet()) {
+          attributes.put(
+              name + "." + entry.getKey(),
+              new SentryLogEventAttributeValue(getType(entry.getValue()), entry.getValue()));
+        }
+        return value;
+      } catch (Exception e) {
+        scopes
+            .getOptions()
+            .getLogger()
+            .log(SentryLevel.DEBUG, "Unable to flatten log attribute value", e);
+      }
+    }
+
+    return value;
+  }
+
   private void setServerName(
       final @NotNull HashMap<String, SentryLogEventAttributeValue> attributes) {
     final @NotNull SentryOptions options = scopes.getOptions();