chore(deps): update php minors

composer.json

@@ -33,12 +33,12 @@
 		"guzzlehttp/guzzle": "7.7.0",
 		"fluent/logger": "1.0.1",
 		"phpunit/phpunit": "10.2.3",
-		"vimeo/psalm": "5.12.0",
+		"vimeo/psalm": "5.13.1",
 		"dealerdirect/phpcodesniffer-composer-installer": "1.0.0",
 		"phpcompatibility/php-compatibility": "9.3.5",
-		"cyclonedx/cyclonedx-php-composer": "4.0.2",
+		"cyclonedx/cyclonedx-php-composer": "4.1.0",
 		"php-http/guzzle7-adapter": "1.0.0",
-		"sentry/sentry": "3.19.1"
+		"sentry/sentry": "3.20.1"
 	},
   "config": {
     "platform": {

phpunit.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" colors="true" bootstrap="./vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
-  <coverage includeUncoveredFiles="false">
-    <include>
-      <directory suffix=".php">./src/</directory>
-    </include>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" colors="true" bootstrap="./vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <coverage includeUncoveredFiles="false"/>
   <testsuites>
     <testsuite name="Kronos-Log">
       <directory>./tests</directory>
     </testsuite>
   </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">./src/</directory>
+    </include>
+  </source>
 </phpunit>

src/Writer/Sentry.php

@@ -12,7 +12,6 @@
 
 class Sentry extends AbstractWriter
 {
-
     /**
      * @var ClientInterface
      */
@@ -65,10 +64,11 @@ private function captureException($level, $message, $context)
         $this->sentryClient->captureException($exception, $sentryScope);
     }
 
-    private function getSentryScope($level, $context): Scope
+    protected function getSentryScope($level, $context): Scope
     {
         $scope = new Scope();
         $scope->setLevel($level);
+
         if (count($context)) {
             $scope->setExtras($context);
         }

tests/Writer/SentryTest.php

@@ -4,14 +4,18 @@
 
 use Kronos\Log\Writer\Sentry;
 use Kronos\Log\Logger;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 use Psr\Log\LogLevel;
 use Sentry\ClientInterface;
 use Sentry\Severity;
 use Sentry\State\Scope;
+use Sentry\Tracing\PropagationContext;
+use Sentry\Tracing\SpanId;
+use Sentry\Tracing\TraceId;
 
-class SentryTest extends \PHPUnit\Framework\TestCase
+class SentryTest extends TestCase
 {
-
     const A_MESSAGE = 'a message';
     const INTERPOLATABLE_MESSAGE = 'message with {key}';
     const INTERPOLATED_MESSAGE = 'message with value';
@@ -20,18 +24,14 @@ class SentryTest extends \PHPUnit\Framework\TestCase
     const ANY_LEVEL = LogLevel::DEBUG;
     const LOGGER_MESSAGE_KEY = 'loggerMessage';
 
-    private $sentryClient;
-
-    /**
-     * @var Sentry
-     */
-    private $writer;
+    private ClientInterface&MockObject $sentryClient;
+    private Sentry|SentryWithScopeDecorator $writer;
 
     public function setUp(): void
     {
         $this->sentryClient = $this->createMock(ClientInterface::class);
 
-        $this->writer = new Sentry($this->sentryClient);
+        $this->writer = new SentryWithScopeDecorator($this->sentryClient);
     }
 
     public function test_MessageAndContext_Log_SouldCallCaptureMessageWithInterpolatedMessage()
@@ -219,9 +219,49 @@ private function expectsCaptureExceptionToBeCalledWith($exception, $level, $para
         if (count($params)) {
             $scope->setExtras($params);
         }
+
+        $propagationContext = PropagationContext::fromDefaults();
+        $propagationContext->setSpanId(new SpanId(SentryWithScopeDecorator::SPAN_ID));
+        $propagationContext->setTraceId(new TraceId(SentryWithScopeDecorator::TRACE_ID));
+
+        $scope->setPropagationContext($propagationContext);
+
         $this->sentryClient
             ->expects($this->once())
             ->method('captureException')
             ->with($exception, $scope);
     }
 }
+
+class SentryWithScopeDecorator extends Sentry
+{
+    const SPAN_ID = "3d1bf6350d09fb80";
+    const TRACE_ID = "141bb800f59d073b7a075b1eed7d5372";
+
+    public function log($level, $message, array $context = [])
+    {
+        parent::log($level, $message, $context);
+    }
+
+    protected function getSentryScope($level, $context): Scope
+    {
+        $scope = new Scope();
+        $scope->setLevel($level);
+        $this->setPropagationContext($scope);
+
+        if (count($context)) {
+            $scope->setExtras($context);
+        }
+
+        return $scope;
+    }
+
+    private function setPropagationContext(Scope $scope): void
+    {
+        $propagationContext = PropagationContext::fromDefaults();
+        $propagationContext->setSpanId(new SpanId(self::SPAN_ID));
+        $propagationContext->setTraceId(new TraceId(self::TRACE_ID));
+
+        $scope->setPropagationContext($propagationContext);
+    }
+}