tingyun_rpm 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c697d815d0c4dfa694eec1b5c600254f77c0a33
-  data.tar.gz: 7c0f3e329a156431014ee6ca7855ed0869059ac9
+  metadata.gz: 03acd867faa468e8cf34e5db0c625be623e83b40
+  data.tar.gz: ff2a3e050fa55b6691e24a6d095d76d1095c983b
 SHA512:
-  metadata.gz: 32c38d249c36946077cecaa0e2483ece0b034a446da3a46ac1664d2d2c9c13a41b347caa962145140de7a6ab2630c752334d809787c6e1e35249fd8a93290da7
-  data.tar.gz: 406227f1aee1ae7ce1e7aa533c29624c6e41be7a1259ce036c673b99a2f3f3af41235ef7b0a0881865d3db738baf9571ffa9463d285c3cb097d6647360fd1fca
+  metadata.gz: ed68cd19c263c869ee5a013e3c94043f74c71d93b34e613e11503fc10ab9f6c58d8adce2360ad90ba7cfc47262b44f184cbe6b2c9e8159adc6098e9793a72c7e
+  data.tar.gz: 3f1dca653319d616cff3c65af9e88082c6a9560617a063a46a90db1cd2ed09e3680a714a155f0a24e72b60867d2f3738714338bf2235e834bf6cab416e003f84

data/lib/ting_yun/agent/database.rb

@@ -129,7 +129,7 @@ module TingYun
           query_plan_string = lines.join("\n")
         end
 
-        unless record_sql_method == :raw
+        unless record_sql_method("nbs.action_tracer.record_sql") == :raw
           query_plan_string = Obfuscator.instance.obfuscate_postgres_explain(query_plan_string)
         end
         values = query_plan_string.split("\n").map { |line| [line] }

data/lib/ting_yun/agent/instance_methods/container_data_manager.rb

@@ -125,9 +125,11 @@ module TingYun
           rescue => e
             TingYun::Agent.logger.info("Unable to send #{endpoint} data, will try again later. Error: ", e)
             container.merge!(items)
-            raise
+          ensure
+            items = nil # take the initiative to GC
           end
 
+
         end
 
       end

data/lib/ting_yun/agent/transaction.rb

@@ -52,7 +52,8 @@ module TingYun
                     :response_content_type,
                     :error_recorded,
                     :guid,
-                    :attributes
+                    :attributes,
+                    :request_attributes
 
 
       def initialize(category, options)

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

@@ -8,11 +8,12 @@ module TingYun
       class RequestAttributes
 
         attr_reader :request_path, :referer, :accept, :content_length, :host,
-                    :port, :user_agent, :request_method, :query_string
+                    :port, :user_agent, :request_method, :query_string, :header, :cookie
 
         HTTP_ACCEPT_HEADER_KEY = 'HTTP_ACCEPT'.freeze
 
         def initialize request
+          @header = request.env
           @request_path = path_from_request request
           @referer = referer_from_request request
           @accept = attribute_from_env request, HTTP_ACCEPT_HEADER_KEY
@@ -22,6 +23,7 @@ module TingYun
           @user_agent = attribute_from_request request, :user_agent
           @request_method = attribute_from_request request, :request_method
           @query_string = attribute_from_request request, :query_string
+          @cookie = set_cookie(request)
         end
 
         def assign_agent_attributes(txn)
@@ -120,6 +122,16 @@ module TingYun
           end
         end
 
+        def set_cookie(request)
+          cookie = {}
+          _c = attribute_from_env(request, 'HTTP_COOKIE')
+          _c.split(';').each do |i|
+            _k, _v = i.split('=')
+            cookie[_k.strip] = _v.strip
+          end unless _c.nil?
+          cookie
+        end
+
       end
     end
   end

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

@@ -9,7 +9,7 @@ module TingYun
     class TransactionState
 
       # Request data
-      attr_accessor :request, :transaction_sample_builder
+      attr_accessor :transaction_sample_builder
       attr_reader   :current_transaction, :traced_method_stack
       # Sql Sampler Transaction Data
       attr_accessor :sql_sampler_transaction_data,
@@ -68,7 +68,6 @@ module TingYun
         # We purposefully don't reset @untraced, @record_tt and @record_sql
         # since those are managed by TingYun::Agent.disable_* calls explicitly
         # and (more importantly) outside the scope of a transaction
