Massive refactor for better architecture

Author: n0nag0n

dashboard/js/script.js

@@ -236,7 +236,7 @@ function populateRequestLog(requests) {
         const time = parseFloat(r.total_time) * 1000;
 
         // Convert UTC timestamp to selected timezone
-        const formattedTimestamp = formatTimestamp(r.timestamp);
+        const formattedTimestamp = formatTimestamp(r.request_dt);
 
         // Build details sections conditionally
         let detailSections = [];
@@ -364,7 +364,7 @@ function populateRequestLog(requests) {
                                 <h2 class="accordion-header" id="event-heading-${index}-${eventIndex}">
                                     <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#event-collapse-${index}-${eventIndex}" aria-expanded="false" aria-controls="event-collapse-${index}-${eventIndex}">
                                         <span class="badge bg-info me-2">${event.type}</span>
-                                        <small class="text-muted">${new Date(parseFloat(event.timestamp) * 1000).toISOString().split('T')[1].replace('Z', '')}</small>
+                                        <small class="text-muted">${new Date(parseFloat(event.event_dt) * 1000).toISOString().split('T')[1].replace('Z', '')}</small>
                                     </button>
                                 </h2>
                                 <div id="event-collapse-${index}-${eventIndex}" class="accordion-collapse collapse" aria-labelledby="event-heading-${index}-${eventIndex}" data-bs-parent="#customEventsAccordion-${index}">
@@ -507,7 +507,7 @@ function drawLatencyChart(data) {
     latencyChart = new Chart(ctxLatency, {
         type: 'line',
         data: {
-            labels: chartData.map(d => d.timestamp),
+            labels: chartData.map(d => d.request_dt),
             datasets: [{
                 label: 'Average Latency (ms)',
                 data: chartData.map(d => d.average_time * 1000),
@@ -593,7 +593,7 @@ function updateResponseCodeChart(responseData) {
     }
 
     // Extract all unique response codes
-    const responseCodes = [...new Set(responseData.flatMap(d => Object.keys(d).filter(k => k !== 'timestamp')))];
+    const responseCodes = [...new Set(responseData.flatMap(d => Object.keys(d).filter(k => k !== 'request_dt')))];
 
     // Create datasets for each response code
     const datasets = responseCodes.map(code => {
@@ -620,7 +620,7 @@ function updateResponseCodeChart(responseData) {
     responseCodeChart = new Chart(ctxResponse, {
         type: 'bar',
         data: {
-            labels: responseData.map(d => d.timestamp),
+            labels: responseData.map(d => d.request_dt),
             datasets: datasets
         },
         options: {

dashboard/views/dashboard.php

@@ -364,6 +364,6 @@
     <!-- Chart.js -->
     <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
     <!-- Dashboard Logic -->
-    <script src="/js/script.js?ver=3"></script>
+    <script src="/js/script.js?ver=4"></script>
 </body>
 </html>

src/Apm.php

@@ -48,16 +48,6 @@ public function __construct(LoggerInterface $logger, float $sampleRate = 1.0)
         $this->sampleRate = $sampleRate;
     }
 
-	/**
-	 * Generates a unique request ID.
-	 * 
-	 * @return string
-	 */
-	public function generateRequestId(): string
-	{
-		return uniqid('req_', true);
-	}
-
 	/**
 	 * Registers the events for the application performance monitoring (APM) system.
 	 *
@@ -92,14 +82,14 @@ public function bindEventsToFlightInstance(Engine $app): void
 
         $dispatcher->on('flight.request.received', function (Request $request) use ($app) {
 			// Generate request ID early and store it
-			$requestId = $this->generateRequestId();
-			$this->metrics['request_id'] = $requestId;
+			$requestToken = $this->generateRequestToken();
+			$this->metrics['request_token'] = $requestToken;
 
 			// Make request ID accessible on the request object
-			$app->response()->setHeader('X-Flight-Request-Id', $requestId);
+			$app->response()->setHeader('X-Flight-Request-Id', $requestToken);
 
 			// Register in Flight's shared variable space for easy access
-			$app->set('apm.request_id', $requestId);
+			$app->set('apm.request_id', $requestToken);
 
             $this->metrics['start_time'] = microtime(true);
             $this->metrics['start_memory'] = memory_get_usage();
@@ -252,13 +242,23 @@ public function isBot(string $userAgent): bool
 		return false;
 	}
 
+	/**
+	 * Gets the current request ID.
+	 * 
+	 * @return string|null The request ID or null if not set.
+	 */
+	public function generateRequestToken(): ?string
+	{
+		return $this->metrics['request_token'] ?? null;
+	}
+
 	/**
 	 * Gets the current request ID.
 	 * 
 	 * @return string|null The request ID or null if not set.
 	 */
 	public function getRequestId(): ?string
 	{
-		return $this->metrics['request_id'] ?? null;
+		return $this->metrics['request_token'] ?? null;
 	}
 }

src/apm/logger/DatabaseLoggerAbstract.php src/apm/logger/LoggerAbstract.phpsrc/apm/logger/DatabaseLoggerAbstract.php renamed to src/apm/logger/LoggerAbstract.php

@@ -12,31 +12,27 @@
  *
  * Handles storing application performance metrics in a database table
  */
-abstract class DatabaseLoggerAbstract
+abstract class LoggerAbstract
 {
     /**
      * PDO database connection instance
      *
      * @var PDO
      */
-    protected PDO $pdo;
-    
-    /**
-     * Flag indicating whether the required database table exists
-     *
-     * @var bool
-     */
-    protected bool $tableCreated = false;
+    protected $pdo;
 
-    /**
-     * Abstract method to ensure the metrics table exists
+	/**
+     * Constructor for the database logger
      *
-     * Implementations should create the table if it doesn't exist
+     * Initializes the PDO connection and ensures the required table exists
      *
-     * @return void
+     * @param PDO $pdo PDO database connection instance
      */
-    abstract protected function ensureTableExists(): void;
-
+    public function __construct(PDO $pdo)
+    {
+        $this->pdo = $pdo;
+    }
+    
     /**
      * Logs performance metrics to the database
      *

src/apm/logger/LoggerFactory.php

@@ -4,6 +4,9 @@
 
 use flight\apm\ApmFactoryAbstract;
 use InvalidArgumentException;
+use flight\apm\logger\MysqlLogger;
+use flight\database\PdoWrapper;
+use PDO;
 
 class LoggerFactory extends ApmFactoryAbstract
 {
@@ -20,10 +23,22 @@ public static function create(?string $runwayConfigPath = null): LoggerInterface
 		}
 		$runwayConfig = self::loadConfig($runwayConfigPath);
 
-        $storageType = $runwayConfig['apm']['source_type'];
-		switch($storageType) {
+		$dsn = $runwayConfig['apm']['source_db_dsn'];
+		$storageType = $runwayConfig['apm']['source_type'];
+		$options = $runwayConfig['apm']['source_db_options'] ?: [
+			PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
+			PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
+			PDO::ATTR_EMULATE_PREPARES => false,
+		];
+		switch ($storageType) {
 			case 'sqlite':
-				return new SqliteLogger($runwayConfig['apm']['dest_db_dsn']);
+				$pdo = new PDO($dsn, null, null, $options);
+				return new SqliteLogger($pdo);
+			case 'mysql':
+				$user = $runwayConfig['apm']['source_db_user'] ?? null;
+				$pass = $runwayConfig['apm']['source_db_pass'] ?? null;
+				$pdo = new PDO($dsn, $user, $pass, $options);
+				return new MysqlLogger($pdo);
 			default:
 				throw new InvalidArgumentException("Unsupported storage type: $storageType");
 		}

src/apm/logger/MysqlLogger.php

@@ -0,0 +1,9 @@
+<?php
+declare(strict_types=1);
+
+namespace flight\apm\logger;
+
+class MysqlLogger extends LoggerAbstract implements LoggerInterface
+{
+
+}

src/apm/logger/SqliteLogger.php

@@ -4,50 +4,7 @@
 
 namespace flight\apm\logger;
 
-use PDO;
-use PDOException;
-
-class SqliteLogger extends DatabaseLoggerAbstract implements LoggerInterface {
-
-	/**
-     * Constructor for the database logger
-     *
-     * Initializes the PDO connection and ensures the required table exists
-     *
-     * @param string $dsn The Data Source Name (DSN) for the SQLite database
-     */
-    public function __construct(string $dsn)
-    {
-        $this->pdo = new PDO($dsn, null, null, [
-			PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
-			PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
-			PDO::ATTR_EMULATE_PREPARES => false,
-		]);
-        $this->ensureTableExists();
-    }
-
-	/**
-	 * @inheritDoc
-	 */
-    protected function ensureTableExists(): void
-	{
-        if ($this->tableCreated) {
-            return;
-        }
-
-        try {
-            $this->pdo->exec("
-                CREATE TABLE IF NOT EXISTS apm_metrics_log (
-                    id INTEGER PRIMARY KEY AUTOINCREMENT,
-                    added_dt DATETIME DEFAULT CURRENT_TIMESTAMP,
-                    metrics_json TEXT NOT NULL
-                )
-            ");
-			$this->pdo->exec("CREATE INDEX IF NOT EXISTS idx_added_dt ON apm_metrics_log (added_dt)");
-            $this->tableCreated = true;
-        } catch (PDOException $e) {
-            error_log("Failed to create apm_metrics_log table: " . $e->getMessage());
-            throw $e;
-        }
-    }
+class SqliteLogger extends LoggerAbstract implements LoggerInterface 
+{
+    
 }