Default stack trace size to 50 and make it configurable

Fixes elastic#10793
akostadinov · May 21, 2019 · 7cd6bb8 · 7cd6bb8
1 parent 15ac5db
commit 7cd6bb8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/docs/static/monitoring-apis.asciidoc b/docs/static/monitoring-apis.asciidoc
@@ -721,6 +721,7 @@ The parameters allowed are:
 
 [horizontal]
 `threads`:: 	        The number of hot threads to return. The default is 10.
+`stacktrace_size`::     The depth of the stack trace to report for each thread. The default is 50.
 `human`:: 	            If true, returns plain text instead of JSON format. The default is false.
 `ignore_idle_threads`:: If true, does not return idle threads. The default is true.
 

diff --git a/logstash-core/lib/logstash/api/commands/hot_threads_reporter.rb b/logstash-core/lib/logstash/api/commands/hot_threads_reporter.rb
@@ -3,11 +3,11 @@
 
 class HotThreadsReport
   STRING_SEPARATOR_LENGTH = 80.freeze
-  HOT_THREADS_STACK_TRACES_SIZE_DEFAULT = 10.freeze
+  HOT_THREADS_STACK_TRACES_SIZE_DEFAULT = 50.freeze
 
   def initialize(cmd, options)
     @cmd = cmd
-    filter = { :stacktrace_size => options.fetch(:stacktrace_size, HOT_THREADS_STACK_TRACES_SIZE_DEFAULT) }
+    filter = { 'stacktrace_size' => "#{options.fetch(:stacktrace_size, HOT_THREADS_STACK_TRACES_SIZE_DEFAULT)}" }
     @thread_dump = ::LogStash::Util::ThreadDump.new(options.merge(:dump => ThreadsReport.generate(filter)))
   end
 

diff --git a/logstash-core/lib/logstash/api/modules/node.rb b/logstash-core/lib/logstash/api/modules/node.rb
@@ -13,9 +13,10 @@ def node
         get "/hot_threads" do
           begin
             ignore_idle_threads = params["ignore_idle_threads"] || true
-
             options = {:ignore_idle_threads => as_boolean(ignore_idle_threads)}
             options[:threads] = params["threads"].to_i if params.has_key?("threads")
+            options[:ordered_by] = params["ordered_by"] if params.has_key?("ordered_by")
+            options[:stacktrace_size] = params["stacktrace_size"] if params.has_key?("stacktrace_size")
 
             as = human? ? :string : :json
             respond_with(node.hot_threads(options), {:as => as})

diff --git a/logstash-core/src/main/java/org/logstash/instrument/monitors/HotThreadsMonitor.java b/logstash-core/src/main/java/org/logstash/instrument/monitors/HotThreadsMonitor.java
@@ -133,7 +133,7 @@ public static List<ThreadReport> detect(Map<String, String> options) {
                 throw new IllegalArgumentException("Invalid sort order");
         }
 
-        Integer threadInfoMaxDepth = 3;
+        Integer threadInfoMaxDepth = 50;
         if (options.containsKey(STACKTRACE_SIZE)) {
             threadInfoMaxDepth = Integer.valueOf(options.get(STACKTRACE_SIZE));
         }