tingyun_rpm 1.1.4.2 → 1.2.0

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

@@ -8,13 +8,14 @@ module TingYun
     class Transaction
       class Trace
 
-        attr_accessor :root_node, :node_count, :threshold, :metric_name, :uri, :guid, :attributes, :start_time, :finished, :tx_id
+        attr_accessor :root_node, :node_count, :threshold, :guid, :attributes, :start_time, :finished
 
         def initialize(start_time)
           @start_time = start_time
           @node_count = 0
           @prepared = false
           @guid = generate_guid
+          @root_node = TingYun::Agent::Transaction::TraceNode.new(0.0, "ROOT")
         end
 
         def create_node(time_since_start, metric_name = nil)
@@ -27,6 +28,7 @@ module TingYun
         end
 
 
+        EMPTY_STRING = ''.freeze
 
         include TingYun::Support::Coerce
         
@@ -43,10 +45,10 @@ module TingYun
           [
               @start_time.round,
               duration,
-              TingYun::Helper.correctly_encoded(metric_name)|| '',
-              TingYun::Helper.correctly_encoded(uri||metric_name||''),
+              TingYun::Helper.correctly_encoded(attributes.agent_attributes[:metric_name]|| EMPTY_STRING),
+              TingYun::Helper.correctly_encoded(attributes.agent_attributes[:request_path]||attributes.agent_attributes[:metric_name]|| EMPTY_STRING),
               encoder.encode(trace_tree),
-              tx_id || '',
+              attributes.agent_attributes[:tx_id],
               guid
           ]
         end
@@ -95,7 +97,7 @@ module TingYun
         def custom_params
           custom_param = {
               :threadName => string(attributes.agent_attributes[:threadName]),
-              :referer    => string(attributes.agent_attributes[:referer]) || ''
+              :referer    => string(attributes.agent_attributes[:referer]) || EMPTY_STRING
           }
           custom_param[:httpStatus] = int(attributes.agent_attributes[:httpStatus]) if attributes.agent_attributes[:httpStatus]
 

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

@@ -95,9 +95,7 @@ module TingYun
           return nil unless statement.respond_to?(:config) &&
               statement.respond_to?(:explainer)
 
-          TingYun::Agent::Database.explain_sql(statement.sql,
-                                                statement.config,
-                                                statement.explainer)
+          TingYun::Agent::Database.explain_sql(statement)
         end
 
         protected

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'ting_yun/agent/collector/transaction_sampler'
 
 module TingYun
   module Agent
@@ -62,10 +63,8 @@ module TingYun
         TingYun::Agent.config[:'nbs.action_tracer.enabled']
       end
 
-
-
       def transaction_sampler
-        TingYun::Agent.instance.transaction_sampler
+        ::TingYun::Agent::Collector::TransactionSampler
       end
 
       def clear

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

@@ -31,6 +31,7 @@ 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)
@@ -91,11 +92,15 @@ module TingYun
       end
 
 
-
+      def set_txId_and_txData(txid, txdata)
+        @current_node[:txId] = txid
+        @current_node[:txData] = txdata
+      end
 
       def node_limit
         Agent.config[:'transaction_tracer.limit_segments']
       end
+
     end
   end
 end

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

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'ting_yun/agent/transaction/traced_method_stack'
+require 'ting_yun/agent/transaction/transaction_timings'
 module TingYun
   module Agent
 
@@ -10,19 +11,12 @@ module TingYun
 
       # Request data
       attr_accessor :transaction_sample_builder
-      attr_reader   :current_transaction, :traced_method_stack
+      attr_reader   :current_transaction, :traced_method_stack, :timings
       # Sql Sampler Transaction Data
       attr_accessor :sql_sampler_transaction_data,
                     :client_transaction_id,
                     :client_tingyun_id_secret,
                     :client_req_id,
