Merge branch 'feat/cache-tracing-autoconfig' into feat/cache-tracing-sample

Author: adinauer

sentry-spring-7/src/main/java/io/sentry/spring7/cache/SentryCacheManagerWrapper.java

@@ -24,8 +24,8 @@ public SentryCacheManagerWrapper(
   @Override
   public @Nullable Cache getCache(final @NotNull String name) {
     final Cache cache = delegate.getCache(name);
-    if (cache == null) {
-      return null;
+    if (cache == null || cache instanceof SentryCacheWrapper) {
+      return cache;
     }
     return new SentryCacheWrapper(cache, scopes);
   }

sentry-spring-7/src/test/kotlin/io/sentry/spring7/cache/SentryCacheManagerWrapperTest.kt

@@ -4,6 +4,7 @@ import io.sentry.IScopes
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNull
+import kotlin.test.assertSame
 import kotlin.test.assertTrue
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.whenever
@@ -36,6 +37,18 @@ class SentryCacheManagerWrapperTest {
     assertNull(result)
   }
 
+  @Test
+  fun `getCache does not double-wrap SentryCacheWrapper`() {
+    val innerCache = mock<Cache>()
+    val alreadyWrapped = SentryCacheWrapper(innerCache, scopes)
+    whenever(delegate.getCache("test")).thenReturn(alreadyWrapped)
+
+    val wrapper = SentryCacheManagerWrapper(delegate, scopes)
+    val result = wrapper.getCache("test")
+
+    assertSame(alreadyWrapped, result)
+  }
+
   @Test
   fun `getCacheNames delegates to underlying cache manager`() {
     whenever(delegate.cacheNames).thenReturn(listOf("cache1", "cache2"))