Merge pull request snowflakedb#356 from snowflakedb/prep-2.0.5

sfc-gh-abhatnagar · web-flow · commit b081423d9175 · 2021-07-30T16:54:01.000-07:00
Prep 2.0.5
diff --git a/Snowflake.Data/Core/HttpUtil.cs b/Snowflake.Data/Core/HttpUtil.cs
@@ -333,12 +333,12 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
                     if (response != null)
                     {
                         if (response.IsSuccessStatusCode) {
-                            logger.Debug($"Success Response: {response.ToString()}");
+                            logger.Debug($"Success Response: StatusCode: {(int)response.StatusCode}, ReasonPhrase: '{response.ReasonPhrase}'");
                             return response;
                         }
                         else
                         {
-                            logger.Debug($"Failed Response: {response.ToString()}");
+                            logger.Debug($"Failed Response: StatusCode: {(int)response.StatusCode}, ReasonPhrase: '{response.ReasonPhrase}'");
                             bool isRetryable = isRetryableHTTPCode((int)response.StatusCode);
                             if (!isRetryable)
                             {
diff --git a/Snowflake.Data/Core/RestRequester.cs b/Snowflake.Data/Core/RestRequester.cs
@@ -37,7 +37,6 @@ internal interface IMockRestRequester : IRestRequester
 
     internal class RestRequester : IRestRequester
     {
-        private static SFLogger logger = SFLoggerFactory.GetLogger<RestRequester>();
 
         protected HttpClient _HttpClient;
 
@@ -72,7 +71,6 @@ public async Task<T> GetAsync<T>(IRestRequest request, CancellationToken cancell
             using (HttpResponseMessage response = await GetAsync(request, cancellationToken).ConfigureAwait(false))
             { 
                 var json = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
-                logger.Debug($"Get response: {json}");
                 return JsonConvert.DeserializeObject<T>(json);
             }
         }
@@ -113,7 +111,6 @@ protected virtual async Task<HttpResponseMessage> SendAsync(HttpRequestMessage m
                             .SendAsync(message, HttpCompletionOption.ResponseHeadersRead, linkedCts.Token)
                             .ConfigureAwait(false);
                         response.EnsureSuccessStatusCode();
-                        logger.Debug($"Http method: {message.ToString()}");
 
                         return response;
                     }
diff --git a/Snowflake.Data/Snowflake.Data.csproj b/Snowflake.Data/Snowflake.Data.csproj
@@ -12,7 +12,7 @@
     <Product>Snowflake Connector for .NET</Product>
     <Authors>howryu, tchen</Authors>
     <Copyright>Copyright (c) 2012-2019 Snowflake Computing Inc. All rights reserved.</Copyright>
-    <Version>2.0.4</Version>
+    <Version>2.0.5</Version>
     <DebugType>Full</DebugType>
   </PropertyGroup>
   
@@ -52,7 +52,7 @@
   <PropertyGroup>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <AssemblyVersion>2.0.4</AssemblyVersion>
+    <AssemblyVersion>2.0.5</AssemblyVersion>
   </PropertyGroup>
   
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -333,12 +333,12 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage`
`333`	`333`	`if (response != null)`
`334`	`334`	`{`
`335`	`335`	`if (response.IsSuccessStatusCode) {`
`336`		`- logger.Debug($"Success Response: {response.ToString()}");`
	`336`	`+ logger.Debug($"Success Response: StatusCode: {(int)response.StatusCode}, ReasonPhrase: '{response.ReasonPhrase}'");`
`337`	`337`	`return response;`
`338`	`338`	`}`
`339`	`339`	`else`
`340`	`340`	`{`
`341`		`- logger.Debug($"Failed Response: {response.ToString()}");`
	`341`	`+ logger.Debug($"Failed Response: StatusCode: {(int)response.StatusCode}, ReasonPhrase: '{response.ReasonPhrase}'");`
`342`	`342`	`bool isRetryable = isRetryableHTTPCode((int)response.StatusCode);`
`343`	`343`	`if (!isRetryable)`
`344`	`344`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ internal interface IMockRestRequester : IRestRequester`
`37`	`37`
`38`	`38`	`internal class RestRequester : IRestRequester`
`39`	`39`	`{`
`40`		`- private static SFLogger logger = SFLoggerFactory.GetLogger<RestRequester>();`
`41`	`40`
`42`	`41`	`protected HttpClient _HttpClient;`
`43`	`42`
`@@ -72,7 +71,6 @@ public async Task<T> GetAsync<T>(IRestRequest request, CancellationToken cancell`
`72`	`71`	`using (HttpResponseMessage response = await GetAsync(request, cancellationToken).ConfigureAwait(false))`
`73`	`72`	`{`
`74`	`73`	`var json = await response.Content.ReadAsStringAsync().ConfigureAwait(false);`
`75`		`- logger.Debug($"Get response: {json}");`
`76`	`74`	`return JsonConvert.DeserializeObject<T>(json);`
`77`	`75`	`}`
`78`	`76`	`}`
`@@ -113,7 +111,6 @@ protected virtual async Task<HttpResponseMessage> SendAsync(HttpRequestMessage m`
`113`	`111`	`.SendAsync(message, HttpCompletionOption.ResponseHeadersRead, linkedCts.Token)`
`114`	`112`	`.ConfigureAwait(false);`
`115`	`113`	`response.EnsureSuccessStatusCode();`
`116`		`- logger.Debug($"Http method: {message.ToString()}");`
`117`	`114`
`118`	`115`	`return response;`
`119`	`116`	`}`