-                    :sql_duration,
-                    :external_duration,
-                    :web_duration,
-                    :queue_duration,
-                    :rds_duration,
-                    :mc_duration,
-                    :mon_duration,
                     :thrift_return_data
 
 
@@ -54,26 +48,21 @@ module TingYun
         @untraced = []
         @current_transaction = nil
         @traced_method_stack = TingYun::Agent::TracedMethodStack.new
-        @sql_duration = 0
-        @external_duration = 0
-        @web_duration = 0
-        @queue_duration = 0
-        @rds_duration = 0
-        @mc_duration = 0
-        @mon_duration = 0
+        @record_tt = nil
       end
 
       # This starts the timer for the transaction.
       def reset(transaction=nil)
-        # We purposefully don't reset @untraced, @record_tt and @record_sql
+        # We purposefully don't reset @untraced, @record_tt and @record_sql,@client_transaction_id,@client_tingyun_id_secret
         # since those are managed by TingYun::Agent.disable_* calls explicitly
         # and (more importantly) outside the scope of a transaction
         @current_transaction = transaction
         @traced_method_stack.clear
         @transaction_sample_builder = nil
         @sql_sampler_transaction_data = nil
-        @cross_tx_data = nil
         @thrift_return_data = nil
+        @timings = nil
+        @client_req_id = nil
       end
 
       # TT's and SQL
@@ -106,6 +95,59 @@ module TingYun
       end
 
 
+      def init_sql_transaction(obj)
+        @sql_sampler_transaction_data = obj
+      end
+
+      def self.process_thrift_data(data)
+        state = tl_get
+        state.thrift_return_data = data
+        builder = state.transaction_sample_builder
+        builder.set_txId_and_txData(state.request_guid, data) if builder
+      end
+
+      def save_referring_transaction_info(data)
+        data = Array(data)
+        @client_tingyun_id_secret = data.shift
+        data.each do |e|
+          if m = e.match(/x=/)
+            @client_transaction_id = m.post_match
+          elsif m = e.match(/r=/)
+            @client_req_id = m.post_match
+          end
+        end
+      end
+
+      def timings
+        @timings ||= TingYun::Agent::TransactionTimings.new(transaction_queue_time, transaction_start_time)
+      end
+
+      def transaction_start_time
+        current_transaction.nil? ? 0.0 : current_transaction.start_time
+      end
+
+      def transaction_queue_time
+        current_transaction.nil? ? 0.0 : current_transaction.apdex.queue_time
+      end
+
+      def transaction_name
+        current_transaction.nil? ? nil : current_transaction.best_name
+      end
+
+      def trace_id
+        transaction_sample_builder.nil? ? nil : transaction_sample_builder.trace.guid
+      end
+
+      def same_account?
+        server_info = TingYun::Agent.config[:tingyunIdSecret].split('|')
+        client_info = (@client_tingyun_id_secret || '').split('|')
+        if server_info[0] && !server_info[0].empty? && server_info[0] == client_info[0]
+          return true
+        else
+          return false
+        end
+      end
+
     end
   end
 end

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

