tingyun_rpm 1.6.1 → 3.2.0

data/lib/ting_yun/logger/create_logger_helper.rb

@@ -9,7 +9,7 @@ module TingYun
       def create_log(root, override_logger)
         if !override_logger.nil?
           @log = override_logger
-        elsif ::TingYun::Agent.config[:'nbs.agent_enabled'] == false
+        elsif ::TingYun::Agent.config[:'agent_enabled'] == false
           create_null_logger
         else
           if wants_stdout?

data/lib/ting_yun/middleware/agent_middleware.rb

@@ -19,7 +19,7 @@ module TingYun
 
     def build_transaction_name
       prefix = ::TingYun::Instrumentation::Support::TransactionNamer.prefix_for_category(nil, @category)
-      "#{prefix}#{self.class.name}/call"
+      "#{prefix}#{self.class.name}"
     end
 
 

data/lib/ting_yun/middleware/browser_monitoring.rb

@@ -87,13 +87,14 @@ module TingYun
     def manufacture_cookie
       state = TingYun::Agent::TransactionState.tl_get
       timings = state.timings
-      "%7B%22id%22%3A%22#{TingYun::Support::Coerce.url_encode(TingYun::Agent.config[:tingyunIdSecret].to_s)}%22%2C%22n%22%3A%22#{TingYun::Support::Coerce.url_encode(state.transaction_name.to_s)}%22%2C%22tid%22%3A%22#{state.trace_id}%22%2C%22q%22%3A#{timings.queue_time_in_millis}%2C%22a%22%3A#{timings.app_time_in_millis}%7D"
+      "%7B%22id%22%3A%22#{TingYun::Support::Coerce.url_encode(TingYun::Agent.config[:idSecret].to_s)
+      }%22%2C%22n%22%3A%22#{TingYun::Support::Coerce.url_encode(state.transaction_name.to_s)}%22%2C%22tid%22%3A%22#{state.trace_id}%22%2C%22q%22%3A#{timings.queue_time_in_millis}%2C%22a%22%3A#{timings.app_time_in_millis}%7D"
     end
     def browser_timing_config(state)
       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/support/collector.rb

@@ -12,6 +12,9 @@ module TingYun
       def collector
         @remote_collector ||= collector_from_host
       end
+      def collectorV3(host)
+        @remote_collector ||= collector_from_host(host)
+      end
 
       def api_collector
         @api_collector ||= Collector.new(TingYun::Agent.config[:api_host], TingYun::Agent.config[:api_port])
@@ -24,11 +27,14 @@ module TingYun
           args = hostname.split(':')
           Collector.new(args[0], args[1]||TingYun::Agent.config[:port])
         end
-
       end
 
+      def reset
+        @remote_collector = nil
+      end
     end
 
+
     extend CollectorMethods
 
   end

data/lib/ting_yun/ting_yun_service.rb

@@ -30,27 +30,31 @@ module TingYun
                   :applicationId,
                   :ssl_cert_store,
                   :shared_tcp_connection,
-                  :quantile_cache
+                  :quantile_cache,
+                  :idSecret,
+                  :config,
+                  :attempts
 
 
-    def initialize(license_key=nil)
 
+    def initialize(license_key=nil)
       @license_key = license_key || TingYun::Agent.config[:'license_key']
       @request_timeout = TingYun::Agent.config[:timeout]
-      @data_version = "1.4"
+      @data_version =  ::TingYun::VERSION::DATA
       @marshaller =TingYun::Support::Serialize::JsonMarshaller.new
       @metric_id_cache = {}
       @quantile_cache = {}
+      @hosts = TingYun::Agent.config[:collector_addresses].split(',')
     end
 
     def connect(settings={})
-      if host = get_redirect_host
+      if host = get_redirect_hostV3
         @collector = TingYun::Support.collector_from_host(host)
       end
-      response = invoke_remote(:initAgentApp, [settings])
-      TingYun::Agent.logger.info("initAgentApp response: #{response}") if TingYun::Agent.config[:'nbs.audit_mode']
-      @applicationId = response['applicationId']
-      @appSessionKey = response['appSessionKey']
+      response = invoke_remote(:init, settings)
+      @applicationId = response['appId']
+      @appSessionKey = response['sessionKey'] unless response['sessionKey'].nil?
+      @idSecret = response['idSecret']
       response
     end
 
