Fixing route_path issue

Treblle · May 26, 2024 · 73eae25 · 73eae25
1 parent e761557
commit 73eae25
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/Factories/DataFactory.php b/src/Factories/DataFactory.php
@@ -8,6 +8,7 @@
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Route;
 use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
 use Throwable;
 use Treblle\Utils\DataObjects\Data;
@@ -37,7 +38,7 @@ public function make(Request $request, JsonResponse|Response|SymfonyResponse $re
         try {
             $responseBody = $this->masker->mask(
                 (array) json_decode(
-                    $response->getContent(),
+                    (string) $response->getContent(),
                     true,
                     512,
                     JSON_THROW_ON_ERROR
@@ -85,8 +86,8 @@ public function make(Request $request, JsonResponse|Response|SymfonyResponse $re
                 Carbon::now('UTC')->format('Y-m-d H:i:s'),
                 (string) $request->ip(),
                 $request->fullUrl(),
-                $request->route()?->getName(),
-                strval($request->userAgent()),
+                Route::getRoutes()->match($request)->action['as'] ?? null,
+                (string) $request->userAgent(),
                 Method::from(
                     $request->method(),
                 ),
@@ -111,7 +112,7 @@ public function make(Request $request, JsonResponse|Response|SymfonyResponse $re
                     )->toArray(),
                 ),
                 $response->getStatusCode(),
-                strlen($response->getContent()),
+                \strlen((string) $response->getContent()),
                 $loadTime,
                 $responseBody,
             ),

diff --git a/src/Treblle.php b/src/Treblle.php
@@ -6,7 +6,6 @@
 
 use Illuminate\Support\Facades\Http;
 use Treblle\Exceptions\ConfigurationException;
-use Treblle\Exceptions\TreblleApiException;
 use Treblle\Http\Endpoint;
 use Treblle\Utils\DataObjects\Data;
 
@@ -19,17 +18,16 @@ final class Treblle
     /**
      * Send request and response payload to Treblle for processing.
      *
-     * @throws ConfigurationException|TreblleApiException
+     * @throws ConfigurationException
      */
-    public static function log(Endpoint $endpoint, Data $data, string $projectId = null): void
+    public static function log(Endpoint $endpoint, Data $data, ?string $projectId = null): void
     {
         $treblleConfig = (array) config('treblle');
 
         if ($treblleConfig['project_id'] === null || $treblleConfig['api_key'] === null) {
             return;
         }
 
-
         /** @var string $appEnvironment */
         $appEnvironment = config('app.env', 'unknownEnvironment');