Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use host:port for server logging and add extra fields to EventCollector logs #1428

Open
wants to merge 2 commits into
base: v1.20
Choose a base branch
from
Open

Use host:port for server logging and add extra fields to EventCollector logs #1428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2680d2
Track servers by host:port instead of serverConnectionId
jmikola Sep 19, 2024
bd6b38c
Rename connectionId and add extra fields to EventCollector logs
jmikola Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions tests/SpecTests/RetryableReads/Prose2_RetryOnMongosTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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();
}
};

Expand Down Expand Up @@ -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();
}
};

Expand Down
4 changes: 2 additions & 2 deletions tests/SpecTests/RetryableWrites/Prose4_RetryOnDifferentMongosTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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();
}
};

Expand Down
8 changes: 4 additions & 4 deletions tests/SpecTests/RetryableWrites/Prose5_RetryOnSameMongosTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
};

Expand Down
11 changes: 5 additions & 6 deletions tests/UnifiedSpecTests/EventCollector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,18 +119,17 @@ private function handleCommandMonitoringEvent($event): void
'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();
}
Comment on lines -130 to -132
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you remove this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's now added unconditionally a few lines up.

This original logic predated PHPC 1.19 adding the property to all APM events in PHPC-2255.


if ($event instanceof CommandSucceededEvent) {
$log['duration'] = $event->getDurationMicros();
}
Expand Down