HttpClientHelper should not log when logging is disabled (#3150)

Azure · Mar 9, 2023 · 1a01e48 · 1a01e48
1 parent d297180
commit 1a01e48
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/common/src/service/HttpClientHelper.cs b/common/src/service/HttpClientHelper.cs
@@ -745,7 +745,8 @@ private async Task ExecuteAsync(
             IDictionary<HttpStatusCode, Func<HttpResponseMessage, Task<Exception>>> errorMappingOverrides,
             CancellationToken cancellationToken)
         {
-            Logging.Enter(this, httpMethod.Method, requestUri, nameof(ExecuteAsync));
+            if (Logging.IsEnabled)
+                Logging.Enter(this, httpMethod.Method, requestUri, nameof(ExecuteAsync));
 
             try
             {
@@ -780,7 +781,8 @@ private async Task ExecuteAsync(
                 }
                 catch (AggregateException ex)
                 {
-                    Logging.Error(this, ex, nameof(ExecuteAsync));
+                    if (Logging.IsEnabled)
+                        Logging.Error(this, ex, nameof(ExecuteAsync));
 
                     ReadOnlyCollection<Exception> innerExceptions = ex.Flatten().InnerExceptions;
                     if (innerExceptions.Any(Fx.IsFatal))
@@ -799,25 +801,29 @@ private async Task ExecuteAsync(
                 }
                 catch (TimeoutException ex)
                 {
-                    Logging.Error(this, ex, nameof(ExecuteAsync));
+                    if (Logging.IsEnabled)
+                        Logging.Error(this, ex, nameof(ExecuteAsync));
 
                     throw new IotHubCommunicationException(ex.Message, ex);
                 }
                 catch (IOException ex)
                 {
-                    Logging.Error(this, ex, nameof(ExecuteAsync));
+                    if (Logging.IsEnabled)
+                        Logging.Error(this, ex, nameof(ExecuteAsync));
 
                     throw new IotHubCommunicationException(ex.Message, ex);
                 }
                 catch (HttpRequestException ex)
                 {
-                    Logging.Error(this, ex, nameof(ExecuteAsync));
+                    if (Logging.IsEnabled)
+                        Logging.Error(this, ex, nameof(ExecuteAsync));
 
                     throw new IotHubCommunicationException(ex.Message, ex);
                 }
                 catch (TaskCanceledException ex)
                 {
-                    Logging.Error(this, ex, nameof(ExecuteAsync));
+                    if (Logging.IsEnabled)
+                        Logging.Error(this, ex, nameof(ExecuteAsync));
 
                     // Unfortunately TaskCanceledException is thrown when HttpClient times out.
                     if (cancellationToken.IsCancellationRequested)
@@ -829,7 +835,8 @@ private async Task ExecuteAsync(
                 }
                 catch (Exception ex) when (!Fx.IsFatal(ex))
                 {
-                    Logging.Error(this, ex, nameof(ExecuteAsync));
+                    if (Logging.IsEnabled)
+                        Logging.Error(this, ex, nameof(ExecuteAsync));
 
                     throw new IotHubException(ex.Message, ex);
                 }
@@ -842,7 +849,8 @@ private async Task ExecuteAsync(
             }
             finally
             {
-                Logging.Exit(this, httpMethod.Method, requestUri, nameof(ExecuteAsync));
+                if (Logging.IsEnabled)
+                    Logging.Exit(this, httpMethod.Method, requestUri, nameof(ExecuteAsync));
             }
         }