tingyun_rpm 1.6.1 → 3.2.0

data/lib/ting_yun/instrumentation/middleware_proxy.rb

@@ -49,9 +49,10 @@ module TingYun
         @is_app            = is_app
         @category          = determine_category
         @target_class_name = determine_class_name
-        @transaction_name  = "#{determine_prefix}#{@target_class_name}/call"
+        @transaction_name  = "#{determine_prefix}#{@target_class_name}"
         @transaction_options  = {
-            :transaction_name => @transaction_name
+            :transaction_name => @transaction_name,
+            :method => "call"
         }
       end
 

data/lib/ting_yun/instrumentation/mongo.rb

@@ -58,7 +58,7 @@ module TingYun
 
       def instrument
         ::Mongo::Collection.class_eval do
-          def save_with_tingyun(doc, opts = {}, &block)
+          def save_with_tingyun(doc, opts = {}, &block) y
             klass_name, *metrics = tingyun_generate_metrics(:save)
             TingYun::Agent::MethodTracerHelpers.trace_execution_scoped(metrics, opts, method(:record_mongo_duration), klass_name) do
               save_without_tingyun(doc, opts, &block)
@@ -92,7 +92,7 @@ TingYun::Support::LibraryDetection.defer do
   end
 
   depends_on do
-    defined?(::Mongo)
+    defined?(::Mongo) && false
   end
 
   depends_on do

data/lib/ting_yun/instrumentation/mongo_command_log_subscriber.rb

@@ -29,13 +29,10 @@ module TingYun
           state = TingYun::Agent::TransactionState.tl_get
           state.timings.mon_duration = state.timings.mon_duration +  event.duration * 1000
           started_event = operations.delete(event.operation_id)
-
-          klass_name, base, *other_metrics = metrics(started_event)
-
-          TingYun::Agent.instance.stats_engine.tl_record_scoped_and_unscoped_metrics(
-              base, other_metrics, event.duration*1000
-          )
-          notice_nosql_statement(state, started_event, base, event.duration, klass_name)
+          # TingYun::Agent.instance.stats_engine.tl_record_scoped_and_unscoped_metrics(
+          #     base, other_metrics, event.duration*1000
+          # )
+          notice_nosql_statement(state, started_event, nil, event.duration, "Mongo::Monitoring::Global")
         rescue Exception => e
           log_notification_error('completed', e)
         end
@@ -76,7 +73,10 @@ module TingYun
         TingYun::Instrumentation::Support::EventFormatter.format(
             event.command_name,
             event.database_name,
-            event.command
+            event.command,
+            event.address.host,
+            event.address.port,
+            event.inspect
         )
       end
 
@@ -88,7 +88,7 @@ module TingYun
         # enter transaction trace node
         frame = stack.push_frame(state, :mongo_db, end_time - duration)
 
-        transaction_sampler.notice_nosql_statement(generate_statement(event),duration*1000)
+        transaction_sampler.notice_nosql_statement(generate_statement(event),duration*1000,:nosql)
 
         # exit transaction trace node
         stack.pop_frame(state, frame, metric, end_time, true, klass_name)

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

@@ -17,13 +17,13 @@ module TingYun
           if TingYun::Agent.config[:'naming.rules_enabled'] && find_rule(request.request_method.upcase, request.path, request.env, request.filtered_parameters)
             return "Rails/#{namespace}/#{name(request.path.slice(1..-1), request.env, request.filtered_parameters, request.cookies)}"
           else
-            return  "URL/#{self.env["PATH_INFO"][1..-1].gsub(/\//,'%2F')}" unless TingYun::Agent.config[:'nbs.auto_action_naming']
+            return  "URL/#{self.env["PATH_INFO"]}" unless TingYun::Agent.config[:'auto_action_naming']
 
             action = action_name_override || action_name
             if action_name_override || self.class.action_methods.include?(action)
-              "Rails/#{self.class.controller_path}%2F#{action}"
+              "Rails/#{self.class.controller_path}/#{action}"
             else
-              "Rails/#{self.class.controller_path}%2F(other)"
+              "Rails/#{self.class.controller_path}/(other)"
             end
           end
         end

data/lib/ting_yun/instrumentation/rake.rb

@@ -28,7 +28,7 @@ TingYun::Support::LibraryDetection.defer do
           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
+          TingYun::Agent::Transaction.wrap(state, "TaskAction/Rake/invoke/#{name}", :rake)  do
             invoke_without_tingyun(*args)
           end
         end
