Merge branch '5.x' into new-scopes

Litarnus · Litarnus · commit 536433d5d1c8 · 2026-02-13T10:15:23.000+01:00
# Conflicts:
#	src/Logs/LogsAggregator.php
#	src/Metrics/MetricsAggregator.php
#	src/SentrySdk.php
#	src/Tracing/Span.php
#	src/functions.php
#	tests/FunctionsTest.php
#	tests/Logs/LogsAggregatorTest.php
#	tests/Monolog/LogsHandlerTest.php
#	tests/State/HubTest.php
diff --git a/.github/workflows/changelog-preview.yml b/.github/workflows/changelog-preview.yml
@@ -0,0 +1,18 @@
+name: Changelog Preview
+on:
+  pull_request:
+    types:
+    - opened
+    - synchronize
+    - reopened
+    - edited
+    - labeled
+    - unlabeled
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  changelog-preview:
+    uses: getsentry/craft/.github/workflows/changelog-preview.yml@v2
+    secrets: inherit
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,15 +27,15 @@ jobs:
           - ubuntu-latest
           - windows-latest
         php:
-          - { version: '7.2', phpunit: '^8.5.40' }
-          - { version: '7.3', phpunit: '^9.6.21' }
-          - { version: '7.4', phpunit: '^9.6.21' }
-          - { version: '8.0', phpunit: '^9.6.21' }
-          - { version: '8.1', phpunit: '^9.6.21' }
-          - { version: '8.2', phpunit: '^9.6.21' }
-          - { version: '8.3', phpunit: '^9.6.21' }
-          - { version: '8.4', phpunit: '^9.6.21' }
-          - { version: '8.5', phpunit: '^9.6.25' }
+          - { version: '7.2', phpunit: '^8.5.52' }
+          - { version: '7.3', phpunit: '^9.6.34' }
+          - { version: '7.4', phpunit: '^9.6.34' }
+          - { version: '8.0', phpunit: '^9.6.34' }
+          - { version: '8.1', phpunit: '^9.6.34' }
+          - { version: '8.2', phpunit: '^9.6.34' }
+          - { version: '8.3', phpunit: '^9.6.34' }
+          - { version: '8.4', phpunit: '^9.6.34' }
+          - { version: '8.5', phpunit: '^9.6.34' }
         dependencies:
           - lowest
           - highest
diff --git a/.github/workflows/publish-release.yaml b/.github/workflows/publish-release.yaml
@@ -24,7 +24,7 @@ jobs:
     steps:
       - name: Get auth token
         id: token
-        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
+        uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
         with:
           app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
           private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
@@ -35,7 +35,7 @@ jobs:
           fetch-depth: 0
 
       - name: Prepare release
-        uses: getsentry/action-prepare-release@v1
+        uses: getsentry/craft@c6e2f04939b6ee67030588afbb5af76b127d8203
         env:
           GITHUB_TOKEN: ${{ steps.token.outputs.token }}
         with:
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,6 @@ package.xml
 .phpunit.result.cache
 docs/_build
 tests/clover.xml
+
+# Local Claude Code settings that should not be committed
+.claude/settings.local.json
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -38,6 +38,7 @@
         ],
         'no_whitespace_before_comma_in_array' => false, // Should be dropped when we drop support for PHP 7.x
         'stringable_for_to_string' => false,
+        'modern_serialization_methods' => false, // Could be re-enabled when we drop support for PHP 7.3 and lower
     ])
     ->setRiskyAllowed(true)
     ->setFinder(
diff --git a/composer.json b/composer.json
@@ -36,7 +36,7 @@
         "monolog/monolog": "^1.6|^2.0|^3.0",
         "phpbench/phpbench": "^1.0",
         "phpstan/phpstan": "^1.3",
-        "phpunit/phpunit": "^8.5|^9.6",
+        "phpunit/phpunit": "^8.5.52|^9.6.34",
         "vimeo/psalm": "^4.17"
     },
     "suggest": {
diff --git a/src/HttpClient/HttpClient.php b/src/HttpClient/HttpClient.php
@@ -57,7 +57,7 @@ public function sendRequest(Request $request, Options $options): Response
         }
 
         $responseHeaders = [];