@@ -0,0 +1,72 @@
+# encoding: utf-8
+
+require 'forwardable'
+
+module TingYun
+  module Agent
+    class TransactionTimings
+
+      class Timings <  Struct.new :sql_duration, :external_duration, :rds_duration, :mc_duration, :mon_duration; end
+
+      def initialize(queue_time_in_seconds, start_time_in_seconds)
+        @queue_time_in_seconds = clamp_to_positive(queue_time_in_seconds.to_f)
+        @start_time_in_seconds = clamp_to_positive(start_time_in_seconds.to_f)
+
+        @timings = TingYun::Agent::TransactionTimings::Timings.new(0.0,0.0,0.0,0.0,0.0)
+      end
+
+
+      attr_reader :start_time_in_seconds, :queue_time_in_seconds, :timings
+
+      extend Forwardable
+
+      def_delegators :@timings, :sql_duration, :sql_duration= ,
+                     :external_duration, :external_duration=,
+                     :rds_duration, :rds_duration=,
+                     :mc_duration, :mc_duration=,
+                     :mon_duration, :mon_duration=
+
+
+
+      def start_time_as_time
+        Time.at(@start_time_in_seconds)
+      end
+
+      def start_time_in_millis
+        convert_to_milliseconds(@start_time_in_seconds)
+      end
+
+      def queue_time_in_millis
+        convert_to_milliseconds(queue_time_in_seconds)
+      end
+
+      def app_time_in_millis
+        convert_to_milliseconds(app_time_in_seconds)
+      end
+
+      def app_time_in_seconds
+        Time.now.to_f - @start_time_in_seconds
+      end
+
+      def app_execute_duration
+        app_time_in_millis - queue_time_in_millis - sql_duration - external_duration - rds_duration - mon_duration - mc_duration
+      end
+
+      # Helpers
+
+      def slow_action_tracer?
+        return app_time_in_seconds > TingYun::Agent.config[:'nbs.action_tracer.action_threshold']
+      end
+
+      def convert_to_milliseconds(value_in_seconds)
+        clamp_to_positive((value_in_seconds.to_f * 1000.0).round)
+      end
+
+      def clamp_to_positive(value)
+        return 0.0 if value < 0.0
+        value
+      end
+
+    end
+  end
+end

data/lib/ting_yun/configuration.rb

@@ -5,5 +5,16 @@
 module TingYun
   module Configuration
 
+    def self.get_name
+      app_name = TingYun::Agent.config[:app_name]
+      case app_name
+        when Array then
+          app_name
+        when String then
+          app_name.split(';')
+        else
+          []
+      end
+    end
   end
 end

data/lib/ting_yun/configuration/default_source.rb

@@ -15,6 +15,7 @@ module TingYun
         TingYun::Agent.config[key]
       end
     end
+    
 
     class Boolean;
     end
@@ -107,12 +108,6 @@ module TingYun
         Proc.new { TingYun::Agent.config[:ssl] ? 443 : 80 }
       end
 
-      def self.agent_enabled
-        Proc.new {
-          TingYun::Agent.config[:enabled]
-        }
-      end
-
       def self.action_tracer_action_threshold
         Proc.new { TingYun::Agent.config[:apdex_t] * 4 }
       end
@@ -161,7 +156,7 @@ module TingYun
             :description => 'Enable or disable the agent.'
         },
         :'nbs.agent_enabled' => {
-            :default => DefaultSource.agent_enabled,
+            :default => true,
             :public => true,
             :type => Boolean,
             :allowed_from_server => true,
@@ -289,7 +284,7 @@ module TingYun
         },
         :'nbs.rum.enabled' => {
             :default => false,
-            :public => false,
+            :public => true,
             :type => Boolean,
             :allowed_from_server => true,
             :description => 'Enable or disable page load timing (sometimes referred to as real user monitoring or RUM).'
@@ -297,11 +292,19 @@ module TingYun
         :'nbs.rum.script' => {
             :default => nil,
             :allow_nil => true,
-            :public => false,
+            :public => true,
             :type => String,
             :allowed_from_server => true,
             :description => 'RUM Script URI'
         },
+        :'nbs.rum.mix_enabled' => {
+            :default => false,
+            :allow_nil => false,
+            :public => true,
+            :type => String,
+            :allowed_from_server => true,
+            :description => '混合嵌码'
+        },
         :'nbs.rum.sample_ratio' => {
             :default => 1,
             :public => true,
@@ -373,13 +376,6 @@ module TingYun
             :allowed_from_server => false,
             :description => 'Autodetected application framework used to enable framework-specific functionality.'
         },
-        :monitor_mode => {
-            :default => true,
-            :public => true,
-            :type => Boolean,
-            :allowed_from_server => false,
-            :description => 'Enable or disable the transmission of data to the collector.'
-        },
         :'nbs.audit_mode' => {
             :default => false,
             :public => true,
@@ -454,7 +450,7 @@ module TingYun
             :public => false,
             :type => Fixnum,
             :allowed_from_server => false,
-            :description => 'Port for the New Relic API host.'
+            :description => 'Port for the TingYun  API host.'
         },
         :disable_middleware_instrumentation => {
             :default => false,
@@ -642,6 +638,13 @@ module TingYun
             :type => Array,
             :allowed_from_server => false,
             :description => 'Specify an array of Rake tasks to automatically instrument.'
+        },
+        :'nbs.transaction_tracer.thrift' =>{
+            :default => true,
+            :public => true,
+            :type => Boolean,
+            :allowed_from_server => true,
+            :description => 'Enable or disable the thrift cross application feature'
         }
     }.freeze
   end

