tingyun_rpm 1.1.4.2 → 1.2.0

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

@@ -0,0 +1,92 @@
+# encoding: utf-8
+require 'ting_yun/support/serialize/json_wrapper'
+
+module TingYun
+  module Instrumentation
+    module Support
+      module JavascriptInstrument
+
+        GT = "}".freeze
+
+        module_function
+
+        def browser_timing_header #THREAD_LOCAL_ACCESS
+          return '' unless rum_enable? # unsupport insert script
+
+          state = TingYun::Agent::TransactionState.tl_get
+          return '' unless insert_js?(state)
+
+          bt_config = browser_timing_config(state)
+
+          return '' if bt_config.empty?
+
+          if TingYun::Agent.config[:'nbs.rum.mix_enabled']
+            html_safe_if_needed("<script>(function(w){(w._ty_rum || (w._ty_rum = {})).agent = #{bt_config};})(window);</script>")
+          else
+            html_safe_if_needed("<script>#{browser_instrument("ty_rum.agent=#{bt_config}")}</script>")
+          end
+        rescue => e
+          ::TingYun::Agent.logger.debug "Failure during RUM browser_timing_header construction", e
+          ''
+        end
+
+        def rum_enable?
+           TingYun::Agent.config[:'nbs.rum.enabled']
+        end
+
+        def insert_js?(state)
+          if !state.current_transaction
+            ::TingYun::Agent.logger.debug "Not in transaction. Skipping browser instrumentation."
+            false
+          elsif !state.transaction_traced?
+            ::TingYun::Agent.logger.debug "Transaction is not traced. Skipping browser instrumentation."
+            false
+          elsif !state.execution_traced?
+            ::TingYun::Agent.logger.debug "Execution is not traced. Skipping browser instrumentation."
+            false
+          else
+            true
+          end
+        end
+
+        def browser_timing_config(state)
+          timings = state.timings
+
+          data = {
+              :id => TingYun::Agent.config[:tingyunIdSecret],
+              :n => state.transaction_name ,
+              :a => timings.app_time_in_millis,
+              :q => timings.queue_time_in_millis,
+              :tid => state.trace_id
+          }
+          TingYun::Support::Serialize::JSONWrapper.dump(data)
+        end
+
+        def html_safe_if_needed(string)
+          string = string.html_safe if string.respond_to?(:html_safe)
+          string
+        end
+
+        def browser_instrument(js)
+          script = TingYun::Agent.config[:'nbs.rum.script']
+          last_brace = script.rindex(GT) if script
+          if last_brace
+            script = script[0..last_brace-1] <<
+                js <<
+                script[last_brace..-1]
+          end
+          script
+        end
+
+        def find_brace_end
+          script = TingYun::Agent.config[:'nbs.rum.script']
+          last_brace = script.rindex(GT) if script
+          last_brace
+        end
+
+
+
+      end
+    end
+  end
+ end

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

@@ -0,0 +1,73 @@
+# encoding: utf-8
+require 'ting_yun/support/helper'
+require 'ting_yun/agent'
+require 'ting_yun/instrumentation/support/external_error'
+
+module TingYun
+  module Instrumentation
+    module ThriftHelper
+      def operator result_klass
+        namespaces = result_klass.to_s.split('::')
+        operator_name = namespaces[0].downcase
+        if namespaces.last =~ /_result/
+          operator_name = "#{operator_name}.#{namespaces.last.sub('_result', '').downcase}"
+        elsif namespaces.last =~ /_args/
+          operator_name = "#{operator_name}.#{namespaces.last.sub('_args', '').downcase}"
+        end
+
+        operator_name
+      end
+
+      def operations
+        @operations ||= {}
+      end
+
+      def started_time_and_node(operate)
+        _op_ = operations.delete(operate)
+        time = (_op_ && _op_[:started_time]) || Time.now.to_f
+        node = _op_ && _op_[:node]
+        [time, node]
+      end
+
+
+      def tingyun_socket
+        @iprot.instance_variable_get("@trans").instance_variable_get("@transport")
+      end
+
+      def tingyun_host
+        @tingyun_host ||= tingyun_socket.instance_variable_get("@host") rescue nil
+      end
+
+      def tingyun_port
+        @tingyun_port  ||= tingyun_socket.instance_variable_get("@port") rescue nil
+      end
+
+      def metrics operate
+        state = TingYun::Agent::TransactionState.tl_get
+        metrics = if tingyun_host.nil?
+                    ["External/thrift:%2F%2F#{operate}/#{operate}"]
+                  else
+                    ["External/thrift:%2F%2F#{tingyun_host}:#{tingyun_port}%2F#{operate}/#{operate}"]
+                  end
+        metrics << "External/NULL/ALL"
+
+        if TingYun::Agent::Transaction.recording_web_transaction?
+          metrics << "External/NULL/AllWeb"
+        else
+          metrics << "External/NULL/AllBackground"
+        end
+
+
+        my_data = state.thrift_return_data
+
+
+        if my_data && TingYun::Agent.config[:'nbs.transaction_tracer.thrift'] && TingYun::Agent.config[:'nbs.transaction_tracer.enabled']
+          uri = "thrift:%2F%2F#{tingyun_host}:#{tingyun_port}%2F#{operate}/#{operate}"
+          metrics << "cross_app;#{my_data["id"]};#{my_data["action"]};#{uri}"
+        end
+        return metrics
+
+      end
+    end
+  end
+end

data/lib/ting_yun/instrumentation/thrift.rb

@@ -1,77 +1,4 @@
-# encoding: utf-8
-require 'ting_yun/support/helper'
-require 'ting_yun/agent'
-require 'ting_yun/instrumentation/support/external_error'
-
-module TingYun
-  module Instrumentation
-    module ThriftHelper
-      def operator result_klass
-        namespaces = result_klass.to_s.split('::')
-        operator_name = namespaces[0].downcase
-        if namespaces.last =~ /_result/
-          operator_name = "#{operator_name}.#{namespaces.last.sub('_result', '').downcase}"
-        elsif namespaces.last =~ /_args/
-          operator_name = "#{operator_name}.#{namespaces.last.sub('_args', '').downcase}"
-        end
-
-        operator_name
-      end
-
-      def operations
-        @operations ||= {}
-      end
-
-      def started_time_and_node(operate)
-        _op_ = operations.delete(operate)
-        time = (_op_ && _op_[:started_time]) || Time.now.to_f
-        node = _op_ && _op_[:node]
-        [time, node]
-      end
-
-
-      def tingyun_socket
-        @iprot.instance_variable_get("@trans").instance_variable_get("@transport")
-      end
-
-      def tingyun_host
-        @tingyun_host ||= tingyun_socket.instance_variable_get("@host") rescue nil
-      end
-
-      def tingyun_port
-        @tingyun_port  ||= tingyun_socket.instance_variable_get("@port") rescue nil
-      end
-
-      def metrics operate
-        state = TingYun::Agent::TransactionState.tl_get
-        metrics = if tingyun_host.nil?
-                    ["External/thrift:%2F%2F#{operate}/#{operate}"]
-                  else
-                    ["External/thrift:%2F%2F#{tingyun_host}:#{tingyun_port}%2F#{operate}/#{operate}"]
-                  end
-        metrics << "External/NULL/ALL"
-
-        if TingYun::Agent::Transaction.recording_web_transaction?
-          metrics << "External/NULL/AllWeb"
-        else
-          metrics << "External/NULL/AllBackground"
-        end
-
-
-        my_data = state.thrift_return_data
-
-
-        if my_data
-          uri = "thrift:%2F%2F#{tingyun_host}:#{tingyun_port}%2F#{operate}/#{operate}"
-          metrics << "cross_app;#{my_data["id"]};#{my_data["action"]};#{uri}"
-        end
-        return metrics
-
-      end
-    end
-  end
-end
-
+  # encoding: utf-8
 
 
 
@@ -89,180 +16,51 @@ TingYun::Support::LibraryDetection.defer do
   end
 
   executes do
-    # ::Thrift::Processor.module_eval do
-    #
-    #
-    #
-    #   def same_account?(state)
-    #     server_info = TingYun::Agent.config[:tingyunIdSecret].split('|')
-    #     client_info = (state.client_tingyun_id_secret || '').split('|')
-    #     if !server_info[0].nil? && server_info[0] == client_info[0] && !server_info[0].empty?
-    #       return true
-    #     else
-    #       return false
-    #     end
-    #   end
-    #   def write_result_with_tingyun(result, oprot, name, seqid)
-    #
-    #     state = TingYun::Agent::TransactionState.tl_get
-    #     oprot.write_message_begin(name, ::Thrift::MessageTypes::REPLY, seqid)
-    #
-    #     if state.execution_traced? && same_account?(state)
-    #       class_name = "WebAction/thrift/#{self.class.to_s.split('::').first.downcase}.#{name}"
-    #       state.current_transaction.default_name = class_name
-    #       data = TingYun::Support::Serialize::JSONWrapper.dump("TingyunTxData" => build_payload(state))
-    #       oprot.write_field_begin("TingyunField", 11, 6)
-    #       oprot.write_string(data)
-    #       oprot.write_field_end
-    #       write_result_without_tingyun(result, oprot, name, seqid)
-    #       state.current_transaction.add_agent_attribute(:httpStatus, 200)
-    #       TingYun::Agent::Transaction.stop(state)
-    #     else
-    #       write_result_without_tingyun(result, oprot, name, seqid)
-    #     end
-    #   end
-    #
-    #   def write_error_with_tingyun(err, oprot, name, seqid)
-    #     p 'write_error'
-    #     state = TingYun::Agent::TransactionState.tl_get
-    #     oprot.write_message_begin(name, ::Thrift::MessageTypes::EXCEPTION, seqid)
-    #
-    #     if state.execution_traced? && same_account?(state)
-    #
-    #       class_name = "WebAction/thrift/#{self.class.to_s.split('::').first.downcase}.#{name}"
-    #       state.current_transaction.default_name = class_name
-    #       data = TingYun::Support::Serialize::JSONWrapper.dump("TingyunTxData" => build_payload(state))
-    #       oprot.write_field_begin("TingyunField", 11, 6)
-    #       oprot.write_string(data)
-    #       oprot.write_field_end
-    #       write_result_without_tingyun(err, oprot, name, seqid)
-    #       p 'write_error end'
-    #       state.current_transaction.add_agent_attribute(:httpStatus, 500)
-    #
-    #       TingYun::Agent::Transaction.stop(state)
-    #     else
-    #       write_result_without_tingyun(err, oprot, name, seqid)
-    #     end
-    #   end
-    #
-    #
-    #   def build_payload(state)
-    #     state.web_duration = TingYun::Helper.time_to_millis(Time.now - state.current_transaction.start_time)
-    #     payload = {
-    #         :id => TingYun::Agent.config[:tingyunIdSecret].split('|')[1],
-    #         :action => state.current_transaction.best_name,
-    #         :trId => state.transaction_sample_builder.trace.guid,
-    #         :time => {
-    #             :duration => state.web_duration,
-    #             :qu => state.queue_duration,
-    #             :db => state.sql_duration,
-    #             :ex => state.external_duration,
-    #             :rds => state.rds_duration,
-    #             :mc => state.mc_duration,
-    #             :mon => state.mon_duration,
-    #             :code => execute_duration(state)
-    #         }
-    #     }
-    #     payload[:tr] = 1 if slow_action_tracer?(state)
-    #     payload[:r] = state.client_req_id unless state.client_req_id.nil?
-    #     payload
-    #   end
-    #
-    #   def slow_action_tracer?(state)
-    #     if state.web_duration > TingYun::Agent.config[:'nbs.action_tracer.action_threshold']
-    #       return true
-    #     else
-    #       return false
-    #     end
-    #   end
-    #
-    #   def write_result_without_tingyun(result, oprot, name, seqid)
-    #     result.write(oprot)
-    #     oprot.write_message_end
-    #     oprot.trans.flush
-    #   end
-    #
-    #   def execute_duration(state)
-    #     state.web_duration - state.queue_duration - state.sql_duration - state.external_duration - state.rds_duration - state.mc_duration - state.mon_duration
-    #   end
-    #
-    #   alias :write_result  :write_result_with_tingyun
-    #   alias :write_error  :write_error_with_tingyun
-    #   # alias :write_result_without_tingyun  :write_result
-    # end
 
     ::Thrift::BaseProtocol.class_eval do
 
       def skip_with_tingyun(type)
-
-        data = skip_without_tingyun(type)
-        state = TingYun::Agent::TransactionState.tl_get
-        if data.is_a? ::String
-          if data.include?("TingyunTxData")
-
-            my_data = TingYun::Support::Serialize::JSONWrapper.load data.gsub("'",'"')
-
-            state.thrift_return_data = my_data["TingyunTxData"]
-
-            transaction_sampler = ::TingYun::Agent.instance.transaction_sampler
-            transaction_sampler.tl_builder.current_node[:txId] = state.request_guid
-            transaction_sampler.tl_builder.current_node[:txData] = my_data["TingyunTxData"]
-          # elsif data.include?("TingyunID")
-          #   TingYun::Agent::Transaction.start(state, :thrift, :apdex_start_time => Time.now)
-          #   my_data = TingYun::Support::Serialize::JSONWrapper.load data.gsub("'",'"')
-          #   save_referring_transaction_info(state, my_data)
+        begin
+          data = skip_without_tingyun(type)
+        ensure
+          if data.is_a? ::String
+            if data.include?("TingyunTxData")
+              my_data = TingYun::Support::Serialize::JSONWrapper.load data.gsub("'",'"')
+              TingYun::Agent::TransactionState.process_thrift_data(my_data["TingyunTxData"])
+            end
           end
         end
       end
 
-      def save_referring_transaction_info(state,data)
-
-        info = data["TingyunID"].split(';')
-        tingyun_id_secret = info[0]
-        client_transaction_id = info.find do |e|
-          e.match(/x=/)
-        end.split('=')[1] rescue nil
-        client_req_id = info.find do |e|
-          e.match(/r=/)
-        end.split('=')[1] rescue nil
-
-        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
       alias :skip  :skip_with_tingyun
     end
 
     ::Thrift::Client.module_eval do
+      require 'ting_yun/instrumentation/support/thrift_helper'
 
       include TingYun::Instrumentation::ThriftHelper
 
 
         def send_message_args_with_tingyun(args_class, args = {})
+          return send_message_args_without_tingyun(args_class, args) unless TingYun::Agent.config[:'nbs.transaction_tracer.thrift'] && TingYun::Agent.config[:'nbs.transaction_tracer.enabled']
           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
+            tingyun_id = "#{cross_app_id};c=1;x=#{state.request_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)
+            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
         alias :send_message_args  :send_message_args_with_tingyun
 
@@ -279,7 +77,7 @@ TingYun::Support::LibraryDetection.defer do
           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)