-        $responseHeaderCallback = function ($curlHandle, $headerLine) use (&$responseHeaders): int {
+        $responseHeaderCallback = static function ($curlHandle, $headerLine) use (&$responseHeaders): int {
             return Http::parseResponseHeaders($headerLine, $responseHeaders);
         };
 
diff --git a/src/Monolog/LogsHandler.php b/src/Monolog/LogsHandler.php
@@ -18,7 +18,9 @@ class LogsHandler implements HandlerInterface
     /**
      * The minimum logging level at which this handler will be triggered.
      *
-     * @var LogLevel
+     * @psalm-suppress UndefinedDocblockClass
+     *
+     * @var LogLevel|\Monolog\Level|int
      */
     private $logLevel;
 
@@ -32,21 +34,32 @@ class LogsHandler implements HandlerInterface
     /**
      * Creates a new Monolog handler that converts Monolog logs to Sentry logs.
      *
-     * @param LogLevel|null $logLevel the minimum logging level at which this handler will be triggered and collects the logs
-     * @param bool          $bubble   whether the messages that are handled can bubble up the stack or not
+     * @psalm-suppress UndefinedDocblockClass
+     *
+     * @param LogLevel|\Monolog\Level|int|null $logLevel the minimum logging level at which this handler will be triggered and collects the logs
+     * @param bool                             $bubble   whether the messages that are handled can bubble up the stack or not
      */
-    public function __construct(?LogLevel $logLevel = null, bool $bubble = true)
+    public function __construct($logLevel = null, bool $bubble = true)
     {
         $this->logLevel = $logLevel ?? LogLevel::debug();
         $this->bubble = $bubble;
     }
 
     /**
+     * @psalm-suppress UndefinedDocblockClass
+     * @psalm-suppress UndefinedClass
+     *
      * @param array<string, mixed>|LogRecord $record
      */
     public function isHandling($record): bool
     {
-        return self::getSentryLogLevelFromMonologLevel($record['level'])->getPriority() >= $this->logLevel->getPriority();
+        if ($this->logLevel instanceof LogLevel) {
+            return self::getSentryLogLevelFromMonologLevel($record['level'])->getPriority() >= $this->logLevel->getPriority();
+        } elseif ($this->logLevel instanceof \Monolog\Level) {
+            return $record['level'] >= $this->logLevel->value;
+        }
+
+        return $record['level'] >= $this->logLevel;
     }
 
     /**
diff --git a/src/SentrySdk.php b/src/SentrySdk.php
@@ -4,6 +4,8 @@
 
 namespace Sentry;
 
+use Sentry\Logs\Logs;
+use Sentry\Metrics\TraceMetrics;
 use Sentry\State\Scope;
 use Sentry\State\ScopeManager;
 use Sentry\Tracing\SamplingContext;
@@ -274,4 +276,20 @@ private static function isValidSampleRate($sampleRate): bool
 
         return true;
     }
+
+    /**
+     * Flushes all buffered telemetry data.
+     *
+     * This is a convenience facade that forwards the flush operation to all
+     * internally managed components.
+     *
+     * Calling this method is equivalent to invoking `flush()` on each component
+     * individually. It does not change flushing behavior, improve performance,
+     * or reduce the number of network requests.
+     */
+    public static function flush(): void
+    {
+        Logs::getInstance()->flush();
+        TraceMetrics::getInstance()->flush();
+    }
 }