@@ -59,6 +59,7 @@ module TingYun
         end
 
         def self.should_trace? name
+
           return ::TingYun::Agent.config[:'rake.tasks'].include?(name) if ::TingYun::Agent.config[:'rake.tasks'].any?
           return !TingYun::Agent.config[:'rake.black.tasks'].include?(name) if ::TingYun::Agent.config[:'rake.black.tasks'].any?
           return false

data/lib/ting_yun/instrumentation/redis.rb

@@ -34,6 +34,8 @@ TingYun::Support::LibraryDetection.defer do
         operation = args[0].is_a?(Array) ? args[0][0] : args[0]
 
         TingYun::Agent::Datastore.wrap("Redis", operation, db, host, port, nil, method(:record_redis_duration)) do
+          state = TingYun::Agent::TransactionState.tl_get
+          state.add_current_node_params(:method=>"call_method",:klass=> "Redis/Client")
           call_without_tingyun_trace(*args, &blk)
         end
       end
@@ -48,6 +50,8 @@ TingYun::Support::LibraryDetection.defer do
           operation = pipeline.is_a?(::Redis::Pipeline::Multi) ? 'multi' : 'pipeline'
 
           TingYun::Agent::Datastore.wrap("Redis", operation, db, host, port, nil, method(:record_redis_duration)) do
+            state = TingYun::Agent::TransactionState.tl_get
+            state.add_current_node_params(:method=>"call_pipelined",:klass=> "Redis/Client")
             call_pipelined_without_tingyun_trace(*args, &block)
           end
         end
@@ -62,6 +66,8 @@ TingYun::Support::LibraryDetection.defer do
 
         def connect(*args, &block)
           TingYun::Agent::Datastore.wrap("Redis", "connect", db, host, port, nil, method(:record_redis_duration)) do
+            state = TingYun::Agent::TransactionState.tl_get
+            state.add_current_node_params(:method=>"connect",:klass=> "Redis/Client")
             connect_without_tingyun(*args, &block)
           end
         end

data/lib/ting_yun/instrumentation/sidekiq.rb

@@ -34,7 +34,7 @@ TingYun::Support::LibraryDetection.defer do
         {
             :name => 'perform',
             :class_name => msg['class'],
-            :category => 'BackgroundAction/Sidekiq'
+            :category => 'TaskAction/Sidekiq'
         }
       end
     end

data/lib/ting_yun/instrumentation/sinatra/action.rb

@@ -13,7 +13,7 @@ module TingYun
           if find_rule(request.request_method.upcase, path, request.env, request.params)
             return "Sinatra/#{current_class}/#{namespace}/#{name(path.slice(1..-1), request.env, request.params, request.cookies)}"
           else
-            return self.env["PATH_INFO"] unless TingYun::Agent.config[:'nbs.auto_action_naming']
+            return self.env["PATH_INFO"] unless TingYun::Agent.config[:'auto_action_naming']
             "Sinatra/#{current_class}/#{path}(#{request.request_method.upcase})".squeeze("/")
           end
         end

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

@@ -60,11 +60,11 @@ module TingYun
         end
 
         def transaction_name_from_event event
-          "WebAction/ActionCable/#{event.payload[:channel_class]}%2F#{event.payload[:action]}"
+          "WebAction/ActionCable/#{event.payload[:channel_class]}/#{event.payload[:action]}"
         end
 
         def metric_name_from_event event
-          "ActionCable/#{event.payload[:channel_class]}%2F#{action_name_from_event(event)}"
+          "ActionCable/#{event.payload[:channel_class]}/#{action_name_from_event(event)}"
         end
 
         DOT_ACTION_CABLE = ".action_cable".freeze

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

@@ -75,12 +75,12 @@ module TingYun
 
         def metric_name
           if TingYun::Agent.config[:'naming.rules_enabled'] && find_rule(method, uri, request.header, params)
-            @metric_name =  "WebAction/#{namespace}/#{name(uri, request.header, params, request.cookie)}"
+            @metric_name =  "#{namespace}/#{name(uri, request.header, params, request.cookie)}"
           else
-            if TingYun::Agent.config[:'nbs.auto_action_naming']
-              @metric_name ||= "WebAction/Rails/#{metric_path}%2F#{metric_action}"
+            if TingYun::Agent.config[:'auto_action_naming']
+              @metric_name ||= "Rails/#{metric_path}/#{metric_action}"
             else
