tingyun_rpm 1.4.2 → 1.5.0

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

@@ -10,7 +10,7 @@ module TingYun
         attr_accessor :apdex_start, :transaction_start_time
 
         def initialize(start, transaction_start)
-          @apdex_start = start || transaction_start
+          @apdex_start = (start || transaction_start).to_f
           @transaction_start_time = transaction_start
         end
 

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

@@ -27,13 +27,14 @@ module TingYun
           txn = state.current_transaction
           if txn
             txn.exceptions.notice_error(e, options)
+            state.transaction_sample_builder.trace.add_errors_to_current_node(state,e) rescue nil
           elsif TingYun::Agent.instance
             TingYun::Agent.instance.error_collector.notice_error(e, options)
           end
         end
 
 
-        def stop(state, end_time = Time.now, summary_metric_names=[])
+        def stop(state, end_time = Time.now.to_f, summary_metric_names=[])
 
           txn = state.current_transaction
 
@@ -48,23 +49,23 @@ module TingYun
             txn.stop(state, end_time, nested_frame, summary_metric_names)
             state.reset
           else
-            nested_name = nested_transaction_name(nested_frame.name)
+            nested_name = Transaction.nested_transaction_name nested_frame.name
 
-            if nested_name.start_with?(MIDDLEWARE_PREFIX)
-              summary_metrics = MIDDLEWARE_SUMMARY_METRICS
-            else
-              summary_metrics = EMPTY_SUMMARY_METRICS
-            end
-            summary_metrics = summary_metric_names unless summary_metric_names.empty?
+            # if nested_name.start_with?(MIDDLEWARE_PREFIX)
+            #   summary_metrics = MIDDLEWARE_SUMMARY_METRICS
+            # 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,
-                nested_frame.start_time.to_f,
+                nested_frame.start_time,
                 nested_name,
-                summary_metrics,
+                EMPTY_SUMMARY_METRICS,
                 nested_frame,
                 NESTED_TRACE_STOP_OPTIONS,
-                end_time.to_f)
+                end_time)
 
           end
 
@@ -83,11 +84,11 @@ module TingYun
             # to be absolutely sure we don't report agent problems as app errors
             yield
           rescue => e
-            Transaction.notice_error(e)
+            ::TingYun::Agent.notice_error(e,:type=> :exception)
             raise e
           ensure
             # when kafka consumer in task, drop original web_action
-            Transaction.stop(state, Time.now, summary_metrics) if state.current_transaction
+            Transaction.stop(state, Time.now.to_f, summary_metrics) if state.current_transaction
           end
         end
 
@@ -100,10 +101,6 @@ module TingYun
           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)

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

@@ -6,6 +6,7 @@ module TingYun
       class Exceptions
         attr_accessor :exceptions
 
+
         def initialize
           @exceptions = {}
         end
@@ -20,7 +21,7 @@ module TingYun
         end
 
         # Do not call this.  Invoke the class method instead.
-        def notice_error(error, options={}) # :nodoc:
+        def notice_error(error, options={}) # :nodoc:11
           if @exceptions[error]
             @exceptions[error].merge! options
           else
@@ -30,12 +31,24 @@ module TingYun
 
         #collector error
         def had_error?
-          if @exceptions.empty?
-            return false
-          else
-            return true
-          end
+          @have ||= count_errors == 0? false : true
         end
+
+        def errors_and_exceptions
+          [count_errors, exceptions.size - count_errors]
+        end
+
+        def count_errors
+          @count_errors ||=  errors.size
+        end
+
+        def errors
+          @errors ||= exceptions.select{|k,v| v[:type]==:error}
+        end
+        def exceptions
+          @exceptions ||= exceptions.select{|k,v| v[:type]==:exception}
+        end
+
       end
     end
   end

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

@@ -14,6 +14,10 @@ module TingYun
         end
 
         def create_nested_frame(state, category, options)
+
+          if options[:filtered_params] && !options[:filtered_params].empty?
+            attributes.merge_request_parameters(options[:filtered_params])
+          end
           @has_children = true
           frame_stack.push TingYun::Agent::MethodTracerHelpers.trace_execution_scoped_header(state, Time.now.to_f)
           name_last_frame(options[:transaction_name])
@@ -71,7 +75,7 @@ module TingYun
 
         def record_summary_metrics(state, outermost_node_name,end_time)
           unless @frozen_name == outermost_node_name
