Skip to content

test(cache): [Cache Tracing 23] Add missing cache key assertions and use exact equals #5228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adinauer merged 2 commits into from
Mar 23, 2026
Merged

test(cache): [Cache Tracing 23] Add missing cache key assertions and use exact equals #5228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bc1f3a
assert multiple keys in single assertions
adinauer Mar 23, 2026
638152a
Format code
getsentry-bot Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions sentry-jcache/src/main/java/io/sentry/jcache/SentryJCacheWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import io.sentry.SpanDataConvention;
import io.sentry.SpanOptions;
import io.sentry.SpanStatus;
import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -468,7 +468,8 @@ public Iterator<Entry<K, V>> iterator() {
private @Nullable ISpan startSpan(
final @Nullable Object key, final @NotNull String operationName) {
final String keyString = key != null ? String.valueOf(key) : null;
return startSpan(operationName, keyString, keyString != null ? Arrays.asList(keyString) : null);
return startSpan(
operationName, keyString, keyString != null ? Collections.singletonList(keyString) : null);
}

private @Nullable ISpan startSpanForKeys(
Expand Down
16 changes: 6 additions & 10 deletions sentry-jcache/src/test/kotlin/io/sentry/jcache/SentryJCacheWrapperTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,9 @@ class SentryJCacheWrapperTest {
assertEquals(1, tx.spans.size)
val span = tx.spans.first()
assertEquals("cache.getAll", span.operation)
assertTrue(span.description!!.contains("k1"))
assertTrue(span.description!!.contains("k2"))
assertEquals("k1, k2", span.description)
assertEquals(true, span.getData(SpanDataConvention.CACHE_HIT))
val cacheKeys = span.getData(SpanDataConvention.CACHE_KEY) as List<*>
assertTrue(cacheKeys.containsAll(listOf("k1", "k2")))
assertEquals(listOf("k1", "k2"), span.getData(SpanDataConvention.CACHE_KEY))
assertEquals("getAll", span.getData(SpanDataConvention.CACHE_OPERATION))
}

Expand Down Expand Up @@ -166,11 +164,9 @@ class SentryJCacheWrapperTest {
assertEquals(1, tx.spans.size)
val span = tx.spans.first()
assertEquals("cache.putAll", span.operation)
assertTrue(span.description!!.contains("k1"))
assertTrue(span.description!!.contains("k2"))
assertEquals("k1, k2", span.description)
assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
val cacheKeys = span.getData(SpanDataConvention.CACHE_KEY) as List<*>
assertTrue(cacheKeys.containsAll(listOf("k1", "k2")))
assertEquals(listOf("k1", "k2"), span.getData(SpanDataConvention.CACHE_KEY))
assertEquals("putAll", span.getData(SpanDataConvention.CACHE_OPERATION))
}

Expand Down Expand Up @@ -320,9 +316,9 @@ class SentryJCacheWrapperTest {
assertEquals(1, tx.spans.size)
val span = tx.spans.first()
assertEquals("cache.removeAll", span.operation)
assertTrue(span.description!!.contains("k1"))
assertTrue(span.description!!.contains("k2"))
assertEquals("k1, k2", span.description)
assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
assertEquals(listOf("k1", "k2"), span.getData(SpanDataConvention.CACHE_KEY))
assertEquals("removeAll", span.getData(SpanDataConvention.CACHE_OPERATION))
}

Expand Down
4 changes: 2 additions & 2 deletions sentry-spring-7/src/main/java/io/sentry/spring7/cache/SentryCacheWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import io.sentry.SpanDataConvention;
import io.sentry.SpanOptions;
import io.sentry.SpanStatus;
import java.util.Arrays;
import java.util.Collections;
import java.util.concurrent.Callable;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicBoolean;
Expand Down Expand Up @@ -318,7 +318,7 @@ public boolean invalidate() {
return null;
}
if (keyString != null) {
span.setData(SpanDataConvention.CACHE_KEY, Arrays.asList(keyString));
span.setData(SpanDataConvention.CACHE_KEY, Collections.singletonList(keyString));
}
span.setData(SpanDataConvention.CACHE_OPERATION, operationName);
return span;
Expand Down
11 changes: 11 additions & 0 deletions sentry-spring-7/src/test/kotlin/io/sentry/spring7/cache/SentryCacheWrapperTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ class SentryCacheWrapperTest {
assertNull(result)
assertEquals(1, tx.spans.size)
assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
assertEquals(listOf("myKey"), tx.spans.first().getData(SpanDataConvention.CACHE_KEY))
}

// -- get(Object key, Class<T>) --
Expand All @@ -93,6 +94,7 @@ class SentryCacheWrapperTest {
assertEquals("value", result)
assertEquals(1, tx.spans.size)
assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
assertEquals(listOf("myKey"), tx.spans.first().getData(SpanDataConvention.CACHE_KEY))
}

@Test
Expand All @@ -106,6 +108,7 @@ class SentryCacheWrapperTest {
assertNull(result)
assertEquals(1, tx.spans.size)
assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
assertEquals(listOf("myKey"), tx.spans.first().getData(SpanDataConvention.CACHE_KEY))
}

@Test
Expand Down Expand Up @@ -138,6 +141,7 @@ class SentryCacheWrapperTest {
assertEquals(1, tx.spans.size)
assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
assertEquals(listOf("myKey"), tx.spans.first().getData(SpanDataConvention.CACHE_KEY))
}

@Test
Expand All @@ -156,6 +160,7 @@ class SentryCacheWrapperTest {
assertEquals(1, tx.spans.size)
assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
assertEquals(listOf("myKey"), tx.spans.first().getData(SpanDataConvention.CACHE_KEY))
}

// -- retrieve(Object key) --
Expand Down Expand Up @@ -191,6 +196,7 @@ class SentryCacheWrapperTest {
assertNull(result!!.get())
assertEquals(1, tx.spans.size)
assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
assertEquals(listOf("myKey"), tx.spans.first().getData(SpanDataConvention.CACHE_KEY))
assertTrue(tx.spans.first().isFinished)
}

Expand All @@ -206,6 +212,7 @@ class SentryCacheWrapperTest {
assertEquals(1, tx.spans.size)
val span = tx.spans.first()
assertEquals(false, span.getData(SpanDataConvention.CACHE_HIT))
assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY))
assertEquals(SpanStatus.OK, span.status)
assertTrue(span.isFinished)
}
Expand Down Expand Up @@ -273,6 +280,7 @@ class SentryCacheWrapperTest {
assertEquals(1, tx.spans.size)
assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
assertEquals(listOf("myKey"), tx.spans.first().getData(SpanDataConvention.CACHE_KEY))
assertTrue(tx.spans.first().isFinished)
}

