tingyun_rpm 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21948f868b2947b4340e0c3da1981721cd469ef4
-  data.tar.gz: 377e83899da310ca20d4491e05bd25debb888b0d
+  metadata.gz: 3c697d815d0c4dfa694eec1b5c600254f77c0a33
+  data.tar.gz: 7c0f3e329a156431014ee6ca7855ed0869059ac9
 SHA512:
-  metadata.gz: 219f57d9cf603a41c5346142a47ed84fcd1f38e113eb715ad8e27fe8534a70a2224e6887cda71b36ac7e2056812fc1d4fa2ce7bf6f209ec28e60a4cfbe309027
-  data.tar.gz: ee3b7d19c7f19308575837b0b76fb6202e993cfc9abb1e456c9d5d919d05dcb794cb02b8a9bc728492b54d0c9e9fa973fc9aa032a2050dd57d9ad0e137c9d1d1
+  metadata.gz: 32c38d249c36946077cecaa0e2483ece0b034a446da3a46ac1664d2d2c9c13a41b347caa962145140de7a6ab2630c752334d809787c6e1e35249fd8a93290da7
+  data.tar.gz: 406227f1aee1ae7ce1e7aa533c29624c6e41be7a1259ce036c673b99a2f3f3af41235ef7b0a0881865d3db738baf9571ffa9463d285c3cb097d6647360fd1fca

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

@@ -10,6 +10,9 @@ module TingYun
     module Collector
       class ErrorCollector
         ERRORS_ACTION = "Errors/Count/".freeze
+
+
+
         ERRORS_ALL = "Errors/Count/All".freeze
         ERRORS_ALL_WEB = "Errors/Count/AllWeb".freeze
         ERRORS_ALL_BACK_GROUND = "Errors/Count/AllBackground".freeze
@@ -61,11 +64,6 @@ module TingYun
         attr_reader :error_trace_array, :external_error_array
 
         def initialize
-          # lookup of exception class names to ignore.  Hash for fast access
-          @ignore = {}
-
-          @lock = Mutex.new
-
           @error_trace_array = ::TingYun::Agent::Collector::ErrorTraceArray.new(MAX_ERROR_QUEUE_LENGTH)
           @external_error_array = ::TingYun::Agent::Collector::ErrorTraceArray.new(MAX_ERROR_QUEUE_LENGTH)
         end

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

@@ -59,7 +59,9 @@ module TingYun
           if state.sql_recorded? && !metric_name.nil?
             if duration*1000 > TingYun::Agent.config[:'nbs.action_tracer.slow_sql_threshold']
               if duration*1000 > TingYun::Agent.config[:'nbs.action_tracer.stack_trace_threshold']
-                backtrace = (caller.reject! { |t| t.include?('tingyun_rpm') }).join("\n")
+                backtrace = (caller.reject! { |t| t.include?('tingyun_rpm') })
+                backtrace = backtrace.first(40) if backtrace.length > 40
+                backtrace = backtrace.join("\n")
               else
                 backtrace = ''
               end

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

@@ -157,7 +157,9 @@ module TingYun
         # than the specified duration
         def append_backtrace(node, duration)
           if duration*1000 >= Agent.config[:'nbs.action_tracer.stack_trace_threshold']
-            node[:stacktrace] = caller.reject! { |t| t.include?('tingyun_rpm') }
+            trace =  caller.reject! { |t| t.include?('tingyun_rpm') }
+            trace = trace.first(40) if trace.length > 40
+            node[:stacktrace] = trace
           end
 
         end

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

@@ -40,6 +40,7 @@ module TingYun
         rescue => e
           klass = "External/#{request.uri.to_s.gsub('/','%2F')}/net%2Fhttp"
           handle_error(e,klass)
+          raise e
         ensure
           finish_trace(state, t0, node, request, response)
         end

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

@@ -8,7 +8,6 @@ module TingYun
         attr_accessor :agent_attributes
         def initialize
           @agent_attributes  = {}
-          @custom_attributes = {}
         end
 
         def add_agent_attribute(key, value)

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

@@ -8,14 +8,11 @@ module TingYun
     class Transaction
       class Trace
 
-        attr_accessor :node_count, :threshold, :metric_name, :uri, :guid, :attributes, :start_time, :finished, :tx_id
-
-        attr_reader  :root_node
+        attr_accessor :root_node, :node_count, :threshold, :metric_name, :uri, :guid, :attributes, :start_time, :finished, :tx_id
 
         def initialize(start_time)
           @start_time = start_time
           @node_count = 0
-          @root_node = TingYun::Agent::Transaction::TraceNode.new(0.0, 'ROOT')
           @prepared = false
           @guid = generate_guid
         end
