Merge branch 'main' into fix/prevent-json-encoding-crashes

Author: YasserB94

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: true
+contact_links:
+    - name: Feature Request
+      url: https://github.com/spatie/flare-client-php/discussions/new?category=ideas
+      about: Share ideas for new features
+    - name: Ask a Question
+      url: https://github.com/spatie/flare-client-php/discussions/new?category=q-a
+      about: Ask the community for help

.github/workflows/run-tests.yml

@@ -8,7 +8,7 @@ jobs:
 
         strategy:
             matrix:
-                php: [8.4, 8.3, 8.2]
+                php: [8.5, 8.4, 8.3, 8.2]
                 dependency-version: [prefer-lowest, prefer-stable]
                 os: [ubuntu-latest]
 

CHANGELOG.md

@@ -2,6 +2,84 @@
 
 All notable changes to `flare-client-php` will be documented in this file
 
+## 2.5.2 - 2025-11-18
+
+- Allow body field censoring using dot and wildcard syntax
+- Fix an issue where the default of the git attribute provider was not provided
+
+## 2.5.1 - 2025-11-13
+
+- Fix an issue where the disabled Flare infrastructure wasn't working propertly
+
+**Full Changelog**: https://github.com/spatie/flare-client-php/compare/2.5.0...2.5.1
+
+## 2.5.0 - 2025-11-07
+
+- Add support for better trace context recording
+
+## 2.4.0 - 2025-11-06
+
+- Update the Git Collector to be more performant
+
+## 2.3.3 - 2025-11-05
+
+- Use local data to determine the telemetry sdk version
+
+## 3.3.3 - 2025-11-05
+
+- Use local data to determine the flare client telemetry version
+
+## 2.3.2 - 2025-10-13
+
+- Fix attribute key for span type in FilesystemRecorder.php
+
+## 2.3.1 - 2025-10-10
+
+- Better handling of success codes in the Api
+
+## 2.3.0 - 2025-10-08
+
+- Fixed an issue where disabled tracing could still trace
+- Completely refactored the recorders, the old traits are now deprecated in favour of specific classes for spans or span events
+- Fix an issue where attributes of spans & span events used in an error removed the span type
+
+## 2.2.3 - 2025-10-06
+
+- Fix sampler
+
+## 2.2.2 - 2025-09-11
+
+- Fix missing interface parameter
+
+**Full Changelog**: https://github.com/spatie/flare-client-php/compare/2.2.0...2.2.2
+
+## 2.2.0 - 2025-09-11
+
+### What's Changed
+
+* Add additional methods to control custom context
+
+**Full Changelog**: https://github.com/spatie/flare-client-php/compare/2.1.0...2.2.0
+
+## 2.1.0 - 2025-08-27
+
+- Add support for stacktraces with logs
+
+## 2.0.9 - 2025-08-25
+
+- Laravel's `artisan` is now considered a vendor file in stacktraces
+- Statamic's `please` is now considered a vendor file in stacktraces
+
+**Full Changelog**: https://github.com/spatie/flare-client-php/compare/2.0.8...2.0.9
+
+## 2.0.8 - 2025-08-21
+
+### What's Changed
+
+* Fix issue where dns servers were contacted by @rubenvanassche in https://github.com/spatie/flare-client-php/pull/44
+
+**Full Changelog**: https://github.com/spatie/flare-client-php/compare/2.0.7...2.0.8
+
 ## 2.0.7 - 2025-07-17
 
 - Add support for Curl Options

README.md

