tingyun_rpm 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e8dd7aa76a5fc1e81648a4240e704b5c7402587
-  data.tar.gz: df892c7c3fc9223d1348f8961a77c53d5c794196
+  metadata.gz: 76cf4f6fc864adb7857d36f09fad87c9a107767f
+  data.tar.gz: 8f56531a2195255e42711438b01d2cf1ca834d06
 SHA512:
-  metadata.gz: 3b9f5b9fd4a36429475e707ad24a6733c2b40f7fadfe9e01df0c4b814cd77b2b4b72725231457871a2ed4f8daad2e2679e565424fe54ce0c174c19865df2ff05
-  data.tar.gz: 44f175d0d5bb19c57d4b2867c90dc6d2fb97047715e8055afd9182ebac0f5be29789bdf458ec7ccda8831b6e73153cf342b03702aae5e24cf6612db6f97f10a6
+  metadata.gz: 030c3c16cf62bdb0dade22e4c65ddf17af9170e537a0b9cffb68d61ecda6e9f6348deb923cfd9e6025c44a7649c628e57fba770be7acef42bd2ef2d8328f0d9a
+  data.tar.gz: 600a8d6e656add40a7f6f1eb898347d4c366598c9266a4dbb6d3434df64d23d2e134f846fdf02ef527f5f063d81e7d850d72ba47ac9e4d100d30f2f84e5363a1

data/lib/ting_yun/agent.rb

@@ -23,7 +23,6 @@ module TingYun
     def agent
       return @agent if @agent
       TingYun::Agent.logger.warn("Agent unavailable as it hasn't been started.")
-      TingYun::Agent.logger.warn(caller.join("\n"))
       nil
     end
 
@@ -173,35 +172,17 @@ module TingYun
 
 
 
-    # Register this method as a callback for processes that fork
-    # jobs.
-    #
-    # If the master/parent connects to the agent prior to forking the
-    # agent in the forked process will use that agent_run.  Otherwise
-    # the forked process will establish a new connection with the
-    # server.
-    #
-    # Use this especially when you fork the process to run background
-    # jobs or other work.  If you are doing this with a web dispatcher
-    # that forks worker processes then you will need to force the
-    # agent to reconnect, which it won't do by default.  Passenger and
-    # Rainbows and Unicorn are already handled, nothing special needed for them.
+
+    # Shutdown the agent.  Call this before exiting.  Sends any queued data
+    # and kills the background thread.
     #
-    # Options:
-    # * <tt>:force_reconnect => true</tt> to force the spawned process to
-    #   establish a new connection, such as when forking a long running process.
-    #   The default is false--it will only connect to the server if the parent
-    #   had not connected.
-    # * <tt>:keep_retrying => false</tt> if we try to initiate a new
-    #   connection, this tells me to only try it once so this method returns
-    #   quickly if there is some kind of latency with the server.
+    # @param options [Hash] Unused options Hash, for back compatibility only
     #
     # @api public
     #
-    def after_fork(options={})
-      agent.after_fork(options) if agent
+    def shutdown
+      agent.shutdown if agent
     end
 
-
   end
 end

data/lib/ting_yun/agent/agent.rb

@@ -61,6 +61,7 @@ module TingYun
         TingYun::Agent.logger.info "Starting Agent shutdown"
 
         stop_event_loop
+        untraced_graceful_disconnect
         reset_to_default_configuration
 
         @started = nil
@@ -122,7 +123,17 @@ module TingYun
         defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby" && RUBY_VERSION.match(/^1\.9/)
       end
 
-
+      def untraced_graceful_disconnect
+        begin
+          TingYun::Agent.disable_all_tracing do
+            if connected?
+              transmit_data
+            end
+          end
+        rescue => e
+          ::TingYun::Agent.logger.error e
+        end
+      end
     end
   end
 end

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

@@ -54,7 +54,7 @@ module TingYun
             metric_names
           end
 
-          def action_metric_name(txn,options)
+          def action_metric_name(txn)
             "#{ERRORS_ACTION}#{txn.best_name}" if txn
           end
 
@@ -90,7 +90,7 @@ module TingYun
 
           metric_names = aggregated_metric_names(txn)
 
-          action_metric = action_metric_name(txn, options)
+          action_metric = action_metric_name(txn)
           metric_names << action_metric if action_metric
 
           stats_engine = TingYun::Agent.agent.stats_engine

data/lib/ting_yun/agent/collector/error_collector/noticed_error.rb

@@ -119,7 +119,8 @@ module TingYun
         end
 
         def request_params
-          attributes.agent_attributes[:request_params]
+          return {}  unless TingYun::Agent.config['nbs.capture_params']
+          attributes.request_params
         end
 
       end

data/lib/ting_yun/agent/collector/middle_ware_collector/cpu_sampler.rb

@@ -54,7 +54,7 @@ module TingYun
             # Calculate the true utilization by taking cpu times and dividing by
             # elapsed time X processor_count.
 
-            record_user_util(usertime / (elapsed * @processor_count))
+            record_user_util((usertime * 100) / (elapsed * @processor_count))
             # record_system_util(systemtime / (elapsed * @processor_count))
           end
           @last_utime = t.utime

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

