tingyun_rpm 1.6.1 → 3.2.0

data/lib/ting_yun/agent/transaction/trace.rb

@@ -4,6 +4,7 @@ require 'ting_yun/support/helper'
 require 'ting_yun/support/coerce'
 require 'ting_yun/agent/database'
 require 'set'
+require 'digest'
 module TingYun
   module Agent
     class Transaction
@@ -16,13 +17,13 @@ module TingYun
           @node_count = 0
           @prepared = false
           @guid = generate_guid
-          @root_node = TingYun::Agent::Transaction::TraceNode.new(0.0, "ROOT")
+          @root_node = TingYun::Agent::Transaction::TraceNode.new(0.0, "ROOT",-1)
           @e_set = Set.new
         end
 
         def create_node(time_since_start, metric_name = nil)
           @node_count += 1
-          TingYun::Agent::Transaction::TraceNode.new(time_since_start, metric_name)
+          TingYun::Agent::Transaction::TraceNode.new(time_since_start, metric_name,@node_count)
         end
 
         def duration
@@ -34,7 +35,7 @@ module TingYun
 
         include TingYun::Support::Coerce
 
-        def trace_tree
+        def trace_treeV2
           [
               @start_time.round,
               request_params,
@@ -43,7 +44,28 @@ module TingYun
           ]
         end
 
-        def to_collector_array(encoder)
+        def trace_tree
+         hash =  {
+            "params" =>attributes.agent_attributes[:params],
+            "queryStringParameters" => attributes.agent_attributes[:queryString],
+            "custom" => {
+                :threadName => attributes.agent_attributes[:threadName]
+            },
+            "responseHeader" =>attributes.response_header,
+            "requestHeader" =>attributes.request_header,
+            "session" => attributes.agent_attributes[:cookie],
+            "tracers" => root_node.to_hash.flatten!
+          }
+          if attributes.agent_attributes[:method] == "GET"
+            hash["params"] = attributes.agent_attributes[:params]
+          else
+            hash["posts"] = attributes.agent_attributes[:params]
+          end
+
+          hash
+        end
+
+        def to_collector_arrayV2(encoder)
           [
               @start_time.round,
               duration,
@@ -55,6 +77,31 @@ module TingYun
           ] + array_size
         end
 
+        def to_collector_array(encoder)
+          hash = {
+            "time" => @start_time.round,
+            "tid" => attributes.agent_attributes[:tx_id],
+            "rid" => guid,
+            "duration" => duration,
+            "ip"=> attributes.agent_attributes[:ip]||"",
+            "method" => attributes.agent_attributes[:method]||"UNKNOWN",
+            "status" => attributes.agent_attributes[:httpStatus]||0,
+            "custom" => attributes.custom_params,
+            "detail" => trace_tree
+          }
+          hash["user"] = attributes.user_info unless attributes.user_info.empty?
+          hash["cross"] = attributes.agent_attributes[:cross]  unless attributes.agent_attributes[:cross].nil?
+          hash["refid"] = attributes.agent_attributes[:refid]  unless attributes.agent_attributes[:refid].nil?
+          actionName = TingYun::Helper.correctly_encoded(attributes.agent_attributes[:metric_name])
+          unless actionName.nil?
+           hash["tmd5"] = attributes.agent_attributes[:tmd5] || Digest::MD5.hexdigest(actionName)
+           hash["action"]= actionName
+          end
+          url = TingYun::Helper.correctly_encoded(attributes.agent_attributes[:url])
+          hash["url"]=url unless url.nil?
+          hash
+        end
+
         def prepare_to_send!
           return self if @prepared
 
@@ -72,7 +119,7 @@ module TingYun
 
         def collect_explain_plans!
           return unless TingYun::Agent::Database.should_action_collect_explain_plans?
-          threshold = TingYun::Agent.config[:'nbs.action_tracer.action_threshold']
+          threshold = TingYun::Agent.config[:'action_tracer.action_threshold']
           root_node.each_call do |node|
             if node[:sql] && node.duration > threshold
               node[:explainPlan] = node.explain_sql
