From 95ac8721f0894ca9d27cf8191208cc404b539545 Mon Sep 17 00:00:00 2001 From: Matej Baco Date: Tue, 22 Nov 2022 16:50:41 +0100 Subject: [PATCH] Revert changes --- app/controllers/shared/api.php | 1 + app/workers/builds.php | 1 + app/workers/functions.php | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php index 324efa6109..db35cebc65 100644 --- a/app/controllers/shared/api.php +++ b/app/controllers/shared/api.php @@ -192,6 +192,7 @@ App::init() ->setUser($user); $usage + ->setParam('projectInternalId', $project->getInternalId()) ->setParam('projectId', $project->getId()) ->setParam('project.{scope}.network.requests', 1) ->setParam('httpMethod', $request->getMethod()) diff --git a/app/workers/builds.php b/app/workers/builds.php index 6b2cfcf66b..d26f07ab75 100644 --- a/app/workers/builds.php +++ b/app/workers/builds.php @@ -254,6 +254,7 @@ class BuildsV1 extends Worker $statsd = $register->get('statsd'); $usage = new Stats($statsd); $usage + ->setParam('projectInternalId', $project->getInternalId()) ->setParam('projectId', $project->getId()) ->setParam('functionId', $function->getId()) ->setParam('builds.{scope}.compute', 1) diff --git a/app/workers/functions.php b/app/workers/functions.php index a0c9bbdbac..2333cb315e 100644 --- a/app/workers/functions.php +++ b/app/workers/functions.php @@ -208,7 +208,8 @@ Server::setResource('execute', function () { $usage = new Stats($statsd); $usage ->setParam('projectId', $project->getId()) - ->setParam('functionId', $function->getId()) + ->setParam('projectInternalId', $project->getInternalId()) + ->setParam('functionId', $function->getId()) // TODO: We should use functionInternalId in usage stats ->setParam('executions.{scope}.compute', 1) ->setParam('executionStatus', $execution->getAttribute('status', '')) ->setParam('executionTime', $execution->getAttribute('duration'))