data/lib/ting_yun/configuration/manager.rb

@@ -5,12 +5,56 @@ require 'ting_yun/configuration/environment_source'
 require 'ting_yun/configuration/yaml_source'
 require 'ting_yun/configuration/server_source'
 require 'ting_yun/configuration/manual_source'
-
+require 'ting_yun/configuration'
 
 module TingYun
   module Configuration
     class Manager
 
+      # module Arel
+      #   module Visitors
+      #     class Visitor
+      #       def initialize
+      #         @dispatch = get_dispatch_cache
+      #       end
+      #
+      #       def accept object
+      #         visit object
+      #       end
+      #
+      #       private
+      #
+      #       def self.dispatch_cache
+      #         Hash.new do |hash, klass|
+      #           hash[klass] = "visit_#{(klass.name || '').gsub('::', '_')}"
+      #         end
+      #       end
+      #
+      #       def get_dispatch_cache
+      #         self.class.dispatch_cache
+      #       end
+      #
+      #       def dispatch
+      #         @dispatch
+      #       end
+      #
+      #       def visit object
+      #         send dispatch[object.class], object
+      #       rescue NoMethodError => e
+      #         raise e if respond_to?(dispatch[object.class], true)
+      #         superklass = object.class.ancestors.find { |klass|
+      #           respond_to?(dispatch[klass], true)
+      #         }
+      #         raise(TypeError, "Cannot visit #{object.class}") unless superklass
+      #         dispatch[object.class] = dispatch[superklass]
+      #         retry
+      #       end
+      #     end
+      #   end
+      # end
+      # 实现缓存的一种方式
+
+
       def initialize
         reset_to_defaults
       end
@@ -31,23 +75,11 @@ module TingYun
         if TingYun::Agent.config[:'nbs.auto_app_naming']
           begin
           [::TingYun::Frameworks.framework.root.split('/').last]
-          rescue Exception => e
-            get_name
+          rescue
+            ::TingYun::Configuration.get_name
           end
         else
-          get_name
-        end
-
-      end
-
-      def get_name
-        case TingYun::Agent.config[:app_name]
-          when Array then
-            TingYun::Agent.config[:app_name]
-          when String then
-            TingYun::Agent.config[:app_name].split(';')
-          else
-            []
+          ::TingYun::Configuration.get_name
         end
       end
 
@@ -74,7 +106,7 @@ module TingYun
           accessor = key.to_sym
 
           if config.has_key?(accessor)
-            return evaluated = evaluate_procs(config[accessor]) #if it's proc
+            return evaluate_procs(config[accessor]) #if it's proc
           end
         end
         nil
@@ -144,12 +176,9 @@ module TingYun
 
         log_config(:add, source)
 
-        notify_finished_configuring if !was_finished && finished_configuring?
+        TingYun::Agent.instance.events.notify(:finished_configuring) if !was_finished && finished_configuring?
       end
 
-      def notify_finished_configuring
-        TingYun::Agent.instance.events.notify(:finished_configuring)
-      end
 
       def finished_configuring?
         !@server_source.nil?