Skip to content

fix(jcache): [Cache Tracing 19] Use comma-joined keys as span description for bulk operations #5208

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

Draft
adinauer wants to merge 1 commit into
base: feat/cache-tracing-cache-write
Choose a base branch
from
+8 −7
Draft

fix(jcache): [Cache Tracing 19] Use comma-joined keys as span description for bulk operations #5208

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
6 changes: 2 additions & 4 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 @@ -473,10 +473,8 @@ public Iterator<Entry<K, V>> iterator() {

private @Nullable ISpan startSpanForKeys(
final @NotNull Set<?> keys, final @NotNull String operationName) {
return startSpan(
operationName,
delegate.getName(),
keys.stream().map(String::valueOf).collect(Collectors.toList()));
final List<String> keyStrings = keys.stream().map(String::valueOf).collect(Collectors.toList());
return startSpan(operationName, String.join(", ", keyStrings), keyStrings);
}

private @Nullable ISpan startSpan(
Expand Down
9 changes: 6 additions & 3 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,7 +96,8 @@ class SentryJCacheWrapperTest {
assertEquals(1, tx.spans.size)
val span = tx.spans.first()
assertEquals("cache.getAll", span.operation)
assertEquals("testCache", span.description)
assertTrue(span.description!!.contains("k1"))
assertTrue(span.description!!.contains("k2"))
assertEquals(true, span.getData(SpanDataConvention.CACHE_HIT_KEY))
val cacheKeys = span.getData(SpanDataConvention.CACHE_KEY_KEY) as List<*>
assertTrue(cacheKeys.containsAll(listOf("k1", "k2")))
Expand Down Expand Up @@ -165,7 +166,8 @@ class SentryJCacheWrapperTest {
assertEquals(1, tx.spans.size)
val span = tx.spans.first()
assertEquals("cache.putAll", span.operation)
assertEquals("testCache", span.description)
assertTrue(span.description!!.contains("k1"))
assertTrue(span.description!!.contains("k2"))
assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
val cacheKeys = span.getData(SpanDataConvention.CACHE_KEY_KEY) as List<*>
assertTrue(cacheKeys.containsAll(listOf("k1", "k2")))
Expand Down Expand Up @@ -318,7 +320,8 @@ class SentryJCacheWrapperTest {
assertEquals(1, tx.spans.size)
val span = tx.spans.first()
assertEquals("cache.removeAll", span.operation)
assertEquals("testCache", span.description)
assertTrue(span.description!!.contains("k1"))
assertTrue(span.description!!.contains("k2"))
assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
assertEquals("removeAll", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
}
Expand Down
Loading