Merge pull request #34188 from nextcloud/feat/profiler-clear

Expose clearing the profiles and fix it

3 files changed, 11 insertions, 0 deletions

diff --git a/lib/private/Profiler/FileProfilerStorage.php b/lib/private/Profiler/FileProfilerStorage.php
index ce09ed51ed9..d583549332e 100644
--- a/lib/private/Profiler/FileProfilerStorage.php
+++ b/lib/private/Profiler/FileProfilerStorage.php
@@ -99,6 +99,7 @@ class FileProfilerStorage {
 		$iterator = new \RecursiveIteratorIterator($iterator, \RecursiveIteratorIterator::CHILD_FIRST);
 
 		foreach ($iterator as $file) {
+			$file = $file->getPathInfo();
 			if (is_file($file)) {
 				unlink($file);
 			} else {
diff --git a/lib/private/Profiler/Profiler.php b/lib/private/Profiler/Profiler.php
index 8aa800fbc6d..9fd5e76d592 100644
--- a/lib/private/Profiler/Profiler.php
+++ b/lib/private/Profiler/Profiler.php
@@ -102,4 +102,8 @@ class Profiler implements IProfiler {
 	public function setEnabled(bool $enabled): void {
 		$this->enabled = $enabled;
 	}
+
+	public function clear(): void {
+		$this->storage->purge();
+	}
 }
diff --git a/lib/public/Profiler/IProfiler.php b/lib/public/Profiler/IProfiler.php
index 78325089523..5fa4582add7 100644
--- a/lib/public/Profiler/IProfiler.php
+++ b/lib/public/Profiler/IProfiler.php
@@ -98,4 +98,10 @@ interface IProfiler {
 	 * @since 24.0.0
 	 */
 	public function collect(Request $request, Response $response): IProfile;
+
+	/**
+	 * Clear the stored profiles
+	 * @since 25.0.0
+	 */
+	public function clear(): void;
 }