-        @request = nil
         @current_transaction = transaction
         @traced_method_stack.clear
         @transaction_sample_builder = nil

data/lib/ting_yun/configuration/default_source.rb

@@ -67,6 +67,10 @@ module TingYun
         }
       end
 
+      def self.empty_array
+        Proc.new { [] }
+      end
+
 
       def default_values
         result = {}
@@ -210,7 +214,7 @@ module TingYun
             :public => true,
             :type => String,
             :allowed_from_server => true,
-            :description => ''
+            :description => 'Specify a comma-delimited list of error classes that the agent should ignore'
         },
         :"nbs.error_collector.record_db_errors" => {
             :default => true,
@@ -311,22 +315,7 @@ module TingYun
             :public => false,
             :type => String,
             :allowed_from_server => true,
-            :description => ''
-        },
-        :'nbs.action_tracer.action_name_functions' => {
-            :default => '',
-            :allow_nil => true,
-            :public => false,
-            :type => String,
-            :allowed_from_server => true,
-            :description => ''
-        },
-        :'nbs.action_tracer.remove_trailing_path' => {
-            :default => false,
-            :public => false,
-            :type => Boolean,
-            :allowed_from_server => true,
-            :description => ''
+            :description => 'obfuscate the special sql fields'
         },
         :'nbs.action_tracer.stack_trace_threshold' => {
             :default => 500,
@@ -342,13 +331,6 @@ module TingYun
             :allowed_from_server => true,
             :description => 'Enable or disable Specifies External  request parameters  '
         },
-        :'nbs.web_action_uri_params_captured' => {
-            :default => '',
-            :public => true,
-            :type => String,
-            :allowed_from_server => true,
-            :description => 'Enable or disable Specifies WebAction request parameters  '
-        },
         :agent_log_file_path => {
             :default => 'log/',
             :public => true,
@@ -634,11 +616,11 @@ module TingYun
             :description => 'trace ID of crossing apps'
         },
         :'nbs.naming.rules' => {
-            :default => '',
+            :default => "[]",
             :public => true,
             :type => String,
             :allowed_from_server => true,
-            :description => 'the rule of name the webaction name  containing match & split ways'
+            :description => 'defined nme rule '
         }
     }.freeze
   end

data/lib/ting_yun/instrumentation/middleware_tracing.rb

@@ -45,10 +45,19 @@ module TingYun
         end
       end
 
+      def capture_request(state, env)
+        if env.is_a? Hash
+
+        end
+      end
+
       def call(env)
         first_middleware = note_transaction_started(env)
 
         state = TingYun::Agent::TransactionState.tl_get
+        if first_middleware
+          capture_request(state, env)
+        end
         begin
           TingYun::Agent::Transaction.start(state, category, build_transaction_options(env, first_middleware))
           events.notify(:before_call, env) if first_middleware

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

@@ -2,26 +2,33 @@
 require 'ting_yun/agent'
 require 'ting_yun/instrumentation/support/controller_instrumentation'
 require 'ting_yun/instrumentation/support/parameter_filtering'
+require 'ting_yun/instrumentation/support/split_controller'
 
 module TingYun
   module Instrumentation
     module Rails3
       module ActionController
 
-        def tingyun_metric_path(action_name_override = nil)
+        include TingYun::Instrumentation::Support::SplitController
+
 
-          return  self.env["PATH_INFO"] unless TingYun::Agent.config[:'nbs.auto_action_naming']
 
-          action = action_name_override || action_name
-          if action_name_override || self.class.action_methods.include?(action)
-            "Rails3/#{self.class.controller_path}%2F#{action}"
+        def tingyun_metric_path(action_name_override = nil)
+          if find_rule(request.request_method.upcase, request.path, request.env, request.filtered_parameters)
+            return "Rails3/#{namespace}/#{name(request.path.slice(1..-1), request.env, request.filtered_parameters, request.cookies)}"
           else
-            "Rails3/#{self.class.controller_path}%2F(other)"
+            return  self.env["PATH_INFO"] unless TingYun::Agent.config[:'nbs.auto_action_naming']
+
+            action = action_name_override || action_name
+            if action_name_override || self.class.action_methods.include?(action)
+              "Rails3/#{self.class.controller_path}%2F#{action}"
+            else
+              "Rails3/#{self.class.controller_path}%2F(other)"
+            end
           end
         end
 
 
