Read product name from HTTP responses

Author: stevejgordon

src/Elasticsearch.Net/Connection/HttpConnection.cs

@@ -65,6 +65,7 @@ public virtual TResponse Request<TResponse>(RequestData requestData)
 			HttpResponseMessage responseMessage;
 			int? statusCode = null;
 			IEnumerable<string> warnings = null;
+			IEnumerable<string> productNames = null;
 			Stream responseStream = null;
 			Exception ex = null;
 			string mimeType = null;
@@ -95,6 +96,7 @@ public virtual TResponse Request<TResponse>(RequestData requestData)
 
 				requestData.MadeItToResponse = true;
 				responseMessage.Headers.TryGetValues("Warning", out warnings);
+				responseMessage.Headers.TryGetValues("X-elastic-product", out productNames);
 				mimeType = responseMessage.Content.Headers.ContentType?.ToString();
 
 				if (responseMessage.Content != null)
@@ -114,7 +116,7 @@ public virtual TResponse Request<TResponse>(RequestData requestData)
 			using(receive)
 			using (responseStream ??= Stream.Null)
 			{
-				var response = ResponseBuilder.ToResponse<TResponse>(requestData, ex, statusCode, warnings, responseStream, mimeType);
+				var response = ResponseBuilder.ToResponse<TResponse>(requestData, ex, statusCode, warnings, responseStream, mimeType, productNames?.FirstOrDefault());
 
 				// set TCP and threadpool stats on the response here so that in the event the request fails after the point of
 				// gathering stats, they are still exposed on the call details. Ideally these would be set inside ResponseBuilder.ToResponse,
@@ -132,6 +134,7 @@ public virtual async Task<TResponse> RequestAsync<TResponse>(RequestData request
 			HttpResponseMessage responseMessage;
 			int? statusCode = null;
 			IEnumerable<string> warnings = null;
+			IEnumerable<string> productNames = null;
 			Stream responseStream = null;
 			Exception ex = null;
 			string mimeType = null;
@@ -164,6 +167,7 @@ public virtual async Task<TResponse> RequestAsync<TResponse>(RequestData request
 				requestData.MadeItToResponse = true;
 				mimeType = responseMessage.Content.Headers.ContentType?.ToString();
 				responseMessage.Headers.TryGetValues("Warning", out warnings);
+				responseMessage.Headers.TryGetValues("X-elastic-product", out productNames);
 
 				if (responseMessage.Content != null)
 				{
@@ -180,13 +184,13 @@ public virtual async Task<TResponse> RequestAsync<TResponse>(RequestData request
 				ex = e;
 			}
 			using (receive)
-			using (responseStream = responseStream ?? Stream.Null)
+			using (responseStream ??= Stream.Null)
 			{
 				var response = await ResponseBuilder.ToResponseAsync<TResponse>
-						(requestData, ex, statusCode, warnings, responseStream, mimeType, cancellationToken)
+						(requestData, ex, statusCode, warnings, responseStream, mimeType, productNames?.FirstOrDefault(), cancellationToken)
 					.ConfigureAwait(false);
 
-				// set TCP and threadpool stats on the response here so that in the event the request fails after the point of
+				// set TCP and thread pool stats on the response here so that in the event the request fails after the point of
 				// gathering stats, they are still exposed on the call details. Ideally these would be set inside ResponseBuilder.ToResponse,
 				// but doing so would be a breaking change in 7.x
 				response.ApiCall.TcpStats = tcpStats;

src/Elasticsearch.Net/Connection/HttpWebRequestConnection.cs

@@ -36,6 +36,7 @@ public virtual TResponse Request<TResponse>(RequestData requestData)
 		{
 			int? statusCode = null;
 			IEnumerable<string> warnings = null;
+			IEnumerable<string> productNames = null;
 			Stream responseStream = null;
 			Exception ex = null;
 			string mimeType = null;
@@ -76,6 +77,10 @@ public virtual TResponse Request<TResponse>(RequestData requestData)
 				//response.Headers.HasKeys() can return false even if response.Headers.AllKeys has values.
 				if (httpWebResponse.SupportsHeaders && httpWebResponse.Headers.Count > 0 && httpWebResponse.Headers.AllKeys.Contains("Warning"))
 					warnings = httpWebResponse.Headers.GetValues("Warning");
+
+				//response.Headers.HasKeys() can return false even if response.Headers.AllKeys has values.
+				if (httpWebResponse.SupportsHeaders && httpWebResponse.Headers.Count > 0 && httpWebResponse.Headers.AllKeys.Contains("X-elastic-product"))
+					productNames = httpWebResponse.Headers.GetValues("X-elastic-product");
 			}
 			catch (WebException e)
 			{
@@ -85,7 +90,7 @@ public virtual TResponse Request<TResponse>(RequestData requestData)
 			}
 
 			responseStream ??= Stream.Null;
-			var response = ResponseBuilder.ToResponse<TResponse>(requestData, ex, statusCode, warnings, responseStream, mimeType);
+			var response = ResponseBuilder.ToResponse<TResponse>(requestData, ex, statusCode, warnings, responseStream, mimeType, productNames.FirstOrDefault());
 
 			// set TCP and threadpool stats on the response here so that in the event the request fails after the point of
 			// gathering stats, they are still exposed on the call details. Ideally these would be set inside ResponseBuilder.ToResponse,
@@ -103,6 +108,7 @@ CancellationToken cancellationToken
 			Action unregisterWaitHandle = null;
 			int? statusCode = null;
 			IEnumerable<string> warnings = null;
+			IEnumerable<string> productNames = null;
 			Stream responseStream = null;
 			Exception ex = null;
 			string mimeType = null;
@@ -151,6 +157,10 @@ CancellationToken cancellationToken
 					HandleResponse(httpWebResponse, out statusCode, out responseStream, out mimeType);
 					if (httpWebResponse.SupportsHeaders && httpWebResponse.Headers.HasKeys() && httpWebResponse.Headers.AllKeys.Contains("Warning"))
 						warnings = httpWebResponse.Headers.GetValues("Warning");
+
+					//response.Headers.HasKeys() can return false even if response.Headers.AllKeys has values.
+					if (httpWebResponse.SupportsHeaders && httpWebResponse.Headers.Count > 0 && httpWebResponse.Headers.AllKeys.Contains("X-elastic-product"))
+						productNames = httpWebResponse.Headers.GetValues("X-elastic-product");
 				}
 			}
 			catch (WebException e)
@@ -165,10 +175,10 @@ CancellationToken cancellationToken
 			}
 			responseStream ??= Stream.Null;
 			var response = await ResponseBuilder.ToResponseAsync<TResponse>
-					(requestData, ex, statusCode, warnings, responseStream, mimeType, cancellationToken)
+					(requestData, ex, statusCode, warnings, responseStream, mimeType, productNames.FirstOrDefault(), cancellationToken)
 				.ConfigureAwait(false);
 
-			// set TCP and threadpool stats on the response here so that in the event the request fails after the point of
+			// set TCP and thread pool stats on the response here so that in the event the request fails after the point of
 			// gathering stats, they are still exposed on the call details. Ideally these would be set inside ResponseBuilder.ToResponse,
 			// but doing so would be a breaking change in 7.x
 			response.ApiCall.TcpStats = tcpStats;