Skip to content

FOUR-20327 [EPIC] Implement Baseline Server Timing Headers #7830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryancooley merged 16 commits into from
Jan 23, 2025
Merged

FOUR-20327 [EPIC] Implement Baseline Server Timing Headers #7830

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
bae5940
feat: add server timing header for controller time execution
devmiguelangel Dec 10, 2024
af61b8c
feat: add server timing header for db time execution
devmiguelangel Dec 10, 2024
ebc1c8d
feat: add server timing header for endpoint time execution
devmiguelangel Dec 10, 2024
625e5d9
feat: add server timing header for service provider time execution
devmiguelangel Dec 10, 2024
f32d25f
feat: server timing header for package service provider time execution
devmiguelangel Dec 11, 2024
e476978
feat: update server timing header for db time execution
devmiguelangel Dec 12, 2024
db3e512
Merge pull request #7820 from ProcessMaker/feature/FOUR-20462
julceslauhub Dec 12, 2024
bc87d9a
feat: improve server timing headers
devmiguelangel Dec 13, 2024
f6fc5ba
fix(cr): add missing validations
devmiguelangel Dec 13, 2024
851f910
Merge pull request #7825 from ProcessMaker/feature/FOUR-20464
caleeli Dec 13, 2024
64ba48b
feat: add configuration option to enable/disable server timing
devmiguelangel Dec 13, 2024
2b4b98e
Merge pull request #7827 from ProcessMaker/feature/FOUR-20465
caleeli Dec 16, 2024
eff830a
Add boot timing to Server-Timing header
caleeli Jan 3, 2025
03409b8
Fix missing namespace for the constant LARAVEL_START
caleeli Jan 3, 2025
37875e8
Conditionally calculate boot timing if LARAVEL_START is defined
caleeli Jan 4, 2025
ed89380
Merge pull request #7859 from ProcessMaker/FOUR-21382
caleeli Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: add server timing header for service provider time execution
  • Loading branch information
@devmiguelangel
devmiguelangel committed Dec 10, 2024
commit 625e5d994408d33f82d05d3b54b3f02bdded792b
9 changes: 7 additions & 2 deletions ProcessMaker/Http/Middleware/ServerTimingMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use Closure;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use ProcessMaker\Providers\ProcessMakerServiceProvider;
use Symfony\Component\HttpFoundation\Response;

class ServerTimingMiddleware
Expand Down Expand Up @@ -36,11 +37,15 @@ public function handle(Request $request, Closure $next): Response
$controllerTime = (microtime(true) - $startController) * 1000; // Convert to ms
$endpointTime = (microtime(true) - $startEndpoint) * 1000; // Convert to ms

// Add Server-Timing header
// Fetch service provider boot time
$serviceProviderTime = ProcessMakerServiceProvider::getBootTime() ?? 0;

// Add Server-Timing headers
$response->headers->set('Server-Timing', [
"providers;dur={$serviceProviderTime}",
"endpoint;dur={$endpointTime}",
"controller;dur={$controllerTime}",
"db;dur={$queryTime}"
"db;dur={$queryTime}",
]);

return $response;
Expand Down
21 changes: 21 additions & 0 deletions ProcessMaker/Providers/ProcessMakerServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@
*/
class ProcessMakerServiceProvider extends ServiceProvider
{
// Track the start time for service providers boot
private static $bootStart;
// Track the boot time for service providers
private static $bootTime;

public function boot(): void
{
$this->app->singleton(Menu::class, function ($app) {
Expand All @@ -52,10 +57,16 @@ public function boot(): void
$this->setupFactories();

parent::boot();

// Hook after service providers boot
self::$bootTime = (microtime(true) - self::$bootStart) * 1000; // Convert to milliseconds
}

public function register(): void
{
// Track the start time for service providers boot
self::$bootStart = microtime(true);

// Dusk, if env is appropriate
// TODO Remove Dusk references and remove from composer dependencies
if (!$this->app->environment('production')) {
Expand Down Expand Up @@ -358,4 +369,14 @@ public static function forceHttps(): void
URL::forceScheme('https');
}
}

/**
* Get the boot time for service providers.
*
* @return float|null
*/
public static function getBootTime(): ?float
{
return self::$bootTime;
}
}