Rename connectionId and add extra fields to EventCollector logs

This renames connectionId to server, to avoid ambiguity with serverConnectionId.

Additional fields have also been added to the output. Since PHPC 1.19, database name is available on all APM events.

Author: jmikola

tests/UnifiedSpecTests/EventCollector.php

@@ -119,18 +119,17 @@ private function handleCommandMonitoringEvent($event): void
             'name' => self::getEventName($event),
             'observedAt' => microtime(true),
             'commandName' => $event->getCommandName(),
-            'connectionId' => $event->getHost() . ':' . $event->getPort(),
-            '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();
         }