Merge pull request #5208 from getsentry/fix/cache-tracing-jcache-bulk-description

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

Author: adinauer

sentry-jcache/src/main/java/io/sentry/jcache/SentryJCacheWrapper.java

@@ -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(

sentry-jcache/src/test/kotlin/io/sentry/jcache/SentryJCacheWrapperTest.kt

@@ -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")))
@@ -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")))
@@ -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))
   }