@@ -286,7 +286,7 @@ module TingYun
               @slow_sql.start_time,
               string(@action_metric_name),
               string(@slow_sql.metric_name),
-              string(@uri),
+              string(@uri||@action_metric_name),
               string(@sql),
               int(@call_count),
               TingYun::Helper.time_to_millis(@total_call_time),

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

@@ -32,6 +32,7 @@ module TingYun
         t0 = Time.now.to_f
         state = TingYun::Agent::TransactionState.tl_get
         return yield unless state.execution_traced?
+        return yield unless state.current_transaction #如果还没有创建Transaction，就发生跨应用，就直接先跳过跟踪。
 
         begin
           node = start_trace(state, t0, request)

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

@@ -12,17 +12,15 @@ module TingYun
 
         NOSQL = %w(MongoDB Redis Memcached).freeze
 
+        CACHE = %w(Redis Memcached).freeze
+
         def self.checkNosql(product)
           NOSQL.include?(product)
         end
 
         def self.metric_name(product, collection, operation)
           if checkNosql(product)
-            if product == 'MongoDB'
               "#{product}/#{collection}/#{operation}"
-            else
-              "#{product}/NULL/#{operation}"
-            end
           else
             "Database #{product}/#{collection}/#{operation}"
           end
@@ -46,16 +44,25 @@ module TingYun
               collection = overrides[1] || collection
             end
           end
-          metrics = [ALL_WEB,ALL]
-          metrics << operation
+          metrics  = [operation]
+          if TingYun::Agent::Transaction.recording_web_transaction?
+            metrics = metrics + [ALL_WEB,ALL]
+          else
+            metrics = metrics + [ALL_BACKGROUND,ALL]
+          end
+
+
           metrics = metrics.map do |suffix|
             product_suffixed_rollup(product,suffix)
           end
 
-          metrics.unshift metric_name(product, collection, operation)
+          metrics.unshift metric_name(product, collection, operation) if collection
           metrics
         end
 
+        def self.include_database?(name)
+          CACHE.include?(name)
+        end
         # Allow Transaction#with_database_metric_name to override our
         # collection and operation
         def self.overridden_operation_and_collection #THREAD_LOCAL_ACCESS

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

@@ -158,6 +158,10 @@ module TingYun
             ::TingYun::Agent.logger.send(message['level'].downcase, message['message'])
           end
         end
+
+        def connect_in_sync
+          TingYun::Agent.disable_all_tracing { connect!(:keep_retrying => false) }
+        end
       end
     end
   end

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

@@ -125,8 +125,9 @@ module TingYun
           rescue => e
             TingYun::Agent.logger.info("Unable to send #{endpoint} data, will try again later. Error: ", e)
             # container.merge!(items)
+            raise
           ensure
-            items = nil # take the initiative to GC
+            items = nil #  to GC
           end
 
 

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

@@ -165,8 +165,11 @@ module TingYun
           install_exit_handler
           cpu_and_memory
 
-          start_worker_thread(options)
-
+          if TingYun::Agent.config[:sync_startup]
+            connect_in_sync
+          else
+            start_worker_thread(options)
+          end
         end
 
         # This method should be called in a forked process after a fork.

data/lib/ting_yun/agent/transaction.rb

@@ -16,12 +16,13 @@ module TingYun
       APDEX_TXN_METRIC_PREFIX = 'Apdex/'.freeze
       SUBTRANSACTION_PREFIX = 'Nested/'.freeze
       CONTROLLER_PREFIX = 'WebAction/'.freeze
+      RAKE_TRANSACTION_PREFIX     = 'BackgroundAction/Rake'.freeze
       TASK_PREFIX = 'OtherTransaction/Background/'.freeze
       RACK_PREFIX = 'Rack/'.freeze
       SINATRA_PREFIX = 'Sinatra/'.freeze
       MIDDLEWARE_PREFIX = 'Middleware/Rack/'.freeze
       GRAPE_PREFIX = 'Grape/'.freeze
-      RAKE_PREFIX = 'OtherTransaction/Rake/'.freeze
+      RAKE_PREFIX = 'Rake'.freeze
       WEB_TRANSACTION_CATEGORIES = [:controller, :uri, :rack, :sinatra, :grape, :middleware, :thrift].freeze
       EMPTY_SUMMARY_METRICS = [].freeze
       MIDDLEWARE_SUMMARY_METRICS = ['Middleware/all'.freeze].freeze
@@ -31,9 +32,6 @@ module TingYun
       NESTED_TRACE_STOP_OPTIONS = {:metric => true}.freeze
 
 
-      WEB_SUMMARY_METRIC = 'HttpDispatcher'.freeze
-      OTHER_SUMMARY_METRIC = 'OtherTransaction/all'.freeze
-
       # A Time instance for the start time, never nil
       attr_accessor :start_time
 
@@ -45,7 +43,6 @@ module TingYun
                     :category,
                     :frame_stack,
                     :exceptions,
-                    :filtered_params,
                     :default_name,
                     :metrics,
                     :http_response_code,
@@ -64,7 +61,6 @@ module TingYun
         @start_time = Time.now
         @apdex_start = options[:apdex_start_time] || @start_time
         @frame_stack = []
