Merge pull request #24 from Naoray/fix/request-file-tracing

Naoray · web-flow · commit be125562ce5d · 2026-01-10T12:01:02.000+01:00
wip
diff --git a/README.md b/README.md
@@ -119,7 +119,7 @@ This will copy the templates to `resources/views/vendor/github-monolog/` where y
 - `comment.md`: Template for comments on existing issues
 - `previous_exception.md`: Template for previous exceptions in the chain
 
-> **Important**: 
+> **Important**:
 > - The templates use HTML comments as section markers (e.g. `<!-- stacktrace:start -->` and `<!-- stacktrace:end -->`). These markers are used to intelligently remove empty sections from the rendered output. Please keep these markers intact when customizing the templates.
 > - If you've previously published and customized templates, you may need to republish them to get the latest structure with triage headers and collapsible sections. Compare your custom templates with the new defaults and migrate any customizations.
 
diff --git a/resources/views/issue.md b/resources/views/issue.md
@@ -1,8 +1,5 @@
-## Triage Information
-
 - **Level:** {level}
 - **Exception:** {class}
-- **Signature:** {signature}
 - **Timestamp:** {timestamp}
 - **Environment:** {environment_name}
 - **Route:** {route_summary}
diff --git a/src/Deduplication/DefaultSignatureGenerator.php b/src/Deduplication/DefaultSignatureGenerator.php
@@ -35,10 +35,7 @@ private function generateFromMessage(LogRecord $record): string
             'message' => $this->normalizeMessage($record->message),
             'channel' => $record->channel,
             'level' => $record->level->name,
-            // optionally include stable keys if you store them:
-            'route' => data_get($record->context, 'request.route'),
-            'job' => data_get($record->context, 'job.class'),
-            'command' => data_get($record->context, 'command.name'),
+            'context' => $this->getContextIdentifier($record),
         ];
 
         return hash('sha256', json_encode($stable, JSON_UNESCAPED_SLASHES));
@@ -56,8 +53,8 @@ private function generateFromException(Throwable $exception, LogRecord $record):
             // prefer in-app origin; avoid line numbers
             'file' => $frame ? $this->normalizePath($frame['file'] ?? '') : $this->normalizePath($exception->getFile()),
             'func' => $frame ? (($frame['class'] ?? '').($frame['type'] ?? '').($frame['function'] ?? '')) : '',
-            // add route grouping if available (huge for Laravel HTTP)
-            'route' => data_get($record->context, 'request.route') ?? data_get($record->context, 'route.action'),
+            'message' => $this->normalizeMessage($exception->getMessage()),
+            'context' => $this->getContextIdentifier($record),
         ];
 
         return hash('sha256', json_encode($parts, JSON_UNESCAPED_SLASHES));
@@ -113,21 +110,54 @@ private function normalizePath(string $path): string
         return str_replace('\\', '/', $path);
     }
 
+    /**
+     * Get context identifier with fallback chain: route → job → command
+     *
+     * @return string|null
+     */
+    private function getContextIdentifier(LogRecord $record): ?string
+    {
+        // Try route first
+        $routeData = data_get($record->context, 'request.route') ?? data_get($record->context, 'route');
+
+        if (is_array($routeData)) {
+            return $routeData['name'] ?? $routeData['uri'] ?? null;
+        }
+
+        if (is_string($routeData)) {
+            return $routeData;
+        }
+
+        // Fall back to job class
+        $jobClass = data_get($record->context, 'job.class');
+        if ($jobClass) {
+            return $jobClass;
+        }
+
+        // Fall back to command name
+        $commandName = data_get($record->context, 'command.name');
+        if ($commandName) {
+            return $commandName;
+        }
+
+        return null;
+    }
+
     /**
      * Normalize a message by replacing unstable values (UUIDs, large numbers)
      */
     private function normalizeMessage(string $message): string
     {
         // Replace UUIDs
-        $message = preg_replace(
+        $result = preg_replace(
             '/\b[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\b/i',
             '{uuid}',
             $message
         );
 
         // Replace long numbers (IDs, timestamps)
-        $message = preg_replace('/\b\d{6,}\b/', '{num}', $message);
+        $result = preg_replace('/\b\d{6,}\b/', '{num}', $result ?? $message);
 
-        return $message;
+        return is_string($result) ? $result : $message;
     }
 }