-              "WebAction/URI/#{uri[1..-1].gsub(/\//,'%2F')}"
+              "URI/#{uri}"
             end
           end
         end

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

@@ -24,7 +24,7 @@ module TingYun
           log_notification_error(e, name, 'start')
         end
 
-        def finish(name, id, payload) #THREAD_LOCAL_ACCESS
+        def finishV2(name, id, payload) #THREAD_LOCAL_ACCESS
           event = pop_event(id)
 
           state = TingYun::Agent::TransactionState.tl_get
@@ -38,6 +38,19 @@ module TingYun
           log_notification_error(e, name, 'finish')
         end
 
+        def finish(name, id, payload) #THREAD_LOCAL_ACCESS
+          event = pop_event(id)
+
+          state = TingYun::Agent::TransactionState.tl_get
+
+          if event.recordable?
+            stack = state.traced_method_stack
+            stack.pop_frame(state, event.frame, event.metric_name, event.end.to_f)
+          end
+        rescue => e
+          log_notification_error(e, name, 'finish')
+        end
+
         def record_metrics(event, frame)
           exclusive = event.duration - frame.children_time
           TingYun::Agent.instance.stats_engine.tl_record_scoped_and_unscoped_metrics(

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

@@ -75,8 +75,12 @@ module TingYun
           splits = split_name(name)
           model = model_from_splits(splits) || product
           operation = operation_from_splits(splits, sql)
-
-          TingYun::Agent::Datastore::MetricHelper.metrics_for(product, operation, config[:host], config[:port], config[:database], model, ACTIVE_RECORD)
+          config[:operation] = operation
+          config[:product] = product
+          config[:model] = model
+          config[:type] = "Database"
+          config
+          # TingYun::Agent::Datastore::MetricHelper.metrics_for(product, operation, config[:host], config[:port], config[:database], model, ACTIVE_RECORD)
         end
 
         def metrics_for_data_mapper(name, sql, config, model=nil)

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

@@ -26,7 +26,6 @@ module TingYun
         end
 
         def start(name, id, payload) #THREAD_LOCAL_ACCESS
-
           return if payload[:name] == CACHED_QUERY_NAME
           super
         rescue => e
@@ -38,8 +37,8 @@ module TingYun
           state = TingYun::Agent::TransactionState.tl_get
           event = pop_event(id)
           config = active_record_config_for_event(event)
-          base, metric = record_metrics(event, config)
-          notice_sql(state, event, config, base, metric)
+          config = record_metrics(event, config)
+          notice_sql(state, event, config, nil, nil)
         rescue Exception => e
           log_notification_error(e, name, 'finish')
         end
@@ -51,9 +50,9 @@ module TingYun
           # enter transaction trace node
           frame = stack.push_frame(state, :active_record, event.time.to_f)
 
-          sql_sampler.notice_sql(event.payload[:sql], base, config,
-                                 TingYun::Helper.milliseconds_to_seconds(event.duration),
-                                 state, @explainer, event.payload[:binds], event.payload[:name])
+          # sql_sampler.notice_sql(event.payload[:sql], base, config,
+          #                        TingYun::Helper.milliseconds_to_seconds(event.duration),
+          #                        state, @explainer, event.payload[:binds], event.payload[:name])
 
           transaction_sampler.notice_sql(event.payload[:sql], config, event.duration,
                                          state, @explainer, event.payload[:binds], event.payload[:name])
@@ -61,7 +60,7 @@ module TingYun
           stack.pop_frame(state, frame, base, event.end.to_f, true, metric)
         end
 
-        def record_metrics(event, config)
+        def record_metricsV2(event, config)
           metric, base, *other_metrics = TingYun::Instrumentation::Support::ActiveRecordHelper.metrics_for(event.payload[:name],
                                                                                                    TingYun::Helper.correctly_encoded(event.payload[:sql]),
                                                                                                    config)
@@ -72,6 +71,14 @@ module TingYun
         end
 
 
+        def record_metrics(event, config)
+          TingYun::Instrumentation::Support::ActiveRecordHelper.metrics_for(event.payload[:name],
+                                                                            TingYun::Helper.correctly_encoded(event.payload[:sql]),
+                                                                                                           config)
+
+        end
+
+
         def active_record_config_for_event(event)
           return unless event.payload[:connection_id]
 

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

@@ -4,12 +4,17 @@ module TingYun
   module Instrumentation
     module Support
       module EventFormatter
-        def self.format(command_name, database_name, command)
+        def self.format(command_name, database_name, command,host="localhost",port="27017", nosql="")
           result = {
               :operation => command_name,
               :database => database_name,
               :collection => command.values.first,
-              :term => command.values.last
+              :term => command.values.last,
+              :product => "Mongo",
+              :type=>"Mongo",
+              :host => host,
+              :port => port,
+              :nosql => nosql
           }
           result
         end

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

@@ -16,7 +16,7 @@ module TingYun
         def capture_exception(response,request)
           if response && response.code.to_s =~ /^[4,5][0-9][0-9]$/ && response.code.to_s!='401'
             e = TingYun::Support::Exception::InternalServerError.new("#{response.code}: #{response.message}")
-            klass = "External/#{request.uri.to_s.gsub(/\/\z/,'').gsub('/','%2F')}/#{request.from}"
+            klass = "External/#{request.uri.to_s.gsub(/\/\z/,'')}/#{request.from}"
             set_attributes(e, klass, response.code)
 
             TingYun::Agent.notice_error(e,:type=>:exception)

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

@@ -1,20 +1,43 @@
 # encoding: utf-8
 
+require 'digest'
 
 module TingYun
   module Instrumentation
     module Support
       module ExternalHelper
-        def create_tingyun_id(protocol)
+        def create_tingyun_idV2(protocol)
           state = TingYun::Agent::TransactionState.tl_get
           externel_guid = tingyun_externel_guid
           state.extenel_req_id = externel_guid
-          cross_app_id  = TingYun::Agent.config[:tingyunIdSecret] or
-              raise TingYun::Agent::CrossAppTracing::Error, "no tingyunIdSecret configured"
-          state.add_current_node_params(:txId=>state.request_guid, :externalId=>state.extenel_req_id)
+          cross_app_id  = TingYun::Agent.config[:idSecret] or
+              raise TingYun::Agent::CrossAppTracing::Error, "no idSecret configured"
+          state.add_current_node_params(:tx_id=>state.request_guid, :externalId=>state.extenel_req_id)
           "#{cross_app_id};c=1;x=#{state.request_guid};e=#{externel_guid};s=#{TingYun::Helper.time_to_millis(Time.now)};p=#{protocol}"
         end
 
+        def create_tingyun_id(protocol=nil,vendor=nil,request=nil)
+          state = TingYun::Agent::TransactionState.tl_get
+          if state.transaction_name_md5.nil?
+            tmd5 = Digest::MD5.hexdigest(state.current_transaction.best_name)
+          else
+            tmd5 = state.transaction_name_md5
+          end
+          externel_guid = tingyun_externel_guid
+          state.add_current_node_paramsV3(:externalId => externel_guid)
+          unless request.nil?
+            state.add_current_node_paramsV3(:protocol=> request.type)
+            state.add_current_node_paramsV3(:instance=> "#{request.host}:#{request.port}")
+            state.add_current_node_paramsV3(:operation=> request.path)
+            state.add_current_node_paramsV3(:vendor => request.from)
+          else
+            state.add_current_node_paramsV3(:protocol => protocol) unless protocol.nil?
+            state.add_current_node_paramsV3(:vendor => vendor) unless vendor.nil?
+          end
+          state.add_current_node_params(:type=> "External")
+          "c=S|#{state.client_tingyun_id_secret};x=#{state.request_guid};e=#{externel_guid};n=#{tmd5}"
+        end
+
         # generate a random 64 bit uuid
         def tingyun_externel_guid
           guid = ''

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

@@ -44,7 +44,7 @@ module TingYun
           timings = state.timings
 
           data = {
-              :id => TingYun::Agent.config[:tingyunIdSecret],
+              :id => TingYun::Agent.config[:idSecret],
               :n => state.transaction_name ,
               :a => timings.app_time_in_millis,
               :q => timings.queue_time_in_millis,

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

@@ -75,7 +75,7 @@ module TingYun
             exists
           end
 
-          def tingyun_eval(method_name, metric_name, options)
+          def tingyun_evalV2(method_name, metric_name, options)
             options = validate_options(method_name, options)
             if options[:scope]
               define_method_with_scope(method_name, metric_name, options)
@@ -84,6 +84,11 @@ module TingYun
             end
           end
 
+          def tingyun_eval(method_name, metric_name, options)
+            options = validate_options(method_name, options)
+            define_method_with_scope(method_name, metric_name, options)
+          end
+
           DEFAULT_SETTINGS = {:scope => true, :metric => true, :before_code => "", :after_code => "" }.freeze
 
           def validate_options(method_name, options)

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

@@ -16,7 +16,7 @@ module TingYun
           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)}
