fix(blackfire): minor fixes to balckfire monitoring feature

Author: Rastusik

phpstan.neon

@@ -26,4 +26,10 @@ parameters:
         -
             message: '#invalid (return )?type Doctrine\\Common\\Proxy\\Proxy#'
             path: src/Bridge/Doctrine/BlockingProxyFactory.php
+        -
+            message: '#Static method BlackfireProbe::startTransaction\(\) invoked with 1 parameter, 0 required\.#'
+            path: src/Bridge/Upscale/Blackfire/Monitoring/RequestMonitoring.php
+        -
+            message: "#Call to function method_exists\\(\\) with 'BlackfireProbe' and 'setAttribute' will always evaluate to false.#"
+            path: src/Bridge/Upscale/Blackfire/Monitoring/RequestMonitoring.php
     tmpDir: /tmp/phpstan_src

src/Bridge/Symfony/Bundle/DependencyInjection/CompilerPass/BlackfireMonitoringPass.php

@@ -10,6 +10,7 @@
 use SwooleBundle\SwooleBundle\Bridge\Upscale\Blackfire\Monitoring\BlackfireMiddlewareFactory;
 use SwooleBundle\SwooleBundle\Bridge\Upscale\Blackfire\Monitoring\RequestMonitoring;
 use SwooleBundle\SwooleBundle\Bridge\Upscale\Blackfire\Monitoring\WithApm;
+use SwooleBundle\SwooleBundle\Common\System\System;
 use SwooleBundle\SwooleBundle\Server\Middleware\MiddlewareInjector;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -34,7 +35,8 @@ public function process(ContainerBuilder $container): void
             ->setAutowired(false)
             ->setAutoconfigured(false)
             ->setPublic(false)
-            ->setArgument('$requestFactory', new Reference(RequestFactory::class));
+            ->setArgument('$requestFactory', new Reference(RequestFactory::class))
+            ->setArgument('$system', new Reference(System::class));
 
         $container->register(BlackfireMiddlewareFactory::class)
             ->setClass(BlackfireMiddlewareFactory::class)

src/Bridge/Upscale/Blackfire/Monitoring/RequestMonitoring.php

@@ -9,11 +9,17 @@
 use Swoole\Http\Request;
 use Swoole\Http\Response;
 use SwooleBundle\SwooleBundle\Bridge\Symfony\HttpFoundation\RequestFactory;
+use SwooleBundle\SwooleBundle\Common\System\System;
 use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
 
-final readonly class RequestMonitoring
+final class RequestMonitoring
 {
-    public function __construct(private RequestFactory $requestFactory) {}
+    private string|null $blackfireVersion = null;
+
+    public function __construct(
+        private RequestFactory $requestFactory,
+        private System $system,
+    ) {}
 
     public function monitor(Closure $fn, Request $request, Response $response): void
     {
@@ -29,11 +35,48 @@ public function monitor(Closure $fn, Request $request, Response $response): void
 
     private function start(SymfonyRequest $request): void
     {
-        BlackfireProbe::startTransaction();
+        $blackfireVersion = $this->getBlackfireVersion();
+
+        if ($blackfireVersion === '') {
+            return;
+        }
+
+        $transactionName = $request->getMethod() . ' ' . $request->getPathInfo();
+
+        if (version_compare($blackfireVersion, '1.78.0', '>=')) {
+            BlackfireProbe::startTransaction($transactionName);
+        } else {
+            BlackfireProbe::startTransaction();
+            BlackfireProbe::setTransactionName($transactionName);
+        }
+
+        if (!method_exists(BlackfireProbe::class, 'setAttribute')) {
+            return;
+        }
+
+        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', sprintf('Symfony with %s', $this->system->extension()->toString()));
     }
 
     private function stop(): void
     {
+        if ($this->getBlackfireVersion() === '') {
+            return;
+        }
+
         BlackfireProbe::stopTransaction();
     }
+
+    private function getBlackfireVersion(): string
+    {
+        if ($this->blackfireVersion === null) {
+            $this->blackfireVersion = (($v = phpversion('blackfire')) === false ? '' : $v);
+        }
+
+        return $this->blackfireVersion;
+    }
 }

tests/Fixtures/Symfony/app/config/swoole.php

@@ -11,7 +11,7 @@
 
     $parameters->set('env(HOST)', '0.0.0.0');
 
-    $parameters->set('env(TRUSTED_HOSTS)', 'localhost,127.0.0.1,.*.swoole-bundle.orb.local');
+    $parameters->set('env(TRUSTED_HOSTS)', 'localhost,127.0.0.1,.*.swoole-bundle.orb.local,192.168.*.*');
 
     $parameters->set('env(TRUSTED_PROXIES)', '*,192.168.0.0/16');