tingyun_rpm 1.4.2 → 1.5.0

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

@@ -14,12 +14,12 @@ module TingYun
         module_function
 
         def capture_exception(response,request)
-          if response && response.code =~ /^[4,5][0-9][0-9]$/ && response.code!='401'
+          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('/','%2F')}/#{request.from}"
+            klass = "External/#{request.uri.to_s.gsub(/\/\z/,'').gsub('/','%2F')}/#{request.from}"
             set_attributes(e, klass, response.code)
 
-            TingYun::Agent.notice_error(e)
+            TingYun::Agent.notice_error(e,:type=>:exception)
           end
         end
 
@@ -37,7 +37,7 @@ module TingYun
               set_attributes(e, klass, 1000)
           end
 
-          TingYun::Agent.notice_error(e)
+          TingYun::Agent.notice_error(e,:type=>:exception)
         end
 
         def set_attributes(exception, klass, code)

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

@@ -25,7 +25,12 @@ module TingYun
         end
 
         def self.metrics_for_message(product, ip_host, operation)
-          metrics =["AllWeb", "All"]
+          if TingYun::Agent::Transaction.recording_web_transaction?
+            metrics =["AllWeb", "All"]
+          else
+            metrics =["AllBackground", "All"]
+          end
+
           metrics = metrics.map { |suffix| "Message #{product}/NULL/#{suffix}" }
           metrics.unshift "Message #{product}/#{ip_host}/#{operation}"
         end

data/lib/ting_yun/instrumentation/thrift.rb

@@ -117,7 +117,7 @@ TingYun::Support::LibraryDetection.defer do
 
 
           result = receive_message_without_tingyun(result_klass)
-          unless result || result.success
+          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

data/lib/ting_yun/instrumentation/typhoeus.rb

@@ -0,0 +1,75 @@
+TingYun::Support::LibraryDetection.defer do
+  named :typhoeus
+
+
+  depends_on do
+    defined?(Typhoeus) && defined?(Typhoeus::VERSION)
+  end
+
+  depends_on do
+    TingYun::Instrumentation::TyphoeusTracing.is_supported_version?
+  end
+
+  executes do
+    ::TingYun::Agent.logger.info 'Installing Typhoeus instrumentation'
+    require 'ting_yun/agent/cross_app/cross_app_tracing'
+    require 'ting_yun/http/typhoeus_wrappers'
+    require 'ting_yun/agent/method_tracer_helpers'
+  end
+
+  # Basic request tracing
+  executes do
+    Typhoeus.before do |request|
+      TingYun::Instrumentation::TyphoeusTracing.trace(request)
+
+      # Ensure that we always return a truthy value from the before block,
+      # otherwise Typhoeus will bail out of the instrumentation.
+      true
+    end
+  end
+
+  # Apply single TT node for Hydra requests until async support
+  executes do
+    class Typhoeus::Hydra
+
+
+      def run_with_tingyun(*args)
+        TingYun::Agent::MethodTracerHelpers.trace_execution_scoped("External/Multiple/Typhoeus::Hydra/run") do
+          run_without_tingyun(*args)
+        end
+      end
+
+      alias run_without_tingyun run
+      alias run run_with_tingyun
+    end
+  end
+
+
+end
+
+
+module TingYun::Instrumentation::TyphoeusTracing
+
+  EARLIEST_VERSION = TingYun::Support::VersionNumber.new("0.5.3")
+
+  def self.is_supported_version?
+    TingYun::Support::VersionNumber.new(Typhoeus::VERSION) >= TingYun::Instrumentation::TyphoeusTracing::EARLIEST_VERSION
+  end
+
+  def self.request_is_hydra_enabled?(request)
+    request.respond_to?(:hydra) && request.hydra
+  end
+
+  def self.trace(request)
+    if TingYun::Agent.tl_is_execution_traced? && !request_is_hydra_enabled?(request)
+      wrapped_request = ::TingYun::Http::TyphoeusHTTPRequest.new(request)
+      state = TingYun::Agent::TransactionState.tl_get
+      t0 = Time.now.to_f
+      segment = TingYun::Agent::CrossAppTracing.start_trace(state, t0, wrapped_request)
+      request.on_complete do
+        wrapped_response = ::TingYun::Http::TyphoeusHTTPResponse.new(request.response)
+        TingYun::Agent::CrossAppTracing.finish_trace(TingYun::Agent::TransactionState.tl_get,t0, segment, wrapped_request, wrapped_response )
+      end
+    end
+  end
+end

data/lib/ting_yun/support/exception.rb

@@ -40,7 +40,9 @@ module TingYun
         end
       end
 
+      #跨应用错误
       class InternalServerError < StandardError
+
       end
 
     end

data/lib/ting_yun/support/http_clients/uri_util.rb

@@ -24,14 +24,19 @@ module TingYun
         # There are valid URI strings that some HTTP client libraries will
         # accept that the stdlib URI module doesn't handle. If we find that
         # Addressable is around, use that to normalize out our URL's.
-        def self.parse_url(url)
-          if defined?(::Addressable::URI)
-            address = ::Addressable::URI.parse(url)
-            address.normalize!
-            URI.parse(address.to_s)
-          else
-            URI.parse(url)
+        def self.parse_and_normalize_url(url)
+          uri = url
+          unless ::URI === uri
+            if defined?(::Addressable::URI)
+              address = ::Addressable::URI.parse(url)
+              address.normalize!
+              uri = ::URI.parse(address.to_s)
+            else
+              uri = ::URI.parse(url)
+            end
           end