+          TingYun::Agent.config["action_tracer.ignored_params"].split(',').each{|key| result.delete(key)}
           result
         end
 

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

@@ -44,9 +44,9 @@ module TingYun
 
       def metrics operate
         metrics = if tingyun_host.nil?
-                    ["External/thrift:%2F%2F#{operate}/thrift"]
+                    ["External/thrift://#{operate}/thrift"]
                   else
-                    ["External/thrift:%2F%2F#{tingyun_host}:#{tingyun_port}%2F#{operate}/thrift"]
+                    ["External/thrift://#{tingyun_host}:#{tingyun_port}/#{operate}/thrift"]
                   end
         metrics << "External/NULL/ALL"
 
@@ -61,7 +61,8 @@ module TingYun
       def metrics_for_cross_app(operate,my_data)
         metrics = ["ExternalTransaction/NULL/#{my_data["id"]}",
                    "ExternalTransaction/thrift/#{my_data["id"]}",
-                   "ExternalTransaction/thrift:%2F%2F#{tingyun_host}:#{tingyun_port}%2F#{operate}/#{my_data["id"]}%2F#{my_data["action"].to_s.gsub(/\/\z/,'')}"]
+                   "ExternalTransaction/thrift://#{tingyun_host}:#{tingyun_port}/#{operate}/#{my_data["id"]}/
+#{my_data["action"].to_s.gsub(/\/\z/,'')}"]
         return metrics
       end
 

