tingyun_rpm 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e1698a0cac85df291567637e7d8905c7dd5d30b
-  data.tar.gz: 504578a77dac8308f1f43d6cec9933da44778a57
+  metadata.gz: 29a46f9e5110b810ddbb29e1b593e25bf725c831
+  data.tar.gz: f6b0999a21a723f30279702f07c286cfa0ad17ca
 SHA512:
-  metadata.gz: e067d0a87a03f9428e811cea75288256ad09cc992ead66d89337ca6966d7428acaa6c2a781a67bf91b77ef62a20057c1d65445dbe6640bc686f43b0ceb52c0ff
-  data.tar.gz: 9246032c6e6841630838a20713a86355a4f73b5085ff3ce1f066988646409dc4b688f2fde31b3fa4d2e4f0e72ea8f6cbb54bf8f070d42ab8f1feae63c33cece7
+  metadata.gz: f20f812206d86863956dc05afb7da78c2e559dc95ef9d9971e3d5d0d3210f1739ddb011e0234b634038c7c0204520fde8914f55bf2772a55070702a5e8ab9a83
+  data.tar.gz: b58306111cfcc24c1f88d3467da3b9a77e5e410b8c8b93e2ebdafafe5c72922828e03c9abb6a89b00ff75d8a8dfd71163b6b582363ce7139a78cb034a6aef36c

data/.gitignore

@@ -12,3 +12,4 @@ log/
 .idea/
 todo
 .DS_Store
+/git_stats

data/lib/ting_yun/agent/agent.rb

@@ -95,8 +95,16 @@ module TingYun
         end
       end
 
+      def sinatra_classic_app?
+        defined?(::Sinatra::Base) && ::Sinatra::Base.respond_to?(:run!)
+      end
+
+      def should_install_exit_handler?
+        !sinatra_classic_app?
+      end
 
       def install_exit_handler
+        return unless should_install_exit_handler?
         TingYun::Agent.logger.debug("Installing at_exit handler")
         at_exit do
           if defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby" && RUBY_VERSION.match(/^1\.9/)

data/lib/ting_yun/agent/collector/stats_engine/base_quantile_hash.rb

@@ -0,0 +1,20 @@
+module TingYun
+  module Agent
+    module Collector
+      class BaseQuantileHash
+        attr_reader :hash
+
+        def initialize
+          @hash = {}
+        end
+
+        def merge!(hash)
+          hash.each do |name, time|
+            @hash[name] ||= []
+            @hash[name] << time
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ting_yun/agent/collector/stats_engine/metric_stats.rb

@@ -127,6 +127,7 @@ module TingYun
           def reset!
             with_stats_lock do
               @stats_hash = StatsHash.new
+              @base_quantile_hash = BaseQuantileHash.new
             end
           end
 
@@ -140,6 +141,15 @@ module TingYun
             snapshot
           end
 
+          def harvest_base_quantile_hash!
+            snapshot = nil
+            with_stats_lock do
+              snapshot = @base_quantile_hash
+              @base_quantile_hash = BaseQuantileHash.new
+            end
+            snapshot
+          end
+
           # Renamed to reset!, here for backwards compatibility with 3rd-party
           # gems (though this really isn't part of the public API).
           # @deprecated

data/lib/ting_yun/agent/collector/stats_engine.rb

@@ -2,6 +2,7 @@
 
 require 'ting_yun/agent/collector/stats_engine/stats_hash'
 require 'ting_yun/agent/collector/stats_engine/metric_stats'
+require 'ting_yun/agent/collector/stats_engine/base_quantile_hash'
 
 module TingYun
   module Agent
@@ -11,10 +12,12 @@ module TingYun
 
         include MetricStats
 
+        attr_reader :base_quantile_hash
 
         def initialize
           @stats_lock = Mutex.new
           @stats_hash = StatsHash.new
+          @base_quantile_hash = BaseQuantileHash.new
         end
 
         # All access to the @stats_hash ivar should be funnelled through this
@@ -22,6 +25,12 @@ module TingYun
         def with_stats_lock
           @stats_lock.synchronize { yield }
         end
+
+        def record_base_quantile(hash)
+          with_stats_lock do
+            @base_quantile_hash.merge!(hash)
+          end
+        end
       end
     end
   end

data/lib/ting_yun/agent/collector/transaction_sampler/class_method.rb

@@ -14,10 +14,10 @@ module TingYun
           end
 
           # Informs the transaction sample builder about the end of a traced frame
