HttpAbstractions changes

Author: benaadams

src/Microsoft.AspNet.Hosting/Internal/FastHttpRequestIdentifierFeature.cs

@@ -278,18 +278,6 @@ private void EnsureServer()
             }
         }
 
-        private string GetRequestIdentifier(HttpContext httpContext)
-        {
-            var requestIdentifierFeature = httpContext.Features.Get<IHttpRequestIdentifierFeature>();
-            if (requestIdentifierFeature == null)
-            {
-                requestIdentifierFeature = new FastHttpRequestIdentifierFeature();
-                httpContext.Features.Set(requestIdentifierFeature);
-            }
-
-            return requestIdentifierFeature.TraceIdentifier;
-        }
-
         private class Disposable : IDisposable
         {
             private Action _dispose;

src/Microsoft.AspNet.Hosting/Internal/HostingEngine.cs

@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.Threading;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Features;
 using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNet.Hosting.Internal
@@ -37,7 +36,6 @@ private class HostingRequestScope : ILogValues
         {
             private readonly HttpContext _httpContext;
 
-            private FeatureReference<IHttpRequestIdentifierFeature> _requestIdentifierFeatureReference;
             private IEnumerable<KeyValuePair<string, object>> _cachedGetValues;
             private string _cachedToString;
 
@@ -46,20 +44,16 @@ public HostingRequestScope(HttpContext httpContext)
                 this._httpContext = httpContext;
             }
 
-            public IHttpRequestIdentifierFeature RequestIdFeature =>
-                _requestIdentifierFeatureReference.Fetch(_httpContext.Features) ??
-                _requestIdentifierFeatureReference.Update(_httpContext.Features, new FastHttpRequestIdentifierFeature());
-
             public override string ToString() => _cachedToString ?? Interlocked.CompareExchange(
                 ref _cachedToString,
-                $"RequestId:{RequestIdFeature.TraceIdentifier} RequestPath:{_httpContext.Request.Path}",
+                $"RequestId:{_httpContext.TraceIdentifier} RequestPath:{_httpContext.Request.Path}",
                 null);
 
             public IEnumerable<KeyValuePair<string, object>> GetValues() => _cachedGetValues ?? Interlocked.CompareExchange(
                 ref _cachedGetValues,
                 new[]
                 {
-                    new KeyValuePair<string, object>("RequestId", RequestIdFeature.TraceIdentifier),
+                    new KeyValuePair<string, object>("RequestId", _httpContext.TraceIdentifier),
                     new KeyValuePair<string, object>("RequestPath", _httpContext.Request.Path.ToString()),
                 },
                 null);

src/Microsoft.AspNet.Hosting/Internal/HostingLoggerExtensions.cs

@@ -6,8 +6,7 @@
         "url": "git://github.com/aspnet/hosting"
     },
     "compilationOptions": {
-        "warningsAsErrors": true,
-        "allowUnsafe": true
+        "warningsAsErrors": true
     },
     "dependencies": {
         "Microsoft.AspNet.FileProviders.Physical": "1.0.0-*",

src/Microsoft.AspNet.Hosting/project.json

@@ -306,7 +306,13 @@ public void HostingEngine_CreatesDefaultRequestIdentifierFeature_IfNotPresent()
 
             // Assert
             Assert.NotNull(httpContext);
-            Assert.IsType<FastHttpRequestIdentifierFeature>(httpContext.Features.Get<IHttpRequestIdentifierFeature>());
+            Assert.IsType<HttpRequestIdentifierFeature>(httpContext.Features.Get<IHttpRequestIdentifierFeature>());
+
+            Assert.NotNull(httpContext.TraceIdentifier);
+            Assert.NotNull(httpContext.Features.Get<IHttpRequestIdentifierFeature>());
+
+            Assert.Same(httpContext.TraceIdentifier, httpContext.Features.Get<IHttpRequestIdentifierFeature>().TraceIdentifier);
+
         }
 
         [Fact]