@@ -59,6 +63,27 @@ module TingYun
       invoke_remote(:getRedirectHost)
     end
 
+    def get_redirect_hostV3
+      @attempts = 0
+      max_attempts = @hosts.size
+      begin
+        @collector=TingYun::Support.collectorV3(@hosts[@attempts])
+        @attempts += 1
+        invoke_remote(:redirect)
+      rescue => e
+        if @attempts < max_attempts
+          TingYun::Agent.logger.error(e)
+          TingYun::Agent.logger.debug("Retrying request to #{@hosts[@attempts]}")
+          TingYun::Support.reset
+          retry
+        else
+          @attempts = 0
+          TingYun::Support.reset
+          retry
+        end
+      end
+    end
+
     def force_restart
       @applicationId = nil
       @appSessionKey = nil
@@ -75,10 +100,8 @@ module TingYun
 
     # private
 
-    def invoke_remote(method, payload=[], options = {})
-
+    def invoke_remote(method, payload={}, options ={})
       data = nil
-      payload = payload[0]  if method == :initAgentApp
       begin
         data = @marshaller.dump(payload, options)
       rescue StandardError, SystemStackError => e
@@ -86,7 +109,7 @@ module TingYun
       end
       # serialize_finish_time = Time.now
       uri = remote_method_uri(method)
-      full_uri = "#{@collector}#{uri}"
+      full_uri = "http://#{@collector}#{uri}"
 
       if audit_mode?
         TingYun::Agent.logger.info("the prepare data: #{data} to url: #{full_uri}")
@@ -94,11 +117,9 @@ module TingYun
         TingYun::Agent.logger.info("prepare to send data")
       end
 