Expand All @@ -293,6 +301,7 @@ class SentryCacheWrapperTest {
assertEquals(1, tx.spans.size)
assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
assertEquals(listOf("myKey"), tx.spans.first().getData(SpanDataConvention.CACHE_KEY))
assertTrue(tx.spans.first().isFinished)
}

Expand Down Expand Up @@ -384,6 +393,7 @@ class SentryCacheWrapperTest {
assertEquals(SpanStatus.OK, span.status)
assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
assertEquals("evict", span.getData(SpanDataConvention.CACHE_OPERATION))
assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY))
}

// -- evictIfPresent --
Expand All @@ -401,6 +411,7 @@ class SentryCacheWrapperTest {
assertEquals("cache.evictIfPresent", tx.spans.first().operation)
assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
assertEquals("evictIfPresent", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION))
assertEquals(listOf("myKey"), tx.spans.first().getData(SpanDataConvention.CACHE_KEY))
}

// -- clear --
Expand Down
4 changes: 2 additions & 2 deletions sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/cache/SentryCacheWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import io.sentry.SpanDataConvention;
import io.sentry.SpanOptions;
import io.sentry.SpanStatus;
import java.util.Arrays;
import java.util.Collections;
import java.util.concurrent.Callable;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicBoolean;
Expand Down Expand Up @@ -318,7 +318,7 @@ public boolean invalidate() {
return null;
}
if (keyString != null) {
span.setData(SpanDataConvention.CACHE_KEY, Arrays.asList(keyString));
span.setData(SpanDataConvention.CACHE_KEY, Collections.singletonList(keyString));
}
span.setData(SpanDataConvention.CACHE_OPERATION, operationName);
return span;
Expand Down
11 changes: 11 additions & 0 deletions ...y-spring-jakarta/src/test/kotlin/io/sentry/spring/jakarta/cache/SentryCacheWrapperTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ class SentryCacheWrapperTest {
assertNull(result)
assertEquals(1, tx.spans.size)
assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
assertEquals(listOf("myKey"), tx.spans.first().getData(SpanDataConvention.CACHE_KEY))
}

// -- get(Object key, Class<T>) --
Expand All @@ -93,6 +94,7 @@ class SentryCacheWrapperTest {
assertEquals("value", result)
assertEquals(1, tx.spans.size)
assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
assertEquals(listOf("myKey"), tx.spans.first().getData(SpanDataConvention.CACHE_KEY))
}

@Test
Expand All @@ -106,6 +108,7 @@ class SentryCacheWrapperTest {
assertNull(result)
assertEquals(1, tx.spans.size)
assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
assertEquals(listOf("myKey"), tx.spans.first().getData(SpanDataConvention.CACHE_KEY))
}

@Test
Expand Down Expand Up @@ -138,6 +141,7 @@ class SentryCacheWrapperTest {
assertEquals(1, tx.spans.size)
assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
assertEquals(listOf("myKey"), tx.spans.first().getData(SpanDataConvention.CACHE_KEY))
}

@Test
Expand All @@ -156,6 +160,7 @@ class SentryCacheWrapperTest {
assertEquals(1, tx.spans.size)
assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
assertEquals(listOf("myKey"), tx.spans.first().getData(SpanDataConvention.CACHE_KEY))
}

