Merge pull request #1267 from elastic/fix/trace-corrolation

Fix/trace corrolation

Author: gmarz

src/Elasticsearch.Net/Connection/RequestState/TransportRequestState.cs

@@ -4,16 +4,30 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using Elasticsearch.Net.Connection.Configuration;
 using Elasticsearch.Net.ConnectionPool;
 using PurifyNet;
 
 namespace Elasticsearch.Net.Connection.RequestState
 {
+	internal static class TransportRequestState
+	{
+		private static long _requestId = 0;
+		public static long RequestId {
+			get
+			{
+				var r = Interlocked.Increment(ref _requestId);
+				return r;
+			}
+		} 
+	}
+
 	public class TransportRequestState<T> : IDisposable, ITransportRequestState
 	{
 		private readonly bool _traceEnabled;
 		private readonly bool _metricsEnabled;
+		private readonly long _requestId;
 
 		private Stopwatch _stopwatch;
 
@@ -87,6 +101,7 @@ public TransportRequestState(
 			string method,
 			string path)
 		{
+			this._requestId = TransportRequestState.RequestId;
 			this.StartedOn = DateTime.UtcNow;
 			this.SeenNodes = new List<Uri>();
 			this.SeenExceptions = new List<Exception>();
@@ -95,7 +110,16 @@ public TransportRequestState(
 			this._traceEnabled = settings.TraceEnabled;
 			this._metricsEnabled = settings.MetricsEnabled;
 			if (this._metricsEnabled || this._traceEnabled)
-				this._stopwatch = Stopwatch.StartNew(); 
+				this._stopwatch = Stopwatch.StartNew();
+
+			if (this._traceEnabled)
+			{
+				Trace.TraceInformation("NEST start:{0} {1} {2}"
+					, this._requestId
+					, _result.RequestMethod
+					, _result.RequestUrl
+				);
+			}
 
 			this.Method = method;
 			this.Path = path;
@@ -179,7 +203,8 @@ public void Dispose()
 
 			if (_result.Success)
 			{
-				Trace.TraceInformation("NEST {0} {1} ({2}):\r\n{3}"
+				Trace.TraceInformation("NEST end:{0} {1} {2} ({3}):\r\n{4}"
+					, this._requestId
 					, _result.RequestMethod
 					, _result.RequestUrl
 					, _stopwatch.Elapsed
@@ -189,7 +214,8 @@ public void Dispose()
 			else
 			{
 				Trace.TraceError(
-					"NEST {0} {1} ({2}):\r\n{3}"
+					"NEST end:{0} {1} {2} ({3}):\r\n{4}"
+					, this._requestId
 					, _result.RequestMethod
 					, _result.RequestUrl
 					, _stopwatch.Elapsed