feat: add toolchain environment collection to CMake build

Author: GuillaumeLagrange

core/CMakeLists.txt

@@ -15,7 +15,7 @@ include(FetchContent)
 FetchContent_Declare(
     instrument_hooks_repo
     GIT_REPOSITORY https://github.com/CodSpeedHQ/instrument-hooks
-    GIT_TAG 89fb72a076ec71c9eca6eee9bca98bada4b4dfb4
+    GIT_TAG 5485d682a49f880262c3cd779906d46cdd792abc
 )
 FetchContent_MakeAvailable(instrument_hooks_repo)
 FetchContent_GetProperties(instrument_hooks_repo)
@@ -96,6 +96,25 @@ target_link_libraries(codspeed PRIVATE instrument_hooks)
 # Version
 add_compile_definitions(CODSPEED_VERSION="${CODSPEED_VERSION}")
 
+# Collect compiler toolchain information for environment reporting
+execute_process(
+    COMMAND ${CMAKE_CXX_COMPILER} --version
+    OUTPUT_VARIABLE CODSPEED_CXX_COMPILER_FULL_VERSION
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_QUIET
+)
+# Extract first line only
+if(CODSPEED_CXX_COMPILER_FULL_VERSION)
+    string(REGEX REPLACE "\n.*" "" CODSPEED_CXX_COMPILER_FULL_VERSION "${CODSPEED_CXX_COMPILER_FULL_VERSION}")
+endif()
+
+target_compile_definitions(codspeed PRIVATE
+    CODSPEED_CXX_COMPILER_ID="${CMAKE_CXX_COMPILER_ID}"
+    CODSPEED_CXX_COMPILER_VERSION="${CMAKE_CXX_COMPILER_VERSION}"
+    CODSPEED_CXX_COMPILER_FULL_VERSION="${CODSPEED_CXX_COMPILER_FULL_VERSION}"
+    CODSPEED_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
+)
+
 # Specify the include directories for users of the library
 target_include_directories(
     codspeed

core/include/measurement.hpp

@@ -35,6 +35,25 @@ inline bool measurement_is_instrumented() {
 inline void measurement_set_metadata() {
   std::string version = get_version();
   instrument_hooks_set_integration(g_hooks, "codspeed-cpp", version.c_str());
+
+  // Report C++ toolchain information
+#ifdef CODSPEED_CXX_COMPILER_ID
+  instrument_hooks_set_environment(g_hooks, "Compiler", "compiler_id",
+                                   CODSPEED_CXX_COMPILER_ID);
+#endif
+#ifdef CODSPEED_CXX_COMPILER_VERSION
+  instrument_hooks_set_environment(g_hooks, "Compiler", "version",
+                                   CODSPEED_CXX_COMPILER_VERSION);
+#endif
+#ifdef CODSPEED_CXX_COMPILER_FULL_VERSION
+  instrument_hooks_set_environment(g_hooks, "Compiler", "build",
+                                   CODSPEED_CXX_COMPILER_FULL_VERSION);
+#endif
+#ifdef CODSPEED_BUILD_TYPE
+  instrument_hooks_set_environment(g_hooks, "Compiler", "build_type",
+                                   CODSPEED_BUILD_TYPE);
+#endif
+  instrument_hooks_write_environment(g_hooks, static_cast<uint32_t>(getpid()));
 }
 
 ALWAYS_INLINE void measurement_start() {
@@ -55,7 +74,7 @@ ALWAYS_INLINE uint64_t measurement_current_timestamp() {
 }
 
 ALWAYS_INLINE uint8_t measurement_add_marker(uint8_t marker_type,
-                                            uint64_t timestamp) {
+                                             uint64_t timestamp) {
   auto pid = static_cast<uint32_t>(getpid());
   return instrument_hooks_add_marker(g_hooks, pid, marker_type, timestamp);
 }