Merge branch 'main' into zachg/handle_cross_org_propagation

DataDog · Dec 19, 2024 · e2911cd · e2911cd
2 parents 533bbe1 + 5cee25e
commit e2911cd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/ddtrace/internal/datadog/profiling/dd_wrapper/test/CMakeLists.txt b/ddtrace/internal/datadog/profiling/dd_wrapper/test/CMakeLists.txt
@@ -13,11 +13,16 @@ include(GoogleTest)
 include(AnalysisFunc)
 
 if(DO_VALGRIND)
-    find_program(VALGRIND_EXECUTABLE NAMES valgrind PATHS /usr/bin /usr/local/bin)
+    find_program(
+        VALGRIND_EXECUTABLE
+        NAMES valgrind
+        PATHS /usr/bin /usr/local/bin)
 
-    if (VALGRIND_EXECUTABLE)
+    if(VALGRIND_EXECUTABLE)
         set(MEMORYCHECK_COMMAND "${VALGRIND_EXECUTABLE}")
-        set(MEMORYCHECK_COMMAND_OPTIONS "--leak-check=full --show-leak-kinds=definite --errors-for-leak-kinds=definite --trace-children=yes --error-exitcode=1 --log-fd=1 --suppressions=${CMAKE_CURRENT_SOURCE_DIR}/valgrind.supp")
+        set(MEMORYCHECK_COMMAND_OPTIONS
+            "--leak-check=full --show-leak-kinds=definite --errors-for-leak-kinds=definite --trace-children=yes --error-exitcode=1 --log-fd=1 --suppressions=${CMAKE_CURRENT_SOURCE_DIR}/valgrind.supp"
+        )
     else()
         message(FATAL_ERROR "Valgrind not found")
     endif()

diff --git a/ddtrace/internal/datadog/profiling/stack_v2/test/CMakeLists.txt b/ddtrace/internal/datadog/profiling/stack_v2/test/CMakeLists.txt
@@ -13,11 +13,16 @@ include(GoogleTest)
 include(AnalysisFunc)
 
 if(DO_VALGRIND)
-    find_program(VALGRIND_EXECUTABLE NAMES valgrind PATHS /usr/bin /usr/local/bin)
+    find_program(
+        VALGRIND_EXECUTABLE
+        NAMES valgrind
+        PATHS /usr/bin /usr/local/bin)
 
-    if (VALGRIND_EXECUTABLE)
+    if(VALGRIND_EXECUTABLE)
         set(MEMORYCHECK_COMMAND "${VALGRIND_EXECUTABLE}")
-        set(MEMORYCHECK_COMMAND_OPTIONS "--leak-check=full --show-leak-kinds=definite --errors-for-leak-kinds=definite --trace-children=yes --error-exitcode=1 --log-fd=1 --suppressions=${CMAKE_CURRENT_SOURCE_DIR}/valgrind.supp")
+        set(MEMORYCHECK_COMMAND_OPTIONS
+            "--leak-check=full --show-leak-kinds=definite --errors-for-leak-kinds=definite --trace-children=yes --error-exitcode=1 --log-fd=1 --suppressions=${CMAKE_CURRENT_SOURCE_DIR}/valgrind.supp"
+        )
     else()
         message(FATAL_ERROR "Valgrind not found")
     endif()

diff --git a/scripts/gen_circleci_config.py b/scripts/gen_circleci_config.py
@@ -51,7 +51,7 @@ def check(name: str, command: str, paths: t.Set[str]) -> None:
     check(
         name="Style",
         command="hatch run lint:style",
-        paths={"docker*", "*.py", "*.pyi", "hatch.toml", "pyproject.toml", "*.cpp", "*.h"},
+        paths={"docker*", "*.py", "*.pyi", "hatch.toml", "pyproject.toml", "*.cpp", "*.h", "CMakeLists.txt"},
     )
     check(
         name="Typing",