apply review feedback

Author: sgiehl

core/Tracker/BotRequestProcessor.php

@@ -27,10 +27,9 @@ public function manipulateRequest(Request $request): void
     }
 
     /**
-     * This is the first method called when processing a tracker request.
+     * This method is called last.
      *
-     * Derived classes can use this method to manipulate a tracker request before the request
-     * is handled. Plugins could change the URL, add custom variables, etc.
+     * Derived classes should use this method to insert log data.
      *
      * @param Request $request
      * @return bool return true if the processor handled the request, this will automatically trigger archive invalidation

plugins/BotTracking/Tracker/BotRequestProcessor.php

@@ -11,8 +11,8 @@
 
 namespace Piwik\Plugins\BotTracking\Tracker;
 
-use Piwik\Common;
 use Piwik\Date;
+use Piwik\Log\LoggerInterface;
 use Piwik\Plugins\BotTracking\BotDetector;
 use Piwik\Plugins\BotTracking\Dao\BotRequestsDao;
 use Piwik\Tracker\Action;
@@ -30,9 +30,15 @@ class BotRequestProcessor extends \Piwik\Tracker\BotRequestProcessor
      */
     private $dao;
 
-    public function __construct(BotRequestsDao $dao)
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    public function __construct(BotRequestsDao $dao, LoggerInterface $logger)
     {
         $this->dao = $dao;
+        $this->logger = $logger;
     }
 
     public function handleRequest(Request $request): bool
@@ -94,9 +100,9 @@ public function handleRequest(Request $request): bool
 
             $idRequest = $this->dao->insert($data);
 
-            Common::printDebug('Bot request recorded: idrequest=' . $idRequest);
+            $this->logger->debug('Bot request recorded: idrequest=' . $idRequest);
         } catch (\Exception $e) {
-            Common::printDebug('Error recording bot request: ' . $e->getMessage());
+            $this->logger->debug('Error recording bot request: ' . $e->getMessage());
             // Don't throw - we don't want to break tracking for other processors
         }
 
@@ -137,7 +143,7 @@ private function getActionId(Request $request): ?int
                 return (int) $actionId;
             }
         } catch (\Exception $e) {
-            Common::printDebug('Error resolving action ID: ' . $e->getMessage());
+            $this->logger->debug('Error resolving action ID: ' . $e->getMessage());
         }
 
         return null;

plugins/BotTracking/tests/Integration/Tracker/BotRequestProcessorTest.php

@@ -13,6 +13,7 @@
 
 use Piwik\Common;
 use Piwik\Db;
+use Piwik\Log\NullLogger;
 use Piwik\Plugins\BotTracking\Dao\BotRequestsDao;
 use Piwik\Plugins\BotTracking\Tracker\BotRequestProcessor;
 use Piwik\Tests\Framework\Fixture;
@@ -43,7 +44,7 @@ public function setUp(): void
 
         $this->idSite = Fixture::createWebsite('2025-01-01 00:00:00');
 
-        $this->requestProcessor = new BotRequestProcessor(new BotRequestsDao());
+        $this->requestProcessor = new BotRequestProcessor(new BotRequestsDao(), new NullLogger());
     }
 
     public function testProcessRequestParamsDetectsBotRequest(): void