-          def notice_pop_frame(state, frame, time = Time.now)
+          def notice_pop_frame(state, frame, time = Time.now, klass_name=nil)
             builder = state.transaction_sample_builder
             return unless builder
-            builder.trace_exit(frame, time.to_f)
+            builder.trace_exit(frame, time.to_f, klass_name)
           end
 
 

data/lib/ting_yun/agent/cross_app/cross_app_tracing.rb

@@ -35,9 +35,9 @@ module TingYun
         begin
           node = start_trace(state, t0, request)
           response = yield
-          capture_exception(response, request, 'net%2Fhttp')
+          capture_exception(response, request)
         rescue => e
-          klass = "External/#{request.uri.to_s.gsub('/','%2F')}/net%2Fhttp"
+          klass = "External/#{request.uri.to_s.gsub(/\/\z/,'').gsub('/','%2F')}/#{request.from}"
           handle_error(e, klass)
         ensure
           finish_trace(state, t0, node, request, response)
@@ -89,7 +89,7 @@ module TingYun
         ::TingYun::Agent::Collector::TransactionSampler.add_node_info(:uri => TingYun::Agent::HTTPClients::URIUtil.filter_uri(request.uri))
         if cross_app
           ::TingYun::Agent::Collector::TransactionSampler.tl_builder.set_txId_and_txData(state.client_transaction_id || state.request_guid,
-                                                             TingYun::Support::Serialize::JSONWrapper.load(response[TY_DATA_HEADER].gsub("'",'"')))
+                                                                                         TingYun::Support::Serialize::JSONWrapper.load(get_ty_data_header(response).gsub("'",'"')))
         end
       end
 
@@ -123,8 +123,8 @@ module TingYun
 
       def metrics_for_regular_request( request )
         metrics = []
-        metrics << "External/#{request.uri.to_s.gsub('/','%2F')}/net%2Fhttp"
-        metrics << "External/#{request.uri.to_s.gsub('/','%2F')}/net%2Fhttp"
+        metrics << "External/#{request.uri.to_s.gsub(/\/\z/,'').gsub('/','%2F')}/#{request.from}"
+        metrics << "External/#{request.uri.to_s.gsub(/\/\z/,'').gsub('/','%2F')}/#{request.from}"
 
         return metrics
       end
@@ -138,8 +138,7 @@ module TingYun
 
       # Inject the X-Process header into the outgoing +request+.
       def inject_request_headers(state, request)
-        cross_app_id  = TingYun::Agent.config[:tingyunIdSecret] or
-            raise TingYun::Agent::CrossAppTracing::Error, "no tingyunIdSecret configured"
+        cross_app_id  = TingYun::Agent.config[:tingyunIdSecret]
 
         request[TY_ID_HEADER] = "#{cross_app_id};c=1;x=#{state.request_guid}"
       end
@@ -148,8 +147,8 @@ module TingYun
       # has the appropriate headers.
       def response_is_cross_app?( response )
         return false unless response
-        return false unless response[TY_DATA_HEADER]
         return false unless cross_app_enabled?
+        return false unless get_ty_data_header(response)
 
         return true
       end
@@ -157,8 +156,8 @@ module TingYun
       # Return the set of metric objects appropriate for the given cross app
       # +response+.
       def metrics_for_cross_app_response(request, response )
-        my_data =  TingYun::Support::Serialize::JSONWrapper.load response[TY_DATA_HEADER].gsub("'",'"')
-        uri = "#{request.uri.to_s.gsub('/','%2F')}/net%2Fhttp"
+        my_data =  TingYun::Support::Serialize::JSONWrapper.load get_ty_data_header(response).gsub("'",'"')
+        uri = "#{request.uri.to_s.gsub(/\/\z/,'').gsub('/','%2F')}/#{request.from}"
         metrics = []
         metrics << "cross_app;#{my_data["id"]};#{my_data["action"]};#{uri}"
         metrics << "External/#{my_data["action"]}:#{uri}"
@@ -166,6 +165,13 @@ module TingYun
         return metrics
       end
 
+      def get_ty_data_header(response)
+        if defined?(::HTTP) && defined?(::HTTP::Message) && response.class == ::HTTP::Message
+          response.header[TY_DATA_HEADER].first rescue nil
+        else
+          response[TY_DATA_HEADER] rescue nil
+        end
+      end
     end
   end
 end