diff --git a/src/Issues/Formatters/ExceptionFormatter.php b/src/Issues/Formatters/ExceptionFormatter.php
@@ -65,6 +65,11 @@ public function formatTitle(Throwable $exception, string $level): string
 
     private function formatMessage(string $message): string
     {
+        // Remove exception class prefix if present (e.g., "RuntimeException: ")
+        if (preg_match('/^[A-Z][a-zA-Z0-9_\\\\]+Exception: (.+)$/s', $message, $matches)) {
+            $message = trim($matches[1]);
+        }
+
         if (! str_contains($message, 'Stack trace:')) {
             return $message;
         }
@@ -93,26 +98,40 @@ private function formatExceptionString(string $exceptionString): array
         $stackTrace = '';
 
         // Try to extract the message and stack trace
-        if (preg_match('/^(.*?)(?:Stack trace:|#\d+ \/)/', $exceptionString, $matches)) {
-            $message = trim($matches[1]);
+        if (! preg_match('/^(.*?)(?:Stack trace:|#\d+ \/)/', $exceptionString, $matches)) {
+            $header = sprintf(
+                '[%s] Exception: %s at unknown:0',
+                now()->format('Y-m-d H:i:s'),
+                $message
+            );
+
+            return [
+                'message' => $this->formatMessage($message),
+                'simplified_stack_trace' => $header."\n[stacktrace]\n".$this->stackTraceFormatter->format($stackTrace, true),
+                'full_stack_trace' => $header."\n[stacktrace]\n".$this->stackTraceFormatter->format($stackTrace, false),
+            ];
+        }
+
+        $message = trim($matches[1]);
+
+        // Remove exception class prefix if present (e.g., "RuntimeException: ")
+        if (preg_match('/^[A-Z][a-zA-Z0-9_\\\\]+Exception: (.+)$/s', $message, $classMatches)) {
+            $message = trim($classMatches[1]);
+        }
+
+        // Remove file/line info if present
+        if (preg_match('/^(.*) in \/[^\s]+(?:\.php)? on line \d+$/s', $message, $fileMatches)) {
+            $message = trim($fileMatches[1]);
+        }
+
+        // Extract stack trace
+        $traceStart = strpos($exceptionString, 'Stack trace:');
+        if ($traceStart === false && preg_match('/#\d+ \//', $exceptionString, $traceMatches, PREG_OFFSET_CAPTURE)) {
+            $traceStart = $traceMatches[0][1];
+        }
 
-            // Remove file/line info if present
-            if (preg_match('/^(.*) in \/[^\s]+(?:\.php)? on line \d+$/s', $message, $fileMatches)) {
-                $message = trim($fileMatches[1]);
-            }
-
-            // Extract stack trace
-            $traceStart = strpos($exceptionString, 'Stack trace:');
-            if ($traceStart === false) {
-                // Find the first occurrence of a stack frame pattern
-                if (preg_match('/#\d+ \//', $exceptionString, $matches, PREG_OFFSET_CAPTURE)) {
-                    $traceStart = $matches[0][1];
-                }
-            }
-
-            if ($traceStart !== false) {
-                $stackTrace = substr($exceptionString, $traceStart);
-            }
+        if ($traceStart !== false) {
+            $stackTrace = substr($exceptionString, $traceStart);
         }
 
         $header = sprintf(
diff --git a/src/Issues/TemplateRenderer.php b/src/Issues/TemplateRenderer.php
@@ -76,7 +76,14 @@ private function buildReplacements(LogRecord $record, ?string $signature): array
         $exceptionDetails = $this->exceptionFormatter->format($record);
         $exceptionData = $record->context['exception'] ?? null;
 
-        $message = $exceptionDetails['message'] ?? $record->message;
+        // If exceptionDetails is empty but record message contains stack trace, try to format it
+        if (empty($exceptionDetails) &&
+            (str_contains($record->message, 'Stack trace:') || preg_match('/#\d+ \//', $record->message))) {
+            $tempRecord = $record->with(context: array_merge($record->context, ['exception' => $record->message]));
+            $exceptionDetails = $this->exceptionFormatter->format($tempRecord);
+        }
+
+        $message = $exceptionDetails['message'] ?? $this->extractMessageFromRecord($record->message);
         $class = $this->resolveExceptionClass($exception, $exceptionData);
 
         return [
@@ -130,22 +137,35 @@ private function formatTimestamp(LogRecord $record): string
     private function formatRouteSummary(LogRecord $record): string
     {
         $request = $record->context['request'] ?? null;
+        $route = $record->context['route'] ?? null;
 
-        if (! is_array($request)) {
-            return '';
-        }
+        // Try to get method and path from request context first
+        if (is_array($request)) {
+            $method = $request['method'] ?? '';
+            $url = $request['url'] ?? '';
 
-        $method = $request['method'] ?? '';
-        $url = $request['url'] ?? '';
+            if ($method !== '' && $url !== '') {
+                $parsedUrl = parse_url($url);
+                $path = $parsedUrl['path'] ?? '/';
 
-        if ($method === '' || $url === '') {
-            return '';
+                return strtoupper($method).' '.$path;
+            }
         }
 
-        $parsedUrl = parse_url($url);
-        $path = $parsedUrl['path'] ?? '/';
+        // Fallback to route context if request context is missing or incomplete
+        if (is_array($route)) {
+            $methods = $route['methods'] ?? [];
+            $uri = $route['uri'] ?? '';
+
+            if (! empty($methods) && $uri !== '') {
+                $method = is_array($methods) ? ($methods[0] ?? '') : $methods;
+                if ($method !== '') {
+                    return strtoupper($method).' /'.$uri;
+                }
+            }
+        }
 
-        return strtoupper($method).' '.$path;
+        return '';
     }
 
     private function formatUserSummary(LogRecord $record): string
@@ -175,4 +195,32 @@ private function extractEnvironmentName(LogRecord $record): string
 
         return $environment['APP_ENV'] ?? $environment['app_env'] ?? '';
     }
+
+    /**
+     * Extract just the message part from a record message that may contain stack trace.
+     */
+    private function extractMessageFromRecord(string $message): string
+    {
+        // If message contains stack trace, extract just the message part
+        if (str_contains($message, 'Stack trace:') || preg_match('/#\d+ \//', $message)) {
+            // Try to extract the message before the stack trace
+            if (preg_match('/^(.*?)(?:Stack trace:|#\d+ \/)/', $message, $matches)) {
+                $extracted = trim($matches[1]);
+
+                // Remove exception class prefix (e.g., "RuntimeException: ")
+                if (preg_match('/^[A-Z][a-zA-Z0-9_\\\\]+Exception: (.+)$/s', $extracted, $classMatches)) {
+                    $extracted = trim($classMatches[1]);
+                }
+
+                // Remove file/line info if present (e.g., "message in /path/to/file.php:123")
+                if (preg_match('/^(.*) in \/[^\s]+(?:\.php)?(?: on line \d+)?$/s', $extracted, $fileMatches)) {
+                    return trim($fileMatches[1]);
+                }
+
+                return $extracted;
+            }
+        }
+
+        return $message;
+    }
 }
diff --git a/src/Tracing/RequestDataCollector.php b/src/Tracing/RequestDataCollector.php
@@ -52,10 +52,20 @@ private function formatFiles(array $files): array
                     return $this->formatFiles($file);
                 }
 
+                /** @var \Illuminate\Http\UploadedFile $file */
+                $name = $file->getClientOriginalName();
+                $mimeType = $file->getMimeType();
+
+                try {
+                    $size = $file->getSize();
+                } catch (\Throwable $e) {
+                    $size = null;
+                }
+
                 return [
-                    'name' => $file->getClientOriginalName(),
-                    'size' => $file->getSize(),
-                    'mime_type' => $file->getMimeType(),
+                    'name' => $name,
+                    'size' => $size,
+                    'mime_type' => $mimeType,
                 ];
             })
             ->toArray();
diff --git a/tests/Issues/TemplateRendererTest.php b/tests/Issues/TemplateRendererTest.php
diff --git a/tests/Tracing/RequestDataCollectorTest.php b/tests/Tracing/RequestDataCollectorTest.php