diff --git a/src/Tracing/Span.php b/src/Tracing/Span.php
@@ -299,7 +299,7 @@ public function setStatus(?SpanStatus $status)
      */
     public function setHttpStatus(int $statusCode)
     {
-        SentrySdk::configureScope(function (Scope $scope) use ($statusCode) {
+        SentrySdk::configureScope(static function (Scope $scope) use ($statusCode): void {
             $scope->setContext('response', [
                 'status_code' => $statusCode,
             ]);
diff --git a/src/functions.php b/src/functions.php
@@ -14,6 +14,7 @@
 use Sentry\Tracing\SpanContext;
 use Sentry\Tracing\Transaction;
 use Sentry\Tracing\TransactionContext;
+use Sentry\Transport\TransportInterface;
 
 /**
  * Creates a new Client and binds it to the global scope.
@@ -61,7 +62,7 @@
  *     trace_propagation_targets?: array<string>|null,
  *     traces_sample_rate?: float|int|null,
  *     traces_sampler?: callable|null,
- *     transport?: callable,
+ *     transport?: TransportInterface|null,
  * } $options The client options
  */
 function init(array $options = []): void
@@ -247,7 +248,7 @@ function startTransaction(TransactionContext $context, array $customSamplingCont
  */
 function trace(callable $trace, SpanContext $context)
 {
-    return SentrySdk::withScope(function (Scope $scope) use ($context, $trace) {
+    return SentrySdk::withScope(static function (Scope $scope) use ($context, $trace) {
         $parentSpan = $scope->getSpan();
 
         // If there is a span set on the scope and it's sampled there is an active transaction.
@@ -346,7 +347,22 @@ function trace_metrics(): TraceMetrics
  */
 function addFeatureFlag(string $name, bool $result): void
 {
-    SentrySdk::configureScope(function (Scope $scope) use ($name, $result) {
+    SentrySdk::configureScope(static function (Scope $scope) use ($name, $result): void {
         $scope->addFeatureFlag($name, $result);
     });
 }
+
+/**
+ * Flushes all buffered telemetry data.
+ *
+ * This is a convenience facade that forwards the flush operation to all
+ * internally managed components.
+ *
+ * Calling this method is equivalent to invoking `flush()` on each component
+ * individually. It does not change flushing behavior, improve performance,
+ * or reduce the number of network requests.
+ */
+function flush(): void
+{
+    SentrySdk::flush();
+}
diff --git a/tests/ClientTest.php b/tests/ClientTest.php
@@ -980,7 +980,7 @@ public function testAttachStacktrace(): void
         $transport = $this->createMock(TransportInterface::class);
         $transport->expects($this->once())
                   ->method('send')
-                  ->with($this->callback(function (Event $event): bool {
+                  ->with($this->callback(static function (Event $event): bool {
                       $result = $event->getStacktrace();
 
                       return $result !== null;
diff --git a/tests/FrameBuilderTest.php b/tests/FrameBuilderTest.php
@@ -290,7 +290,7 @@ public function testGetFunctionArgumentsWithVariadicParameters(): void
         $options = new Options([]);
         $frameBuilder = new FrameBuilder($options, new RepresentationSerializer($options));
 
-        $testFunction = function (string $first, int $second, ...$rest) {
+        $testFunction = static function (string $first, int $second, ...$rest) {
         };
 
         $backtraceFrame = [
@@ -325,7 +325,7 @@ public function testGetFunctionArgumentsWithOnlyVariadicParameters(): void
         $options = new Options([]);
         $frameBuilder = new FrameBuilder($options, new RepresentationSerializer($options));
 
-        $testFunction = function (...$args) {
+        $testFunction = static function (...$args) {
         };
 
         $backtraceFrame = [
@@ -352,7 +352,7 @@ public function testGetFunctionArgumentsWithEmptyVariadicParameters(): void
         $options = new Options([]);
         $frameBuilder = new FrameBuilder($options, new RepresentationSerializer($options));
 
-        $testFunction = function (string $first, ...$rest) {
+        $testFunction = static function (string $first, ...$rest) {
         };
 
         $backtraceFrame = [
@@ -381,7 +381,7 @@ public function testGetFunctionArgumentsWithNullValues(): void
         $options = new Options([]);
         $frameBuilder = new FrameBuilder($options, new RepresentationSerializer($options));
 
-        $testFunction = function (string $first, $second, ...$rest) {
+        $testFunction = static function (string $first, $second, ...$rest) {
         };
 
         $backtraceFrame = [
@@ -411,7 +411,7 @@ public function testGetFunctionArgumentsWithGapsInBacktraceArrayIndices(): void
         $options = new Options([]);
         $frameBuilder = new FrameBuilder($options, new RepresentationSerializer($options));
 
-        $testFunction = function (string $first, int $second, ...$rest) {
+        $testFunction = static function (string $first, int $second, ...$rest) {
         };
 
         $backtraceFrameArgs = [];
diff --git a/tests/FunctionsTest.php b/tests/FunctionsTest.php
@@ -249,15 +249,15 @@ public function testWithMonitor(): void
         $client->expects($this->exactly(2))
             ->method('captureCheckIn')
             ->with(
-                $this->callback(function (string $slug): bool {
+                $this->callback(static function (string $slug): bool {
                     return $slug === 'test-crontab';
                 }),
-                $this->callback(function (CheckInStatus $checkInStatus): bool {
+                $this->callback(static function (CheckInStatus $checkInStatus): bool {
                     // just check for type CheckInStatus
                     return true;
                 }),
                 $this->anything(),
-                $this->callback(function (MonitorConfig $monitorConfig): bool {
+                $this->callback(static function (MonitorConfig $monitorConfig): bool {
                     return $monitorConfig->getSchedule()->getValue() === '*/5 * * * *'
                         && $monitorConfig->getSchedule()->getType() === MonitorSchedule::TYPE_CRONTAB
                         && $monitorConfig->getCheckinMargin() === 5
@@ -268,7 +268,7 @@ public function testWithMonitor(): void
 
         SentrySdk::init($client);
 
-        withMonitor('test-crontab', function () {
+        withMonitor('test-crontab', static function () {
             // Do something...
         }, new MonitorConfig(
             new MonitorSchedule(MonitorSchedule::TYPE_CRONTAB, '*/5 * * * *'),
@@ -286,14 +286,15 @@ public function testWithMonitorCallableThrows(): void
         $client->expects($this->exactly(2))
             ->method('captureCheckIn')
             ->with(
-                $this->callback(function (string $slug): bool {
+                $this->callback(static function (string $slug): bool {
                     return $slug === 'test-crontab';
                 }),
-                $this->callback(function (CheckInStatus $checkInStatus): bool {
+                $this->callback(static function (CheckInStatus $checkInStatus): bool {
+                    // just check for type CheckInStatus
                     return true;
                 }),
                 $this->anything(),
-                $this->callback(function (MonitorConfig $monitorConfig): bool {
+                $this->callback(static function (MonitorConfig $monitorConfig): bool {
                     return $monitorConfig->getSchedule()->getValue() === '*/5 * * * *'
                         && $monitorConfig->getSchedule()->getType() === MonitorSchedule::TYPE_CRONTAB
                         && $monitorConfig->getCheckinMargin() === 5
@@ -304,7 +305,7 @@ public function testWithMonitorCallableThrows(): void
 
         SentrySdk::init($client);
 
-        withMonitor('test-crontab', function () {
+        withMonitor('test-crontab', static function () {
             throw new \Exception();
         }, new MonitorConfig(
             new MonitorSchedule(MonitorSchedule::TYPE_CRONTAB, '*/5 * * * *'),
@@ -425,7 +426,7 @@ public function testTraceReturnsClosureResult(): void
     {
         $returnValue = 'foo';
 
-        $result = trace(function () use ($returnValue) {
+        $result = trace(static function () use ($returnValue) {
             return $returnValue;
         }, new SpanContext());
 
@@ -449,7 +450,7 @@ public function testTraceCorrectlyReplacesAndRestoresCurrentSpan(): void
         $this->assertSame($transaction, SentrySdk::getCurrentScope()->getSpan());
 
         try {
-            trace(function () {
+            trace(static function () {
                 throw new \RuntimeException('Throwing should still restore the previous span');
             }, new SpanContext());
         } catch (\RuntimeException $e) {
diff --git a/tests/Logs/LogsAggregatorTest.php b/tests/Logs/LogsAggregatorTest.php
@@ -166,7 +166,7 @@ public function testAttributesAreAddedToLogMessage(): void
 
         SentrySdk::init($client);
 
-        SentrySdk::configureScope(function (Scope $scope) {
+        SentrySdk::configureScope(static function (Scope $scope): void {
             $userDataBag = new UserDataBag();
             $userDataBag->setId('unique_id');
             $userDataBag->setEmail('foo@example.com');
diff --git a/tests/Logs/LogsTest.php b/tests/Logs/LogsTest.php
@@ -169,7 +169,7 @@ private function assertEvent(callable $assert, array $options = []): ClientInter
         $transport = $this->createMock(TransportInterface::class);
         $transport->expects($this->once())
                   ->method('send')
-                  ->with($this->callback(function (Event $event) use ($assert): bool {
+                  ->with($this->callback(static function (Event $event) use ($assert): bool {
                       $assert($event);
 
                       return true;
diff --git a/tests/Monolog/LogsHandlerTest.php b/tests/Monolog/LogsHandlerTest.php
diff --git a/tests/Monolog/RecordFactory.php b/tests/Monolog/RecordFactory.php
diff --git a/tests/OptionResolverTest.php b/tests/OptionResolverTest.php
diff --git a/tests/Serializer/AbstractSerializerTest.php b/tests/Serializer/AbstractSerializerTest.php
diff --git a/tests/State/ScopeTest.php b/tests/State/ScopeTest.php
diff --git a/tests/Transport/HttpTransportTest.php b/tests/Transport/HttpTransportTest.php

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function sendRequest(Request $request, Options $options): Response`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`$responseHeaders = [];`
`60`		`- $responseHeaderCallback = function ($curlHandle, $headerLine) use (&$responseHeaders): int {`
	`60`	`+ $responseHeaderCallback = static function ($curlHandle, $headerLine) use (&$responseHeaders): int {`
`61`	`61`	`return Http::parseResponseHeaders($headerLine, $responseHeaders);`
`62`	`62`	`};`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ public function setStatus(?SpanStatus $status)`
`299`	`299`	`*/`
`300`	`300`	`public function setHttpStatus(int $statusCode)`
`301`	`301`	`{`
`302`		`- SentrySdk::configureScope(function (Scope $scope) use ($statusCode) {`
	`302`	`+ SentrySdk::configureScope(static function (Scope $scope) use ($statusCode): void {`
`303`	`303`	`$scope->setContext('response', [`
`304`	`304`	`'status_code' => $statusCode,`
`305`	`305`	`]);`