Skip to content

fix(spring): [Cache Tracing 24] Track invalidate cache.write accurately #5231

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 1 commit into from
Mar 25, 2026
Merged

fix(spring): [Cache Tracing 24] Track invalidate cache.write accurately #5231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion 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 @@ -287,7 +287,7 @@ public boolean invalidate() {
}
try {
final boolean result = delegate.invalidate();
span.setData(SpanDataConvention.CACHE_WRITE, true);
span.setData(SpanDataConvention.CACHE_WRITE, result);
span.setStatus(SpanStatus.OK);
return result;
} catch (Throwable e) {
Expand Down
16 changes: 16 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 @@ -13,6 +13,7 @@ import kotlin.test.BeforeTest
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertFailsWith
import kotlin.test.assertFalse
import kotlin.test.assertNull
import kotlin.test.assertTrue
import org.mockito.kotlin.any
Expand Down Expand Up @@ -450,6 +451,21 @@ class SentryCacheWrapperTest {
assertEquals("invalidate", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION))
}

@Test
fun `invalidate sets cache write false when cache had no mappings`() {
val tx = createTransaction()
val wrapper = SentryCacheWrapper(delegate, scopes)
whenever(delegate.invalidate()).thenReturn(false)

val result = wrapper.invalidate()

assertFalse(result)
assertEquals(1, tx.spans.size)
assertEquals("cache.invalidate", tx.spans.first().operation)
assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
assertEquals("invalidate", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION))
}

// -- no span when no active transaction --

@Test
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -287,7 +287,7 @@ public boolean invalidate() {
}
try {
final boolean result = delegate.invalidate();
span.setData(SpanDataConvention.CACHE_WRITE, true);
span.setData(SpanDataConvention.CACHE_WRITE, result);
span.setStatus(SpanStatus.OK);
return result;
} catch (Throwable e) {
Expand Down
16 changes: 16 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 @@ -13,6 +13,7 @@ import kotlin.test.BeforeTest
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertFailsWith
import kotlin.test.assertFalse
import kotlin.test.assertNull
import kotlin.test.assertTrue
import org.mockito.kotlin.any
Expand Down Expand Up @@ -450,6 +451,21 @@ class SentryCacheWrapperTest {
assertEquals("invalidate", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION))
}

@Test
fun `invalidate sets cache write false when cache had no mappings`() {
val tx = createTransaction()
val wrapper = SentryCacheWrapper(delegate, scopes)
whenever(delegate.invalidate()).thenReturn(false)

val result = wrapper.invalidate()

assertFalse(result)
assertEquals(1, tx.spans.size)
assertEquals("cache.invalidate", tx.spans.first().operation)
assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
assertEquals("invalidate", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION))
}

// -- no span when no active transaction --

@Test
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -214,7 +214,7 @@ public boolean invalidate() {
}
try {
final boolean result = delegate.invalidate();
span.setData(SpanDataConvention.CACHE_WRITE, true);
span.setData(SpanDataConvention.CACHE_WRITE, result);
span.setStatus(SpanStatus.OK);
return result;
} catch (Throwable e) {
Expand Down
16 changes: 16 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 @@ -11,6 +11,7 @@ import kotlin.test.BeforeTest
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertFailsWith
import kotlin.test.assertFalse
import kotlin.test.assertNull
import kotlin.test.assertTrue
import org.mockito.kotlin.any
Expand Down Expand Up @@ -274,6 +275,21 @@ class SentryCacheWrapperTest {
assertEquals("invalidate", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION))
}

@Test
fun `invalidate sets cache write false when cache had no mappings`() {
val tx = createTransaction()
val wrapper = SentryCacheWrapper(delegate, scopes)
whenever(delegate.invalidate()).thenReturn(false)

val result = wrapper.invalidate()

assertFalse(result)
assertEquals(1, tx.spans.size)
assertEquals("cache.invalidate", tx.spans.first().operation)
assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
assertEquals("invalidate", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION))
}

// -- no span when no active transaction --

@Test
Expand Down
Loading