diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php index e1641040c8..a37d921d40 100644 --- a/app/controllers/shared/api.php +++ b/app/controllers/shared/api.php @@ -422,9 +422,9 @@ App::init() ->inject('apiKey') ->inject('plan') ->inject('devKey') - ->inject('cacheHitsGauge') - ->inject('cacheMissesGauge') - ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Publisher $publisher, Event $queueForEvents, Messaging $queueForMessaging, Audit $queueForAudits, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, StatsUsage $queueForStatsUsage, Database $dbForProject, callable $timelimit, Document $resourceToken, string $mode, ?Key $apiKey, array $plan, Document $devKey, Gauge $cacheHitsCounter, Gauge $cacheMissesCounter) use ($usageDatabaseListener, $eventDatabaseListener) { + ->inject('storageCacheHitsGauge') + ->inject('storageCacheMissesGauge') + ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Publisher $publisher, Event $queueForEvents, Messaging $queueForMessaging, Audit $queueForAudits, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, StatsUsage $queueForStatsUsage, Database $dbForProject, callable $timelimit, Document $resourceToken, string $mode, ?Key $apiKey, array $plan, Document $devKey, Gauge $storageCacheHitsCounter, Gauge $storageCacheMissesCounter) use ($usageDatabaseListener, $eventDatabaseListener) { $route = $utopia->getRoute(); @@ -622,14 +622,14 @@ App::init() ->addHeader('Cache-Control', sprintf('private, max-age=%d', $timestamp)) ->addHeader('X-Appwrite-Cache', 'hit') ->setContentType($cacheLog->getAttribute('mimeType')); - $cacheHitsCounter->record(1, [ + $storageCacheHitsCounter->record(1, [ 'resourceType' => $type, ]); if (!$isImageTransformation || !$isDisabled) { $response->send($data); } } else { - $cacheMissesCounter->record(1); + $storageCacheMissesCounter->record(1); $response ->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate') ->addHeader('Pragma', 'no-cache') diff --git a/app/init/resources.php b/app/init/resources.php index c68a8d389d..a01fd0e13e 100644 --- a/app/init/resources.php +++ b/app/init/resources.php @@ -1010,10 +1010,10 @@ App::setResource('httpReferrerSafe', function (Request $request, string $httpRef return $referrer; }, ['request', 'httpReferrer', 'platforms', 'dbForPlatform', 'project', 'utopia']); -App::setResource('cacheHitsGauge', function (Telemetry $telemetry) { - return $telemetry->createGauge('cache.hits.total'); +App::setResource('storageCacheHitsGauge', function (Telemetry $telemetry) { + return $telemetry->createGauge('storage.cache.hits'); }, ['telemetry']); -App::setResource('cacheMissesGauge', function (Telemetry $telemetry) { - return $telemetry->createGauge('cache.misses.total'); +App::setResource('storageCacheMissesGauge', function (Telemetry $telemetry) { + return $telemetry->createGauge('storage.cache.misses'); }, ['telemetry']);