+          TingYun::Agent.logger.debug("Failed to thrift send_message_with_tingyun : ", e)
         ensure
           send_message_without_tingyun(name, args_class, args)
         end
@@ -300,7 +98,7 @@ TingYun::Support::LibraryDetection.defer do
           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)
+          TingYun::Agent.logger.debug("Failed to thrift send_oneway_message_with_tingyun : ", e)
           return send_oneway_message_without_tingyun(name, args_class, args)
         end
 
@@ -318,7 +116,7 @@ TingYun::Support::LibraryDetection.defer do
 
 
           result = receive_message_without_tingyun(result_klass)
-          if result.nil? || result.success.nil?
+          unless result || result.success
             e = ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, "#{operate} failed: unknown result")
             ::TingYun::Instrumentation::Support::ExternalError.handle_error(e,metrics(operate)[0])
           end
@@ -332,15 +130,15 @@ TingYun::Support::LibraryDetection.defer do
           )
           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}")
+            ::TingYun::Agent::Collector::TransactionSampler.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)
+
+          TingYun::Agent.logger.debug("Failed to thrift receive_message_with_tingyun : ", e)
           return  receive_message_without_tingyun(result_klass)
         end
       end
@@ -349,5 +147,4 @@ TingYun::Support::LibraryDetection.defer do
       alias :receive_message :receive_message_with_tingyun
     end
   end
-
 end