From a7bc4bd411ba8f993fbcd4ce4d3bfa477b9c3926 Mon Sep 17 00:00:00 2001 From: Eric Espie Date: Wed, 22 Jan 2025 16:34:31 +0100 Subject: [PATCH] :zap: Add new measure points for KPI logger --- application/cmdbabstract.class.inc.php | 6 ++++++ .../UI/Base/Layout/ActivityPanel/ActivityPanelFactory.php | 4 ++++ sources/Service/Module/ModuleService.php | 2 ++ 3 files changed, 12 insertions(+) diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index d5d4cf99a..947185a49 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -1115,7 +1115,9 @@ HTML // Note: DisplayBareHeader is called before adding $oObjectDetails to the page, so it can inject HTML before it through $oPage. /** @var \iTopWebPage $oPage */ + $oKPI = new ExecutionKPI(); $aHeadersBlocks = $this->DisplayBareHeader($oPage, $bEditMode); + $oKPI->ComputeStatsForExtension($this, 'DisplayBareHeader'); if (false === empty($aHeadersBlocks['subtitle'])) { $oObjectDetails->AddSubTitleBlocks($aHeadersBlocks['subtitle']); } @@ -1128,8 +1130,12 @@ HTML $oPage->AddTabContainer(OBJECT_PROPERTIES_TAB, '', $oObjectDetails); $oPage->SetCurrentTabContainer(OBJECT_PROPERTIES_TAB); $oPage->SetCurrentTab('UI:PropertiesTab'); + $oKPI = new ExecutionKPI(); $this->DisplayBareProperties($oPage, $bEditMode); + $oKPI->ComputeStatsForExtension($this, 'DisplayBareProperties'); + $oKPI = new ExecutionKPI(); $this->DisplayBareRelations($oPage, $bEditMode); + $oKPI->ComputeStatsForExtension($this, 'DisplayBareRelations'); // Note: Adding the JS snippet which enables the image upload should have been done directly by the ActivityPanel which would have kept the independance principle diff --git a/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelFactory.php b/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelFactory.php index 19803735e..c36d3f688 100644 --- a/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelFactory.php +++ b/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelFactory.php @@ -27,6 +27,7 @@ use DBObject; use DBObjectSearch; use DBObjectSet; use Exception; +use ExecutionKPI; use IssueLog; use MetaModel; @@ -58,6 +59,7 @@ class ActivityPanelFactory */ public static function MakeForObjectDetails(DBObject $oObject, string $sMode = cmdbAbstractObject::DEFAULT_DISPLAY_MODE) { + $oKPI = new ExecutionKPI(); $sObjClass = get_class($oObject); $sObjId = $oObject->GetKey(); @@ -171,6 +173,8 @@ class ActivityPanelFactory } } + $oKPI->ComputeStatsForExtension(new ActivityPanelFactory(), 'MakeForObjectDetails'); + return $oActivityPanel; } } \ No newline at end of file diff --git a/sources/Service/Module/ModuleService.php b/sources/Service/Module/ModuleService.php index c41961c1a..16fa34f06 100644 --- a/sources/Service/Module/ModuleService.php +++ b/sources/Service/Module/ModuleService.php @@ -46,6 +46,8 @@ class ModuleService $sExtension = $this->GetModuleNameFromObject($oReflectionClass->getName()); if (strlen($sExtension) !== 0) { $sSignature .= '['.$sExtension.'] '; + } else { + $sSignature .= '[core] '; } $sSignature .= $oReflectionClass->getShortName().'::'.$sMethod.'()';