-      data, encoding = compress_request_if_needed(data)
-
-      response = send_request(:data      => data,
-                              :uri       => uri,
-                              :encoding  => encoding,
+      # data, encoding = compress_request_if_needed(data)
+      response = send_requestV3(:data  => data,
+                              :full_uri => full_uri,
                               :collector => @collector)
 
       if audit_mode?
@@ -107,10 +128,6 @@ 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 audit_mode?

data/lib/ting_yun/ting_yun_service/http.rb

@@ -18,9 +18,11 @@ module TingYun
       include Connection
 
       def remote_method_uri(method)
-        params = {'licenseKey'=> @license_key,'version' => @data_version}
-        raise ::TingYun::Support::Exception::AppSessionKeyError.new("@appSessionKey is asked when the upload-method happen") if method==:upload && @appSessionKey.nil?
-        params[:appSessionKey] = @appSessionKey
+        params = {'version'=> @data_version}
+        params[:license] = @license_key unless method == :trace
+        raise ::TingYun::Support::Exception::AppSessionKeyError.new("@appSessionKey is asked when the upload-method happen") if method==:trace && @appSessionKey.nil?
+        params[:sessionKey] = @appSessionKey
+        params[:format] = "json"
 
         uri = "/" + method.to_s
         uri << '?' + params.map do |k,v|

data/lib/ting_yun/ting_yun_service/request.rb

@@ -6,6 +6,34 @@ module TingYun
   class TingYunService
     module Request
 
+      #Posts to the specified server, retry every minute if ServerConnectionException
+      def send_requestV3(opts)
+        request = Net::HTTP::Post.new(URI(opts[:full_uri]))
+        request.content_type = "application/json"
+        request.body = opts[:data]
+        response = nil
+        begin
+          conn = http_connection
+          TingYun::Agent.logger.debug "Sending request to #{opts[:collector]}#{opts[:uri]}"
+          TingYun::Support::TimerLib.timeout(@request_timeout) do
+            response = conn.request(request)
+          end
+        rescue *CONNECTION_ERRORS => e
+          close_shared_connection
+          raise TingYun::Support::Exception::ServerConnectionException, "Recoverable error talking to #{@collector} after #{attempts} attempts: #{e}"
+        end
+        TingYun::Agent.logger.debug "Received response, status: #{response.code}, encoding: '#{response['content-encoding']}'"
+
+        case response
+          when Net::HTTPSuccess
+            true # do nothing
+          else
+            raise TingYun::Support::Exception::ServerConnectionException, "Unexpected response from server (#{response.code}): #{response.message}"
+        end
+        response
+      end
+
+
       #Posts to the specified server, retry every minute if ServerConnectionException
       def send_request(opts)
         request = Net::HTTP::Post.new(opts[:uri], 'CONTENT-ENCODING' => opts[:encoding], 'HOST' => opts[:collector].name)
@@ -34,16 +62,14 @@ module TingYun
         TingYun::Agent.logger.debug "Received response, status: #{response.code}, encoding: '#{response['content-encoding']}'"
 
         case response
-          when Net::HTTPSuccess
-            true # do nothing
-          else
-            raise TingYun::Support::Exception::ServerConnectionException, "Unexpected response from server (#{response.code}): #{response.message}"
+        when Net::HTTPSuccess
+          true # do nothing
+        else
+          raise TingYun::Support::Exception::ServerConnectionException, "Unexpected response from server (#{response.code}): #{response.message}"
         end
         response
       end
 
-
-
       def compress_request_if_needed(data)
         encoding = 'identity'
         if data.size > 64*1024

data/lib/ting_yun/ting_yun_service/upload_service.rb

@@ -4,6 +4,7 @@ require 'ting_yun/metrics/metric_data'
 require 'ting_yun/support/serialize/encodes'
 require 'ting_yun/support/quantile_p2'
 require 'json'
+require 'ting_yun/configuration/server_source'
 
 module TingYun
   class TingYunService
@@ -147,10 +148,9 @@ module TingYun
 
     def action_trace_data(traces)
       upload_data = {
-          :type => 'actionTraceData',
-          :actionTraces => traces
+          :traces => traces
       }
-      invoke_remote(:upload, [upload_data], :encoder=> json)
+      invoke_remote(:trace, upload_data, :encoder=> json)
     end
 
 
@@ -164,6 +164,19 @@ module TingYun
 
     end
 
+    def getCmd
+
+      upload_data = {
+          :mTime => TingYun::Agent.config["mTime"],
+      }
+      result =  invoke_remote(:getCmd, upload_data, :encoder=> json)
+
+      if !result.empty?
+        server_config = TingYun::Configuration::ServerSource.new(result["args"])
+        ::TingYun::Agent.config.replace_or_add_config(server_config)
+      end
+    end
+
     def external_error_data(traces)
       upload_data = {
           :type => 'externalErrorTraceData',
@@ -171,5 +184,14 @@ module TingYun
       }
       invoke_remote(:upload, [upload_data], :encoder=> json)
     end
+
+
+    def action_traceV3(traces)
+      upload_data = {
+          :type => 'externalErrorTraceData',
+          :errors => traces
+      }
+      invoke_remote(:trace, upload_data, :encoder=> json)
+    end
   end
 end

data/lib/ting_yun/version.rb

@@ -3,9 +3,10 @@
 
 module TingYun
   module VERSION
-    MAJOR = 1
-    MINOR = 6
-    TINY = 1
+    MAJOR = 3
+    MINOR = 2
+    TINY = 0
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
+    DATA = "3.2.0"
   end
 end

data/lib/tingyun_rpm.rb

@@ -22,9 +22,7 @@
 #
 
 require 'ting_yun/frameworks'
-
 #if the agent had started in manual , then shouldn't start in auto again
-
 if defined?(Rails::VERSION)
   if Rails::VERSION::MAJOR.to_i >= 3
     module TingYun

data/tingyun_rpm.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'yard'
   s.add_development_dependency 'rubycritic'
 
+  # s.add_runtime_dependency 'google-protobuf', '~> 3.11.4'
 
   if RUBY_VERSION >= '1.9.3'
     s.add_development_dependency 'guard', '= 2.12.5'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tingyun_rpm
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 3.2.0
 platform: ruby
 authors:
 - tingyun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-26 00:00:00.000000000 Z
+date: 2020-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake