fix: logging HTTP header from streaming request

Author: bednar

Client.Core/Internal/AbstractQueryClient.cs

@@ -114,7 +114,8 @@ private async Task Query(Func<Func<HttpResponseMessage, RestResponse>, RestReque
                 var query = queryFn.Invoke(response =>
                 {
                     var result = GetStreamFromResponse(response, cancellationToken);
-                    result = AfterIntercept((int)response.StatusCode, () => response.Headers.ToHeaderParameters(),
+                    result = AfterIntercept((int)response.StatusCode,
+                        () => response.Headers.ToHeaderParameters(response.Content.Headers),
                         result);
 
                     RaiseForInfluxError(response, result);
@@ -157,7 +158,8 @@ private void QuerySync(Func<Func<HttpResponseMessage, RestResponse>, RestRequest
                 var query = queryFn.Invoke(response =>
                 {
                     var result = GetStreamFromResponse(response, cancellationToken);
-                    result = AfterIntercept((int)response.StatusCode, () => response.Headers.ToHeaderParameters(),
+                    result = AfterIntercept((int)response.StatusCode,
+                        () => response.Headers.ToHeaderParameters(response.Content.Headers),
                         result);
 
                     RaiseForInfluxError(response, result);
@@ -196,7 +198,8 @@ protected async IAsyncEnumerable<T> QueryEnumerable<T>(
             var query = queryFn.Invoke(response =>
             {
                 stream = GetStreamFromResponse(response, cancellationToken);
-                stream = AfterIntercept((int)response.StatusCode, () => response.Headers.ToHeaderParameters(), stream);
+                stream = AfterIntercept((int)response.StatusCode,
+                    () => response.Headers.ToHeaderParameters(response.Content.Headers), stream);
 
                 RaiseForInfluxError(response, stream);
 

Client.Core/Internal/RestSharpExtensions.cs

@@ -10,9 +10,17 @@ namespace InfluxDB.Client.Core.Internal
 {
     internal static class RestSharpExtensions
     {
-        internal static IEnumerable<HeaderParameter> ToHeaderParameters(this HttpHeaders httpHeaders)
+        /// <summary>
+        /// Transform `HttpHeaders` to `HeaderParameter` type.
+        /// </summary>
+        /// <param name="httpHeaders"></param>
+        /// <param name="httpContentHeaders">Additionally content Headers</param>
+        /// <returns>IEnumerable&lt;HeaderParameter&gt;</returns>
+        internal static IEnumerable<HeaderParameter> ToHeaderParameters(this HttpHeaders httpHeaders,
+            HttpContentHeaders? httpContentHeaders = null)
         {
             return httpHeaders
+                .Concat(httpContentHeaders ?? Enumerable.Empty<KeyValuePair<string, IEnumerable<string>>>())
                 .SelectMany(x => x.Value.Select(y => (x.Key, y)))
                 .Select(x => new HeaderParameter(x.Key, x.y));
         }

Client.Test/QueryApiTest.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using InfluxDB.Client.Api.Domain;
@@ -127,6 +128,23 @@ public void RequiredOrgQueryAsync()
                 ae.Message);
         }
 
+        [Test]
+        public async Task LoggedContentType()
+        {
+            var writer = new StringWriter();
+            Trace.Listeners.Add(new TextWriterTraceListener(writer));
+
+            _influxDbClient.SetLogLevel(LogLevel.Headers);
+
+            MockServer
+                .Given(Request.Create().WithPath("/api/v2/query").UsingPost())
+                .RespondWith(CreateResponse(Data));
+
+            await _queryApi.QueryAsync("from(...");
+
+            StringAssert.Contains("Content-Type=text/csv; charset=utf-8", writer.ToString());
+        }
+
         private class SyncPoco
         {
             [Column(IsMeasurement = true)] public string Measurement { get; set; }