Merge v1.x into v2.x (#1446)

mongodb-php-bot · web-flow · commit 251bd4bac499 · 2024-09-24T14:23:08.000+02:00
diff --git a/tests/SpecTests/RetryableReads/Prose2_RetryOnMongosTest.php b/tests/SpecTests/RetryableReads/Prose2_RetryOnMongosTest.php
@@ -64,7 +64,7 @@ public function testRetryOnDifferentMongos(): void
 
         // Step 4: Enable failed command event monitoring for client
         $subscriber = new class implements CommandSubscriber {
-            /** @var int[] */
+            /** @var string[] */
             public array $commandFailedServers = [];
 
             public function commandStarted(CommandStartedEvent $event): void
@@ -77,7 +77,7 @@ public function commandSucceeded(CommandSucceededEvent $event): void
 
             public function commandFailed(CommandFailedEvent $event): void
             {
-                $this->commandFailedServers[] = $event->getServerConnectionId();
+                $this->commandFailedServers[] = $event->getHost() . ':' . $event->getPort();
             }
         };
 
@@ -130,21 +130,21 @@ public function testRetryOnSameMongos(): void
 
         // Step 4: Enable succeeded and failed command event monitoring
         $subscriber = new class implements CommandSubscriber {
-            public ?int $commandSucceededServer = null;
-            public ?int $commandFailedServer = null;
+            public ?string $commandSucceededServer = null;
+            public ?string $commandFailedServer = null;
 
             public function commandStarted(CommandStartedEvent $event): void
             {
             }
 
             public function commandSucceeded(CommandSucceededEvent $event): void
             {
-                $this->commandSucceededServer = $event->getServerConnectionId();
+                $this->commandSucceededServer = $event->getHost() . ':' . $event->getPort();
             }
 
             public function commandFailed(CommandFailedEvent $event): void
             {
-                $this->commandFailedServer = $event->getServerConnectionId();
+                $this->commandFailedServer = $event->getHost() . ':' . $event->getPort();
             }
         };
 
diff --git a/tests/SpecTests/RetryableWrites/Prose4_RetryOnDifferentMongosTest.php b/tests/SpecTests/RetryableWrites/Prose4_RetryOnDifferentMongosTest.php
@@ -67,7 +67,7 @@ public function testRetryOnDifferentMongos(): void
 
         // Step 4: Enable failed command event monitoring for client
         $subscriber = new class implements CommandSubscriber {
-            /** @var int[]  */
+            /** @var string[]  */
             public array $commandFailedServers = [];
 
             public function commandStarted(CommandStartedEvent $event): void
@@ -80,7 +80,7 @@ public function commandSucceeded(CommandSucceededEvent $event): void
 
             public function commandFailed(CommandFailedEvent $event): void
             {
-                $this->commandFailedServers[] = $event->getServerConnectionId();
+                $this->commandFailedServers[] = $event->getHost() . ':' . $event->getPort();
             }
         };
 
diff --git a/tests/SpecTests/RetryableWrites/Prose5_RetryOnSameMongosTest.php b/tests/SpecTests/RetryableWrites/Prose5_RetryOnSameMongosTest.php
@@ -49,21 +49,21 @@ public function testRetryOnSameMongos(): void
 
         // Step 4: Enable succeeded and failed command event monitoring
         $subscriber = new class implements CommandSubscriber {
-            public ?int $commandSucceededServer = null;
-            public ?int $commandFailedServer = null;
+            public ?string $commandSucceededServer = null;
+            public ?string $commandFailedServer = null;
 
             public function commandStarted(CommandStartedEvent $event): void
             {
             }
 
             public function commandSucceeded(CommandSucceededEvent $event): void
             {
-                $this->commandSucceededServer = $event->getServerConnectionId();
+                $this->commandSucceededServer = $event->getHost() . ':' . $event->getPort();
             }
 
             public function commandFailed(CommandFailedEvent $event): void
             {
-                $this->commandFailedServer = $event->getServerConnectionId();
+                $this->commandFailedServer = $event->getHost() . ':' . $event->getPort();
             }
         };
 
diff --git a/tests/UnifiedSpecTests/EventCollector.php b/tests/UnifiedSpecTests/EventCollector.php
@@ -107,18 +107,17 @@ private function handleCommandMonitoringEvent(CommandStartedEvent|CommandSucceed
             'name' => self::getEventName($event),
             'observedAt' => microtime(true),
             'commandName' => $event->getCommandName(),
-            'connectionId' => $event->getServerConnectionId(),
-            'requestId' => $event->getRequestId(),
+            'databaseName' => $event->getDatabaseName(),
             'operationId' => $event->getOperationId(),
+            'requestId' => $event->getRequestId(),
+            'server' => $event->getHost() . ':' . $event->getPort(),
+            'serverConnectionId' => $event->getServerConnectionId(),
+            'serviceId' => $event->getServiceId(),
         ];
 
         /* Note: CommandStartedEvent.command and CommandSucceededEvent.reply can
          * be omitted from logged events. */
 
-        if ($event instanceof CommandStartedEvent) {
-            $log['databaseName'] = $event->getDatabaseName();
-        }
-
         if ($event instanceof CommandSucceededEvent) {
             $log['duration'] = $event->getDurationMicros();
         }

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public function testRetryOnDifferentMongos(): void`
`64`	`64`
`65`	`65`	`// Step 4: Enable failed command event monitoring for client`
`66`	`66`	`$subscriber = new class implements CommandSubscriber {`
`67`		`- /** @var int[] */`
	`67`	`+ /** @var string[] */`
`68`	`68`	`public array $commandFailedServers = [];`
`69`	`69`
`70`	`70`	`public function commandStarted(CommandStartedEvent $event): void`
`@@ -77,7 +77,7 @@ public function commandSucceeded(CommandSucceededEvent $event): void`
`77`	`77`
`78`	`78`	`public function commandFailed(CommandFailedEvent $event): void`
`79`	`79`	`{`
`80`		`- $this->commandFailedServers[] = $event->getServerConnectionId();`
	`80`	`+ $this->commandFailedServers[] = $event->getHost() . ':' . $event->getPort();`
`81`	`81`	`}`
`82`	`82`	`};`
`83`	`83`
`@@ -130,21 +130,21 @@ public function testRetryOnSameMongos(): void`
`130`	`130`
`131`	`131`	`// Step 4: Enable succeeded and failed command event monitoring`
`132`	`132`	`$subscriber = new class implements CommandSubscriber {`
`133`		`- public ?int $commandSucceededServer = null;`
`134`		`- public ?int $commandFailedServer = null;`
	`133`	`+ public ?string $commandSucceededServer = null;`
	`134`	`+ public ?string $commandFailedServer = null;`
`135`	`135`
`136`	`136`	`public function commandStarted(CommandStartedEvent $event): void`
`137`	`137`	`{`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`public function commandSucceeded(CommandSucceededEvent $event): void`
`141`	`141`	`{`
`142`		`- $this->commandSucceededServer = $event->getServerConnectionId();`
	`142`	`+ $this->commandSucceededServer = $event->getHost() . ':' . $event->getPort();`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`public function commandFailed(CommandFailedEvent $event): void`
`146`	`146`	`{`
`147`		`- $this->commandFailedServer = $event->getServerConnectionId();`
	`147`	`+ $this->commandFailedServer = $event->getHost() . ':' . $event->getPort();`
`148`	`148`	`}`
`149`	`149`	`};`
`150`	`150`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public function testRetryOnDifferentMongos(): void`
`67`	`67`
`68`	`68`	`// Step 4: Enable failed command event monitoring for client`
`69`	`69`	`$subscriber = new class implements CommandSubscriber {`
`70`		`- /** @var int[] */`
	`70`	`+ /** @var string[] */`
`71`	`71`	`public array $commandFailedServers = [];`
`72`	`72`
`73`	`73`	`public function commandStarted(CommandStartedEvent $event): void`
`@@ -80,7 +80,7 @@ public function commandSucceeded(CommandSucceededEvent $event): void`
`80`	`80`
`81`	`81`	`public function commandFailed(CommandFailedEvent $event): void`
`82`	`82`	`{`
`83`		`- $this->commandFailedServers[] = $event->getServerConnectionId();`
	`83`	`+ $this->commandFailedServers[] = $event->getHost() . ':' . $event->getPort();`
`84`	`84`	`}`
`85`	`85`	`};`
`86`	`86`
Original file line number	Diff line number	Diff line change
`@@ -49,21 +49,21 @@ public function testRetryOnSameMongos(): void`
`49`	`49`
`50`	`50`	`// Step 4: Enable succeeded and failed command event monitoring`
`51`	`51`	`$subscriber = new class implements CommandSubscriber {`
`52`		`- public ?int $commandSucceededServer = null;`
`53`		`- public ?int $commandFailedServer = null;`
	`52`	`+ public ?string $commandSucceededServer = null;`
	`53`	`+ public ?string $commandFailedServer = null;`
`54`	`54`
`55`	`55`	`public function commandStarted(CommandStartedEvent $event): void`
`56`	`56`	`{`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`public function commandSucceeded(CommandSucceededEvent $event): void`
`60`	`60`	`{`
`61`		`- $this->commandSucceededServer = $event->getServerConnectionId();`
	`61`	`+ $this->commandSucceededServer = $event->getHost() . ':' . $event->getPort();`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`public function commandFailed(CommandFailedEvent $event): void`
`65`	`65`	`{`
`66`		`- $this->commandFailedServer = $event->getServerConnectionId();`
	`66`	`+ $this->commandFailedServer = $event->getHost() . ':' . $event->getPort();`
`67`	`67`	`}`
`68`	`68`	`};`
`69`	`69`