From 12ace1e9e43f6d8d25918100bb6d05638e7ef577 Mon Sep 17 00:00:00 2001
From: Ganga Mahesh Siddem <gangams@microsoft.com>
Date: Wed, 8 Apr 2020 15:29:32 -0700
Subject: [PATCH] fix log exception

---
 .../plugin/kubernetes_container_inventory.rb     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/code/plugin/kubernetes_container_inventory.rb b/source/code/plugin/kubernetes_container_inventory.rb
index a95ca59a2..207514c1e 100644
--- a/source/code/plugin/kubernetes_container_inventory.rb
+++ b/source/code/plugin/kubernetes_container_inventory.rb
@@ -117,7 +117,7 @@ def getContainerInventoryRecords(podItem, batchTime, clusterCollectEnvironmentVa
           end
         end
       rescue => error
-        @log.warn("KubernetesContainerInventory::getContainerInventoryRecords : Get Container Inventory Records failed: #{error}")
+        $log.warn("KubernetesContainerInventory::getContainerInventoryRecords : Get Container Inventory Records failed: #{error}")
         $log.debug_backtrace(error.backtrace)
         ApplicationInsightsUtility.sendExceptionTelemetry(error)
       end
@@ -160,7 +160,7 @@ def getContainersInfoMap(podItem, isWindows)
           end
         end
       rescue => error
-        @log.warn("KubernetesContainerInventory::getContainersInfoMap : Get Container Info Maps failed: #{error}")
+        $log.warn("KubernetesContainerInventory::getContainersInfoMap : Get Container Info Maps failed: #{error}")
         $log.debug_backtrace(error.backtrace)
         ApplicationInsightsUtility.sendExceptionTelemetry(error)
       end
@@ -199,8 +199,8 @@ def obtainContainerEnvironmentVars(containerId)
               envValueString = ["AZMON_COLLECT_ENV=FALSE"]
               $log.warn("Environment Variable collection for container: #{containerId} skipped because AZMON_COLLECT_ENV is set to false")
             else
-              # Restricting the ENV string value to 200kb since the size of this string can go very high
-              envVars = File.read(environFilePath, 200000)
+              # Restricting the ENV string value to 200kb since the size of this string can go very high             
+              envVars = File.read(environFilePath, 200000)             
               if !envVars.nil? && !envVars.empty?
                 envVars = envVars.split("\0")
                 envValueString = envVars.to_s
@@ -217,10 +217,10 @@ def obtainContainerEnvironmentVars(containerId)
             end
           end
         else
-          @log.warn("KubernetesContainerInventory::obtainContainerEnvironmentVars: cGroupPid is NIL or empty for containerId: #{containerId}")  
+          $log.warn("KubernetesContainerInventory::obtainContainerEnvironmentVars: cGroupPid is NIL or empty for containerId: #{containerId}")  
         end
       rescue => error
-        @log.warn("KubernetesContainerInventory::obtainContainerEnvironmentVars: obtain Container Environment vars failed: #{error} for containerId: #{containerId}")
+        $log.warn("KubernetesContainerInventory::obtainContainerEnvironmentVars: obtain Container Environment vars failed: #{error} for containerId: #{containerId}")
         $log.debug_backtrace(error.backtrace)
         ApplicationInsightsUtility.sendExceptionTelemetry(error)
       end
@@ -299,7 +299,7 @@ def obtainWindowsContainerEnvironmentVars(pod, container)
           end
         end
       rescue => error
-        @log.warn("KubernetesContainerInventory::obtainWindowsContainerEnvironmentVars: parsing of EnvVars failed: #{error}")
+        $log.warn("KubernetesContainerInventory::obtainWindowsContainerEnvironmentVars: parsing of EnvVars failed: #{error}")
         $log.debug_backtrace(error.backtrace)
         ApplicationInsightsUtility.sendExceptionTelemetry(error)
       end
@@ -312,7 +312,7 @@ def deleteCGroupCacheEntryForDeletedContainer(containerId)
           @@containerCGroupCache.delete(containerId)
         end      
       rescue => error
-        @log.warn("KubernetesContainerInventory::deleteCGroupCacheEntryForDeletedContainer: deleting of cache entry failed: #{error}")
+        $log.warn("KubernetesContainerInventory::deleteCGroupCacheEntryForDeletedContainer: deleting of cache entry failed: #{error}")
         $log.debug_backtrace(error.backtrace)
         ApplicationInsightsUtility.sendExceptionTelemetry(error)
       end