-        @filtered_params = options[:filtered_params] || {}
         @frozen_name = nil
         @default_name = TingYun::Helper.correctly_encoded(options[:transaction_name])
         @metrics = TingYun::Agent::TransactionMetrics.new
@@ -73,6 +69,7 @@ module TingYun
 
         @attributes = TingYun::Agent::Transaction::Attributes.new
 
+
         if request = options[:request]
           @request_attributes = TingYun::Agent::Transaction::RequestAttributes.new request
         else
@@ -109,12 +106,15 @@ module TingYun
         category ||= :controller
         txn = state.current_transaction
         options[:client_transaction_id] = state.client_transaction_id
-        if txn && options[:transaction_name]
+        if txn
           txn.create_nested_frame(state, category, options)
         else
           txn = start_new_transaction(state, category, options)
         end
 
+        # merge params every step into here
+        txn.attributes.merge_request_parameters(options[:filtered_params])
+
         txn
       rescue => e
         TingYun::Agent.logger.error("Exception during Transaction.start", e)
@@ -135,6 +135,7 @@ module TingYun
         TingYun::Agent.instance.events.notify(:start_transaction)
         frame_stack.push TingYun::Agent::MethodTracerHelpers.trace_execution_scoped_header(state, Time.now.to_f)
         name_last_frame @default_name
+        freeze_name_and_execute if @default_name.start_with?(RAKE_TRANSACTION_PREFIX)
       end
 
       def create_nested_frame(state, category, options)
@@ -154,6 +155,7 @@ module TingYun
         end
       end
 
+
       def self.stop(state, end_time = Time.now)
 
         txn = state.current_transaction
@@ -228,7 +230,7 @@ module TingYun
       end
 
       def self.nested_transaction_name(name)
-        if name.start_with?(CONTROLLER_PREFIX)
+        if name.start_with?(CONTROLLER_PREFIX) || name.start_with?(RAKE_TRANSACTION_PREFIX)
           "#{SUBTRANSACTION_PREFIX}#{name}"
         else
           name
@@ -236,6 +238,7 @@ module TingYun
       end
 
       def commit!(state, end_time, outermost_node_name)
+
         assign_agent_attributes
 
 
@@ -243,13 +246,19 @@ module TingYun
 
         sql_sampler.on_finishing_transaction(state, @frozen_name)
 
-
         record_summary_metrics(outermost_node_name, end_time)
         record_apdex(state, end_time)
         record_exceptions
         merge_metrics
       end
 
+
+      def record_summary_metrics(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))
+        end
+      end
+
       def assign_agent_attributes
 
         add_agent_attribute(:threadName,  "pid-#{$$}");
@@ -412,33 +421,6 @@ module TingYun
         TingYun::Agent.instance.stats_engine.merge_transaction_metrics!(@metrics, best_name)
       end
 
-
-      def summary_metrics
-        if @frozen_name.start_with?(CONTROLLER_PREFIX)
-          [WEB_SUMMARY_METRIC]
-        else
-          background_summary_metrics
-        end
-      end
-
-      def background_summary_metrics
-        segments = @frozen_name.split('/')
-        if segments.size > 2
-          ["OtherTransaction/#{segments[1]}/all", OTHER_SUMMARY_METRIC]
-        else
-          []
-        end
-      end
-
-
-      # The summary metrics recorded by this method all end up with a duration
-      # equal to the transaction itself, and an exclusive time of zero.
-      def record_summary_metrics(outermost_node_name, end_time)
-        metrics = summary_metrics
-        metrics << @frozen_name unless @frozen_name == outermost_node_name
-        @metrics.record_unscoped(metrics, (end_time.to_f - start_time.to_f)*1000)
-      end
-
       def name_last_frame(name)
         frame_stack.last.name = name
       end

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

@@ -5,9 +5,10 @@ module TingYun
     class Transaction
       class Attributes
 
-        attr_accessor :agent_attributes
+        attr_accessor :agent_attributes, :request_params
         def initialize
           @agent_attributes  = {}
+          @request_params = {}
         end
 
         def add_agent_attribute(key, value)
@@ -15,6 +16,9 @@ module TingYun
           @agent_attributes[key] = value
         end
 
+        def merge_request_parameters(hash)
+          @request_params.merge!(hash) if hash
+        end
       end
     end
   end

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

@@ -8,7 +8,7 @@ module TingYun
       class RequestAttributes
 
         attr_reader :request_path, :referer, :accept, :content_length, :host,
-                    :port, :user_agent, :request_method, :query_string, :header, :cookie
+                    :port, :user_agent, :request_method, :header, :cookie
 
         HTTP_ACCEPT_HEADER_KEY = 'HTTP_ACCEPT'.freeze
 
@@ -22,7 +22,6 @@ module TingYun
           @port = port_from_request request
           @user_agent = attribute_from_request request, :user_agent
           @request_method = attribute_from_request request, :request_method
-          @query_string = attribute_from_request request, :query_string
           @cookie = set_cookie(request)
         end
 
@@ -60,9 +59,7 @@ module TingYun
             txn.add_agent_attribute :method, request_method
           end
 
-          if query_string
-            txn.add_agent_attribute :request_params, request_params
-          end
+
         end
 
 