// -- retrieve(Object key) --
Expand Down Expand Up @@ -191,6 +196,7 @@ class SentryCacheWrapperTest {
assertNull(result!!.get())
assertEquals(1, tx.spans.size)
assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
assertEquals(listOf("myKey"), tx.spans.first().getData(SpanDataConvention.CACHE_KEY))
assertTrue(tx.spans.first().isFinished)
}

Expand All @@ -206,6 +212,7 @@ class SentryCacheWrapperTest {
assertEquals(1, tx.spans.size)
val span = tx.spans.first()
assertEquals(false, span.getData(SpanDataConvention.CACHE_HIT))
assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY))
assertEquals(SpanStatus.OK, span.status)
assertTrue(span.isFinished)
}
Expand Down Expand Up @@ -273,6 +280,7 @@ class SentryCacheWrapperTest {
assertEquals(1, tx.spans.size)
assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
assertEquals(listOf("myKey"), tx.spans.first().getData(SpanDataConvention.CACHE_KEY))
assertTrue(tx.spans.first().isFinished)
}

Expand All @@ -293,6 +301,7 @@ class SentryCacheWrapperTest {
assertEquals(1, tx.spans.size)
assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
assertEquals(listOf("myKey"), tx.spans.first().getData(SpanDataConvention.CACHE_KEY))
assertTrue(tx.spans.first().isFinished)
}

Expand Down Expand Up @@ -384,6 +393,7 @@ class SentryCacheWrapperTest {
assertEquals(SpanStatus.OK, span.status)
assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
assertEquals("evict", span.getData(SpanDataConvention.CACHE_OPERATION))
assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY))
}

// -- evictIfPresent --
Expand All @@ -401,6 +411,7 @@ class SentryCacheWrapperTest {
assertEquals("cache.evictIfPresent", tx.spans.first().operation)
assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
assertEquals("evictIfPresent", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION))
assertEquals(listOf("myKey"), tx.spans.first().getData(SpanDataConvention.CACHE_KEY))
}

// -- clear --
Expand Down
4 changes: 2 additions & 2 deletions sentry-spring/src/main/java/io/sentry/spring/cache/SentryCacheWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import io.sentry.SpanDataConvention;
import io.sentry.SpanOptions;
import io.sentry.SpanStatus;
import java.util.Arrays;
import java.util.Collections;
import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicBoolean;
import org.jetbrains.annotations.ApiStatus;
Expand Down Expand Up @@ -245,7 +245,7 @@ public boolean invalidate() {
return null;
}
if (keyString != null) {
span.setData(SpanDataConvention.CACHE_KEY, Arrays.asList(keyString));
span.setData(SpanDataConvention.CACHE_KEY, Collections.singletonList(keyString));
}
span.setData(SpanDataConvention.CACHE_OPERATION, operationName);
return span;
Expand Down
7 changes: 7 additions & 0 deletions sentry-spring/src/test/kotlin/io/sentry/spring/cache/SentryCacheWrapperTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ class SentryCacheWrapperTest {
assertNull(result)
assertEquals(1, tx.spans.size)
assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
assertEquals(listOf("myKey"), tx.spans.first().getData(SpanDataConvention.CACHE_KEY))
}

// -- get(Object key, Class<T>) --
Expand All @@ -91,6 +92,7 @@ class SentryCacheWrapperTest {
assertEquals("value", result)
assertEquals(1, tx.spans.size)
assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
assertEquals(listOf("myKey"), tx.spans.first().getData(SpanDataConvention.CACHE_KEY))
}

@Test
Expand All @@ -104,6 +106,7 @@ class SentryCacheWrapperTest {
assertNull(result)
assertEquals(1, tx.spans.size)
assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
assertEquals(listOf("myKey"), tx.spans.first().getData(SpanDataConvention.CACHE_KEY))
}

@Test
Expand Down Expand Up @@ -136,6 +139,7 @@ class SentryCacheWrapperTest {
assertEquals(1, tx.spans.size)
assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
assertEquals(listOf("myKey"), tx.spans.first().getData(SpanDataConvention.CACHE_KEY))
}

@Test
Expand All @@ -154,6 +158,7 @@ class SentryCacheWrapperTest {
assertEquals(1, tx.spans.size)
assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
assertEquals(listOf("myKey"), tx.spans.first().getData(SpanDataConvention.CACHE_KEY))
}

// -- put --
Expand Down Expand Up @@ -212,6 +217,7 @@ class SentryCacheWrapperTest {
assertEquals(SpanStatus.OK, span.status)
assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
assertEquals("evict", span.getData(SpanDataConvention.CACHE_OPERATION))
assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY))
}

// -- evictIfPresent --
Expand All @@ -229,6 +235,7 @@ class SentryCacheWrapperTest {
assertEquals("cache.evictIfPresent", tx.spans.first().operation)
assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
assertEquals("evictIfPresent", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION))
assertEquals(listOf("myKey"), tx.spans.first().getData(SpanDataConvention.CACHE_KEY))
}

// -- clear --
Expand Down
Loading