Merge master changes

.github/workflows/ci.yml

@@ -35,13 +35,14 @@ jobs:
           - { 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' }
         dependencies:
           - lowest
           - highest
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 2
 
@@ -60,7 +61,7 @@ jobs:
         shell: bash
 
       - name: Cache Composer dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.composer-cache.outputs.directory }}
           key: ${{ runner.os }}-${{ matrix.php.version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}

.github/workflows/publish-release.yaml

@@ -24,12 +24,12 @@ jobs:
     steps:
       - name: Get auth token
         id: token
-        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
+        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
         with:
           app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
           private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           token: ${{ steps.token.outputs.token }}
           fetch-depth: 0

.github/workflows/static-analysis.yaml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -52,7 +52,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.php-cs-fixer.dist.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 return (new PhpCsFixer\Config())
     ->setRules([
         '@PHP71Migration' => true,
@@ -35,6 +37,7 @@
             'elements' => ['arrays'],
         ],
         'no_whitespace_before_comma_in_array' => false, // Should be dropped when we drop support for PHP 7.x
+        'stringable_for_to_string' => false,
     ])
     ->setRiskyAllowed(true)
     ->setFinder(

CHANGELOG.md

@@ -1,5 +1,89 @@
 # CHANGELOG
 
+## 4.19.1
+
+The Sentry SDK team is happy to announce the immediate availability of Sentry PHP SDK v4.19.1.
+
+### Bug Fixes
+
+- Don't cast metrics value to `float` in constructor, drop invalid metrics instead. [(#1981)](https://github.com/getsentry/sentry-php/pull/1981)
+
+## 4.19.0
+
+The Sentry SDK team is happy to announce the immediate availability of Sentry PHP SDK v4.19.0.
+
+### Features
+
+- Add support for metrics. [(#1968)](https://github.com/getsentry/sentry-php/pull/1968)
+```php
+// Counter metric
+\Sentry\trace_metrics()->count('test-counter', 10, ['my-attribute' => 'foo']);
+
+// Gauge metric
+\Sentry\trace_metrics()->gauge('test-gauge', 50.0, ['my-attribute' => 'foo'], \Sentry\Unit::millisecond());
+
+// Distribution metric
+\Sentry\trace_metrics()->distribution('test-distribution', 20.0, ['my-attribute' => 'foo'], \Sentry\Unit::kilobyte());
+
+// Flush metrics
+\Sentry\trace_metrics()->flush();
+```
+
+### Bug Fixes
+
+- Add rate limiting for profiles and cron check-ins. [(#1970)](https://github.com/getsentry/sentry-php/pull/1970)
+- Fix Spotlight so it always registers the error integrations and emits transport logs even when no DSN is configured. [(#1964)](https://github.com/getsentry/sentry-php/pull/1964)
+
+## 4.18.1
+
+The Sentry SDK team is happy to announce the immediate availability of Sentry PHP SDK v4.18.1.
+
+### Misc
+
+- Add `addFeatureFlag` helper function. [(#1960)](https://github.com/getsentry/sentry-php/pull/1960)
+```php
+\Sentry\addFeatureFlag("my.feature.enabled", true);
+```
+
+## 4.18.0
+
+The Sentry SDK team is happy to announce the immediate availability of Sentry PHP SDK v4.18.0.
+
+### Features
+
+- Add support for feature flags. [(#1951)](https://github.com/getsentry/sentry-php/pull/1951)
+```php
+\Sentry\SentrySdk::getCurrentHub()->configureScope(function (\Sentry\State\Scope $scope) {
+    $scope->addFeatureFlag("my.feature.enabled", true);
+});
+```
+- Add more representations for log attributes instead of dropping them. [(#1950)](https://github.com/getsentry/sentry-php/pull/1950)
+
+### Misc
+
+- Merge log attributes in a separate method. [(#1931)](https://github.com/getsentry/sentry-php/pull/1931)
+
+## 4.17.1
+
+The Sentry SDK team is happy to announce the immediate availability of Sentry PHP SDK v4.17.1.
+
+### Misc
+
+- Call `curl_close` only on PHP version 7.4 and below to prevent deprecation warnings. [(#1947)](https://github.com/getsentry/sentry-php/pull/1947)
+
+## 4.17.0
+
+The Sentry SDK team is happy to announce the immediate availability of Sentry PHP SDK v4.17.0.
+
+### Bug Fixes
+
+- Empty strings will no longer display `<encoding error>` when serialized. [(#1940)](https://github.com/getsentry/sentry-php/pull/1940)
+
+### Misc
+
+- Remove `symfony/phpunit-bridge` as a dev dependency. [(#1930)](https://github.com/getsentry/sentry-php/pull/1930)
+- Update `sentry.origin` to be consistent with other SDKs. [(#1938)](https://github.com/getsentry/sentry-php/pull/1938)
+
 ## 4.16.0
 
 The Sentry SDK team is happy to announce the immediate availability of Sentry PHP SDK v4.16.0.

README.md

@@ -63,11 +63,13 @@ The following integrations are available and maintained by members of the Sentry
 - [WordPress](https://wordpress.org/plugins/wp-sentry-integration/)
 - Magento 2 by [JustBetter](https://github.com/justbetter/magento2-sentry) or by [Mygento](https://github.com/mygento/module-sentry)
 - [Joomla!](https://github.com/AlterBrains/sentry-joomla)
+- Neos Flow (and CMS) using [flownative/sentry](https://github.com/flownative/flow-sentry) or [networkteam/sentryclient](https://github.com/networkteam/Networkteam.SentryClient)
+- Neos CMS with specific Fusion handling using [networkteam/neos-sentryclient](https://github.com/networkteam/Netwokteam.Neos.SentryClient)
+- [TYPO3](https://github.com/networkteam/sentry_client)
 - ... feel free to be famous, create a port to your favourite platform!
 
 ## 3rd party integrations using the old SDK 3.x
 
-- [Neos Flow](https://github.com/flownative/flow-sentry)
 - [ZendFramework](https://github.com/facile-it/sentry-module)
 - [Yii2](https://github.com/notamedia/yii2-sentry)
 - [Silverstripe](https://github.com/phptek/silverstripe-sentry)
@@ -77,14 +79,11 @@ The following integrations are available and maintained by members of the Sentry
 
 ## 3rd party integrations using the old SDK 2.x
 
-- [Neos Flow](https://github.com/networkteam/Networkteam.SentryClient)
 - [OXID eShop](https://github.com/OXIDprojects/sentry)
-- [TYPO3](https://github.com/networkteam/sentry_client)
 - [CakePHP](https://github.com/Connehito/cake-sentry/tree/3.x)
 
 ## 3rd party integrations using the old SDK 1.x
 
-- [Neos CMS](https://github.com/networkteam/Netwokteam.Neos.SentryClient)
 - [OpenCart](https://github.com/BurdaPraha/oc_sentry)
 - [TYPO3](https://github.com/networkteam/sentry_client/tree/2.1.1)
 
@@ -113,7 +112,7 @@ If you need help setting up or configuring the PHP SDK (or anything else in the
 - [![Documentation](https://img.shields.io/badge/documentation-sentry.io-green.svg)](https://docs.sentry.io/quickstart/)
 - [![Discord](https://img.shields.io/discord/621778831602221064)](https://discord.gg/Ww9hbqr)
 - [![Stack Overflow](https://img.shields.io/badge/stack%20overflow-sentry-green.svg)](http://stackoverflow.com/questions/tagged/sentry)
-- [![Twitter Follow](https://img.shields.io/twitter/follow/getsentry?label=getsentry&style=social)](https://twitter.com/intent/follow?screen_name=getsentry)
+- [![X Follow](https://img.shields.io/twitter/follow/sentry?label=sentry&style=social)](https://x.com/intent/follow?screen_name=sentry)
 
 ## License
 

phpstan.neon

@@ -10,7 +10,7 @@ parameters:
     excludePaths:
         - tests/resources
         - tests/Fixtures
-        - src/Util/ClockMock.php
+        - tests/TestUtil/ClockMock.php
     dynamicConstantNames:
         - Monolog\Logger::API
     bootstrapFiles:

psalm.xml.dist

@@ -11,7 +11,7 @@
         <ignoreFiles>
             <directory name="vendor" />
             <file name="src/Util/DebugType.php" />
-            <file name="src/Util/ClockMock.php" />
+            <file name="tests/TestUtil/ClockMock.php" />
         </ignoreFiles>
     </projectFiles>
 

src/Attributes/Attribute.php

@@ -4,6 +4,9 @@
 
 namespace Sentry\Attributes;
 
+use Sentry\Serializer\SerializableInterface;
+use Sentry\Util\JSON;
+
 /**
  * @phpstan-type AttributeType 'string'|'boolean'|'integer'|'double'
  * @phpstan-type AttributeValue string|bool|int|float
@@ -68,7 +71,7 @@ public static function fromValue($value): self
     public static function tryFromValue($value): ?self
     {
         if ($value === null) {
-            return null;
+            return new self('null', 'string');
         }
 
         if (\is_bool($value)) {
@@ -83,14 +86,22 @@ public static function tryFromValue($value): ?self
             return new self($value, 'double');
         }
 
-        if (\is_string($value) || (\is_object($value) && method_exists($value, '__toString'))) {
-            $stringValue = (string) $value;
-
-            if (empty($stringValue)) {
-                return null;
+        if ($value instanceof SerializableInterface) {
+            try {
+                return new self(JSON::encode($value->toSentry()), 'string');
+            } catch (\Throwable $e) {
+                // Ignore the exception and continue trying other methods
             }
+        }
+
+        if (\is_string($value) || (\is_object($value) && method_exists($value, '__toString'))) {
+            return new self((string) $value, 'string');
+        }
 
-            return new self($stringValue, 'string');
+        try {
+            return new self(JSON::encode($value), 'string');
+        } catch (\Throwable $e) {
+            // Ignore the exception
         }
 
         return null;

src/Client.php

@@ -32,7 +32,7 @@ class Client implements ClientInterface
     /**
      * The version of the SDK.
      */
-    public const SDK_VERSION = '4.16.0';
+    public const SDK_VERSION = '4.19.1';
 
     /**
      * Regex pattern to detect if a string is a regex pattern (starts and ends with / optionally followed by flags).

src/Event.php

@@ -8,6 +8,7 @@
 use Sentry\Context\OsContext;
 use Sentry\Context\RuntimeContext;
 use Sentry\Logs\Log;
+use Sentry\Metrics\Types\Metric;
 use Sentry\Profiling\Profile;
 use Sentry\Tracing\Span;
 use Sentry\Util\DebugType;
@@ -73,6 +74,11 @@ final class Event
      */
     private $logs = [];
 
+    /**
+     * @var Metric[]
+     */
+    private $metrics = [];
+
     /**
      * @var string|null The name of the server (e.g. the host name)
      */
@@ -248,6 +254,11 @@ public static function createLogs(?EventId $eventId = null): self
         return new self($eventId, EventType::logs());
     }
 
+    public static function createMetrics(?EventId $eventId = null): self
+    {
+        return new self($eventId, EventType::metrics());
+    }
+
     /**
      * Gets the ID of this event.
      */
@@ -444,6 +455,24 @@ public function setLogs(array $logs): self
         return $this;
     }
 
+    /**
+     * @return Metric[]
+     */
+    public function getMetrics(): array
+    {
+        return $this->metrics;
+    }
+
+    /**
+     * @param Metric[] $metrics
+     */
+    public function setMetrics(array $metrics): self
+    {
+        $this->metrics = $metrics;
+
+        return $this;
+    }
+
     /**
      * Gets the name of the server.
      */

src/EventType.php

@@ -47,6 +47,11 @@ public static function logs(): self
         return self::getInstance('log');
     }
 
+    public static function metrics(): self
+    {
+        return self::getInstance('trace_metric');
+    }
+
     /**
      * List of all cases on the enum.
      *
@@ -59,9 +64,21 @@ public static function cases(): array
             self::transaction(),
             self::checkIn(),
             self::logs(),
+            self::metrics(),
         ];
     }
 
+    public function requiresEventId(): bool
+    {
+        switch ($this) {
+            case self::metrics():
+            case self::logs():
+                return false;
+            default:
+                return true;
+        }
+    }
+
     public function __toString(): string
     {
         return $this->value;

src/HttpClient/HttpClient.php

@@ -106,7 +106,9 @@ public function sendRequest(Request $request, Options $options): Response
         if ($body === false) {
             $errorCode = curl_errno($curlHandle);
             $error = curl_error($curlHandle);
-            curl_close($curlHandle);
+            if (\PHP_MAJOR_VERSION < 8) {
+                curl_close($curlHandle);
+            }
 
             $message = 'cURL Error (' . $errorCode . ') ' . $error;
 
@@ -115,7 +117,9 @@ public function sendRequest(Request $request, Options $options): Response
 
         $statusCode = curl_getinfo($curlHandle, \CURLINFO_HTTP_CODE);
 
-        curl_close($curlHandle);
+        if (\PHP_MAJOR_VERSION < 8) {
+            curl_close($curlHandle);
+        }
 
         $error = $statusCode >= 400 ? $body : '';