Fix cache integration span data merging and improve session handling in tests

Author: cursoragent

src/Sentry/Laravel/Features/CacheIntegration.php

@@ -225,9 +225,10 @@ private function maybeHandleCacheEventAsEndOfSpan(Events\CacheEvent $event): boo
             $finishedSpan = $this->maybeFinishSpan(SpanStatus::ok());
 
             if ($finishedSpan !== null && count($finishedSpan->getData()['cache.key'] ?? []) === 1) {
-                $finishedSpan->setData([
-                    'cache.hit' => $event instanceof Events\CacheHit,
-                ]);
+                $finishedSpan->setData(array_merge(
+                    $finishedSpan->getData(),
+                    ['cache.hit' => $event instanceof Events\CacheHit]
+                ));
             }
 
             return true;
@@ -240,9 +241,10 @@ private function maybeHandleCacheEventAsEndOfSpan(Events\CacheEvent $event): boo
             );
 
             if ($finishedSpan !== null) {
-                $finishedSpan->setData([
-                    'cache.success' => $event instanceof Events\KeyWritten,
-                ]);
+                $finishedSpan->setData(array_merge(
+                    $finishedSpan->getData(),
+                    ['cache.success' => $event instanceof Events\KeyWritten]
+                ));
             }
 
             return true;
@@ -314,9 +316,9 @@ private function replaceSessionKey(string $key): string
     /**
      * Replace session keys in an array of keys with placeholders.
      *
-     * @param array $keys
+     * @param string[] $keys
      *
-     * @return array
+     * @return string[]
      */
     private function replaceSessionKeys(array $keys): array
     {

test/Sentry/Features/CacheIntegrationTest.php

@@ -9,6 +9,10 @@
 
 class CacheIntegrationTest extends TestCase
 {
+    protected $defaultSetupConfig = [
+        'session.driver' => 'array',
+    ];
+
     public function testCacheBreadcrumbForWriteAndHitIsRecorded(): void
     {
         Cache::put($key = 'foo', 'bar');
@@ -53,10 +57,10 @@ public function testCacheBreadcrumbIsNotRecordedWhenDisabled(): void
 
     public function testCacheBreadcrumbReplacesSessionKeyWithPlaceholder(): void
     {
-        // Start a session
-        $this->app['request']->setLaravelSession($session = $this->app['session.store']);
-        $session->start();
-        $sessionId = $session->getId();
+        // Start a session properly in the test environment
+        $this->withSession(['test' => 'value']);
+        
+        $sessionId = $this->app['session']->getId();
 
         // Use the session ID as a cache key
         Cache::put($sessionId, 'session-data');
@@ -178,10 +182,10 @@ public function testCacheSpanReplacesSessionKeyWithPlaceholder(): void
     {
         $this->markSkippedIfTracingEventsNotAvailable();
 
-        // Start a session
-        $this->app['request']->setLaravelSession($session = $this->app['session.store']);
-        $session->start();
-        $sessionId = $session->getId();
+        // Start a session properly in the test environment
+        $this->withSession(['test' => 'value']);
+        
+        $sessionId = $this->app['session']->getId();
 
         $span = $this->executeAndReturnMostRecentSpan(function () use ($sessionId) {
             Cache::get($sessionId);
@@ -196,10 +200,10 @@ public function testCacheSpanReplacesMultipleSessionKeysWithPlaceholder(): void
     {
         $this->markSkippedIfTracingEventsNotAvailable();
 
-        // Start a session
-        $this->app['request']->setLaravelSession($session = $this->app['session.store']);
-        $session->start();
-        $sessionId = $session->getId();
+        // Start a session properly in the test environment
+        $this->withSession(['test' => 'value']);
+        
+        $sessionId = $this->app['session']->getId();
 
         $span = $this->executeAndReturnMostRecentSpan(function () use ($sessionId) {
             Cache::get([$sessionId, 'regular-key', $sessionId . '_another']);
@@ -214,15 +218,14 @@ public function testCacheOperationDoesNotStartSessionPrematurely(): void
     {
         $this->markSkippedIfTracingEventsNotAvailable();
 
-        // Make sure session is not started
-        $this->assertFalse($this->app['session.store']->isStarted());
+        // Don't start a session to ensure it's not started
 
         $span = $this->executeAndReturnMostRecentSpan(function () {
             Cache::get('some-key');
         });
-
-        // Session should still not be started
-        $this->assertFalse($this->app['session.store']->isStarted());
+        
+        // Check that session was not started  
+        $this->assertFalse($this->app['session']->isStarted());
 
         // And the key should not be replaced
         $this->assertEquals('some-key', $span->getDescription());