@@ -26,7 +23,7 @@ module TingYun
         end
 
         def duration
-          @root_node.duration
+          root_node.duration
         end
 
 
@@ -38,7 +35,7 @@ module TingYun
               duration,
               request_params,
               custom_params,
-              @root_node.to_array
+              root_node.to_array
           ]
         end
 
@@ -61,7 +58,7 @@ module TingYun
             collect_explain_plans!
             prepare_sql_for_transmission!
           else
-            @root_node.each_call do |node|
+            root_node.each_call do |node|
               node.params.delete(:sql)
             end
           end
@@ -72,7 +69,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']
-          @root_node.each_call do |node|
+          root_node.each_call do |node|
             if node[:sql] && node.duration > threshold
               node[:explainPlan] = node.explain_sql
             end
@@ -81,7 +78,7 @@ module TingYun
 
         def prepare_sql_for_transmission!(&block)
           strategy = TingYun::Agent::Database.record_sql_method('nbs.action_tracer.record_sql')
-          @root_node.each_call do |node|
+          root_node.each_call do |node|
             next unless node[:sql]
 
             case strategy

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

@@ -11,10 +11,15 @@ module TingYun
       def initialize(time=Time.now)
         @trace = TingYun::Agent::Transaction::Trace.new(time.to_f)
         @trace_start = time.to_f
-        @current_node = @trace.root_node
       end
 
       def trace_entry(time)
+        if @trace.node_count == 0
+          node = @trace.create_node(time.to_f - @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)
           @current_node.add_called_node(node)

data/lib/ting_yun/configuration/default_source.rb

@@ -631,7 +631,14 @@ module TingYun
             :public => true,
             :type => String,
             :allowed_from_server => true,
-            :description => '跨应用追踪加密ID'
+            :description => 'trace ID of crossing apps'
+        },
+        :'nbs.naming.rules' => {
+            :default => '',
+            :public => true,
+            :type => String,
+            :allowed_from_server => true,
+            :description => 'the rule of name the webaction name  containing match & split ways'
         }
     }.freeze
   end

data/lib/ting_yun/instrumentation/net.rb

@@ -38,6 +38,7 @@ TingYun::Support::LibraryDetection.defer do
           rescue => e
             klass = "External/#{uri_or_host.to_s.gsub('/','%2F')}/net%2Fhttp"
             ::TingYun::Instrumentation::Support::ExternalError.handle_error(e,klass)
+            raise e
           end
         end
         alias get_response_without_tingyun get_response
@@ -49,6 +50,7 @@ TingYun::Support::LibraryDetection.defer do
           rescue => e
             klass = "External/#{address.to_s.gsub('/','%2F')}/net%2Fhttp"
             ::TingYun::Instrumentation::Support::ExternalError.handle_error(e,klass)
+            raise e
           end
         end
         alias :start_without_tingyun :start

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

@@ -14,20 +14,15 @@ module TingYun
           if !response.nil? && response.code =~ /^[4,5][0-9][0-9]$/ && response.code!='401'
             e = TingYun::Support::Exception::InternalServerError.new("#{response.code}: #{response.message}")
             klass = "External/#{request.uri.to_s.gsub('/','%2F')}/#{type}"
-            e.instance_variable_set(:@tingyun_klass, klass)
-            e.instance_variable_set(:@tingyun_external, true)
+            set_attributes(e, klass)
             e.instance_variable_set(:@tingyun_code, response.code)
-            e.instance_variable_set(:@tingyun_trace, caller.reject! { |t| t.include?('tingyun_rpm') })
             TingYun::Agent.notice_error(e)
           end
         end
 
         def handle_error(e,klass)
 
-          e.instance_variable_set(:@tingyun_klass, klass)
-          e.instance_variable_set(:@tingyun_external, true)
-          e.instance_variable_set(:@tingyun_trace, caller.reject! { |t| t.include?('tingyun_rpm') })
-
+          set_attributes(e, klass)
           case e
             when Errno::ECONNREFUSED
               e.instance_variable_set(:@tingyun_code, 902)
@@ -42,8 +37,18 @@ module TingYun
           end
 
           TingYun::Agent.notice_error(e)
+        end
 
-          raise e
+        def set_attributes(exception, klass)
+          begin
+            exception.instance_variable_set(:@tingyun_klass, klass)
+            exception.instance_variable_set(:@tingyun_external, true)
+            trace = caller.reject! { |t| t.include?('tingyun_rpm') }
+            trace = trace.first(40) if trace.length > 40
+            exception.instance_variable_set(:@tingyun_trace, trace)
+          rescue => e
+            TingYun::Agent.logger.warn("Failed to set attributes for : #{exception}: ", e)
+          end
         end
 
       end

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