@@ -1,4 +1,4 @@
-# Send PHP errors to Flare
+# Send PHP errors and traces to Flare
 
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/spatie/flare-client-php.svg?style=flat-square)](https://packagist.org/packages/spatie/flare-client-php)
 [![Run tests](https://github.com/spatie/flare-client-php/actions/workflows/run-tests.yml/badge.svg)](https://github.com/spatie/flare-client-php/actions/workflows/run-tests.yml)
@@ -11,7 +11,7 @@ Using Laravel? You probably want to use [Flare for Laravel](https://github.com/s
 
 ## Documentation
 
-You can find the documentation of this package at [the docs of Flare](https://flareapp.io/docs/flare/general/welcome-to-flare).
+You can find the documentation of this package at [the docs of Flare](https://flareapp.io/docs/php/general/introduction).
 
 ## Changelog
 

composer.json

@@ -14,15 +14,15 @@
         "ext-curl": "*",
         "guzzlehttp/guzzle": "^7.9",
         "psr/container": "^2.0",
-        "spatie/backtrace": "^1.6.2",
+        "spatie/backtrace": "^1.8.0",
         "spatie/error-solutions": "^2.0",
         "symfony/http-foundation": "^5.2|^6.0|^7.0",
         "symfony/mime": "^5.2|^6.0|^7.0",
         "symfony/process": "^5.2|^6.0|^7.0",
         "symfony/var-dumper": "^5.2|^6.0|^7.0"
     },
     "require-dev": {
-        "pestphp/pest": "^2.36.0",
+        "pestphp/pest": "^2.36.0|^3.0|^4.0",
         "phpstan/extension-installer": "^1.4",
         "phpstan/phpstan-deprecation-rules": "^1.2",
         "phpstan/phpstan-phpunit": "^1.4",
@@ -31,10 +31,7 @@
     "autoload": {
         "psr-4": {
             "Spatie\\FlareClient\\": "src"
-        },
-        "files": [
-            "src/helpers.php"
-        ]
+        }
     },
     "autoload-dev": {
         "psr-4": {

phpstan-baseline.neon

@@ -85,145 +85,35 @@ parameters:
 			count: 1
 			path: src/FlareConfig.php
 
-		-
-			message: "#^Instanceof between \\*NEVER\\* and Spatie\\\\FlareClient\\\\Spans\\\\SpanEvent will always evaluate to false\\.$#"
-			count: 1
-			path: src/Recorders/ApplicationRecorder/ApplicationRecorder.php
-
-		-
-			message: "#^Match arm is unreachable because previous comparison is always true\\.$#"
-			count: 1
-			path: src/Recorders/ApplicationRecorder/ApplicationRecorder.php
-
-		-
-			message: "#^Instanceof between Spatie\\\\FlareClient\\\\Spans\\\\SpanEvent and Spatie\\\\FlareClient\\\\Spans\\\\Span will always evaluate to false\\.$#"
-			count: 1
-			path: src/Recorders/CacheRecorder/CacheRecorder.php
-
-		-
-			message: "#^Instanceof between \\*NEVER\\* and Spatie\\\\FlareClient\\\\Spans\\\\SpanEvent will always evaluate to false\\.$#"
-			count: 1
-			path: src/Recorders/CommandRecorder/CommandRecorder.php
-
-		-
-			message: "#^Match arm is unreachable because previous comparison is always true\\.$#"
-			count: 1
-			path: src/Recorders/CommandRecorder/CommandRecorder.php
-
-		-
-			message: "#^Instanceof between Spatie\\\\FlareClient\\\\Spans\\\\SpanEvent and Spatie\\\\FlareClient\\\\Spans\\\\Span will always evaluate to false\\.$#"
-			count: 1
-			path: src/Recorders/DumpRecorder/DumpRecorder.php
-
-		-
-			message: "#^Instanceof between Spatie\\\\FlareClient\\\\Spans\\\\SpanEvent and Spatie\\\\FlareClient\\\\Spans\\\\Span will always evaluate to false\\.$#"
-			count: 1
-			path: src/Recorders/ErrorRecorder/ErrorRecorder.php
-
-		-
-			message: "#^Instanceof between \\*NEVER\\* and Spatie\\\\FlareClient\\\\Spans\\\\SpanEvent will always evaluate to false\\.$#"
-			count: 1
-			path: src/Recorders/ExternalHttpRecorder/ExternalHttpRecorder.php
-
-		-
-			message: "#^Match arm is unreachable because previous comparison is always true\\.$#"
-			count: 1
-			path: src/Recorders/ExternalHttpRecorder/ExternalHttpRecorder.php
-
 		-
 			message: "#^Class Spatie\\\\FlareClient\\\\Recorders\\\\ExternalHttpRecorder\\\\Guzzle\\\\FlareHandlerStack extends @final class GuzzleHttp\\\\HandlerStack\\.$#"
 			count: 1
 			path: src/Recorders/ExternalHttpRecorder/Guzzle/FlareHandlerStack.php
 
-		-
-			message: "#^Instanceof between \\*NEVER\\* and Spatie\\\\FlareClient\\\\Spans\\\\SpanEvent will always evaluate to false\\.$#"
-			count: 1
-			path: src/Recorders/FilesystemRecorder/FilesystemRecorder.php
-
-		-
-			message: "#^Match arm is unreachable because previous comparison is always true\\.$#"
-			count: 1
-			path: src/Recorders/FilesystemRecorder/FilesystemRecorder.php
-
-		-
-			message: "#^Instanceof between Spatie\\\\FlareClient\\\\Spans\\\\SpanEvent and Spatie\\\\FlareClient\\\\Spans\\\\Span will always evaluate to false\\.$#"
-			count: 1
-			path: src/Recorders/GlowRecorder/GlowRecorder.php
-
 		-
 			message: "#^Instanceof between Spatie\\\\FlareClient\\\\Spans\\\\SpanEvent and Spatie\\\\FlareClient\\\\Spans\\\\Span will always evaluate to false\\.$#"
 			count: 1
-			path: src/Recorders/LogRecorder/LogRecorder.php
-
-		-
-			message: "#^Instanceof between \\*NEVER\\* and Spatie\\\\FlareClient\\\\Spans\\\\SpanEvent will always evaluate to false\\.$#"
-			count: 1
-			path: src/Recorders/QueryRecorder/QueryRecorder.php
-
-		-
-			message: "#^Match arm is unreachable because previous comparison is always true\\.$#"
-			count: 1
-			path: src/Recorders/QueryRecorder/QueryRecorder.php
-
-		-
-			message: "#^Instanceof between \\*NEVER\\* and Spatie\\\\FlareClient\\\\Spans\\\\SpanEvent will always evaluate to false\\.$#"
-			count: 1
-			path: src/Recorders/RedisCommandRecorder/RedisCommandRecorder.php
-
-		-
-			message: "#^Match arm is unreachable because previous comparison is always true\\.$#"
-			count: 1
-			path: src/Recorders/RedisCommandRecorder/RedisCommandRecorder.php
-
-		-
-			message: "#^Instanceof between \\*NEVER\\* and Spatie\\\\FlareClient\\\\Spans\\\\SpanEvent will always evaluate to false\\.$#"
-			count: 1
-			path: src/Recorders/RequestRecorder/RequestRecorder.php
-
-		-
-			message: "#^Match arm is unreachable because previous comparison is always true\\.$#"
-			count: 1
-			path: src/Recorders/RequestRecorder/RequestRecorder.php
-
-		-
-			message: "#^Instanceof between \\*NEVER\\* and Spatie\\\\FlareClient\\\\Spans\\\\SpanEvent will always evaluate to false\\.$#"
-			count: 1
-			path: src/Recorders/ResponseRecorder/ResponseRecorder.php
-
-		-
-			message: "#^Match arm is unreachable because previous comparison is always true\\.$#"
-			count: 1
-			path: src/Recorders/ResponseRecorder/ResponseRecorder.php
+			path: src/Recorders/SpanEventsRecorder.php
 
 		-
-			message: "#^Instanceof between \\*NEVER\\* and Spatie\\\\FlareClient\\\\Spans\\\\SpanEvent will always evaluate to false\\.$#"
-			count: 1
-			path: src/Recorders/RoutingRecorder/RoutingRecorder.php
-
-		-
-			message: "#^Match arm is unreachable because previous comparison is always true\\.$#"
+			message: "#^Unsafe usage of new static\\(\\)\\.$#"
 			count: 1
-			path: src/Recorders/RoutingRecorder/RoutingRecorder.php
+			path: src/Recorders/SpanEventsRecorder.php
 
 		-
 			message: "#^Instanceof between \\*NEVER\\* and Spatie\\\\FlareClient\\\\Spans\\\\SpanEvent will always evaluate to false\\.$#"
 			count: 1
-			path: src/Recorders/TransactionRecorder/TransactionRecorder.php
+			path: src/Recorders/SpansRecorder.php
 
 		-
 			message: "#^Match arm is unreachable because previous comparison is always true\\.$#"
 			count: 1
-			path: src/Recorders/TransactionRecorder/TransactionRecorder.php
+			path: src/Recorders/SpansRecorder.php
 
 		-
-			message: "#^Instanceof between \\*NEVER\\* and Spatie\\\\FlareClient\\\\Spans\\\\SpanEvent will always evaluate to false\\.$#"
-			count: 1
-			path: src/Recorders/ViewRecorder/ViewRecorder.php
-
-		-
-			message: "#^Match arm is unreachable because previous comparison is always true\\.$#"
+			message: "#^Unsafe usage of new static\\(\\)\\.$#"
 			count: 1
-			path: src/Recorders/ViewRecorder/ViewRecorder.php
+			path: src/Recorders/SpansRecorder.php
 
 		-
 			message: "#^Access to an undefined property Spatie\\\\FlareClient\\\\Contracts\\\\FlareSpanType\\:\\:\\$value\\.$#"

shared/FakeSender.php

@@ -3,6 +3,7 @@
 namespace Spatie\FlareClient\Tests\Shared;
 
 use Closure;
+use Spatie\FlareClient\Enums\FlarePayloadType;
 use Spatie\FlareClient\Senders\Sender;
 use Spatie\FlareClient\Senders\Support\Response;
 
@@ -25,6 +26,7 @@ public function post(
         string $endpoint,
         string $apiToken,
         array $payload,
+        FlarePayloadType $type,
         Closure $callback
     ): void {
         self::$requests[] = [

shared/FakeTime.php

@@ -52,6 +52,15 @@ public static function setCurrentTime(string|DateTimeImmutable $dateTime): void
         static::$dateTime = $dateTime;
     }
 
+    public static function advance(int $seconds): void
+    {
+        if (static::isSetup() === false) {
+            throw new \Exception('FakeTime is not setup. Call FakeTime::setup() first.');
+        }
+
+        static::$dateTime = static::$dateTime->add(new \DateInterval("PT{$seconds}S"));
+    }
+
     public static function reset()
     {
         static::$instance = null;

shared/Samplers/TestSampler.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Spatie\FlareClient\Tests\Shared\Samplers;
+
+use Spatie\FlareClient\Sampling\RateSampler;
+use Spatie\FlareClient\Sampling\Sampler;
+
+class TestSampler implements Sampler
+{
+    public static float $sampleRate;
+
+    public static function alwaysSample(): void
+    {
+        static::$sampleRate = 1;
+    }
+
+    public static function neverSample(): void
+    {
+        static::$sampleRate = 0;
+    }
+
+    public static function sampleRate(float $sampleRate): void
+    {
+        static::$sampleRate = $sampleRate;
+    }
+
+    public function shouldSample(array $context): bool
+    {
+        return (new RateSampler(['rate' => static::$sampleRate]))->shouldSample($context);
+    }
+}