Merge pull request #18811 from ghalliday/issue32148

HPCC-32148 Add an option to gather metrics by default for service calls in esp Reviewed-By: Ken Rowland <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Jun 27, 2024 · 30cae58 · 30cae58
2 parents fc72798 + f311665
commit 30cae58
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/cmake_modules/options.cmake b/cmake_modules/options.cmake
@@ -70,6 +70,7 @@ option(USE_ADDRESS_SANITIZER "Use address sanitizer to spot leaks" OFF)
 option(INSTALL_VCPKG_CATALOG "Install vcpkg-catalog.txt" ON)
 option(PORTALURL "Set url to hpccsystems portal download page")
 option(PROFILING "Set to true if planning to profile so stacks are informative" OFF)
+option(COLLECT_SERVICE_METRICS "Set to true to gather metrics for HIDL services by default" OFF)
 
 set(CUSTOM_LABEL "" CACHE STRING "Appends a custom label to the final package name")
 

diff --git a/initfiles/componentfiles/configxml/dali.xsl b/initfiles/componentfiles/configxml/dali.xsl
@@ -346,8 +346,8 @@
           </xsl:element>
         </xsl:if>
       </xsl:element>
+      <xsl:call-template name="addMetricsConfig"/>
     </DALI>
-    <xsl:call-template name="addMetricsConfig"/>
   </xsl:template>
 
   <xsl:template name="makeAbsolutePath">

diff --git a/tools/hidl/CMakeLists.txt b/tools/hidl/CMakeLists.txt
@@ -23,7 +23,7 @@
 
 project( hidl )
 
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR COLLECT_SERVICE_METRICS)
     add_definitions(-DENABLE_DEFAULT_EXECUTION_PROFILING)
 endif()