fix

Author: BrennanConroy

src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs

@@ -740,13 +740,13 @@ public void ActivityParentIdAndBaggageReadFromHeaders()
         {
             Headers = new HeaderDictionary()
             {
-                {"Request-Id", "ParentId1"},
+                {"Request-Id", "ParentId1"}, // non-standard header, won't apply to Activity
                 {"baggage", "Key1=value1, Key2=value2"}
             }
         });
         hostingApplication.CreateContext(features);
         Assert.Equal("Microsoft.AspNetCore.Hosting.HttpRequestIn", Activity.Current.OperationName);
-        Assert.Equal("ParentId1", Activity.Current.ParentId);
+        Assert.Null(Activity.Current.ParentId);
         Assert.Contains(Activity.Current.Baggage, pair => pair.Key == "Key1" && pair.Value == "value1");
         Assert.Contains(Activity.Current.Baggage, pair => pair.Key == "Key2" && pair.Value == "value2");
     }

src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.KeyServices.cs

@@ -127,7 +127,7 @@ public async Task ThrowsForUnregisteredRequiredKeyService()
         var exception = await Assert.ThrowsAsync<InvalidOperationException>(
             async () => await endpoint.RequestDelegate(httpContext));
 
-        Assert.Equal("No keyed service for type 'Microsoft.AspNetCore.Http.Generators.Tests.TestService' has been registered.", exception.Message);
+        Assert.Equal("No keyed service for type 'Microsoft.AspNetCore.Http.Generators.Tests.TestService' using key type 'System.String' has been registered.", exception.Message);
     }
 
     [Fact]

src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/HubConnectionHandlerTests.Activity.cs

@@ -132,7 +132,7 @@ public async Task HubMethodInvokesCreateActivities_ReadTraceHeaders()
                 var headers = new Dictionary<string, string>
                 {
                     {"traceparent", "00-0123456789abcdef0123456789abcdef-0123456789abcdef-01"},
-                    {"tracestate", "TraceState=1"},
+                    {"tracestate", "tracestate=1"},
                     {"baggage", "Key1=value1, Key2=value2"}
                 };
 
@@ -149,7 +149,7 @@ public async Task HubMethodInvokesCreateActivities_ReadTraceHeaders()
                 Assert.Equal(ActivityIdFormat.W3C, invocationActivity.IdFormat);
                 Assert.Equal("0123456789abcdef0123456789abcdef", invocationActivity.TraceId.ToHexString());
                 Assert.Equal("0123456789abcdef", invocationActivity.ParentSpanId.ToHexString());
-                Assert.Equal("TraceState=1", invocationActivity.TraceStateString);
+                Assert.Equal("tracestate=1", invocationActivity.TraceStateString);
 
                 client.Dispose();
 
@@ -262,7 +262,7 @@ public async Task StreamingHubMethodCreatesActivities_ReadTraceHeaders()
                 var headers = new Dictionary<string, string>
                 {
                     {"traceparent", "00-0123456789abcdef0123456789abcdef-0123456789abcdef-01"},
-                    {"tracestate", "TraceState=1"},
+                    {"tracestate", "tracestate=1"},
                     {"baggage", "Key1=value1, Key2=value2"}
                 };
 
@@ -275,7 +275,7 @@ public async Task StreamingHubMethodCreatesActivities_ReadTraceHeaders()
                 Assert.Equal(ActivityIdFormat.W3C, invocationActivity.IdFormat);
                 Assert.Equal("0123456789abcdef0123456789abcdef", invocationActivity.TraceId.ToHexString());
                 Assert.Equal("0123456789abcdef", invocationActivity.ParentSpanId.ToHexString());
-                Assert.Equal("TraceState=1", invocationActivity.TraceStateString);
+                Assert.Equal("tracestate=1", invocationActivity.TraceStateString);
 
                 client.Dispose();