data/lib/ting_yun/instrumentation/thrift.rb

@@ -6,7 +6,7 @@ TingYun::Support::LibraryDetection.defer do
   named :thrift
 
   depends_on do
-    defined?(::Thrift) && defined?(::Thrift::Client) && defined?(::Thrift::BaseProtocol)
+    defined?(::Thrift) && defined?(::Thrift::Client) && defined?(::Thrift::BaseProtocol) && false
   end
 
 
@@ -51,7 +51,7 @@ TingYun::Support::LibraryDetection.defer do
             state = TingYun::Agent::TransactionState.tl_get
             return  unless state.execution_traced?
 
-            data = TingYun::Support::Serialize::JSONWrapper.dump("TingyunID" => create_tingyun_id("thrift"))
+            data = TingYun::Support::Serialize::JSONWrapper.dump("TingyunID" => create_tingyun_id("Thrift","thrift"))
             TingYun::Agent.logger.info("thift will send TingyunID : ", data)
             @oprot.write_field_begin("TingyunField", 11, 40000)
             @oprot.write_string(data)
@@ -96,7 +96,7 @@ TingYun::Support::LibraryDetection.defer do
           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)
+          # TingYun::Agent.instance.stats_engine.tl_record_scoped_and_unscoped_metrics(base, other_metrics, duration)
           result
         rescue => e
           TingYun::Agent.logger.debug("Failed to thrift send_oneway_message_with_tingyun : ", e)
@@ -128,14 +128,14 @@ TingYun::Support::LibraryDetection.defer do
           my_data = state.thrift_return_data || {}
           # net_block_duration = my_data["time"]? duration - my_data["time"]["duration"]- my_data["time"]["qu"] : duration
           # net_block_duration = duration if net_block_duration < 0
-          TingYun::Agent.instance.stats_engine.tl_record_scoped_and_unscoped_metrics(
-              node_name, other_metrics, duration
-          )
+          # TingYun::Agent.instance.stats_engine.tl_record_scoped_and_unscoped_metrics(
+          #     node_name, other_metrics, duration
+          # )
 
           if my_data["time"]
             metrics_cross_app = metrics_for_cross_app(operate, my_data)
             _duration =  my_data["time"]["duration"] + my_data["time"]["qu"] + 0.1
-            ::TingYun::Agent.instance.stats_engine.record_scoped_and_unscoped_metrics(state, metrics_cross_app.pop, metrics_cross_app, duration, _duration)
+            # ::TingYun::Agent.instance.stats_engine.record_scoped_and_unscoped_metrics(state, metrics_cross_app.pop, metrics_cross_app, duration, _duration)
           end
           if node
             node.name = node_name