Release

src/Messenger/Middleware/BaggageSchemaMiddleware.php

@@ -28,7 +28,11 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope
                 ->setSchema($stamp->schema)
                 ->setBaggage($this->baggageCodec->decode($stamp->baggage));
 
-            return $stack->next()->handle($envelope, $stack);
+            $result = $stack->next()->handle($envelope, $stack);
+
+            $this->baggageSchemaResolver->reset();
+
+            return $result;
         }
 
         $schema = $this->baggageSchemaResolver->getSchema();

src/Service/BaggageSchemaResolver.php

@@ -41,4 +41,10 @@ public function getSchema(): ?string
     {
         return $this->schema;
     }
+
+    public function reset(): void
+    {
+        $this->baggage = null;
+        $this->schema = null;
+    }
 }

tests/Messenger/Middleware/BaggageSchemaMiddlewareTest.php

@@ -32,18 +32,28 @@ public function testSchemaIsSetFromStamp(): void
         $nextMiddleware = new class implements MiddlewareInterface {
             public function handle(Envelope $envelope, StackInterface $stack): Envelope
             {
-                return $envelope;
+                /** @var BaggageSchemaStamp|null $stamp */
+                $stamp = $envelope->last(BaggageSchemaStamp::class);
+
+                return new Envelope((object) [
+                    'schema' => $stamp?->schema,
+                    'baggage' => $stamp?->baggage,
+                ]);
             }
         };
 
         $stack->expects($this->once())
             ->method('next')
             ->willReturn($nextMiddleware);
 
-        $middleware->handle($envelope, $stack);
+        $envelope = $middleware->handle($envelope, $stack);
+
+        $result = (array) $envelope->getMessage();
 
-        $this->assertSame($schema, $resolver->getSchema());
-        $this->assertSame($baggage, $resolver->getBaggage());
+        $this->assertSame($schema, $result['schema']);
+        $this->assertSame($baggage, $baggageCodec->decode($result['baggage']));
+        $this->assertNull($resolver->getSchema());
+        $this->assertNull($resolver->getBaggage());
     }
 
     public function testSchemaStampIsInjectedIfMissing(): void