chore: tweaks at ServerTimingDoctrine middleware

Author: smarcet

app/Http/Controllers/Apis/Protected/Summit/Traits/ParametrizedGetAll.php

@@ -13,7 +13,9 @@
  **/
 
 use App\ModelSerializers\SerializerUtils;
+use http\Env\Response;
 use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\Validator;
 use libs\utils\PaginationValidationRules;
 use models\exceptions\ValidationException;
@@ -119,7 +121,7 @@ public function _getAll
                     $order = call_user_func($defaultOrderRules);
                 }
             }
-
+            $dbStart = microtime(true);
             if (!is_null($queryCallable))
                 $data = call_user_func($queryCallable,
                     $page,
@@ -136,21 +138,26 @@ public function _getAll
                     $order,
                     $applyExtraFilters
                 );
-
+            $dbEnd = (microtime(true)-$dbStart)*1000;
+            $transformStart = microtime(true);
             $serializerParams['filter'] = $filter;
-
-            return $this->ok
+            $res = $data->toArray
             (
-                $data->toArray
-                (
-                    SerializerUtils::getExpand(),
-                    SerializerUtils::getFields(),
-                    SerializerUtils::getRelations(),
-                    $serializerParams,
-                    $serializerType  && is_callable($serializerType) ? call_user_func($serializerType) : SerializerRegistry::SerializerType_Public
-                )
+                SerializerUtils::getExpand(),
+                SerializerUtils::getFields(),
+                SerializerUtils::getRelations(),
+                $serializerParams,
+                $serializerType  && is_callable($serializerType) ? call_user_func($serializerType) : SerializerRegistry::SerializerType_Public
             );
-
+            $transformEnd = (microtime(true)-$transformStart)*1000;
+            $encodeStart = microtime(true);
+            $json_response = $this->ok($res);
+            $encodeEnd = (microtime(true)-$encodeStart)*1000;
+            Session::put("db_time", $dbEnd );
+            Session::put("transform_time", $transformEnd );
+            Session::put("encode_time", $encodeEnd );
+            Session::save();
+            return $json_response;
         });
     }
 
@@ -272,4 +279,4 @@ public function _getAllCSV
 
         });
     }
-}
+}

app/Http/Middleware/ServerTimingDoctrine.php

@@ -4,6 +4,7 @@
 
 use Closure;
 use Doctrine\ORM\EntityManagerInterface;
+use Illuminate\Support\Facades\Session;
 use LaravelDoctrine\ORM\Facades\Registry;
 use models\utils\SilverstripeBaseModel;
 use Psr\Log\LoggerInterface;
@@ -87,16 +88,15 @@ public function debug($m, array $c = []):void   { $this->log('debug', $m, $c); }
             $response = $next($request);
         }
 
-
         $totalMs = (microtime(true) - $start) * 1000.0;
         $bootMs  = defined('LARAVEL_START') ? max(($start - LARAVEL_START) * 1000.0, 0.0) : 0.0;
         $appMs   = max($totalMs - $dbMs, 0.0);
-
-        // Al setear el header:
-        $response->headers->set(
-            'Server-Timing',
-            sprintf('boot;dur=%.1f, db;dur=%.1f, app;dur=%.1f, total;dur=%.1f', $bootMs, $dbMs, $appMs, $totalMs)
-        );
+        $dbMs = Session::has("db_time") ? (float) Session::get("db_time") : $dbMs;
+        $transformMs = Session::has("transform_time") ? (float) Session::get("transform_time") : 0.0;
+        $encodeMs = Session::has("encode_time") ? (float) Session::get("encode_time") : 0.0;
+        $response->headers->set('Server-Timing',
+            sprintf('boot;dur=%.1f,db;dur=%.1f,transform;dur=%.1f,encode;dur=%.1f,app;dur=%.1f,total;dur=%.1f',
+                $bootMs,$dbMs,$transformMs,$encodeMs,$appMs,$totalMs));
         $response->headers->set('Timing-Allow-Origin', '*');
 
         return $response;