Skip to content

Improve --latest option. #1596

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

Open
mharacewiat wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −4
Open

Improve --latest option. #1596

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions src/Command/Metrics/MetricsCommandBase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@

abstract class MetricsCommandBase extends CommandBase
{
const MIN_INTERVAL = 60; // 1 minute
const MIN_INTERVAL = 60; // 1 minute

const MIN_RANGE = 300; // 5 minutes
const DEFAULT_RANGE = 600;
const MIN_RANGE = 300; // 5 minutes
const DEFAULT_RANGE = 600; // 10 minutes
const LATEST_GRAIN = 300; // 5 minutes

/**
* @var bool whether services have been identified that use high memory
Expand Down Expand Up @@ -64,7 +65,7 @@ protected function addMetricsOptions()
. "\n" . \sprintf('Minimum <comment>%s</comment>.', $duration->humanize(self::MIN_INTERVAL))
);
$this->addOption('to', null, InputOption::VALUE_REQUIRED, 'The end time. Defaults to now.');
$this->addOption('latest', '1', InputOption::VALUE_NONE, 'Show only the latest single data point');
$this->addOption('latest', '1', InputOption::VALUE_NONE, 'Show only the latest single data point' . "\n" . 'Defaults to a 5-minute aggregation window to ensure all containers are included. Override with <comment>--interval</comment>.');
$this->addOption('service', 's', InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'Filter by service or application name' . "\n" . Wildcard::HELP);
$this->addOption('type', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'Filter by service type (if --service is not provided). The version is not required.' . "\n" . Wildcard::HELP);

Expand Down Expand Up @@ -231,6 +232,8 @@ private function getServices(InputInterface $input, Environment $environment)
*/
protected function validateTimeInput(InputInterface $input)
{
$isLatest = $input->getOption('latest');

if ($to = $input->getOption('to')) {
$endTime = \strtotime($to);
if (!$endTime) {
Expand All @@ -253,6 +256,8 @@ protected function validateTimeInput(InputInterface $input)
return false;
}
$rangeSeconds = (int) $rangeSeconds;
} elseif ($isLatest && !$input->getOption('interval')) {
$rangeSeconds = self::LATEST_GRAIN;
} else {
$rangeSeconds = self::DEFAULT_RANGE;
}
Expand All @@ -274,6 +279,8 @@ protected function validateTimeInput(InputInterface $input)

return false;
}
} elseif ($isLatest) {
$interval = self::LATEST_GRAIN;
}

return new TimeSpec($startTime, $endTime, $interval);
Expand Down
Loading