data/lib/ting_yun/agent/datastore/metric_helper.rb

@@ -9,7 +9,7 @@ module TingYun
         ALL_WEB = "AllWeb".freeze
         ALL_BACKGROUND = "AllBackground".freeze
         ALL = "All".freeze
-
+        UNKNOWN = 'Unknown'.freeze
         NOSQL = %w(MongoDB Redis Memcached).freeze
 
         CACHE = %w(Redis Memcached).freeze
@@ -18,11 +18,21 @@ module TingYun
           NOSQL.include?(product)
         end
 
-        def self.metric_name(product, collection, operation)
+        def self.metric_name(product, collection, operation,host,port,dbname)
+          if checkNosql(product)
+            return "#{product}/#{host}:#{port}%2F#{dbname}%2F#{collection}/#{operation}" if product=="MongoDB"
+            "#{product}/#{host}:#{port}%2F#{collection}/#{operation}"
+          else
+            "Database #{product}/#{host}:#{port}%2F#{dbname}%2F#{collection}/#{operation}"
+          end
+        end
+
+        def self.metric_name_others(product, collection, operation)
+          collection ||= 'NULL'
           if checkNosql(product)
-              "#{product}/#{collection}/#{operation}"
+            "#{product}%2F#{collection}/#{operation}"
           else
-            "Database #{product}/#{collection}/#{operation}"
+            "Database #{product}%2F#{collection}/#{operation}"
           end
         end
 
@@ -34,9 +44,16 @@ module TingYun
           end
         end
 
+        def self.metrics_for_message(product, ip_host, operation)
+          metrics = TingYun::Agent::Transaction.recording_web_transaction? ? [ALL_WEB, ALL] : [ALL_BACKGROUND, ALL]
+          metrics = metrics.map { |suffix| "Message #{product}/NULL/#{suffix}" }
+          metrics.unshift "Message #{product}/#{ip_host}/#{operation}"
+        end
 
-
-        def self.metrics_for(product, operation, collection = nil, generic_product = nil)
+        def self.metrics_for(product, operation, host = UNKNOWN, port = 0, dbname = UNKNOWN, collection = nil,  generic_product = nil )
+          dbname ||= UNKNOWN
+          host ||= UNKNOWN
+          port ||= UNKNOWN
           operation = operation.to_s.upcase
           if overrides = overridden_operation_and_collection   # [method, model_name, product]
             if should_override?(overrides, product, generic_product)
@@ -56,7 +73,14 @@ module TingYun
             product_suffixed_rollup(product,suffix)
           end
 
-          metrics.unshift metric_name(product, collection, operation) if collection
+          if checkNosql(product)
+            metrics << (product=="MongoDB" ? "#{product}/#{host}:#{port}%2F#{dbname}/All" : "#{product}/#{host}:#{port}/All")
+          else
+            metrics << "Database #{product}/#{host}:#{port}%2F#{dbname}/All"
+          end
+          metrics.unshift metric_name(product, collection, operation,host,port,dbname) if collection
+          metrics.unshift  "#{product}/#{host}:#{port}/#{operation}" if product=="Memcached"
+          metrics.unshift  metric_name_others(product, collection, operation)
           metrics
         end
 

data/lib/ting_yun/agent/datastore.rb

@@ -1,29 +1,24 @@
 # encoding: utf-8
 
 require 'ting_yun/agent/datastore/metric_helper'
-require 'ting_yun/agent/method_tracer'
+require 'ting_yun/agent/method_tracer_helpers'
 
 
 module TingYun
   module Agent
     module Datastore
-
-
-      def self.wrap(product, operation, collection = nil, callback = nil)
+      def self.wrap(product, operation, collection = nil, ip_address = nil, port = nil, dbname=nil,  callback = nil )
         return yield unless operation
 
-        metrics = TingYun::Agent::Datastore::MetricHelper.metrics_for(product, operation, collection)
-
-        scoped_metric = metrics.last
-
-        TingYun::Agent::MethodTracer.trace_execution_scoped(metrics) do
+        klass_name, *metrics = TingYun::Agent::Datastore::MetricHelper.metrics_for(product, operation, ip_address , port, dbname,collection )
+        TingYun::Agent::MethodTracerHelpers.trace_execution_scoped(metrics, {}, nil, klass_name) do
           t0 = Time.now
           begin
-            result = yield
+            yield
           ensure
             elapsed_time = (Time.now - t0).to_f
             if callback