-            time = (end_time.to_f - start_time.to_f) * 1000
+            time = (end_time - start_time) * 1000
             @metrics.record_unscoped(@frozen_name, time)
             if @frozen_name.start_with?('WebAction')
               state.current_transaction.base_quantile_hash[@frozen_name] = time
@@ -79,7 +83,7 @@ module TingYun
           end
         end
 
-        def assign_agent_attributes
+        def assign_agent_attributes(state)
 
           @attributes.add_agent_attribute(:threadName,  "pid-#{$$}");
 
@@ -89,7 +93,7 @@ module TingYun
 
           @attributes.add_agent_attribute(:tx_id,  @guid);
           @attributes.add_agent_attribute(:metric_name,  best_name);
-
+          @attributes.add_agent_attribute(:trace_id, state.trace_id || "0")
         end
 
 
@@ -131,7 +135,7 @@ module TingYun
           unless @frozen_name
             @frozen_name = best_name
           end
-
+          @frozen_name = CONTROLLER_PREFIX + @frozen_name unless @frozen_name.start_with? CONTROLLER_PREFIX,BACKGROUND_PREFIX
           yield if block_given?
         end
 

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

@@ -1,14 +1,15 @@
-  # encoding: utf-8
+# encoding: utf-8
 require 'ting_yun/agent/transaction/trace_node'
 require 'ting_yun/support/helper'
 require 'ting_yun/support/coerce'
 require 'ting_yun/agent/database'
+require 'set'
 module TingYun
   module Agent
     class Transaction
       class Trace
 
-        attr_accessor :root_node, :node_count, :threshold, :guid, :attributes, :start_time, :finished
+        attr_accessor :root_node, :node_count, :threshold, :guid, :attributes, :start_time, :finished, :array_size,:e_set
 
         def initialize(start_time)
           @start_time = start_time
@@ -16,6 +17,7 @@ module TingYun
           @prepared = false
           @guid = generate_guid
           @root_node = TingYun::Agent::Transaction::TraceNode.new(0.0, "ROOT")
+          @e_set = Set.new
         end
 
         def create_node(time_since_start, metric_name = nil)
@@ -31,7 +33,7 @@ module TingYun
         EMPTY_STRING = ''.freeze
 
         include TingYun::Support::Coerce
-        
+
         def trace_tree
           [
               @start_time.round,
@@ -50,7 +52,7 @@ module TingYun
               encoder.encode(trace_tree),
               attributes.agent_attributes[:tx_id],
               guid
-          ]
+          ] + array_size
         end
 
         def prepare_to_send!
@@ -110,6 +112,23 @@ module TingYun
           attributes.request_params
         end
 
+        def add_errors(errors)
+          errors.each do |error|
+            unless @e_set.member? error.object_id
+              @e_set.add error.object_id
+              root_node.add_error(error)
+            end
+          end
+        end
+
+        def add_errors_to_current_node(state, error)
+          unless @e_set.member? error.object_id
+            @e_set.add error.object_id
+            state.transaction_sample_builder.current_node.add_error(error)
+          end
+        end
+
+
         HEX_DIGITS = (0..15).map{|i| i.to_s(16)}
         GUID_LENGTH = 16
 

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

@@ -22,6 +22,7 @@ module TingYun
           @metric_name     = metric_name || UNKNOWN_NODE_NAME
           @called_nodes    = nil
           @count           = 1
+          self["exception"] ||= []
         end
 
         def add_called_node(s)
@@ -41,11 +42,11 @@ 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]}"
-          else
-            metric_name
-          end
+          @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
@@ -57,7 +58,7 @@ module TingYun
            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} : [])]
+              [(@called_nodes ? @called_nodes.map{|s| s.to_array} : [])]
         end
 
         def custom_params
@@ -110,6 +111,25 @@ module TingYun
           TingYun::Agent::Database.explain_sql(statement)
         end
 
+        def add_error(error)
+          if error.respond_to?(:tingyun_external)
+            self["exception"] << {"message" => error.message,
+                                  "class" => "External #{error.tingyun_code}"
+                                  }
+          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') }
+              }
+            else
+              self["exception"] << {"message" => error.message,
+                                    "class" => error.class.name
+              }
+            end
+          end
+        end
+
         protected
         def parent_node=(s)
           @parent_node = s

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, klass_name=nil)
+      def pop_frame(state, expected_frame, name, time, deduct_call_time_from_parent=true, klass_name=nil, error = 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, klass_name) if sampler_enabled?
+        transaction_sampler.notice_pop_frame(state, name, time, klass_name, error) if sampler_enabled?
         frame.name = name
         frame
       end

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

