Rashmi/http leak fixes

source/code/plugin/CAdvisorMetricsAPIClient.rb

@@ -65,14 +65,11 @@ def getSummaryStatsFromCAdvisor(winNode)
         cAdvisorUri = getCAdvisorUri(winNode)
         if !cAdvisorUri.nil?
           uri = URI.parse(cAdvisorUri)
-          http = Net::HTTP.new(uri.host, uri.port)
-          http.use_ssl = false
-          http.open_timeout = 20
-          http.read_timeout = 40
-
-          cAdvisorApiRequest = Net::HTTP::Get.new(uri.request_uri)
-          response = http.request(cAdvisorApiRequest)
-          @Log.info "Got response code #{response.code} from #{uri.request_uri}"
+          Net::HTTP.start(uri.host, uri.port, :use_ssl => false, :open_timeout => 20, :read_timeout => 40 ) do |http|
+            cAdvisorApiRequest = Net::HTTP::Get.new(uri.request_uri)
+            response = http.request(cAdvisorApiRequest)
+            @Log.info "Got response code #{response.code} from #{uri.request_uri}"
+          end
         end
       rescue => error
         @Log.warn("CAdvisor api request failed: #{error}")

source/code/plugin/DockerApiClient.rb

@@ -3,7 +3,7 @@
 
 class DockerApiClient
   require "socket"
-  require 'yajl/json_gem'
+  require "yajl/json_gem"
   require "timeout"
   require_relative "omslog"
   require_relative "DockerApiRestHelper"
@@ -40,7 +40,6 @@ def getResponse(request, isMultiJson, isVersion)
           end
           break if (isVersion) ? (responseChunk.length < @@ChunkSize) : (responseChunk.end_with? "0\r\n\r\n")
         end
-        socket.close
         return (isTimeOut) ? nil : parseResponse(dockerResponse, isMultiJson)
       rescue => errorStr
         $log.warn("Socket call failed for request: #{request} error: #{errorStr} , isMultiJson: #{isMultiJson} @ #{Time.now.utc.iso8601}")
@@ -49,6 +48,12 @@ def getResponse(request, isMultiJson, isVersion)
           ApplicationInsightsUtility.sendExceptionTelemetry(errorStr)
         end
         return nil
+      ensure
+        ## REMOVE LOG BEFORE MERGE
+        $log.warn "Closing docker socket connection"
+        if !socket.nil?
+          socket.close
+        end
       end
     end
 

source/code/plugin/KubernetesApiClient.rb

@@ -40,23 +40,16 @@ def getKubeResourceInfo(resource, api_group: nil)
         resourceUri = getResourceUri(resource, api_group)
         if !resourceUri.nil?
           uri = URI.parse(resourceUri)
-          http = Net::HTTP.new(uri.host, uri.port)
-          http.use_ssl = true
-          http.open_timeout = 20
-          http.read_timeout = 40
-
           if !File.exist?(@@CaFile)
             raise "#{@@CaFile} doesnt exist"
           else
-            http.ca_file = @@CaFile if File.exist?(@@CaFile)
+            Net::HTTP.start(uri.host, uri.port, :use_ssl => true, :ca_file => @@CaFile, :verify_mode => OpenSSL::SSL::VERIFY_PEER ) do |http|
+              kubeApiRequest = Net::HTTP::Get.new(uri.request_uri)
+              kubeApiRequest["Authorization"] = "Bearer " + getTokenStr
+              @Log.info "KubernetesAPIClient::getKubeResourceInfo : Making request to #{uri.request_uri} @ #{Time.now.utc.iso8601}"
+              response = http.request(kubeApiRequest)
+              @Log.info "KubernetesAPIClient::getKubeResourceInfo : Got response of #{response.code} for #{uri.request_uri} @ #{Time.now.utc.iso8601}"
           end
-          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-
-          kubeApiRequest = Net::HTTP::Get.new(uri.request_uri)
-          kubeApiRequest["Authorization"] = "Bearer " + getTokenStr
-          @Log.info "KubernetesAPIClient::getKubeResourceInfo : Making request to #{uri.request_uri} @ #{Time.now.utc.iso8601}"
-          response = http.request(kubeApiRequest)
-          @Log.info "KubernetesAPIClient::getKubeResourceInfo : Got response of #{response.code} for #{uri.request_uri} @ #{Time.now.utc.iso8601}"
         end
       rescue => error
         @Log.warn("kubernetes api request failed: #{error} for #{resource} @ #{Time.now.utc.iso8601}")