From 70116bf4e81a8b699a109f19cc4c3c37cc3a2a8d Mon Sep 17 00:00:00 2001
From: Ivo Anjo <ivo.anjo@datadoghq.com>
Date: Tue, 26 Nov 2024 14:18:08 +0000
Subject: [PATCH] Merge pull request #4162 from
 DataDog/ivoanjo/fix-suppresions-after-pr-4161

[PROF-10967] Fix missing suppressions after PR 4161 got merged
---
 .github/workflows/test-memory-leaks.yaml |  1 +
 suppressions/ruby-3.4.supp               | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/.github/workflows/test-memory-leaks.yaml b/.github/workflows/test-memory-leaks.yaml
index 64e424f9a63..05ce09fb6db 100644
--- a/.github/workflows/test-memory-leaks.yaml
+++ b/.github/workflows/test-memory-leaks.yaml
@@ -12,6 +12,7 @@ jobs:
           bundler: latest
           cache-version: v1 # bump this to invalidate cache
       - run: sudo apt-get update && (sudo apt-get install -y valgrind || sleep 5 && sudo apt-get install -y valgrind) && valgrind --version
+      - run: gem update --system 3.5.23 # TODO: This is a workaround for a buggy rubygems in 3.4.0-preview2; remove once stable version 3.4 is out
       - run: bundle exec rake compile spec:profiling:memcheck
   test-asan:
     runs-on: ubuntu-24.04
diff --git a/suppressions/ruby-3.4.supp b/suppressions/ruby-3.4.supp
index 9910e76b275..646151fa9fb 100644
--- a/suppressions/ruby-3.4.supp
+++ b/suppressions/ruby-3.4.supp
@@ -45,6 +45,21 @@
   ...
 }
 
+# When a Ruby process forks, it looks like Ruby doesn't clean up the memory of old threads?
+{
+  ruby-native-thread-memory-3
+  Memcheck:Leak
+  fun:calloc
+  fun:calloc1
+  fun:rb_gc_impl_calloc
+  fun:ruby_xcalloc
+  fun:native_thread_alloc
+  fun:native_thread_create_dedicated
+  fun:native_thread_create
+  fun:thread_create_core
+  ...
+}
+
 # We don't care about the pkg-config external tool
 {
   pkg-config-memory