lib/ting_yun/instrumentation/net.rb in tingyun_rpm-1.2.0 vs lib/ting_yun/instrumentation/net.rb in tingyun_rpm-1.3.0

@@ -3,11 +3,11 @@
 TingYun::Support::LibraryDetection.defer do
 
   named :net_http
 
   depends_on do
-    defined?(Net) && defined?(Net::HTTP)
+    defined?(Net) && defined?(Net::HTTP) && !::TingYun::Agent.config[:disable_net_http]
   end
 
   executes do
     ::TingYun::Agent.logger.info 'Installing Net instrumentation'
     require 'ting_yun/agent/cross_app/cross_app_tracing'
@@ -34,21 +34,21 @@
       class << self
         def get_response_with_tingyun(uri_or_host, path = nil, port = nil, &block)
           begin
             get_response_without_tingyun(uri_or_host, path , port , &block)
           rescue => e
-            ::TingYun::Instrumentation::Support::ExternalError.handle_error(e, "External/#{uri_or_host.to_s.gsub('/','%2F')}/net%2Fhttp")
+            ::TingYun::Instrumentation::Support::ExternalError.handle_error(e, "External/#{uri_or_host.to_s.gsub(/\/\z/,'').gsub('/','%2F')}/net%2Fhttp")
             raise e
           end
         end
         alias get_response_without_tingyun get_response
         alias get_response get_response_with_tingyun
 
         def start_with_tingyun(address, *arg, &block)
           begin
             start_without_tingyun(address, *arg, &block)
           rescue => e
-            ::TingYun::Instrumentation::Support::ExternalError.handle_error(e, "External/#{address.to_s.gsub('/','%2F')}/net%2Fhttp")
+            ::TingYun::Instrumentation::Support::ExternalError.handle_error(e, "External/#{address.to_s.gsub(/\/\z/,'').gsub('/','%2F')}/net%2Fhttp")
             raise e
           end
         end
         alias :start_without_tingyun :start
         alias :start :start_with_tingyun
\ No newline at end of file