@@ -5,7 +5,7 @@ require 'ting_yun/agent/transaction/trace'
 
 module TingYun
   module Agent
-    class TransactionSampleBuilder
+    class  TransactionSampleBuilder
 
       class PlaceholderNode
         attr_reader :parent_node
@@ -28,21 +28,21 @@ module TingYun
 
       attr_reader :current_node, :trace
 
-      def initialize(time=Time.now)
-        @trace = TingYun::Agent::Transaction::Trace.new(time.to_f)
-        @trace_start = time.to_f
+      def initialize(time=Time.now.to_f)
+        @trace = TingYun::Agent::Transaction::Trace.new(time)
+        @trace_start = time
         @current_node = @trace.root_node
       end
 
       def trace_entry(time)
         if @trace.node_count == 0
-          node = @trace.create_node(time.to_f - @trace_start)
+          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.to_f - @trace_start)
+          node = @trace.create_node(time - @trace_start)
           @current_node.add_called_node(node)
           @current_node = node
 
@@ -59,7 +59,7 @@ module TingYun
         @current_node
       end
 
-      def trace_exit(metric_name, time, klass_name)
+      def trace_exit(metric_name, time, klass_name, error = nil)
         if @current_node.is_a?(PlaceholderNode)
           @current_node.depth -= 1
           if @current_node.depth == 0
@@ -68,9 +68,18 @@ module TingYun
         else
           @current_node.metric_name = metric_name
           @current_node.klass = klass_name
-          @current_node.end_trace(time.to_f - @trace_start)
+          @current_node.end_trace(time - @trace_start)
           @current_node = @current_node.parent_node
         end
+        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
+            }
+          end
+        end
       end
 
       def finish_trace(time=Time.now.to_f)

data/lib/ting_yun/configuration/default_source.rb

@@ -634,12 +634,19 @@ module TingYun
             :allowed_from_server => true,
             :description => 'trace ID of crossing apps'
         },
+        :'naming.rules_enabled' => {
+            :default => false,
+            :public => true,
+            :type => Boolean,
+            :allowed_from_server => false,
+            :description => 'Enable or disable of the naming.rules function'
+        },
         :'nbs.naming.rules' => {
             :default => "[]",
             :public => true,
             :type => String,
             :allowed_from_server => true,
-            :description => 'defined nme rule '
+            :description => 'defined name rule '
         },
         :disable_rake => {
             :default => true,
@@ -655,6 +662,13 @@ module TingYun
             :allowed_from_server => false,
             :description => 'Specify an array of Rake tasks to automatically instrument.'
         },
+        :'rake.black.tasks' => {
+            :default => [],
+            :public => true,
+            :type => Array,
+            :allowed_from_server => false,
+            :description => 'Specify an array of Rake tasks to automatically uninstrument.'
+        },
         :'nbs.transaction_tracer.thrift' =>{
             :default => true,
             :public => true,
@@ -682,6 +696,13 @@ module TingYun
             :type => Boolean,
             :allowed_from_server => true,
             :description => 'Enable or disable the  mq feature'
+        },
+        :'nbs.exception.stack_enabled' => {
+            :default => false,
+            :public => true,
+            :type => Boolean,
+            :allowed_from_server => true,
+            :description => 'Enable or disable the  exception trace'
         }
     }.freeze
   end

data/lib/ting_yun/http/abstract_request.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+require 'ting_yun/support/http_clients/uri_util'
+module TingYun
+  module Http
+    class AbstractRequest
+      ERROR_MESSAGE = 'Subclasses of TingYun::Http::AbstractRequest must implement a '.freeze
+
+      def []
+        raise NotImplementedError, ERROR_MESSAGE + ':[] method'
+      end
+
+      def []=
+        raise NotImplementedError, ERROR_MESSAGE + ':[]= method'
+      end
+
+      def from
+        raise NotImplementedError, ERROR_MESSAGE + ':from method'
+      end
+
+
+    end
+  end
+end