-
         def process_action(*args)
           params = TingYun::Instrumentation::Support::ParameterFiltering.filter_rails_request_parameters(request.filtered_parameters)
           perform_action_with_tingyun_trace(:category => :controller,

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

@@ -4,6 +4,7 @@ require 'ting_yun/instrumentation/support/queue_time'
 require 'ting_yun/agent/transaction/transaction_state'
 require 'ting_yun/instrumentation/support/evented_subscriber'
 require 'ting_yun/agent/transaction'
+require 'ting_yun/instrumentation/support/split_controller'
 
 module TingYun
   module Instrumentation
@@ -11,7 +12,7 @@ module TingYun
       class ActionControllerSubscriber < TingYun::Instrumentation::Support::EventedSubscriber
         def start(name, id, payload) #THREAD_LOCAL_ACCES
           state = TingYun::Agent::TransactionState.tl_get
-          request = state.request
+          request = state.current_transaction.request_attributes rescue nil
           event = ControllerEvent.new(name, Time.now, nil, id, payload, request)
           push_event(event)
           # if state.execution_traced?
@@ -51,11 +52,14 @@ module TingYun
       end
 
       class ControllerEvent < TingYun::Instrumentation::Support::Event
+
+        include TingYun::Instrumentation::Support::SplitController
+
         attr_accessor :parent
         attr_reader :queue_start, :request
 
         def initialize(name, start, ending, transaction_id, payload, request)
-          # We have a different initialize parameter list, so be explicit
+          # We have a different initialize parameter[[j]] list, so be explicit
           super(name, start, ending, transaction_id, payload, nil)
 
           @request = request
@@ -68,13 +72,25 @@ module TingYun
         end
 
         def metric_name
-          if TingYun::Agent.config[:'nbs.auto_action_naming']
-            @metric_name ||= "WebAction/Rails/#{metric_path}%2F#{metric_action}"
+          if find_rule(method, uri, request.header, params)
+            @metric_name =  "WebAction/Rails/#{namespace}/#{name(uri, request.header, params, request.cookie)}"
           else
-            path
+            if TingYun::Agent.config[:'nbs.auto_action_naming']
+              @metric_name ||= "WebAction/Rails/#{metric_path}%2F#{metric_action}"
+            else
+              path
+            end
           end
         end
 
+        def method
+          payload[:params]['_method'].upcase rescue nil ||  payload[:method]
+        end
+
+        def params
+           payload[:params]
+        end
+
         def metric_path
           @controller_class.controller_path
         end
@@ -87,6 +103,12 @@ module TingYun
           payload[:action]
         end
 
+        #expect the params
+        def uri
+          path.split('?').first
+        end
+        #contain the params
+
         def path
           payload[:path]
         end

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

@@ -17,10 +17,9 @@ module TingYun
 
           state = TingYun::Agent::TransactionState.tl_get
 
-          state.request = self.request
           trace_options = args.last.is_a?(Hash) ? args.last : NR_DEFAULT_OPTIONS
           category = trace_options[:category] || :controller
-          txn_options = create_transaction_options(trace_options, category, state)
+          txn_options = create_transaction_options(trace_options, category)
 
           begin
              txn = TingYun::Agent::Transaction.start(state, category, txn_options)
@@ -37,7 +36,7 @@ module TingYun
 
         private
 
-        def create_transaction_options(trace_options, category, state)
+        def create_transaction_options(trace_options, category)
           txn_options = {}
 
           txn_options[:request] ||= request if respond_to?(:request)

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

@@ -2,48 +2,139 @@ 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
+        attr_accessor :rule, :tingyun_http_verb
+        HTTP = {
+          'GET' => 1,
+          'POST' => 2,
+          'PUT' => 3,
+          'DELETE' => 4,
+          'HEAD' => 5,
+          'PATCH' => 3
+        }
+
+        RULE = {
+          1=> :eql?,
+          2=> :start_with?,
+          3=> :end_with?,
+          4=> :include?,
+          5=> :match
+        }
+
+        def find_rule(method, path, header, params)
+          @tingyun_http_verb = method
+          @rule = rules.detect do |_r|
+            method_match?(method, _r["match"]["method"]) and
+                url_match?(path, _r["match"]["match"], _r["match"]["value"]) and
+                params_match?(header, dot_flattened(params), _r["match"]["params"])
+          end
+        end
+
+        def namespace
+          @rule["name"]
+        end
+
+        def rules
+          require 'ting_yun/support/serialize/json_wrapper'
+          TingYun::Support::Serialize::JSONWrapper.load(TingYun::Agent.config[:'nbs.naming.rules'])
+        end
+
+        def method_match?(method, _r)
+          _r == 0 || _r == HTTP[method]
+        end
+
+        def url_match?(url, _r, value)
+          (!value.nil?) and (!value.strip.empty? rescue true) and url.send(RULE[_r], value.downcase)
+        end
+
+        def params_match?(header, params, _rs)
+          return true if _rs.empty?
+          begin
+            _rs.each do |_r|
+              next if _r["name"].nil? || _r["name"].strip.empty?
+              if _r["type"] == 2
+                raise_error(header["HTTP_#{_r["name"].upcase}"], RULE[_r["match"]], _r["value"], _r["type"])
+              else
+                raise_error(params[_r["name"].downcase], RULE[_r["match"]], _r["value"],  _r["type"])
+              end
+            end
+          rescue
+            return false
+          end
+          return true
+        end
+
+        def raise_error(_v, _r, _v2, _t)
+          raise 'this param unexist so the rule is unmatched' if _v.nil? or _v2.nil? or _v2.strip.empty? rescue false
+          unless _t == 0
+            raise 'this param  is unmatched  with the rule' unless _v.send(_r, _v2)
+          end
+        end
+
+
+        def name(path, header, params, cookie)
+          return nil if @rule.nil?
+
+          name = ""
+          name << split_url(path.split('/'))
+          name << "?"
+          name << split_params(@rule["split"]["urlParams"], params)
+          name << split_params(@rule["split"]["bodyParams"], params)
+          name << split_params(@rule["split"]["cookieParams"], cookie)
+          name << split_header(@rule["split"]["headerParams"], header)
+          name = name[0..-2] << split_method
+          name.strip
+        end
+
+        def split_url(url)
+          uri = @rule["split"]["uri"]
+          return '' if uri.nil? or uri.strip.empty?
+          if uri.include? ','
+            _i = uri.split(',').map{|n|n.to_i}
+            url.values_at(*_i).join('/')
+          else
+            _i = uri.to_i
+            if _i > 0
+              url.values_at(1.._i).join('/')
+            else
+              url.values_at(_i..-1).join('/')
+            end
+          end
+        end
+
+        def split_method
+           if @rule["split"]["method"]
+             "(#{tingyun_http_verb})"
+           else
+             ''
+           end
+        end
+
+        def split_params(_r, params)
+          return '' if _r.nil? or _r.strip.empty?
+          query_string =''
+          _r.split(',').each {|_i|query_string +="#{_i}=#{params[_i]}&"}
+          query_string
+        end
+
+        def split_header(_r, header)
+          return '' if _r.nil? or _r.strip.empty?
+          query_string =''
+          _r.split(',').each {|_i|query_string +="#{_i}=#{header["HTTP_#{_i.upcase}"]}&"}
+          query_string
+        end
+
+        # turns {'a' => {'b' => 'c'}} into {'b' => 'c'}
+        def dot_flattened(nested_hash, result={})
+          nested_hash.each do |key, val|
+            next if val == nil
+            if val.respond_to?(:has_key?)
+              dot_flattened(val, result)
+            else
+              result[key] = val
+            end
+          end
+          result
+        end
       end
     end
   end

data/lib/ting_yun/instrumentation/thrift.rb

@@ -24,7 +24,7 @@ module TingYun
 
       def started_time_and_node(operate)
         _op_ = operations.delete(operate)
-        time = (_op_ && _op_[:started_time]) or Time.now.to_f
+        time = (_op_ && _op_[:started_time]) || Time.now.to_f
         node = _op_ && _op_[:node]
         [time, node]
       end
@@ -261,7 +261,7 @@ TingYun::Support::LibraryDetection.defer do
 
       def send_message_with_tingyun(name, args_class, args = {})
 
-        tag = "#{args_class.to_s.split('::').first.downcase}.#{name}"
+        tag = "#{args_class.to_s.split('::').first}.#{name}".downcase
         t0 = Time.now.to_f
         operations[tag] = {:started_time => t0}
         state = TingYun::Agent::TransactionState.tl_get
@@ -277,7 +277,7 @@ TingYun::Support::LibraryDetection.defer do
       alias :send_message  :send_message_with_tingyun
 
       def send_oneway_message_with_tingyun(name, args_class, args = {})
-        tag = "#{args_class.to_s.split('::').first.downcase}.#{name}"
+        tag = "#{args_class.to_s.split('::').first}.#{name}".downcase
         op_started = Time.now.to_f
         base, *other_metrics = metrics(tag)
         result = send_oneway_message_without_tingyun(name, args_class, args)

data/lib/ting_yun/ting_yun_service.rb

@@ -105,6 +105,10 @@ module TingYun
         TingYun::Agent.logger.info("the send-process end")
       end
       @marshaller.load(decompress_response(response))
+    ensure
+      # take the initiative to GC
+      payload = nil
+      data = nil
     end
 
     def handle_serialization_error(method, e)

data/lib/ting_yun/version.rb

@@ -7,7 +7,7 @@ module TingYun
     MAJOR = 1
 
     MINOR = 1
-    TINY = 0
+    TINY = 1
 
     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.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - tingyun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -268,7 +268,6 @@ files:
 - lib/ting_yun/agent/collector/transaction_sampler.rb
 - lib/ting_yun/agent/collector/transaction_sampler/slowest_sample_buffer.rb
 - lib/ting_yun/agent/collector/transaction_sampler/transaction_sample_buffer_base.rb
-- lib/ting_yun/agent/container_data_manager.rb
 - lib/ting_yun/agent/cross_app/cross_app_monitor.rb
 - lib/ting_yun/agent/cross_app/cross_app_tracing.rb
 - lib/ting_yun/agent/cross_app/inbound_request_monitor.rb

data/lib/ting_yun/agent/container_data_manager.rb

@@ -1,94 +0,0 @@
-# encoding: utf-8
-require 'ting_yun/support/exception'
-require 'ting_yun/agent/collector/stats_engine'
-require 'ting_yun/agent/collector/error_collector'
-
-module TingYun
-  module Agent
-    module ContainerDataManager
-
-      attr_reader :stats_engine, :error_collector, :transaction_sampler
-
-      def drop_buffered_data
-        @stats_engine.reset!
-      end
-
-      # private
-
-      def init_containers
-        @stats_engine = TingYun::Agent::Collector::StatsEngine.new
-        @error_collector = TingYun::Agent::Collector::ErrorCollector.new
-      end
-
-      def container_for_endpoint(endpoint)
-        case endpoint
-          when :metric_data             then @stats_engine
-            # type code here
-        end
-      end
-
-      def transmit_data
-        ::TingYun::Agent.logger.debug('Sending data to Ting Yun Service')
-
-        @service.session do # use http keep-alive
-          harvest_and_send_errors
-          harvest_and_send_timeslice_data
-        end
-      end
-
-      def harvest_and_send_timeslice_data
-        harvest_and_send_from_container(@stats_engine, :metric_data)
-      end
-
-      def harvest_and_send_errors
-        harvest_and_send_from_container(@error_collector.error_trace_array, :error_data)
-      end
-
-      # Harvests data from the given container, sends it to the named endpoint
-      # on the service, and automatically merges back in upon a recoverable
-      # failure.
-      #
-      # The given container should respond to:
-      #
-      #  #harvest!
-      #    returns an enumerable collection of data items to be sent to the
-      #    collector.
-      #
-      #  #reset!
-      #    drop any stored data and reset to a clean state.
-      #
-      #  #merge!(items)
-      #    merge the given items back into the internal buffer of the
-      #    container, so that they may be harvested again later.
-      #
-      def harvest_and_send_from_container(container,endpoint)
-        items = harvest_from_container(container, endpoint)
-        if !items.empty? && TingYun::Agent.config[:'nbs.agent_enabled']
-          send_data_to_endpoint(endpoint, items, container)
-        end
-      end
-
-      def harvest_from_container(container, endpoint)
-        items =[]
-        begin
-          items = container.harvest!
-        rescue => e
-          TingYun::Agent.logger.error("Failed to harvest #{endpoint} data, resetting. Error: ", e)
-          container.reset!
-        end
-        items
-      end
-
-      def send_data_to_endpoint(endpoint, items, container)
-        TingYun::Agent.logger.debug("Sending #{items.size} items to #{endpoint}")
-        begin
-          @service.send(endpoint, items)
-        rescue => e
-          TingYun::Agent.logger.info("Unable to send #{endpoint} data, will try again later. Error: ", e)
-        end
-
-      end
-
-    end
-  end
-end