feat(deps): support for blackfirephp-sdk v2.5

Rastusik · Rastusik · commit 476b20d7cdbc · 2025-02-22T21:23:58.000+01:00
diff --git a/composer.json b/composer.json
@@ -46,7 +46,7 @@
     "require-dev": {
         "ext-ffi": "^8.2",
         "ext-intl": "*",
-        "blackfire/php-sdk": "^1.30",
+        "blackfire/php-sdk": "^2.5",
         "doctrine/dbal": "^3.7 || ^4.0",
         "doctrine/doctrine-bundle": "^2.7",
         "doctrine/doctrine-migrations-bundle": "^3.2.4",
diff --git a/composer.lock b/composer.lock
diff --git a/src/Bridge/Symfony/Bundle/DependencyInjection/SwooleExtension.php b/src/Bridge/Symfony/Bundle/DependencyInjection/SwooleExtension.php
@@ -4,7 +4,7 @@
 
 namespace SwooleBundle\SwooleBundle\Bridge\Symfony\Bundle\DependencyInjection;
 
-use BlackfireProbe;
+use Composer\InstalledVersions;
 use Exception;
 use Monolog\Formatter\LineFormatter;
 use ReflectionMethod;
@@ -498,7 +498,7 @@ private function configureHttpServerServices(array $config, ContainerBuilder $co
             $def->addArgument(new Reference(WithProfiler::class));
         }
 
-        if ($config['blackfire_monitoring'] && class_exists(BlackfireProbe::class)) {
+        if ($config['blackfire_monitoring'] && InstalledVersions::isInstalled('blackfire/php-sdk')) {
             $container->setParameter(ContainerConstants::PARAM_BLACKFIRE_MONITORING_ENABLED, true);
         }
 
diff --git a/src/Bridge/Upscale/Blackfire/Monitoring/RequestMonitoring.php b/src/Bridge/Upscale/Blackfire/Monitoring/RequestMonitoring.php
@@ -29,13 +29,7 @@ public function monitor(Closure $fn, Request $request, Response $response): void
 
     private function start(SymfonyRequest $request): void
     {
-        BlackfireProbe::startTransaction($request->getPathInfo());
-        BlackfireProbe::setAttribute('http.target', $request->getPathInfo());
-        BlackfireProbe::setAttribute('http.url', $request->getRequestUri());
-        BlackfireProbe::setAttribute('http.method', $request->getMethod());
-        BlackfireProbe::setAttribute('http.host', $request->getHost());
-        BlackfireProbe::setAttribute('host', $request->getHost());
-        BlackfireProbe::setAttribute('framework', 'Symfony');
+        BlackfireProbe::startTransaction();
     }
 
     private function stop(): void

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace SwooleBundle\SwooleBundle\Bridge\Symfony\Bundle\DependencyInjection;`
`6`	`6`
`7`		`-use BlackfireProbe;`
	`7`	`+use Composer\InstalledVersions;`
`8`	`8`	`use Exception;`
`9`	`9`	`use Monolog\Formatter\LineFormatter;`
`10`	`10`	`use ReflectionMethod;`
`@@ -498,7 +498,7 @@ private function configureHttpServerServices(array $config, ContainerBuilder $co`
`498`	`498`	`$def->addArgument(new Reference(WithProfiler::class));`
`499`	`499`	`}`
`500`	`500`
`501`		`- if ($config['blackfire_monitoring'] && class_exists(BlackfireProbe::class)) {`
	`501`	`+ if ($config['blackfire_monitoring'] && InstalledVersions::isInstalled('blackfire/php-sdk')) {`
`502`	`502`	`$container->setParameter(ContainerConstants::PARAM_BLACKFIRE_MONITORING_ENABLED, true);`
`503`	`503`	`}`
`504`	`504`
Original file line number	Diff line number	Diff line change
`@@ -29,13 +29,7 @@ public function monitor(Closure $fn, Request $request, Response $response): void`
`29`	`29`
`30`	`30`	`private function start(SymfonyRequest $request): void`
`31`	`31`	`{`
`32`		`- BlackfireProbe::startTransaction($request->getPathInfo());`
`33`		`- BlackfireProbe::setAttribute('http.target', $request->getPathInfo());`
`34`		`- BlackfireProbe::setAttribute('http.url', $request->getRequestUri());`
`35`		`- BlackfireProbe::setAttribute('http.method', $request->getMethod());`
`36`		`- BlackfireProbe::setAttribute('http.host', $request->getHost());`
`37`		`- BlackfireProbe::setAttribute('host', $request->getHost());`
`38`		`- BlackfireProbe::setAttribute('framework', 'Symfony');`
	`32`	`+ BlackfireProbe::startTransaction();`
`39`	`33`	`}`
`40`	`34`
`41`	`35`	`private function stop(): void`