mirror of
https://github.com/appwrite/appwrite.git
synced 2026-11-18 20:36:03 +00:00
Merge pull request #12631 from appwrite/fix/audits-worker-log-noise-and-null-key
fix(audits): use span attributes instead of per-message Console logging
This commit is contained in:
1 file changed
+14
-12
@@ -5,11 +5,11 @@ namespace Appwrite\Platform\Workers;
|
||||
use Appwrite\Event\Message\Audit;
|
||||
use Exception;
|
||||
use Throwable;
|
||||
use Utopia\Console;
|
||||
use Utopia\Database\Document;
|
||||
use Utopia\Database\Exception\Structure;
|
||||
use Utopia\Platform\Action;
|
||||
use Utopia\Queue\Message;
|
||||
use Utopia\Span\Span;
|
||||
use Utopia\System\System;
|
||||
|
||||
class Audits extends Action
|
||||
@@ -63,8 +63,6 @@ class Audits extends Action
|
||||
|
||||
$auditMessage = Audit::fromArray($payload);
|
||||
|
||||
Console::info('Aggregating audit logs');
|
||||
|
||||
$event = $auditMessage->event;
|
||||
|
||||
$auditPayload = '';
|
||||
@@ -123,10 +121,11 @@ class Audits extends Action
|
||||
];
|
||||
}
|
||||
|
||||
if (isset($this->logs[$auditMessage->project->getSequence()])) {
|
||||
$this->logs[$auditMessage->project->getSequence()]['logs'][] = $eventData;
|
||||
$projectSequence = (string) $auditMessage->project->getSequence();
|
||||
if (isset($this->logs[$projectSequence])) {
|
||||
$this->logs[$projectSequence]['logs'][] = $eventData;
|
||||
} else {
|
||||
$this->logs[$auditMessage->project->getSequence()] = [
|
||||
$this->logs[$projectSequence] = [
|
||||
'project' => new Document([
|
||||
'$id' => $auditMessage->project->getId(),
|
||||
'$sequence' => $auditMessage->project->getSequence(),
|
||||
@@ -148,22 +147,25 @@ class Audits extends Action
|
||||
return;
|
||||
}
|
||||
|
||||
$projects = 0;
|
||||
$events = 0;
|
||||
foreach ($this->logs as $sequence => $projectLogs) {
|
||||
try {
|
||||
Console::log('Processing Project "' . $sequence . '" batch with ' . count($projectLogs['logs']) . ' events');
|
||||
|
||||
$projectDocument = $projectLogs['project'];
|
||||
$audit = $getAudit($projectDocument);
|
||||
$audit = $getAudit($projectLogs['project']);
|
||||
$audit->logBatch($projectLogs['logs']);
|
||||
|
||||
Console::success('Audit logs processed successfully');
|
||||
$projects++;
|
||||
$events += count($projectLogs['logs']);
|
||||
} catch (Throwable $e) {
|
||||
Console::error('Error processing audit logs for Project "' . $sequence . '": ' . $e->getMessage());
|
||||
Span::add('audits.error', $e->getMessage());
|
||||
} finally {
|
||||
unset($this->logs[$sequence]);
|
||||
}
|
||||
}
|
||||
|
||||
Span::add('audits.projects', $projects);
|
||||
Span::add('audits.count', $events);
|
||||
|
||||
$this->lastTriggeredTime = time();
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user