1 files changed, 16 insertions, 6 deletions
diff --git a/lib/gitlab/memory/jemalloc.rb b/lib/gitlab/memory/jemalloc.rb
index 454c54569de..7163a70a5cb 100644
--- a/lib/gitlab/memory/jemalloc.rb
+++ b/lib/gitlab/memory/jemalloc.rb
@@ -14,6 +14,8 @@ module Gitlab
 
       STATS_DEFAULT_FORMAT = :json
 
+      FILENAME_PREFIX = 'jemalloc_stats'
+
       # Return jemalloc stats as a string.
       def stats(format: STATS_DEFAULT_FORMAT)
         verify_format!(format)
@@ -23,16 +25,24 @@ module Gitlab
         end
       end
 
-      # Write jemalloc stats to the given directory.
-      def dump_stats(path:, format: STATS_DEFAULT_FORMAT)
+      # Write jemalloc stats to the given directory
+      # @param [String] path Directory path the dump will be put into
+      # @param [String] format `json` or `txt`
+      # @param [String] filename_label Optional custom string that will be injected into the file name, e.g. `worker_0`
+      # @return [String] Full path to the resulting dump file
+      def dump_stats(path:, format: STATS_DEFAULT_FORMAT, filename_label: nil)
         verify_format!(format)
 
+        format_settings = STATS_FORMATS[format]
+        file_path = File.join(path, file_name(format_settings[:extension], filename_label))
+
         with_malloc_stats_print do |stats_print|
-          format_settings = STATS_FORMATS[format]
-          File.open(File.join(path, file_name(format_settings[:extension])), 'wb') do |io|
+          File.open(file_path, 'wb') do |io|
             write_stats(stats_print, io, format_settings)
           end
         end
+
+        file_path
       end
 
       private
@@ -80,8 +90,8 @@ module Gitlab
         stats_print.call(callback, nil, format[:options])
       end
 
-      def file_name(extension)
-        "jemalloc_stats.#{$$}.#{Time.current.to_i}.#{extension}"
+      def file_name(extension, filename_label)
+        [FILENAME_PREFIX, $$, filename_label, Time.current.to_i, extension].reject(&:blank?).join('.')
       end
     end
   end