@@ -108,7 +155,7 @@ module TingYun
         end
 
         def request_params
-          return {} unless TingYun::Agent.config['nbs.capture_params']
+          return {} unless TingYun::Agent.config['action_tracer.capture_params']
           attributes.request_params
         end
 

data/lib/ting_yun/agent/transaction/trace_node.rb

@@ -12,17 +12,28 @@ module TingYun
         attr_reader :entry_timestamp, :parent_node, :called_nodes
         attr_accessor :metric_name, :exit_timestamp, :uri, :count, :klass, :method, :name
 
+        attr_accessor :tracerId, :parentTracerId, :type,:params_data,:datas,:backtrace,:exception
+
 
 
         UNKNOWN_NODE_NAME = '<unknown>'.freeze
 
 
-        def initialize(timestamp, metric_name)
+        def initialize(timestamp, metric_name,tracerId,option={})
+          @type = option[:type] || 'Java'
           @entry_timestamp = timestamp
-          @metric_name     = metric_name || UNKNOWN_NODE_NAME
+          @metric_name     = metric_name
           @called_nodes    = nil
           @count           = 1
-          self["exception"] ||= []
+          if metric_name == "ROOT"
+            @parentTracerId = -1
+            @tracerId = 0
+          else
+            @tracerId = tracerId
+          end
+          @exception = []
+          @params_data = {}
+          @backtrace = []
         end
 
         def add_called_node(s)
@@ -32,6 +43,7 @@ module TingYun
         end
 
         def end_trace(timestamp)
+          @parentTracerId = @parent_node.tracerId  unless @parent_node.nil?
           @exit_timestamp = timestamp
         end
 
@@ -43,7 +55,7 @@ module TingYun
 
         def pre_metric_name(metric_name)
           @name ||= if metric_name.start_with?('Database ')
-                      "#{metric_name.split('/')[0]}%2F#{metric_name.split('%2F')[-1]}"
+                      "#{metric_name.split('/')[0]}/#{metric_name.split('/')[-1]}"
                     else
                       metric_name
                     end
@@ -61,6 +73,25 @@ module TingYun
               [(@called_nodes ? @called_nodes.map{|s| s.to_array} : [])]
         end
 
+        def to_hash
+          hash =  {
+              "parentTracerId" => @parentTracerId,
+              "start" => TingYun::Helper.time_to_millis(entry_timestamp),
+              "end" =>  TingYun::Helper.time_to_millis(exit_timestamp),
+              "type"=>  params[:type] || @type
+          }
+          hash["tracerId"]= @tracerId if @tracerId!=0
+          method =  params[:method] || TingYun::Support::Coerce.string(method)
+          hash["method"] = method unless method.nil?
+          hash["metric"] = TingYun::Support::Coerce.string(metric_name) unless (metric_name.nil? or metric_name=="ROOT")
+          clazz =   params[:klass] || TingYun::Support::Coerce.string(klass)
+          hash["clazz"] = clazz unless clazz.nil?
+          hash["params"] = params_data unless params_data.empty?
+          hash["backtrace"] = backtrace unless backtrace.empty?
+          hash["exception"] = exception unless exception.empty?
+          [hash].concat([(@called_nodes ? @called_nodes.map{|s| s.to_hash} : nil)].compact)
+        end
+
         def custom_params
           {}
         end
@@ -113,18 +144,23 @@ module TingYun
 
         def add_error(error)
           if error.respond_to?(:tingyun_external)
-            self["exception"] << {"message" => error.message,
-                                  "class" => "External #{error.tingyun_code}"
-                                  }
+            exception << {"msg" => error.message,
+                          "name" => "External #{error.tingyun_code}",
+                          "stack"=> error.backtrace,
+                          "error"=> false
+            }
           else
             if ::TingYun::Agent.config[:'nbs.exception.stack_enabled']
