extract logic in profiler

src/Debug/DefaultProfiler.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Patchlevel\EventSourcing\Debug;
+
+use Symfony\Component\Stopwatch\Stopwatch;
+
+final class DefaultProfiler implements Profiler
+{
+    public function __construct(
+        private readonly ProfileDataHolder $dataHolder,
+        private readonly Stopwatch|null $stopwatch = null,
+    ) {
+    }
+
+    /**
+     * @param \Closure():T $closure
+     *
+     * @return T
+     *
+     * @template T of mixed
+     */
+    public function profile(string $name, \Closure $closure, $context = []): mixed
+    {
+        $data = new ProfileData($name, $context);
+
+        $this->dataHolder->addData($data);
+        $event = $this->stopwatch?->start('event_sourcing', $name);
+        $data->start();
+
+        try {
+            return $closure();
+        } finally {
+            $data->stop();
+            $event?->stop();
+        }
+    }
+}

src/Debug/ProfileData.php

@@ -4,21 +4,16 @@
 
 namespace Patchlevel\EventSourcing\Debug;
 
-use Patchlevel\EventSourcing\Aggregate\AggregateRoot;
-
 use function microtime;
 
 final class ProfileData
 {
     private float|null $start = null;
     private float|null $duration = null;
 
-    private function __construct(
-        /** @var 'load'|'has'|'save' */
-        private readonly string $type,
-        /** @var class-string<AggregateRoot> */
-        private readonly string $aggregateClass,
-        private readonly string $aggregateId,
+    public function __construct(
+        private readonly string $name,
+        private readonly array  $context = [],
     ) {
     }
 
@@ -36,43 +31,18 @@ public function stop(): void
         $this->duration = microtime(true) - $this->start;
     }
 
-    /** @return 'load'|'has'|'save' */
-    public function type(): string
-    {
-        return $this->type;
-    }
-
-    /** @return class-string<AggregateRoot> */
-    public function aggregateClass(): string
+    public function name(): string
     {
-        return $this->aggregateClass;
+        return $this->name;
     }
 
-    public function aggregateId(): string
+    public function context(): array
     {
-        return $this->aggregateId;
+        return $this->context;
     }
 
     public function duration(): float|null
     {
         return $this->duration;
     }
-
-    /** @param class-string<AggregateRoot> $aggregateClass */
-    public static function loadAggregate(string $aggregateClass, string $aggregateId): self
-    {
-        return new ProfileData('load', $aggregateClass, $aggregateId);
-    }
-
-    /** @param class-string<AggregateRoot> $aggregateClass */
-    public static function hasAggregate(string $aggregateClass, string $aggregateId): self
-    {
-        return new ProfileData('has', $aggregateClass, $aggregateId);
-    }
-
-    /** @param class-string<AggregateRoot> $aggregateClass */
-    public static function saveAggregate(string $aggregateClass, string $aggregateId): self
-    {
-        return new ProfileData('save', $aggregateClass, $aggregateId);
-    }
 }

src/Debug/Profiler.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Patchlevel\EventSourcing\Debug;
+
+interface Profiler
+{
+    /**
+     * @param \Closure():T $closure
+     *
+     * @return T
+     *
+     * @template T of mixed
+     */
+    public function profile(string $name, \Closure $closure, $context = []): mixed;
+}

src/Debug/TraceableRepository.php

@@ -6,7 +6,6 @@
 
 use Patchlevel\EventSourcing\Aggregate\AggregateRoot;
 use Patchlevel\EventSourcing\Repository\Repository;
-use Symfony\Component\Stopwatch\Stopwatch;
 
 /**
  * @template T of AggregateRoot
@@ -19,58 +18,45 @@ public function __construct(
         private readonly Repository $repository,
         /** @var class-string<T> */
         private readonly string $aggregateClass,
-        private readonly ProfileDataHolder $dataHolder,
-        private readonly Stopwatch|null $stopwatch = null,
+        private readonly Profiler $profiler,
     ) {
     }
 
     /** @return T */
     public function load(string $id): AggregateRoot
     {
-        $data = ProfileData::loadAggregate($this->aggregateClass, $id);
-
-        $this->dataHolder->addData($data);
-        $event = $this->stopwatch?->start('event_sourcing', 'event_sourcing');
-        $data->start();
-
-        try {
-            return $this->repository->load($id);
-        } finally {
-            $data->stop();
-            $event?->stop();
-        }
+        return $this->profiler->profile(
+            'aggregate.load',
+            static fn () => $this->repository->load($id),
+            [
+                'aggregateClass' => $this->aggregateClass,
+                'aggregateId' => $id,
+            ]
+        );
     }
 
     public function has(string $id): bool
     {
-        $data = ProfileData::hasAggregate($this->aggregateClass, $id);
-
-        $this->dataHolder->addData($data);
-        $event = $this->stopwatch?->start('event_sourcing', 'event_sourcing');
-        $data->start();
-
-        try {
-            return $this->repository->has($id);
-        } finally {
-            $data->stop();
-            $event?->stop();
-        }
+        return $this->profiler->profile(
+            'aggregate.has',
+            static fn () => $this->repository->has($id),
+            [
+                'aggregateClass' => $this->aggregateClass,
+                'aggregateId' => $id,
+            ]
+        );
     }
 
     /** @param T $aggregate */
     public function save(AggregateRoot $aggregate): void
     {
-        $data = ProfileData::saveAggregate($this->aggregateClass, $aggregate->aggregateRootId());
-
-        $this->dataHolder->addData($data);
-        $event = $this->stopwatch?->start('event_sourcing', 'event_sourcing');
-        $data->start();
-
-        try {
-            $this->repository->save($aggregate);
-        } finally {
-            $data->stop();
-            $event?->stop();
-        }
+        $this->profiler->profile(
+            'aggregate.save',
+            static fn () => $this->repository->save($aggregate),
+            [
+                'aggregateClass' => $this->aggregateClass,
+                'aggregateId' => $aggregate->aggregateRootId(),
+            ]
+        );
     }
 }