Merge pull request #16243 from dotnet/revert-16199-release/1.1.0

Revert "Update AspNetCoreHosting keyword"
dotnet · Feb 16, 2017 · dbf6aa0 · dbf6aa0
2 parents 0c2ff97 + 8d774a8
commit dbf6aa0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/...System.Diagnostics.DiagnosticSource/src/System/Diagnostics/DiagnosticSourceEventSource.cs b/...System.Diagnostics.DiagnosticSource/src/System/Diagnostics/DiagnosticSourceEventSource.cs
@@ -164,9 +164,7 @@ public class Keywords
                 "httpContext.Request.Path;" +
                 "httpContext.Request.QueryString" +
             "\n" +
-            "Microsoft.AspNetCore/Microsoft.AspNetCore.Hosting.EndRequest@Activity1Stop:-" +
-                "httpContext.TraceIdentifier;" +
-                "httpContext.Response.StatusCode";
+            "Microsoft.AspNetCore/Microsoft.AspNetCore.Hosting.EndRequest@Activity1Stop:-";
 
         // Setting EntityFrameworkCoreCommands is like having this in the FilterAndPayloadSpecs string
         // It turns on basic SQL commands.

diff --git a/src/System.Diagnostics.DiagnosticSource/tests/DiagnosticSourceEventSourceBridgeTests.cs b/src/System.Diagnostics.DiagnosticSource/tests/DiagnosticSourceEventSourceBridgeTests.cs
@@ -586,25 +586,11 @@ public void TestShortcutKeywords()
                 eventSourceListener.ResetEventCountAndLastEvent();
 
                 // Stop the ASP.NET reqeust.  
-                aspNetCoreSource.Write("Microsoft.AspNetCore.Hosting.EndRequest", 
-                    new
-                    {
-                        httpContext = new
-                        {
-                            Response = new
-                            {
-                                StatusCode = "200"
-                            },
-                            TraceIdentifier = "MyTraceId"
-                        }
-                    });
+                aspNetCoreSource.Write("Microsoft.AspNetCore.Hosting.EndRequest", null);
                 Assert.Equal(1, eventSourceListener.EventCount); // Exactly one more event has been emitted.
                 Assert.Equal("Activity1Stop", eventSourceListener.LastEvent.EventSourceEventName);
                 Assert.Equal("Microsoft.AspNetCore", eventSourceListener.LastEvent.SourceName);
                 Assert.Equal("Microsoft.AspNetCore.Hosting.EndRequest", eventSourceListener.LastEvent.EventName);
-                Assert.True(2 <= eventSourceListener.LastEvent.Arguments.Count);
-                Assert.Equal("MyTraceId", eventSourceListener.LastEvent.Arguments["TraceIdentifier"]);
-                Assert.Equal("200", eventSourceListener.LastEvent.Arguments["StatusCode"]);
                 eventSourceListener.ResetEventCountAndLastEvent();
             }
         }