Added request id functionality and general refactoring..also turned out i wasnt returning headers....sigh

test/Ocelot.AcceptanceTests/RequestIdTests.cs

@@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Primitives;
+using Ocelot.Configuration.Yaml;
+using TestStack.BDDfy;
+using Xunit;
+
+namespace Ocelot.AcceptanceTests
+{
+    public class RequestIdTests : IDisposable
+    {
+        private IWebHost _builder;
+        private readonly Steps _steps;
+
+        public RequestIdTests()
+        {
+            _steps = new Steps();
+        }
+
+        [Fact]
+        public void should_use_default_request_id_and_forward()
+        {
+            var yamlConfiguration = new YamlConfiguration
+            {
+                ReRoutes = new List<YamlReRoute>
+                    {
+                        new YamlReRoute
+                        {
+                            DownstreamTemplate = "http://localhost:51879/",
+                            UpstreamTemplate = "/",
+                            UpstreamHttpMethod = "Get",
+                            RequestIdKey = _steps.RequestIdKey
+                        }
+                    }
+            };
+
+            this.Given(x => x.GivenThereIsAServiceRunningOn("http://localhost:51879"))
+                .And(x => _steps.GivenThereIsAConfiguration(yamlConfiguration))
+                .And(x => _steps.GivenOcelotIsRunning())
+                .When(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
+                .Then(x => _steps.ThenTheRequestIdIsReturned())
+                .BDDfy();
+        }
+
+        [Fact]
+        public void should_use_request_id_and_forward()
+        {
+            var yamlConfiguration = new YamlConfiguration
+            {
+                ReRoutes = new List<YamlReRoute>
+                    {
+                        new YamlReRoute
+                        {
+                            DownstreamTemplate = "http://localhost:51879/",
+                            UpstreamTemplate = "/",
+                            UpstreamHttpMethod = "Get",
+                            RequestIdKey = _steps.RequestIdKey
+                        }
+                    }
+            };
+
+            var requestId = Guid.NewGuid().ToString();
+
+            this.Given(x => x.GivenThereIsAServiceRunningOn("http://localhost:51879"))
+                .And(x => _steps.GivenThereIsAConfiguration(yamlConfiguration))
+                .And(x => _steps.GivenOcelotIsRunning())
+                .When(x => _steps.WhenIGetUrlOnTheApiGateway("/", requestId))
+                .Then(x => _steps.ThenTheRequestIdIsReturned(requestId))
+                .BDDfy();
+        }
+
+        private void GivenThereIsAServiceRunningOn(string url)
+        {
+            _builder = new WebHostBuilder()
+                .UseUrls(url)
+                .UseKestrel()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseIISIntegration()
+                .UseUrls(url)
+                .Configure(app =>
+                {
+                    app.Run(context =>
+                    {
+                        StringValues requestId;
+                        context.Request.Headers.TryGetValue(_steps.RequestIdKey, out requestId);
+                        context.Response.Headers.Add(_steps.RequestIdKey, requestId.First());
+                        return Task.CompletedTask;
+                    });
+                })
+                .Build();
+
+            _builder.Start();
+        }
+
+        public void Dispose()
+        {
+            _builder?.Dispose();
+            _steps.Dispose();
+        }
+    }
+}

test/Ocelot.AcceptanceTests/Steps.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
@@ -26,6 +27,7 @@ namespace Ocelot.AcceptanceTests
         private HttpContent _postContent;
         private BearerToken _token;
         public HttpClient OcelotClient => _ocelotClient;
+        public string RequestIdKey = "OcRequestId";
 
         public void GivenThereIsAConfiguration(YamlConfiguration yamlConfiguration)
         {
@@ -146,6 +148,13 @@ namespace Ocelot.AcceptanceTests
             _response = _ocelotClient.GetAsync(url).Result;
         }
 
+        public void WhenIGetUrlOnTheApiGateway(string url, string requestId)
+        {
+            _ocelotClient.DefaultRequestHeaders.TryAddWithoutValidation(RequestIdKey, requestId);
+
+            _response = _ocelotClient.GetAsync(url).Result;
+        }
+
         public void WhenIPostUrlOnTheApiGateway(string url)
         {
             _response = _ocelotClient.PostAsync(url, _postContent).Result;
@@ -171,5 +180,15 @@ namespace Ocelot.AcceptanceTests
             _ocelotClient?.Dispose();
             _ocelotServer?.Dispose();
         }
+
+        public void ThenTheRequestIdIsReturned()
+        {
+            _response.Headers.GetValues(RequestIdKey).First().ShouldNotBeNullOrEmpty();
+        }
+
+        public void ThenTheRequestIdIsReturned(string expected)
+        {
+            _response.Headers.GetValues(RequestIdKey).First().ShouldBe(expected);
+        }
     }
 }