-              self["exception"] << {"message" => error.message,
-                                    "class" => error.class.name ,
-                                    "stacktrace"=> error.backtrace.reject! { |t| t.include?('tingyun_rpm') }
+              exception << {"msg" => error.message,
+                            "name" => error.class.name ,
+                            "stack"=> error.backtrace.reject! { |t| t.include?('tingyun_rpm') },
+                            "error"=> false
               }
             else
-              self["exception"] << {"message" => error.message,
-                                    "class" => error.class.name
+              exception << {"msg" => error.message,
+                            "name" => error.class.name,
+                            "stack"=> error.backtrace,
+                            "error"=> false
               }
             end
           end

data/lib/ting_yun/agent/transaction/traced_method_stack.rb

@@ -60,7 +60,7 @@ module TingYun
 
 
       def sampler_enabled?
-        TingYun::Agent.config[:'nbs.action_tracer.enabled']
+        TingYun::Agent.config[:'action_tracer.enabled']
       end
 
       def transaction_sampler

data/lib/ting_yun/agent/transaction/transaction_sample_builder.rb

@@ -35,12 +35,12 @@ module TingYun
       end
 
       def trace_entry(time)
-        if @trace.node_count == 0
-          node = @trace.create_node(time - @trace_start)
-          @trace.root_node = node
-          @current_node = node
-          return @current_node
-        end
+        # if @trace.node_count == 0
+        #   node = @trace.create_node(time - @trace_start)
+        #   @trace.root_node = node
+        #   @current_node = node
+        #   return @current_node
+        # end
         if @trace.node_count < node_limit
           node = @trace.create_node(time - @trace_start)
           @current_node.add_called_node(node)
@@ -74,9 +74,10 @@ module TingYun
         if error
           unless trace.e_set.member? error.object_id
             trace.e_set.add error.object_id
-            @current_node["exception"] << {"message" => error.message,
-                                           "class" => error.class.to_s,
-                                           "stacktrace"=> error.backtrace
+            @current_node.exception << {"msg" => error.message,
+                                           "name" => error.class.to_s,
+                                           "stack"=> error.backtrace,
+                                        "error"=> false
             }
           end
         end
@@ -98,12 +99,12 @@ module TingYun
 
 
       def transaction_trace_threshold
-        Agent.config[:'nbs.action_tracer.action_threshold']
+        Agent.config[:'action_tracer.action_threshold']
       end
 
 
       def set_txId_and_txData(txid, txdata)
-        @current_node[:txId] = txid
+        @current_node[:tx_id] = txid
         @current_node[:txData] = txdata
       end
 

data/lib/ting_yun/agent/transaction/transaction_state.rb

@@ -19,7 +19,10 @@ module TingYun
                     :client_req_id,
                     :thrift_return_data,
                     :extenel_req_id,
-                    :externel_time
+                    :externel_time,
+                    :transaction_name_md5,
+                    :action_type,
+                    :call_list
 
 
 
@@ -52,6 +55,8 @@ module TingYun
         @current_transaction = nil
         @traced_method_stack = TingYun::Agent::TracedMethodStack.new
         @record_tt = nil
+        @action_type = "Transaction" #[WebAction, Transaction]
+        @client_tingyun_id_secret = TingYun::Agent.config[:idSecret]
       end
 
       # This starts the timer for the transaction.
@@ -110,7 +115,6 @@ module TingYun
 
       def save_referring_transaction_info(data)
         data = Array(data)
-        @client_tingyun_id_secret = data.shift
         data.each do |e|
           if m = e.match(/x=/)
             @client_transaction_id = m.post_match
@@ -118,8 +122,12 @@ module TingYun
             @client_req_id = m.post_match
           elsif m = e.match(/e=/)
             @extenel_req_id = m.post_match
-          elsif m = e.match(/s=/)
-            @externel_time = m.post_match
+          elsif m = e.match(/n=/)
+            @transaction_name_md5 = m.post_match
+          elsif m = e.match(/c=/)
+            @call_list = m.post_match
+            @action_type = "WebAction" if @call_list.start_with?("S|")
+            @client_tingyun_id_secret = "#{TingYun::Agent.config[:idSecret]},#{call_list}"
           end
         end
       end
@@ -145,7 +153,7 @@ module TingYun
       end
 
       def same_account?
-        server_info = TingYun::Agent.config[:tingyunIdSecret].split('|')
+        server_info = TingYun::Agent.config[:idSecret].split('|')
         client_info = (@client_tingyun_id_secret || '').split('|')
         if server_info[0] && !server_info[0].empty? && server_info[0] == client_info[0]
           return true
@@ -172,6 +180,9 @@ module TingYun
       def add_current_node_params(hash)
         transaction_sample_builder.current_node.merge hash if transaction_sample_builder
       end
+      def add_current_node_paramsV3(hash)
+        transaction_sample_builder.current_node.params_data.merge! hash if transaction_sample_builder
+      end
     end
   end
 end

data/lib/ting_yun/agent/transaction/transaction_timings.rb

@@ -54,7 +54,7 @@ module TingYun
       # Helpers
 
       def slow_action_tracer?
-        return app_time_in_millis > TingYun::Agent.config[:'nbs.action_tracer.action_threshold']
+        return app_time_in_millis > TingYun::Agent.config[:'action_tracer.action_thresholdaction_tracer.action_threshold']
       end
 
       def convert_to_milliseconds(value_in_seconds)

data/lib/ting_yun/configuration/default_source.rb

@@ -143,6 +143,13 @@ module TingYun
             :allowed_from_server => false,
             :description => 'Your Ting Yun <a href="">license key</a>.'
         },
+        :collector_addresses => {
+            :default => '',
+            :public => true,
+            :type => String,
+            :allowed_from_server => false,
+            :description => 'few of DC adr,  ip:port'
+        },
         :enabled => {
             :default => true,
             :public => true,
@@ -150,7 +157,7 @@ module TingYun
             :allowed_from_server => true,
             :description => 'Enable or disable the agent.'
         },
-        :'nbs.agent_enabled' => {
+        :'agent_enabled' => {
             :default => true,
             :public => true,
             :type => Boolean,
@@ -158,17 +165,40 @@ module TingYun
             :description => 'Enable or disable the agent.'
         },
         :app_name => {
-            :default => DefaultSource.app_name,
+            :default => "",
             :public => true,
             :type => String,
             :allowed_from_server => false,
             :description => 'Semicolon-delimited list of Naming your application.'
         },
+        :'instance.name' => {
+            :default => "",
+            :public => true,
+            :type => String,
+            :allowed_from_server => false,
+            :description => ''
+        },
         :'nbs.auto_app_naming' => {
             :default => false,
             :public => true,
             :type => Boolean,
             :allowed_from_server => true,
+            :exclude_from_reported_settings => true,
+            :description => 'Enable or disable to identify the application name'
+        },
+        :'user_info.rules' => {
+            :default => "{}",
+            :public => true,
+            :type => String,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :'auto_app_naming' => {
+            :default => false,
+            :public => true,
+            :type => Boolean,
+            :allowed_from_server => true,
+            :exclude_from_reported_settings => true,
             :description => 'Enable or disable to identify the application name'
         },
         :'nbs.urls_captured' => {
@@ -176,12 +206,14 @@ module TingYun
             :public => true,
             :type => String,
             :allowed_from_server => true,
+            :exclude_from_reported_settings => true,
             :description => '换行符分隔的URL正则表达式列表，缺省为采集全部URL。若指定此参数，则仅采集列表中的URL，忽略其它用户不关心URL '
         },
-        :'nbs.ignored_params' => {
+        :'action_tracer.ignored_params' => {
             :default => '',
             :public => true,
             :type => String,
+            :exclude_from_reported_settings => true,
             :allowed_from_server => true,
             :description => 'Enable or disable Specifies HTTP request parameters '
         },
@@ -189,6 +221,7 @@ module TingYun
             :default => true,
             :public => true,
             :type => Boolean,
+            :exclude_from_reported_settings => true,
             :allowed_from_server => true,
             :description => 'Enable or disable recording of traced errors and error count metrics.'
         },
@@ -196,6 +229,7 @@ module TingYun
             :default => '',
             :public => true,
             :type => String,
+            :exclude_from_reported_settings => true,
             :allowed_from_server => true,
             :description => 'Enable or disable Specifies HTTP response code '
         },
@@ -204,6 +238,7 @@ module TingYun
             :public => true,
             :type => String,
             :allowed_from_server => true,
+            :exclude_from_reported_settings => true,
             :description => 'Specify a comma-delimited list of error classes that the agent should ignore'
         },
         :"nbs.error_collector.record_db_errors" => {
@@ -211,20 +246,23 @@ module TingYun
             :public => true,
             :type => Boolean,
             :allowed_from_server => true,
+            :exclude_from_reported_settings => true,
             :description => ' '
         },
-        :'nbs.action_tracer.enabled' => {
+        :'action_tracer.enabled' => {
             :default => true,
             :public => true,
             :type => Boolean,
             :allowed_from_server => true,
+            :exclude_from_reported_settings => true,
             :description => '是否启用Web事务跟踪'
         },
-        :'nbs.action_tracer.action_threshold' => {
-            :default => DefaultSource.action_tracer_action_threshold,
+        :'action_tracer.action_threshold' => {
+            :default => 500,
             :allow_nil => true,
             :public => true,
             :type => Fixnum,
+            :exclude_from_reported_settings => true,
             :allowed_from_server => true,
             :description => 'The agent will collect traces for action that exceed this time threshold (in millisecond). Specify a int value or <code><a href="">apdex_f</a></code>.'
         },
@@ -232,6 +270,7 @@ module TingYun
             :default => 'obfuscated',
             :public => true,
             :type => String,
+            :exclude_from_reported_settings => true,
             :allowed_from_server => true,
             :description => 'Obfuscation level for SQL queries reported in action trace nodes. Valid options are <code>obfuscated</code>, <code>raw</code>, <code>off</code>.'
         },
@@ -239,13 +278,15 @@ module TingYun
             :default => true,
             :public => true,
             :type => Boolean,
+            :exclude_from_reported_settings => true,
             :allowed_from_server => true,
             :description => 'Enable or disable collection of slow SQL queries.'
         },
-        :'nbs.action_tracer.slow_sql_threshold' => {
+        :'action_tracer.slow_sql_threshold' => {
             :default => 500,
             :public => true,
             :type => Fixnum,
+            :exclude_from_reported_settings => true,
             :allowed_from_server => true,
             :description => 'The agent will collect traces for slow_sql that exceed this time threshold (in millisecond). Specify a int value or <code><a href="">apdex_f</a></code>.'
         },
@@ -253,6 +294,7 @@ module TingYun
             :default => true,
             :public => true,
             :type => Boolean,
+            :exclude_from_reported_settings => true,
             :allowed_from_server => true,
             :description => 'Enable or disable the collection of explain plans in action traces. This setting will also apply to explain plans in Slow SQL traces if slow_sql.explain_enabled is not set separately.'
         },
@@ -260,6 +302,7 @@ module TingYun
             :default => 500,
             :public => true,
             :type => Fixnum,
+            :exclude_from_reported_settings => true,
             :allowed_from_server => true,
             :description => 'Threshold (in millisecond) above which the agent will collect explain plans. Relevant only when <code><a href="">explain_enabled</a></code> is true.'
         },
@@ -275,12 +318,14 @@ module TingYun
             :public => true,
             :type => Boolean,
             :allowed_from_server => true,
+            :exclude_from_reported_settings => true,
             :description => 'Enable or disable to trace nbs web request'
         },
         :'nbs.rum.enabled' => {
             :default => false,
             :public => true,
             :type => Boolean,
+            :exclude_from_reported_settings => true,
             :allowed_from_server => true,
             :description => 'Enable or disable page load timing (sometimes referred to as real user monitoring or RUM).'
         },