@@ -0,0 +1,50 @@
+module TingYun
+  module Instrumentation
+    module Support
+      module SplitController
+        # HTTP = {
+        #   'GET' => 1,
+        #   'POST' => 2,
+        #   'PUT' => 3,
+        #   'DELETE' => 4,
+        #   'HEAD' => 5
+        # }
+        #
+        # RULE = {
+        #   1=> :eql?,
+        #   2=> :start_with?,
+        #   3=> :end_with?,
+        #   4=> :include?
+        # }
+        #
+        # def match?(event)
+        #   rules.each do |rule|
+        #     if method_match?(event.method, rule[:match]['method'])
+        #       if url_match?(event.path,rule[:match][:match], rule[:match]['value'])
+        #
+        #       end
+        #     end
+        #   end
+        # end
+        #
+        #
+        #
+        # def rules
+        #   TingYun::Agent.config[:'']
+        # end
+        #
+        # def method_match?(method, rule)
+        #   rule[:match]['method'] == 0 || rule == HTTP[method]
+        # end
+        #
+        # def url_match?(url, rule, value)
+        #   url.send(RULE[rule], value)
+        # end
+        #
+        # def params_match?
+        #
+        # end
+      end
+    end
+  end
+end

data/lib/ting_yun/instrumentation/thrift.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require 'ting_yun/support/helper'
 require 'ting_yun/agent'
+require 'ting_yun/instrumentation/support/external_error'
 
 module TingYun
   module Instrumentation
@@ -238,23 +239,25 @@ TingYun::Support::LibraryDetection.defer do
 
       include TingYun::Instrumentation::ThriftHelper
 
-      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)
-      end
 
-      alias :send_message_args_without_tingyun :send_message_args
-      alias :send_message_args  :send_message_args_with_tingyun
+        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)
+        end
+
+        alias :send_message_args_without_tingyun :send_message_args
+        alias :send_message_args  :send_message_args_with_tingyun
+
 
       def send_message_with_tingyun(name, args_class, args = {})
 
@@ -296,11 +299,7 @@ TingYun::Support::LibraryDetection.defer do
         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")
-          e.instance_variable_set(:@tingyun_klass, metrics(operate)[0])
-          e.instance_variable_set(:@tingyun_external, true)
-          e.instance_variable_set(:@tingyun_code, 1000)
-          e.instance_variable_set(:@tingyun_trace, caller.reject! { |t| t.include?('tingyun_rpm') })
-          TingYun::Agent.notice_error(e)
+          ::TingYun::Instrumentation::Support::ExternalError.handle_error(e,metrics(operate)[0])
         end
 
         t1 = Time.now.to_f

data/lib/ting_yun/support/collector.rb

@@ -18,7 +18,13 @@ module TingYun
       end
 
       def collector_from_host(hostname=nil)
-        Collector.new(hostname || TingYun::Agent.config[:host], TingYun::Agent.config[:port])
+        if hostname.nil?
+          Collector.new(TingYun::Agent.config[:host], TingYun::Agent.config[:port])
+        else
+          args = hostname.split(':')
+          Collector.new(args[0], args[1]||TingYun::Agent.config[:port])
+        end
+
       end
 
     end

data/lib/ting_yun/ting_yun_service/upload_service.rb

@@ -67,7 +67,7 @@ module TingYun
               if metric_spec.scope.empty?
                 general_array << TingYun::Metrics::MetricData.new(metric_spec, stats, metric_id)
               else
-                components_array << TingYun::Metrics::MetricData.new(metric_spec, stats, metric_id)
+                components_array << TingYun::Metrics::MetricData.new(metric_spec, stats, metric_id) unless metric_spec.name.start_with?('External/NULL')
               end
             elsif metric_spec.name.start_with?('cross_app')
               external =  metric_spec.name.split(';')

data/lib/ting_yun/version.rb

@@ -6,10 +6,8 @@ module TingYun
 
     MAJOR = 1
 
-    MINOR = 0
-    TINY = 7
-
-
+    MINOR = 1
+    TINY = 0
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tingyun_rpm
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - tingyun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -344,6 +344,7 @@ files:
 - lib/ting_yun/instrumentation/support/mongo_formatter.rb
 - lib/ting_yun/instrumentation/support/parameter_filtering.rb
 - lib/ting_yun/instrumentation/support/queue_time.rb
+- lib/ting_yun/instrumentation/support/split_controller.rb
 - lib/ting_yun/instrumentation/support/transaction_namer.rb
 - lib/ting_yun/instrumentation/thrift.rb
 - lib/ting_yun/logger.rb