+          uri.host.downcase! unless uri.host.nil?
+          uri
         end
 
         QUESTION_MARK = "?".freeze

data/lib/ting_yun/ting_yun_service.rb

@@ -37,7 +37,7 @@ module TingYun
 
       @license_key = license_key || TingYun::Agent.config[:'license_key']
       @request_timeout = TingYun::Agent.config[:timeout]
-      @data_version = TingYun::VERSION::STRING
+      @data_version = "1.4"
       @marshaller =TingYun::Support::Serialize::JsonMarshaller.new
       @metric_id_cache = {}
       @quantile_cache = {}

data/lib/ting_yun/ting_yun_service/upload_service.rb

@@ -23,7 +23,7 @@ module TingYun
       end
 
       def metric_data(stats_hash, base_quantile_hash)
-        action_array, adpex_array, general_array, components_array, errors_array = build_metric_data_array(stats_hash, base_quantile_hash)
+        action_array, adpex_array, general_array, components_array, errors_array,exception_array = build_metric_data_array(stats_hash, base_quantile_hash)
 
         upload_data = {
             :type => 'perfMetrics',
@@ -34,7 +34,8 @@ module TingYun
             :apdex => adpex_array,
             :components => components_array,
             :general => general_array,
-            :errors  => errors_array
+            :errors  => errors_array,
+            :exceptions  => exception_array
         }
         upload_data.merge!(:config => {"nbs.quantile" => TingYun::Agent.config[:'nbs.quantile']}) if TingYun::Agent.config[:'nbs.quantile']
         result = invoke_remote(:upload, [upload_data])
@@ -53,6 +54,7 @@ module TingYun
         general_array = []
         components_array = []
         errors_array = []
+        exception_array = []
 
         calculate_quantile(base_quantile_hash.hash)
 
@@ -68,6 +70,8 @@ module TingYun
               adpex_array << TingYun::Metrics::MetricData.new(metric_spec, stats, metric_id)
             elsif metric_spec.name.start_with?('Errors') && metric_spec.scope.empty?
               errors_array << TingYun::Metrics::MetricData.new(metric_spec, stats, metric_id)
+            elsif metric_spec.name.start_with?('Exception') && metric_spec.scope.empty?
+              exception_array << TingYun::Metrics::MetricData.new(metric_spec, stats, metric_id)
             else
               if metric_spec.scope.empty?
                 general_array << TingYun::Metrics::MetricData.new(metric_spec, stats, metric_id)  unless metric_spec.name.start_with?("View","Middleware","Nested","Rack")
@@ -79,7 +83,7 @@ module TingYun
           end
         end
 
-        [action_array, adpex_array, general_array, components_array, errors_array]
+        [action_array, adpex_array, general_array, components_array, errors_array,exception_array]
       end
 
       def generate_action(metric_spec, stats, metric_id)
@@ -132,6 +136,14 @@ module TingYun
       invoke_remote(:upload, [upload_data], :encoder=> json)
     end
 
+    def exception_data(unsent_exceptions)
+      upload_data = {
+          :type => 'exceptionTraceData',
+          :exceptions => unsent_exceptions
+      }
+      invoke_remote(:upload, [upload_data], :encoder=> json)
+    end
+
 
     def action_trace_data(traces)
       upload_data = {

data/lib/ting_yun/version.rb

@@ -4,8 +4,8 @@
 module TingYun
   module VERSION
     MAJOR = 1
-    MINOR = 4
-    TINY = 2
+    MINOR = 5
+    TINY = 0
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tingyun_rpm
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - tingyun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2018-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -354,12 +354,17 @@ files:
 - lib/ting_yun/frameworks/rails5.rb
 - lib/ting_yun/frameworks/ruby.rb
 - lib/ting_yun/frameworks/sinatra.rb
-- lib/ting_yun/http/generic_request.rb
+- lib/ting_yun/http/abstract_request.rb
+- lib/ting_yun/http/curb_wrappers.rb
+- lib/ting_yun/http/excon_wrappers.rb
 - lib/ting_yun/http/http_client_request.rb
 - lib/ting_yun/http/net_http_request.rb
+- lib/ting_yun/http/typhoeus_wrappers.rb
 - lib/ting_yun/instrumentation/active_record.rb
 - lib/ting_yun/instrumentation/bunny.rb
+- lib/ting_yun/instrumentation/curb.rb
 - lib/ting_yun/instrumentation/data_mapper.rb
+- lib/ting_yun/instrumentation/excon.rb
 - lib/ting_yun/instrumentation/grape.rb
 - lib/ting_yun/instrumentation/http_client.rb
 - lib/ting_yun/instrumentation/kafka.rb
@@ -409,6 +414,7 @@ files:
 - lib/ting_yun/instrumentation/support/thrift_helper.rb
 - lib/ting_yun/instrumentation/support/transaction_namer.rb
 - lib/ting_yun/instrumentation/thrift.rb
+- lib/ting_yun/instrumentation/typhoeus.rb
 - lib/ting_yun/logger.rb
 - lib/ting_yun/logger/agent_logger.rb
 - lib/ting_yun/logger/create_logger_helper.rb

data/lib/ting_yun/http/generic_request.rb

@@ -1,8 +0,0 @@
-# encoding: utf-8
-module TingYun
-  module Http
-    class GenericRequest
-
-    end
-  end
-end