-              callback.call(result, scoped_metric, elapsed_time)
+              callback.call(elapsed_time)
             end
           end
         end

data/lib/ting_yun/agent/dispatcher.rb

@@ -17,11 +17,15 @@ module TingYun
       end
 
       def on_transaction(*_)
-        return unless needs_restart?
+        return unless restart_in_children_enabled? && needs_restart?
 
         restart_harvest_thread
       end
 
+      def restart_in_children_enabled?
+        TingYun::Agent.config[:restart_thread_in_children]
+      end
+
       def mark_started(pid = Process.pid)
         @starting_pid = pid
       end

data/lib/ting_yun/agent/instance_methods/container_data_manager.rb

@@ -120,7 +120,11 @@ module TingYun
         def send_data_to_endpoint(endpoint, items, container)
           TingYun::Agent.logger.info("Sending #{items.size} items to #{endpoint}")
           begin
-            @service.send(endpoint, items)
+            if container.respond_to?(:harvest_base_quantile_hash!)
+              @service.send(endpoint, items, container.harvest_base_quantile_hash!)
+            else
+              @service.send(endpoint, items)
+            end
           rescue => e
             TingYun::Agent.logger.info("Unable to send #{endpoint} data, will try again later. Error: ", e)
             # container.merge!(items)

data/lib/ting_yun/agent/instance_methods/start_worker_thread.rb

@@ -43,6 +43,11 @@ module TingYun
           end
           @event_loop.fire_every(Agent.config[:data_report_period], :report_data)
 
+          @event_loop.on(:create_new_logfile) do
+            TingYun::Logger::CreateLoggerHelper.create_new_logfile
+          end
+          @event_loop.fire_every(TingYun::Agent.config[:agent_log_file_check_days]*60*60*24, :create_new_logfile)
+
           @event_loop.run
         end
       end

data/lib/ting_yun/agent/method_tracer_helpers.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require 'ting_yun/agent'
 require 'ting_yun/agent/transaction/transaction_state'
+require 'ting_yun/support/quantile_p2'
 
 module TingYun
   module Agent
@@ -22,12 +23,12 @@ module TingYun
         end
       end
 
-      def trace_execution_scoped_footer(state, t0, first_name, metric_names, expected_frame, options, t1=Time.now.to_f)
+      def trace_execution_scoped_footer(state, t0, first_name, metric_names, expected_frame, options, t1=Time.now.to_f, klass_name=nil)
         log_errors(:trace_execution_scoped_footer) do
           if expected_frame
             stack = state.traced_method_stack
             create_metrics = options.has_key?(:metric) ? options[:metric] : true
-            frame = stack.pop_frame(state, expected_frame, first_name, t1, create_metrics)
+            frame = stack.pop_frame(state, expected_frame, first_name, t1, create_metrics, klass_name)
 
             if create_metrics
               duration = (t1 - t0)*1000
@@ -41,6 +42,9 @@ module TingYun
                                                  "Metric #{first_name} has negative exclusive time: duration = #{duration} ms, child_time = #{frame.children_time}")
               end
               record_metrics(state, first_name, metric_names, duration, exclusive, options)
+              if first_name.start_with?('WebAction')
+                state.current_transaction.base_quantile_hash[first_name] = duration
+              end
             end
           end
         end
@@ -57,7 +61,7 @@ module TingYun
         end
       end
 
-      def  trace_execution_scoped(metric_names, options={}, callback = nil) #THREAD_LOCAL_ACCESS
+      def  trace_execution_scoped(metric_names, options={}, callback = nil, klass_name=nil) #THREAD_LOCAL_ACCESS
         state = TingYun::Agent::TransactionState.tl_get
 
         metric_names = Array(metric_names)
@@ -74,7 +78,7 @@ module TingYun
           if callback
             callback.call(elapsed_time)
           end
-          trace_execution_scoped_footer(state, start_time, first_name, metric_names, expected_scope, options)
+          trace_execution_scoped_footer(state, start_time, first_name, metric_names, expected_scope, options, Time.now.to_f, klass_name)
         end
       end
 

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

@@ -5,10 +5,11 @@ module TingYun
     class Transaction
       class Attributes
 
-        attr_accessor :agent_attributes, :request_params
+        attr_accessor :agent_attributes, :request_params, :custom_params
         def initialize
-          @agent_attributes  = {}
+          @agent_attributes  = {:httpStatus => 0} #defaul value
           @request_params = {}
+          @custom_params = {}
         end
 
         # no longer to care about the value if nil or not
@@ -20,6 +21,9 @@ module TingYun
           @request_params.merge!(hash) if hash
         end
 
+        def add_custom_params(key, value)
+          @custom_params[key] = value
+        end
       end
     end
   end

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

@@ -33,7 +33,7 @@ module TingYun
         end
 
 
-        def stop(state, end_time = Time.now)
+        def stop(state, end_time = Time.now, summary_metric_names=[])
 
           txn = state.current_transaction
 
@@ -45,7 +45,7 @@ module TingYun
           nested_frame = txn.frame_stack.pop
 
           if txn.frame_stack.empty?
-            txn.stop(state, end_time, nested_frame)
+            txn.stop(state, end_time, nested_frame, summary_metric_names)
             state.reset
           else
             nested_name = nested_transaction_name(nested_frame.name)
@@ -55,6 +55,7 @@ module TingYun
             else
               summary_metrics = EMPTY_SUMMARY_METRICS
             end
+            summary_metrics = summary_metric_names unless summary_metric_names.empty?
 
             TingYun::Agent::MethodTracerHelpers.trace_execution_scoped_footer(
                 state,
@@ -74,7 +75,7 @@ module TingYun
           nil
         end
 
-        def wrap(state, name, category, options = {})
+        def wrap(state, name, category, options = {}, summary_metrics=[])
           Transaction.start(state, category, options.merge(:transaction_name => name))
 
           begin
@@ -85,7 +86,8 @@ module TingYun
             Transaction.notice_error(e)
             raise e
           ensure
-            Transaction.stop(state)
+            # when kafka consumer in task, drop original web_action
+            Transaction.stop(state, Time.now, summary_metrics) if state.current_transaction
           end
         end
 
@@ -115,12 +117,19 @@ module TingYun
         end
 
         def nested_transaction_name(name)
-          if name.start_with?(CONTROLLER_PREFIX) || name.start_with?(RAKE_TRANSACTION_PREFIX)
+          if name.start_with?(CONTROLLER_PREFIX) || name.start_with?(BACKGROUND_PREFIX)
             "#{SUBTRANSACTION_PREFIX}#{name}"
           else
             name
           end
         end
+
+        def set_default_transaction_name(name, category = nil, node_name = nil) #THREAD_LOCAL_ACCESS
+          txn  = tl_current
+          name = txn.make_transaction_name(name, category)
+          txn.name_last_frame(node_name || name)
+          txn.set_default_transaction_name(name, category)
+        end
       end
     end
   end

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

@@ -1,10 +1,18 @@
 # encoding: utf-8
-
+require 'ting_yun/support/quantile_p2'
 module TingYun
   module Agent
     class Transaction
       module InstanceMethod
 
+        def ignore!
+          @ignore_this_transaction = true
+        end
+
+        def ignore?
+          @ignore_this_transaction
+        end
+
         def create_nested_frame(state, category, options)
           @has_children = true
           frame_stack.push TingYun::Agent::MethodTracerHelpers.trace_execution_scoped_header(state, Time.now.to_f)
@@ -25,6 +33,10 @@ module TingYun
           end
         end
 
+        def make_transaction_name(name, category=nil)
+          namer = TingYun::Instrumentation::Support::TransactionNamer
+          "#{namer.prefix_for_category(self, category)}#{name}"
+        end
 
         def name_last_frame(name)
           frame_stack.last.name = name
@@ -40,7 +52,7 @@ module TingYun
           !category || frame_stack.size == 1 || similar_category?(category)
         end
 
-        WEB_TRANSACTION_CATEGORIES = [:controller, :uri, :rack, :sinatra, :grape, :middleware, :thrift].freeze
+        WEB_TRANSACTION_CATEGORIES = [:controller, :uri, :rack, :sinatra, :grape, :middleware, :thrift, :action_cable, :message].freeze
 
         def web_category?(category)
           WEB_TRANSACTION_CATEGORIES.include?(category)
@@ -57,9 +69,13 @@ module TingYun
 
         alias_method :ignore, :needs_middleware_summary_metrics?
 
-        def record_summary_metrics(outermost_node_name,end_time)
+        def record_summary_metrics(state, outermost_node_name,end_time)
           unless @frozen_name == outermost_node_name
-            @metrics.record_unscoped(@frozen_name, TingYun::Helper.time_to_millis(end_time.to_f - start_time.to_f))
+            time = (end_time.to_f - start_time.to_f) * 1000
+            @metrics.record_unscoped(@frozen_name, time)
+            if @frozen_name.start_with?('WebAction')
+              state.current_transaction.base_quantile_hash[@frozen_name] = time
+            end
           end
         end
 

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

@@ -100,7 +100,8 @@ module TingYun
               :referer    => string(attributes.agent_attributes[:referer]) || EMPTY_STRING
           }
           custom_param[:httpStatus] = int(attributes.agent_attributes[:httpStatus]) if attributes.agent_attributes[:httpStatus]
