Skip to content

Commit a374fe8

Browse files
committed
remove variable depth flatten; add test
1 parent c549bcf commit a374fe8

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

sentry/api/sentry.api

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2663,7 +2663,6 @@ public final class io/sentry/SentryAttribute {
26632663
public static fun booleanAttribute (Ljava/lang/String;Ljava/lang/Boolean;)Lio/sentry/SentryAttribute;
26642664
public static fun doubleAttribute (Ljava/lang/String;Ljava/lang/Double;)Lio/sentry/SentryAttribute;
26652665
public static fun flattened (Ljava/lang/String;Ljava/lang/Object;)Lio/sentry/SentryAttribute;
2666-
public static fun flattened (Ljava/lang/String;Ljava/lang/Object;I)Lio/sentry/SentryAttribute;
26672666
public fun getFlattenDepth ()I
26682667
public fun getName ()Ljava/lang/String;
26692668
public fun getType ()Lio/sentry/SentryAttributeType;

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,6 @@ public int getFlattenDepth() {
4747
return new SentryAttribute(name, null, value, 1);
4848
}
4949

50-
public static @NotNull SentryAttribute flattened(
51-
final @NotNull String name, final @Nullable Object value, final int flattenDepth) {
52-
return new SentryAttribute(name, null, value, flattenDepth);
53-
}
54-
5550
public static @NotNull SentryAttribute booleanAttribute(
5651
final @NotNull String name, final @Nullable Boolean value) {
5752
return new SentryAttribute(name, SentryAttributeType.BOOLEAN, value, 0);

sentry/src/test/java/io/sentry/ScopesTest.kt

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import org.mockito.kotlin.times
3636
import org.mockito.kotlin.verify
3737
import org.mockito.kotlin.verifyNoMoreInteractions
3838
import org.mockito.kotlin.whenever
39+
import java.awt.Point
3940
import java.io.File
4041
import java.nio.file.Files
4142
import java.util.Queue
@@ -2687,7 +2688,8 @@ class ScopesTest {
26872688
SentryAttribute.named("namedstrattr", "namedstrval"),
26882689
SentryAttribute.named("namedboolattr", false),
26892690
SentryAttribute.named("namedintattr", 18),
2690-
SentryAttribute.named("nameddoubleattr", 4.9)
2691+
SentryAttribute.named("nameddoubleattr", 4.9),
2692+
SentryAttribute.flattened("flattenedpoint", Point(10, 20))
26912693
)
26922694
),
26932695
"log message"
@@ -2730,6 +2732,18 @@ class ScopesTest {
27302732
val nameddoubleattr = it.attributes?.get("nameddoubleattr")!!
27312733
assertEquals(4.9, nameddoubleattr.value)
27322734
assertEquals("double", nameddoubleattr.type)
2735+
2736+
val flattenedpoint = it.attributes?.get("flattenedpoint")!!
2737+
assertEquals("java.awt.Point[x=10,y=20]", flattenedpoint.value)
2738+
assertEquals("string", flattenedpoint.type)
2739+
2740+
val flattenedpointx = it.attributes?.get("flattenedpoint.x")!!
2741+
assertEquals(10, flattenedpointx.value)
2742+
assertEquals("integer", flattenedpointx.type)
2743+
2744+
val flattenedpointy = it.attributes?.get("flattenedpoint.y")!!
2745+
assertEquals(20, flattenedpointy.value)
2746+
assertEquals("integer", flattenedpointy.type)
27332747
},
27342748
anyOrNull()
27352749
)

0 commit comments

Comments
 (0)