TASK: Add CorrelationId to removed events from cs pruner

neos · Jan 27, 2025 · 2647207 · 2647207
1 parent 2e0c7b7
commit 2647207
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/Neos.ContentRepository.Core/Classes/Service/ContentStreamPruner.php b/Neos.ContentRepository.Core/Classes/Service/ContentStreamPruner.php
@@ -4,6 +4,7 @@
 
 namespace Neos\ContentRepository\Core\Service;
 
+use Neos\ContentRepository\Core\EventStore\DecoratedEvent;
 use Neos\ContentRepository\Core\EventStore\EventNormalizer;
 use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceInterface;
 use Neos\ContentRepository\Core\Feature\ContentStreamCreation\Event\ContentStreamWasCreated;
@@ -22,6 +23,7 @@
 use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
 use Neos\ContentRepository\Core\Subscription\Engine\SubscriptionEngine;
 use Neos\EventStore\EventStoreInterface;
+use Neos\EventStore\Model\Event\CorrelationId;
 use Neos\EventStore\Model\Event\EventType;
 use Neos\EventStore\Model\Event\EventTypes;
 use Neos\EventStore\Model\EventStream\EventStreamFilter;
@@ -129,6 +131,7 @@ public function removeDanglingContentStreams(\Closure $outputFn, \DateTimeImmuta
     {
         $allContentStreams = $this->findAllContentStreams();
 
+        $correlationId = CorrelationId::fromString(sprintf('ContentStreamPruner_%s', bin2hex(random_bytes(9))));
         $danglingContentStreamsPresent = false;
         foreach ($allContentStreams as $contentStream) {
             if (!$contentStream->isDangling()) {
@@ -145,8 +148,12 @@ public function removeDanglingContentStreams(\Closure $outputFn, \DateTimeImmuta
             $this->eventStore->commit(
                 ContentStreamEventStreamName::fromContentStreamId($contentStream->id)->getEventStreamName(),
                 $this->eventNormalizer->normalize(
-                    new ContentStreamWasRemoved(
-                        $contentStream->id
+                    DecoratedEvent::create(
+                        new ContentStreamWasRemoved(
+                            $contentStream->id
+                        ),
+                        metadata: ['debug_reason' => sprintf('Removed dangling content stream with status %s', $contentStream->status->value)],
+                        correlationId: $correlationId
                     )
                 ),
                 ExpectedVersion::STREAM_EXISTS()

diff --git a/Neos.ContentRepository.Core/Classes/Service/ContentStreamPruner/ContentStreamForPruning.php b/Neos.ContentRepository.Core/Classes/Service/ContentStreamPruner/ContentStreamForPruning.php
@@ -71,13 +71,13 @@ public static function create(
         ContentStreamId $id,
         ContentStreamStatus $status,
         ?ContentStreamId $sourceContentStreamId,
-        \DateTimeImmutable $create,
+        \DateTimeImmutable $created,
     ): self {
         return new self(
             $id,
             $status,
             $sourceContentStreamId,
-            $create,
+            $created,
             false
         );
     }

diff --git a/Neos.ContentRepository.StructureAdjustment/src/StructureAdjustmentService.php b/Neos.ContentRepository.StructureAdjustment/src/StructureAdjustmentService.php
@@ -134,11 +134,7 @@ public function fixError(StructureAdjustment $adjustment): void
             return $this->eventNormalizer->normalize($decoratedEvent);
         }));
 
-        $this->eventStore->commit(
-            $eventsToPublish->streamName,
-            $normalizedEvents,
-            $eventsToPublish->expectedVersion
-        );
+        $this->eventStore->commit($eventsToPublish->streamName, $normalizedEvents, $eventsToPublish->expectedVersion);
         $this->subscriptionEngine->catchUpActive();
     }
 }