@@ -300,8 +345,8 @@ module TingYun
             :allowed_from_server => true,
             :description => '混合嵌码'
         },
-        :'nbs.rum.sample_ratio' => {
-            :default => 1,
+        :'rum.sample_ratio' => {
+            :default => 1.0,
             :public => true,
             :type => Fixnum,
             :allowed_from_server => true,
@@ -311,14 +356,16 @@ module TingYun
             :default => '',
             :allow_nil => true,
             :public => false,
+            :exclude_from_reported_settings => true,
             :type => String,
             :allowed_from_server => true,
             :description => 'obfuscate the special sql fields'
         },
-        :'nbs.action_tracer.stack_trace_threshold' => {
-            :default => 500,
+        :'action_tracer.stack_trace_threshold' => {
+            :default => 200,
             :public => true,
             :type => Fixnum,
+            :exclude_from_reported_settings => true,
             :allowed_from_server => true,
             :description => 'Threshold (in millisecond) above which the agent will collect stack_trace.'
         },
@@ -327,6 +374,7 @@ module TingYun
             :public => true,
             :type => String,
             :allowed_from_server => true,
+            :exclude_from_reported_settings => true,
             :description => 'Enable or disable Specifies External  request parameters  '
         },
         :agent_log_file_path => {
@@ -357,6 +405,13 @@ module TingYun
             :allowed_from_server => false,
             :description => "The remaining number of log file, delete the earliest when more than this value."
         },
+        :agent_log_file_count => {
+            :default => 10,
+            :public => true,
+            :type => Fixnum,
+            :allowed_from_server => false,
+            :description => "The remaining number of log file, delete the earliest when more than this value."
+        },
         :agent_log_file_check_days => {
             :default => 7,
             :public => true,
@@ -369,6 +424,7 @@ module TingYun
             :public => false,
             :type => Array,
             :allowed_from_server => false,
+            :exclude_from_reported_settings => true,
             :description => "An array of candidate locations for the agent's configuration file."
         },
         :dispatcher => {
@@ -399,6 +455,13 @@ module TingYun
             :allowed_from_server => false,
             :description => 'Enable or disable to log the transmission-date for developer'
         },
+        :'audit_mode' => {
+            :default => false,
+            :public => true,
+            :type => Boolean,
+            :allowed_from_server => false,
+            :description => 'Enable or disable to log the transmission-date for developer'
+        },
         :agent_log_level => {
             :default => 'info',
             :public => true,
@@ -412,6 +475,7 @@ module TingYun
             :public => true,
             :type => String,
             :allowed_from_server => false,
+            :exclude_from_reported_settings => true,
             :description => 'Defines a host for communicating with Ting Yun via a proxy server.'
         },
         :proxy_port => {
@@ -420,6 +484,7 @@ module TingYun
             :public => true,
             :type => Fixnum,
             :allowed_from_server => false,
+            :exclude_from_reported_settings => true,
             :description => 'Defines a port for communicating with Ting Yun via a proxy server.'
         },
         :proxy_user => {
@@ -428,6 +493,7 @@ module TingYun
             :public => true,
             :type => String,
             :allowed_from_server => false,
+            :exclude_from_reported_settings => true,
             :description => 'Defines a user for communicating with Ting Yun via a proxy server.'
         },
         :proxy_password => {
@@ -444,6 +510,7 @@ module TingYun
             :public => false,
             :type => String,
             :allowed_from_server => false,
+            :exclude_from_reported_settings => true,
             :description => "URI for the Ting Yun data collection service."
         },
         :port => {
@@ -452,6 +519,7 @@ module TingYun
             :public => false,
             :type => Fixnum,
             :allowed_from_server => false,
+            :exclude_from_reported_settings => true,
             :description => 'Port for the Ting Yun data collection service.'
         },
         :api_host => {
@@ -459,6 +527,7 @@ module TingYun
             :public => false,
             :type => String,
             :allowed_from_server => false,
+            :exclude_from_reported_settings => true,
             :description => 'API host for Ting Yun.'
         },
         :api_port => {
@@ -466,6 +535,7 @@ module TingYun
             :public => false,
             :type => Fixnum,
             :allowed_from_server => false,
+            :exclude_from_reported_settings => true,
             :description => 'Port for the TingYun  API host.'
         },
         :disable_middleware_instrumentation => {
@@ -528,7 +598,7 @@ module TingYun
             :description => "Manual override for the path to your local CA bundle. This CA bundle will be used to validate the SSL certificate presented by Ting Yun's data collection service."
         },
         :ssl => {
-            :default => true,
+            :default => false,
             :allow_nil => true,
             :public => true,
             :type => Boolean,
@@ -554,6 +624,7 @@ module TingYun
             :public => false,
             :type => Fixnum,
             :allowed_from_server => false,
+            :exclude_from_reported_settings => true,
             :description => 'Number of seconds betwixt connections to the Ting Yun data collection service.'
         },
         :'action_tracer.log_sql' => {
@@ -561,6 +632,7 @@ module TingYun
             :public => true,
             :type => Boolean,
             :allowed_from_server => false,
+            :exclude_from_reported_settings => true,
             :description => 'Enable or disable(write into log file) collection of SQL queries.'
         },
         :daemon_debug => {
@@ -575,20 +647,22 @@ module TingYun
             :public => true,
             :type => String,
             :allowed_from_server => false,
+            :exclude_from_reported_settings => true,
             :description => 'Enable or disable Specifies url'
         },
-        :'nbs.auto_action_naming' => {
+        :'auto_action_naming' => {
             :default => true,
             :public => true,
             :type => Boolean,
             :allowed_from_server => true,
             :description => 'Enable or disable to use default name '
         },
-        :'nbs.capture_params' => {
+        :'action_tracer.capture_params' => {
             :default => false,
             :public => true,
             :type => Boolean,
             :allowed_from_server => true,
+            :exclude_from_reported_settings => true,
             :description => 'Enable or disable the capture of HTTP request parameters to be attached to transaction traces and traced errors.'
         },
         :config_path => {
@@ -604,6 +678,7 @@ module TingYun
             :type => Fixnum,
             :allowed_from_server => true,
             :deprecated => true,
+            :exclude_from_reported_settings => true,
             :description => 'millisecond'
         },
         :'transaction_tracer.limit_segments' => {
@@ -627,7 +702,7 @@ module TingYun
             :allowed_from_server => false,
             :description => 'Controls whether to normalize string encodings prior to serializing data for the collector to JSON.'
         },
-        :tingyunIdSecret => {
+        :idSecret => {
             :default => '',
             :public => true,
             :type => String,
@@ -660,6 +735,7 @@ module TingYun
             :public => true,
             :type => Array,
             :allowed_from_server => false,
+            :exclude_from_reported_settings => true,
             :description => 'Specify an array of Rake tasks to automatically instrument.'
         },
         :'rake.black.tasks' => {
@@ -667,6 +743,7 @@ module TingYun
             :public => true,
             :type => Array,
             :allowed_from_server => false,
+            :exclude_from_reported_settings => true,
             :description => 'Specify an array of Rake tasks to automatically uninstrument.'
         },
         :'nbs.transaction_tracer.thrift' =>{
@@ -676,6 +753,20 @@ module TingYun
             :allowed_from_server => true,
             :description => 'Enable or disable the thrift cross application feature'
         },
+        :"thrift.enabled" => {
+            :default => false,
+            :public => true,
+            :type => Boolean,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"function.fetch_enabled" => {
+            :default => true,
+            :public => true,
+            :type => Boolean,
+            :allowed_from_server => true,
+            :description => ''
+        },
         :restart_thread_in_children => {
             :default => true,
             :public => false,
@@ -688,9 +779,10 @@ module TingYun
             :public => true,
             :type => String,
             :allowed_from_server => true,
+            :exclude_from_reported_settings => true,
             :description => 'Quantile'
         },
-        :'nbs.mq.enabled' => {
+        :'mq.enabled' => {
             :default => false,
             :public => true,
             :type => Boolean,
@@ -702,7 +794,226 @@ module TingYun
             :public => true,
             :type => Boolean,
             :allowed_from_server => true,
+            :exclude_from_reported_settings => true,
+            :description => 'Enable or disable the  exception trace'
+        },
+        :"business_id.rules" => {
+            :default => "[]",
+            :public => true,
+            :type => String,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"hotspot.black_list" => {
+            :default => "",
+            :public => true,
+            :type => String,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :'hotspot.enabled' => {
+            :default => false,
+            :public => true,
+            :type => Boolean,
+            :allowed_from_server => true,
+            :exclude_from_reported_settings => true,
             :description => 'Enable or disable the  exception trace'
+        },
+        :"mTime" => {
+            :default => 0,
+            :public => true,
+            :type => Fixnum,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"rum.mode" => {
+            :default => "",
+            :public => true,
+            :type => String,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"action_tracer.obfuscate_sql" => {
+            :default => false,
+            :public => true,
+            :type => Boolean,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"hotspot.period" => {
+            :default => 0,
+            :public => true,
+            :type => Fixnum,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"action_tracer.stack_enabled" => {
+            :default => true,
+            :public => true,
+            :type => Boolean,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"error_collector.stack_enabled" => {
+            :default => true,
+            :public => true,
+            :type => Boolean,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"error_collector.enabled" => {
+            :default => true,
+            :public => true,
+            :type => Boolean,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"hotspot.interval" => {
+            :default => 0,
+            :public => true,
+            :type => Fixnum,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"action_tracer.rules" => {
+            :default => "[]",
+            :public => true,
+            :type => String,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"business_error.rules" => {
+            :default => "[]",
+            :public => true,
+            :type => String,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"apm_data.rules" => {
+            :default => "[]",
+            :public => true,
+            :type => String,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"error_collector.ignored_exception_classes" => {
+            :default => "",
+            :public => true,
+            :type => String,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"function.rules" => {
+            :default => "[]",
+            :public => true,
+            :type => String,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"action_tracer.max" => {
+            :default => 2000,
+            :public => true,
+            :type => Fixnum,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"log_tracking" => {
+            :default => true,
+            :public => true,
+            :type => Boolean,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"data_item.rules" => {
+            :default => "",
+            :public => true,
+            :type => String,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"quantile" => {
+            :default => "[]",
+            :public => true,
+            :type => String,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"appId" => {
+            :default => 265,
+            :public => true,
+            :type => Fixnum,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"ignore_static_resources" => {
+            :default => true,
+            :public => true,
+            :type => Boolean,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"error_collector.ignored_status_codes" => {
+            :default => "",
+            :public => true,
+            :type => String,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"custom_data.max" => {
+            :default => 1000,
+            :public => true,
+            :type => Fixnum,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"hotspot.white_list" => {
+            :default => "",
+            :public => true,
+            :type => String,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"hotspot.rules" => {
+            :default => "[]",
+            :public => true,
+            :type => String,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"custom_data.rules" => {
+            :default => "[]",
+            :public => true,
+            :type => String,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"business_data.rules" => {
+            :default => "[]",
+            :public => true,
+            :type => String,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"nosql.rules" => {
+            :default => "[]",
+            :public => true,
+            :type => String,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"data.rules" => {
+            :default => "[]",
+            :public => true,
+            :type => String,
+            :allowed_from_server => true,
+            :description => ''
+        },
+        :"resource_breaker" => {
+            :default => {},
+            :public => true,
+            :type => Hash,
+            :allowed_from_server => true,
+            :description => ''
         }
     }.freeze
   end