-
+          custom_param[:entryTrace] = attributes.agent_attributes[:entryTrace] if attributes.agent_attributes[:entryTrace]
+          custom_param.merge! attributes.custom_params
           custom_param
         end
 

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

@@ -10,7 +10,7 @@ module TingYun
       class TraceNode
 
         attr_reader :entry_timestamp, :parent_node, :called_nodes
-        attr_accessor :metric_name, :exit_timestamp, :uri, :count, :klass, :method
+        attr_accessor :metric_name, :exit_timestamp, :uri, :count, :klass, :method, :name
 
 
 
@@ -40,13 +40,21 @@ module TingYun
         end
 
 
+        def pre_metric_name(metric_name)
+         @name ||= if metric_name.start_with?('Database ')
+            "#{metric_name.split('/')[0]}%2F#{metric_name.split('%2F')[-1]}"
+          else
+            metric_name
+          end
+        end
+
         def to_array
           [TingYun::Helper.time_to_millis(entry_timestamp),
            TingYun::Helper.time_to_millis(exit_timestamp),
            TingYun::Support::Coerce.string(metric_name),
            TingYun::Support::Coerce.string(uri)||'',
            TingYun::Support::Coerce.int(count),
-           TingYun::Support::Coerce.string(klass)||TingYun::Support::Coerce.string(metric_name),
+           TingYun::Support::Coerce.string(klass)||TingYun::Support::Coerce.string(pre_metric_name(metric_name)),
            TingYun::Support::Coerce.string(method)||'',
            params] +
            [(@called_nodes ? @called_nodes.map{|s| s.to_array} : [])]

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

@@ -25,10 +25,10 @@ module TingYun
         frame
       end
 
-      def pop_frame(state, expected_frame, name, time, deduct_call_time_from_parent=true)
+      def pop_frame(state, expected_frame, name, time, deduct_call_time_from_parent=true, klass_name=nil)
         frame = fetch_matching_frame(expected_frame)
         note_children_time(frame, time, deduct_call_time_from_parent)
-        transaction_sampler.notice_pop_frame(state, name, time) if sampler_enabled?
+        transaction_sampler.notice_pop_frame(state, name, time, klass_name) if sampler_enabled?
         frame.name = name
         frame
       end

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

@@ -59,7 +59,7 @@ module TingYun
         @current_node
       end
 
-      def trace_exit(metric_name, time)
+      def trace_exit(metric_name, time, klass_name)
         if @current_node.is_a?(PlaceholderNode)
           @current_node.depth -= 1
           if @current_node.depth == 0
@@ -67,6 +67,7 @@ module TingYun
           end
         else
           @current_node.metric_name = metric_name
+          @current_node.klass = klass_name
           @current_node.end_trace(time.to_f - @trace_start)
           @current_node = @current_node.parent_node
         end

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

@@ -17,7 +17,9 @@ module TingYun
                     :client_transaction_id,
                     :client_tingyun_id_secret,
                     :client_req_id,
-                    :thrift_return_data
+                    :thrift_return_data,
+                    :extenel_req_id,
+                    :externel_time
 
 
 
@@ -114,6 +116,10 @@ module TingYun
             @client_transaction_id = m.post_match
           elsif m = e.match(/r=/)
             @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
           end
         end
       end
@@ -148,6 +154,21 @@ module TingYun
         end
       end
 
+      # if you wanna call the method, you must make sure current_transaction is not nil at first
+      # if current_transaction
+      #    add_custom_params(:key1,:value1)
+      #    add_custom_params(:key2,:value2)
+      # end
+      # public api
+      def add_custom_params(key, value)
+        current_transaction.attributes.add_custom_params(key, value)
+      end
+
+      # same to add_custom_params
+      def merge_request_parameters(hash)
+        current_transaction.attributes.merge_request_parameters(hash)
+      end
+
     end
   end
 end