allow exporting a single profile

Signed-off-by: Robin Appelman <[email protected]>
nextcloud · Sep 17, 2023 · 6369023 · 6369023
1 parent 5bcc135
commit 6369023
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 21 deletions.
diff --git a/apps/dav/lib/Profiler/ProfilerPlugin.php b/apps/dav/lib/Profiler/ProfilerPlugin.php
@@ -42,28 +42,26 @@ public function __construct(
 		$a = 1;
 	}
 
-	/** @return void */
-	public function initialize(Server $server) {
+	public function initialize(Server $server): void {
 		$server->on('beforeMethod:*', [$this, 'beforeMethod'], 1);
 		$server->on('afterMethod:*', [$this, 'afterMethod'], 9999);
 		$server->on('afterResponse', [$this, 'afterResponse'], 9999);
 		$server->on('exception', [$this, 'exception']);
 	}
 
-	public function beforeMethod() {
+	public function beforeMethod(): void {
 		$this->eventLogger->start('dav:server:method', 'Processing dav request');
 	}
 
-	/** @return void */
-	public function afterMethod(RequestInterface $request, ResponseInterface $response) {
+	public function afterMethod(RequestInterface $request, ResponseInterface $response): void {
 		$this->eventLogger->end('dav:server:method');
 		$this->eventLogger->start('dav:server:response', 'Sending dav response');
 		if ($this->profiler->isEnabled()) {
 			$response->addHeader('X-Debug-Token', $this->request->getId());
 		}
 	}
 
-	public function afterResponse(RequestInterface $request, ResponseInterface $response) {
+	public function afterResponse(RequestInterface $request, ResponseInterface $response): void {
 		$this->eventLogger->end('dav:server:response');
 		$this->finalize($response->getStatus());
 	}

diff --git a/core/Command/Profiler/Export.php b/core/Command/Profiler/Export.php
@@ -7,6 +7,7 @@
 
 namespace OC\Core\Command\Profiler;
 
+use _HumbugBox1cb33d1f20f1\LanguageServerProtocol\PackageDescriptor;
 use OC\Core\Command\Base;
 use OCP\Profiler\IProfiler;
 use Symfony\Component\Console\Input\InputInterface;
@@ -25,23 +26,30 @@ protected function configure() {
 		$this
 			->setName('profiler:export')
 			->setDescription('Export captured profiles as json')
-			->addOption('limit', null, InputOption::VALUE_REQUIRED, 'Maximum number of profiles to return')
-			->addOption('url', null, InputOption::VALUE_REQUIRED, 'Url to list profiles for')
-			->addOption('since', null, InputOption::VALUE_REQUIRED, 'Minimum date for listed profiles, as unix timestamp')
-			->addOption('before', null, InputOption::VALUE_REQUIRED, 'Maximum date for listed profiles, as unix timestamp');
+			->addOption('limit', null, InputOption::VALUE_REQUIRED, 'Maximum number of profiles to export')
+			->addOption('url', null, InputOption::VALUE_REQUIRED, 'Url to export profiles for')
+			->addOption('since', null, InputOption::VALUE_REQUIRED, 'Minimum date for exported profiles, as unix timestamp')
+			->addOption('before', null, InputOption::VALUE_REQUIRED, 'Maximum date for exported profiles, as unix timestamp')
+			->addOption('token', null, InputOption::VALUE_REQUIRED, 'Export only profile for a single request token');
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$since = $input->getOption('since') ? (int)$input->getOption('since') : null;
 		$before = $input->getOption('before') ? (int)$input->getOption('before') : null;
 		$limit = $input->getOption('limit') ? (int)$input->getOption('limit') : 1000;
+		$token = $input->getOption('token') ? $input->getOption('token') : null;
 		$url = $input->getOption('url');
 
-		$profiles = $this->profiler->find($url, $limit, null, $since, $before);
-		$profiles = array_reverse($profiles);
-		$profiles = array_map(function (array $profile) {
-			return $this->profiler->loadProfile($profile['token']);
-		}, $profiles);
+		if ($token) {
+			$profiles = [$this->profiler->loadProfile($token)];
+			$profiles = array_filter($profiles);
+		} else {
+			$profiles = $this->profiler->find($url, $limit, null, $since, $before);
+			$profiles = array_reverse($profiles);
+			$profiles = array_map(function (array $profile) {
+				return $this->profiler->loadProfile($profile['token']);
+			}, $profiles);
+		}
 
 		$output->writeln(json_encode($profiles));
 

diff --git a/lib/private/Profiler/DataCollector/MemoryDataCollector.php b/lib/private/Profiler/DataCollector/MemoryDataCollector.php
@@ -55,11 +55,11 @@ private function convertToBytes(string $memoryLimit) {
 
 		switch (substr($memoryLimit, -1)) {
 			case 't': $max *= 1024;
-			// no break
+				// no break
 			case 'g': $max *= 1024;
-			// no break
+				// no break
 			case 'm': $max *= 1024;
-			// no break
+				// no break
 			case 'k': $max *= 1024;
 		}
 		return $max;

diff --git a/lib/private/Profiler/Profiler.php b/lib/private/Profiler/Profiler.php
@@ -28,17 +28,14 @@
 
 use OC\AppFramework\Http\Request;
 use OC\AppFramework\Http\RequestVars;
-use OC\Profiler\DataCollector\EventLoggerDataProvider;
 use OC\Profiler\DataCollector\HttpDataCollector;
 use OC\Profiler\DataCollector\MemoryDataCollector;
 use OCP\AppFramework\Http\Response;
 use OCP\DataCollector\IDataCollector;
-use OCP\Diagnostics\IEventLogger;
 use OCP\IRequest;
 use OCP\Profiler\IProfiler;
 use OCP\Profiler\IProfile;
 use OC\SystemConfig;
-use Psr\Container\ContainerInterface;
 
 class Profiler implements IProfiler {
 	/** @var array<string, IDataCollector> */