@@ -71,16 +68,7 @@ module TingYun
         # Make a safe attempt to get the referer from a request object, generally successful when
         # it's a Rack request.
 
-        def request_params
-          hash = {}
-          return hash if @query_string.empty?
-          query_string.split('&').each do |param|
-            _k,_v = param.strip.split('=')
-            hash[_k] = _v unless _v.nil?
-          end
 
-          hash
-        end
 
         def referer_from_request request
           if referer = attribute_from_request(request, :referer)
@@ -125,10 +113,12 @@ module TingYun
         def set_cookie(request)
           cookie = {}
           _c = attribute_from_env(request, 'HTTP_COOKIE')
-          _c.split(';').each do |i|
+          _c.split(/\s*;\s*/).each do |i|
             _k, _v = i.split('=')
-            cookie[_k.strip] = _v.strip
-          end unless _c.nil?
+            if _k && _v
+              cookie[_k] = _v
+            end
+          end if _c
           cookie
         end
 

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

@@ -32,7 +32,7 @@ module TingYun
         
         def trace_tree
           [
-              duration,
+              @start_time.round,
               request_params,
               custom_params,
               root_node.to_array
@@ -43,8 +43,8 @@ module TingYun
           [
               @start_time.round,
               duration,
-              TingYun::Helper.correctly_encoded(metric_name),
-              TingYun::Helper.correctly_encoded(uri),
+              TingYun::Helper.correctly_encoded(metric_name)|| '',
+              TingYun::Helper.correctly_encoded(uri||metric_name||''),
               encoder.encode(trace_tree),
               tx_id || '',
               guid
@@ -93,15 +93,18 @@ module TingYun
         end
 
         def custom_params
-          {
+          custom_param = {
               :threadName => string(attributes.agent_attributes[:threadName]),
-              :httpStatus => int(attributes.agent_attributes[:httpStatus]),
               :referer    => string(attributes.agent_attributes[:referer]) || ''
           }
+          custom_param[:httpStatus] = int(attributes.agent_attributes[:httpStatus]) if attributes.agent_attributes[:httpStatus]
+
+          custom_param
         end
 
         def request_params
-          attributes.agent_attributes[:request_params]
+          return {} unless TingYun::Agent.config['nbs.capture_params']
+          attributes.request_params
         end
 
         HEX_DIGITS = (0..15).map{|i| i.to_s(16)}

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

@@ -6,6 +6,26 @@ require 'ting_yun/agent/transaction/trace'
 module TingYun
   module Agent
     class TransactionSampleBuilder
+
+      class PlaceholderNode
+        attr_reader :parent_node
+        attr_accessor :depth
+
+        def initialize(parent_node)
+          @parent_node = parent_node
+          @depth = 1
+        end
+
+        # No-op - some clients expect to be able to use these to read/write
+        # params on TT nodes.
+        def [](key); end
+        def []=(key, value); end
+
+        # Stubbed out in case clients try to touch params directly.
+        def params; {}; end
+        def params=; end
+      end
+
       attr_reader :current_node, :trace
 
       def initialize(time=Time.now)
@@ -28,14 +48,27 @@ module TingYun
           if @trace.node_count == node_limit
             ::TingYun::Agent.logger.debug("Node limit of #{node_limit} reached, ceasing collection.")
           end
+        else
+          if @current_node.is_a?(PlaceholderNode)
+            @current_node.depth += 1
+          else
+            @current_node = PlaceholderNode.new(@current_node)
+          end
         end
         @current_node
       end
 
       def trace_exit(metric_name, time)
-        @current_node.metric_name = metric_name
-        @current_node.end_trace(time.to_f - @trace_start)
-        @current_node = @current_node.parent_node
+        if @current_node.is_a?(PlaceholderNode)
+          @current_node.depth -= 1
+          if @current_node.depth == 0
+            @current_node = @current_node.parent_node
+          end
+        else
+          @current_node.metric_name = metric_name
+          @current_node.end_trace(time.to_f - @trace_start)
+          @current_node = @current_node.parent_node
+        end
       end
 
       def finish_trace(time=Time.now.to_f)

data/lib/ting_yun/configuration/default_source.rb

@@ -359,6 +359,13 @@ module TingYun
             :allowed_from_server => false,
             :description => 'Autodetected application component that reports metrics to Ting YUN.'
         },
+        :sync_startup => {
+            :default => false,
+            :public => true,
+            :type => Boolean,
+            :allowed_from_server => false,
+            :description => 'When set to true, forces a synchronous connection to the collector during application startup. For very short-lived processes, this helps ensure the has time to report.'
+        },
         :framework => {
             :default => DefaultSource.framework,
             :public => false,
@@ -565,11 +572,11 @@ module TingYun
             :allowed_from_server => true,
             :description => 'Enable or disable to use default name '
         },
-        :capture_params => {
+        :'nbs.capture_params' => {
             :default => false,
             :public => true,
             :type => Boolean,
-            :allowed_from_server => false,
+            :allowed_from_server => true,
             :description => 'Enable or disable the capture of HTTP request parameters to be attached to transaction traces and traced errors.'
         },
         :config_path => {
@@ -621,6 +628,20 @@ module TingYun
             :type => String,
             :allowed_from_server => true,
             :description => 'defined nme rule '
+        },
+        :disable_rake => {
+            :default => true,
+            :public => true,
+            :type => Boolean,
+            :allowed_from_server => false,
+            :description => 'If true, disables Rake instrumentation.'
+        },
+        :'rake.tasks' => {
+            :default => [],
+            :public => true,
+            :type => Array,
+            :allowed_from_server => false,
+            :description => 'Specify an array of Rake tasks to automatically instrument.'
         }
     }.freeze
   end

data/lib/ting_yun/frameworks/instance_methods.rb

@@ -64,7 +64,7 @@ module TingYun
           start_agent
           install_instrumentation
         else
-          LibraryDetection.detect!
+          TingYun::Support::LibraryDetection.detect!
         end
 
       end

data/lib/ting_yun/instrumentation/rails3/action_controller.rb

@@ -30,7 +30,7 @@ module TingYun
 
 
         def process_action(*args)
-          params = TingYun::Instrumentation::Support::ParameterFiltering.filter_rails_request_parameters(request.filtered_parameters)
+          params = TingYun::Instrumentation::Support::ParameterFiltering.flattened_filter_request_parameters(request.filtered_parameters)
           perform_action_with_tingyun_trace(:category => :controller,
                                             :name     => self.action_name,
                                             :path     => tingyun_metric_path,

data/lib/ting_yun/instrumentation/rails4/action_controller_subscriber.rb

@@ -5,6 +5,7 @@ require 'ting_yun/agent/transaction/transaction_state'
 require 'ting_yun/instrumentation/support/evented_subscriber'
 require 'ting_yun/agent/transaction'
 require 'ting_yun/instrumentation/support/split_controller'
+require 'ting_yun/instrumentation/support/parameter_filtering'
 
 module TingYun
   module Instrumentation
@@ -36,9 +37,10 @@ module TingYun
         end
 
         def start_transaction(state, event)
+          params = TingYun::Instrumentation::Support::ParameterFiltering.flattened_filter_request_parameters(event.payload[:params])
           TingYun::Agent::Transaction.start(state, :controller,
                                             :request => event.request,
-                                            :filtered_params => event.payload[:params],
+                                            :filtered_params => params,
                                             :apdex_start_time => event.queue_start,
                                             :transaction_name => event.metric_name)
         end
@@ -78,7 +80,7 @@ module TingYun
             if TingYun::Agent.config[:'nbs.auto_action_naming']
               @metric_name ||= "WebAction/Rails/#{metric_path}%2F#{metric_action}"
             else
-              path
+              "WebAction/#{uri}"
             end
           end
         end

data/lib/ting_yun/instrumentation/rake.rb

@@ -0,0 +1,111 @@
+# encoding: utf-8
+
+TingYun::Support::LibraryDetection.defer do
+
+  named :rake
+
+  depends_on do
+    defined?(::Rake)&&
+        !::TingYun::Agent.config[:'disable_rake'] &&
+        ::TingYun::Agent.config[:'rake.tasks'].any? &&
+        ::TingYun::Agent::Instrumentation::RakeInstrumentation.supported_version?
+  end
+
+  executes do
+    ::TingYun::Agent.logger.info 'Installing deferred Rake instrumentation'
+  end
+
+  executes do
+    module Rake
+      class Task
+        alias_method :invoke_without_tingyun, :invoke
+        def invoke(*args)
+          unless TingYun::Agent::Instrumentation::RakeInstrumentation.should_trace? name
+            return invoke_without_tingyun(*args)
+          end
+
+          TingYun::Agent::Instrumentation::RakeInstrumentation.before_invoke_transaction(self)
+
+          state = TingYun::Agent::TransactionState.tl_get
+          TingYun::Agent::Transaction.wrap(state, "BackgroundAction/Rake/invoke/#{name}", :rake)  do
+            invoke_without_tingyun(*args)
+          end
+        end
+      end
+    end
+  end
+end
+
+module TingYun
+  module Agent
+    module Instrumentation
+      module RakeInstrumentation
+
+        def self.supported_version?
+          ::TingYun::Support::VersionNumber.new(::Rake::VERSION) >= ::TingYun::Support::VersionNumber.new("10.0.0")
+        end
+
+        def self.before_invoke_transaction(task)
+          ensure_at_exit
+
+          if task.application.options.always_multitask
+            instrument_invoke_prerequisites_concurrently(task)
+          else
+            instrument_execute_on_prereqs(task)
+          end
+        rescue => e
+          TingYun::Agent.logger.error("Error during Rake task invoke", e)
+        end
+
+        def self.should_trace? name
+          TingYun::Agent.config[:'rake.tasks'].any? do |task|
+            task == name
+          end
+        end
+
+        def self.ensure_at_exit
+          return if @installed_at_exit
+
+          at_exit do
+            # The agent's default at_exit might not default to installing, but
+            # if we are running an instrumented rake task, we always want it.
+            TingYun::Agent.shutdown
+          end
+
+          @installed_at_exit = true
+        end
+
+        def self.instrument_execute_on_prereqs(task)
+          task.prerequisite_tasks.each do |child_task|
+            instrument_execute(child_task)
+          end
+        end
+
+        def self.instrument_execute(task)
+          return if task.instance_variable_get(:@__tingyun_instrumented_execute)
+
+          task.instance_variable_set(:@__tingyun_instrumented_execute, true)
+          task.instance_eval do
+            def execute(*args, &block)
+              TingYun::Agent::MethodTracer.trace_execution_scoped("Rake/execute/#{self.name}") do
+                super
+              end
+            end
+          end
+
+          instrument_execute_on_prereqs(task)
+        end
+
+        def self.instrument_invoke_prerequisites_concurrently(task)
+          task.instance_eval do
+            def invoke_prerequisites_concurrently(*_)
+              TingYun::Agent::MethodTracer.trace_execution_scoped("Rake/execute/multitask") do
+                super
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+ end

data/lib/ting_yun/instrumentation/support/parameter_filtering.rb

@@ -13,8 +13,29 @@ module TingYun
           result = params.dup
           result.delete("controller")
           result.delete("action")
+          result.delete("commit")
+          result.delete("authenticity_token")
+          result.delete_if{|_,v| !v.is_a? String}
+          TingYun::Agent.config["nbs.ignored_params"].split(',').each{|key| result.delete(key)}
           result
         end
+
+        # turns {'a' => {'b' => 'c'}} into {'b' => 'c'}
+        def dot_flattened(nested_hash, result={})
+          nested_hash.each do |key, val|
+            next if val == nil
+            if val.respond_to?(:has_key?)
+              dot_flattened(val, result)
+            else
+              result[key] = val
+            end
+          end
+          result
+        end
+
+        def flattened_filter_request_parameters(params)
+          filter_rails_request_parameters(dot_flattened(params))
+        end
       end
     end
   end

data/lib/ting_yun/instrumentation/support/split_controller.rb

@@ -1,3 +1,5 @@
+require 'ting_yun/instrumentation/support/parameter_filtering'
+
 module TingYun
   module Instrumentation
     module Support
@@ -125,15 +127,7 @@ module TingYun
 
         # turns {'a' => {'b' => 'c'}} into {'b' => 'c'}
         def dot_flattened(nested_hash, result={})
-          nested_hash.each do |key, val|
-            next if val == nil
-            if val.respond_to?(:has_key?)
-              dot_flattened(val, result)
-            else
-              result[key] = val
-            end
-          end
-          result
+          TingYun::Instrumentation::Support::ParameterFiltering.dot_flattened(nested_hash, result={})
         end
       end
     end

data/lib/ting_yun/instrumentation/thrift.rb

@@ -229,6 +229,8 @@ TingYun::Support::LibraryDetection.defer do
         state.client_tingyun_id_secret = tingyun_id_secret
         state.client_transaction_id = client_transaction_id
         state.client_req_id = client_req_id
+        state.transaction_sample_builder.trace.tx_id = client_transaction_id
+
       end
 
       alias :skip_without_tingyun :skip
@@ -241,18 +243,24 @@ TingYun::Support::LibraryDetection.defer do
 
 
         def send_message_args_with_tingyun(args_class, args = {})
-          state = TingYun::Agent::TransactionState.tl_get
-          return  unless state.execution_traced?
-          cross_app_id  = TingYun::Agent.config[:tingyunIdSecret] or
-              raise TingYun::Agent::CrossAppTracing::Error, "no tingyunIdSecret configured"
-          txn_guid = state.request_guid
-          tingyun_id = "#{cross_app_id};c=1;x=#{txn_guid}"
-
-          data = TingYun::Support::Serialize::JSONWrapper.dump("TingyunID" => tingyun_id)
-          @oprot.write_field_begin("TingyunField", 11, 6)
-          @oprot.write_string(data)
-          @oprot.write_field_end
-          send_message_args_without_tingyun(args_class, args)
+          begin
+            state = TingYun::Agent::TransactionState.tl_get
+            return  unless state.execution_traced?
+            cross_app_id  = TingYun::Agent.config[:tingyunIdSecret] or
+                raise TingYun::Agent::CrossAppTracing::Error, "no tingyunIdSecret configured"
+            txn_guid = state.request_guid
+            tingyun_id = "#{cross_app_id};c=1;x=#{txn_guid}"
+            state.transaction_sample_builder.trace.tx_id = txn_guid
+
+            data = TingYun::Support::Serialize::JSONWrapper.dump("TingyunID" => tingyun_id)
+            @oprot.write_field_begin("TingyunField", 11, 6)
+            @oprot.write_string(data)
+            @oprot.write_field_end
+          rescue => e
+            TingYun::Agent.logger.error("Failed to thrift send_message_args_with_tingyun : ", e)
+          ensure
+            send_message_args_without_tingyun(args_class, args)
+          end
         end
 
         alias :send_message_args_without_tingyun :send_message_args
@@ -261,63 +269,80 @@ TingYun::Support::LibraryDetection.defer do
 
       def send_message_with_tingyun(name, args_class, args = {})
 
-        tag = "#{args_class.to_s.split('::').first}.#{name}".downcase
-        t0 = Time.now.to_f
-        operations[tag] = {:started_time => t0}
-        state = TingYun::Agent::TransactionState.tl_get
-        return  unless state.execution_traced?
-        stack = state.traced_method_stack
-        node = stack.push_frame(state,:thrift,t0)
-        operations[tag][:node] = node
+        begin
+          tag = "#{args_class.to_s.split('::').first}.#{name}".downcase
+          t0 = Time.now.to_f
+          operations[tag] = {:started_time => t0}
+          state = TingYun::Agent::TransactionState.tl_get
+          return  unless state.execution_traced?
+          stack = state.traced_method_stack
+          node = stack.push_frame(state,:thrift,t0)
+          operations[tag][:node] = node
+        rescue => e
+          TingYun::Agent.logger.error("Failed to thrift send_message_with_tingyun : ", e)
+        ensure
+          send_message_without_tingyun(name, args_class, args)
+        end
 
-        send_message_without_tingyun(name, args_class, args)
       end
 
       alias :send_message_without_tingyun :send_message
       alias :send_message  :send_message_with_tingyun
 
       def send_oneway_message_with_tingyun(name, args_class, args = {})
-        tag = "#{args_class.to_s.split('::').first}.#{name}".downcase
-        op_started = Time.now.to_f
-        base, *other_metrics = metrics(tag)
-        result = send_oneway_message_without_tingyun(name, args_class, args)
-        duration = (Time.now.to_f - op_started)*1000
-        TingYun::Agent.instance.stats_engine.tl_record_scoped_and_unscoped_metrics(base, other_metrics, duration)
-        result
+
+        begin
+          tag = "#{args_class.to_s.split('::').first}.#{name}".downcase
+          op_started = Time.now.to_f
+          base, *other_metrics = metrics(tag)
+          result = send_oneway_message_without_tingyun(name, args_class, args)
+          duration = (Time.now.to_f - op_started)*1000
+          TingYun::Agent.instance.stats_engine.tl_record_scoped_and_unscoped_metrics(base, other_metrics, duration)
+          result
+        rescue => e
+          TingYun::Agent.logger.error("Failed to thrift send_oneway_message_with_tingyun : ", e)
+          return send_oneway_message_without_tingyun(name, args_class, args)
+        end
+
       end
       alias :send_oneway_message_without_tingyun :send_oneway_message
       alias :send_oneway_message :send_oneway_message_with_tingyun
 
       def receive_message_with_tingyun(result_klass)
-        state = TingYun::Agent::TransactionState.tl_get
+        begin
+          state = TingYun::Agent::TransactionState.tl_get
 
-        operate = operator(result_klass)
+          operate = operator(result_klass)
 
-        t0, node =  started_time_and_node(operate)
+          t0, node =  started_time_and_node(operate)
 
 
-        result = receive_message_without_tingyun(result_klass)
-        if result.nil? || result.success.nil?
-          e = ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, "#{operate} failed: unknown result")
-          ::TingYun::Instrumentation::Support::ExternalError.handle_error(e,metrics(operate)[0])
-        end
+          result = receive_message_without_tingyun(result_klass)
+          if result.nil? || result.success.nil?
+            e = ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, "#{operate} failed: unknown result")
+            ::TingYun::Instrumentation::Support::ExternalError.handle_error(e,metrics(operate)[0])
+          end
 
-        t1 = Time.now.to_f
-        node_name, *other_metrics = metrics(operate)
-        duration = TingYun::Helper.time_to_millis(t1 - t0)
-
-        TingYun::Agent.instance.stats_engine.tl_record_scoped_and_unscoped_metrics(
-            other_metrics.pop, other_metrics, duration
-        )
-        if node
-          node.name = node_name
-          transaction_sampler = ::TingYun::Agent.instance.transaction_sampler
-          transaction_sampler.add_node_info(:uri => "thrift:#{tingyun_host}:#{tingyun_port}/#{operate}")
-          stack = state.traced_method_stack
-          stack.pop_frame(state, node, node_name, t1)
-        end
+          t1 = Time.now.to_f
+          node_name, *other_metrics = metrics(operate)
+          duration = TingYun::Helper.time_to_millis(t1 - t0)
 
-        result
+          TingYun::Agent.instance.stats_engine.tl_record_scoped_and_unscoped_metrics(
+              other_metrics.pop, other_metrics, duration
+          )
+          if node
+            node.name = node_name
+            transaction_sampler = ::TingYun::Agent.instance.transaction_sampler
+            transaction_sampler.add_node_info(:uri => "thrift:#{tingyun_host}:#{tingyun_port}/#{operate}")
+            stack = state.traced_method_stack
+            stack.pop_frame(state, node, node_name, t1)
+          end
+
+          result
+        rescue => e
+          TingYun::Agent.logger.error("Failed to thrift receive_message_with_tingyun : ", e)
+          return  receive_message_without_tingyun(result_klass)
+        end
       end
 
       alias :receive_message_without_tingyun :receive_message

data/lib/ting_yun/logger/agent_logger.rb

@@ -109,7 +109,7 @@ module TingYun
             set_log_format!
           rescue => e
             @log = ::Logger.new(STDOUT)
-            warn("check_log_file:  Failed creating logger for file #{file_path}, using standard out for logging.", e)
+            warn("check_log_file:  Failed creating logger for file #{@file_path}, using standard out for logging.", e)
           end
         end
       end
@@ -139,7 +139,7 @@ module TingYun
             @log = ::Logger.new(@file_path)
           rescue => e
             @log = ::Logger.new(STDOUT)
-            warn("Failed creating logger for file #{file_path}, using standard out for logging.", e)
+            warn("Failed creating logger for file #{@file_path}, using standard out for logging.", e)
           end
         end
       end

data/lib/ting_yun/metrics/metric_data.rb

@@ -69,14 +69,14 @@ module TingYun
 
         metrics << int(stats.call_count, stat_key)
         if stats.max_call_time != 0.0 #apedx
-          metrics << float(stats.total_call_time.round, stat_key)
-          metrics << float(stats.total_exclusive_time.round, stat_key)
-          metrics << float(stats.max_call_time.round, stat_key)
+          metrics << float(stats.total_call_time, stat_key)
+          metrics << float(stats.total_exclusive_time, stat_key)
+          metrics << float(stats.max_call_time, stat_key)
         end
 
         if stats.min_call_time !=0.0 #
-          metrics << float(stats.min_call_time.round, stat_key)
-          metrics << float(stats.sum_of_squares.round, stat_key)
+          metrics << float(stats.min_call_time, stat_key)
+          metrics << float(stats.sum_of_squares, stat_key)
         end
 
         metrics

data/lib/ting_yun/ting_yun_service/upload_service.rb

@@ -7,6 +7,7 @@ module TingYun
   class TingYunService
     module UploadService
 
+      EMPTY_PARENT = ''.freeze
       def compressed_json
         TingYun::Support::Serialize::Encoders::CompressedJSON
       end
@@ -55,15 +56,15 @@ module TingYun
 
           # Omit empty stats as an optimization
           unless stats.is_reset?
-            metric_id = metric_id_cache[metric_spec.name]
+            metric_id = metric_id_cache[metric_spec.hash]
 
-            if metric_spec.name.start_with?('WebAction')
+            if metric_spec.name.start_with?('WebAction','BackgroundAction')
               action_array << TingYun::Metrics::MetricData.new(metric_spec, stats, metric_id)
             elsif metric_spec.name.start_with?('Apdex')
               adpex_array << TingYun::Metrics::MetricData.new(metric_spec, stats, metric_id)
             elsif metric_spec.name.start_with?('Errors') && metric_spec.scope.empty?
               errors_array << TingYun::Metrics::MetricData.new(metric_spec, stats, metric_id)
-            elsif metric_spec.name.start_with?('Database','View','MongoDB','Redis','Memcached','External','Nested', 'CPU', 'Memory', 'WebFrontend')
+            elsif metric_spec.name.start_with?('Database','View','MongoDB','Redis','Memcached','External','Nested', 'CPU', 'Memory', 'WebFrontend','Rake')
               if metric_spec.scope.empty?
                 general_array << TingYun::Metrics::MetricData.new(metric_spec, stats, metric_id)
               else
@@ -97,7 +98,7 @@ module TingYun
           if value.is_a? Array
             value.each do |array|
               if array.is_a? Array
-                metric_id_cache[array[0]["name"]] = array[1]
+                metric_id_cache[array[0]['name'].hash ^ (array[0]['parent']||EMPTY_PARENT).hash] = array[1]
               end
             end
           end

data/lib/ting_yun/version.rb

@@ -7,7 +7,9 @@ module TingYun
     MAJOR = 1
 
     MINOR = 1
-    TINY = 2
+
+    TINY = 3
+
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
 

data/lib/tingyun_rpm.rb

@@ -23,15 +23,17 @@
 
 require 'ting_yun/frameworks'
 
-
+require 'pry'
+#if the agent had started in manual , then shouldn't start in auto again
+unless defined?(::TingYun::Agent) && TingYun::Agent.agent
 if defined?(Rails::VERSION)
   if Rails::VERSION::MAJOR.to_i >= 3
     module TingYun
       class Railtie < Rails::Railtie
 
         initializer "tingyun_rpm.start_plugin" do |app|
-          TingYun::Agent.logger.info('initialize tingyun_rpm start_plugin')
-          TingYun::Frameworks.init_start(:config => app.config)
+            TingYun::Agent.logger.info('initialize tingyun_rpm start_plugin')
+            TingYun::Frameworks.init_start(:config => app.config)
         end
       end
     end
@@ -45,3 +47,4 @@ if defined?(Rails::VERSION)
 else
   TingYun::Frameworks.init_start
 end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tingyun_rpm
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - tingyun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -332,6 +332,7 @@ files:
 - lib/ting_yun/instrumentation/rails4/action_view_subscriber.rb
 - lib/ting_yun/instrumentation/rails4/active_record_subscriber.rb
 - lib/ting_yun/instrumentation/rails_middleware.rb
+- lib/ting_yun/instrumentation/rake.rb
 - lib/ting_yun/instrumentation/redis.rb
 - lib/ting_yun/instrumentation/support/active_record_helper.rb
 - lib/ting_yun/instrumentation/support/controller_instrumentation.rb
@@ -412,4 +413,3 @@ signing_key:
 specification_version: 4
 summary: TingYun Ruby Agent
 test_files: []
-has_rdoc: