diff --git a/test/iis/AspNetFullFrameworkSampleApp/AspNetFullFrameworkSampleApp.csproj b/test/iis/AspNetFullFrameworkSampleApp/AspNetFullFrameworkSampleApp.csproj index 4e41fddf2f..63c2e3d295 100644 --- a/test/iis/AspNetFullFrameworkSampleApp/AspNetFullFrameworkSampleApp.csproj +++ b/test/iis/AspNetFullFrameworkSampleApp/AspNetFullFrameworkSampleApp.csproj @@ -80,10 +80,6 @@ true $(SolutionRoot)\build\elasticapmsample.snk - - - - diff --git a/test/iis/AspNetFullFrameworkSampleApp/Controllers/HomeController.cs b/test/iis/AspNetFullFrameworkSampleApp/Controllers/HomeController.cs index 2710190e2b..77336e9d0c 100644 --- a/test/iis/AspNetFullFrameworkSampleApp/Controllers/HomeController.cs +++ b/test/iis/AspNetFullFrameworkSampleApp/Controllers/HomeController.cs @@ -53,7 +53,7 @@ public class HomeController : ControllerBase internal const string GenNSpansPageRelativePath = HomePageRelativePath + "/" + nameof(GenNSpans); internal const string GetDotNetRuntimeDescriptionPageRelativePath = HomePageRelativePath + "/" + nameof(GetDotNetRuntimeDescription); internal const string HomePageRelativePath = "Home"; - internal const string CookiesPageRelativePath = "Cookies"; + internal const string CookiesPageRelativePath = HomePageRelativePath + "/" + nameof(Cookies); internal const string LabelsTestRelativePath = HomePageRelativePath + "/" + nameof(LabelsTest); internal const string NotFoundPageRelativePath = HomePageRelativePath + "/" + nameof(NotFound); diff --git a/test/iis/AspNetFullFrameworkSampleApp/Web.config b/test/iis/AspNetFullFrameworkSampleApp/Web.config index 0f5320cf74..bb2c07310c 100644 --- a/test/iis/AspNetFullFrameworkSampleApp/Web.config +++ b/test/iis/AspNetFullFrameworkSampleApp/Web.config @@ -20,10 +20,11 @@ + - - + + diff --git a/test/iis/Elastic.Apm.AspNetFullFramework.Tests/SanitizeFieldNamesTests.cs b/test/iis/Elastic.Apm.AspNetFullFramework.Tests/SanitizeFieldNamesTests.cs index d9564a1ec4..63f167d936 100644 --- a/test/iis/Elastic.Apm.AspNetFullFramework.Tests/SanitizeFieldNamesTests.cs +++ b/test/iis/Elastic.Apm.AspNetFullFramework.Tests/SanitizeFieldNamesTests.cs @@ -22,7 +22,7 @@ public async Task SanitizesCookieHeaders() { var pathData = SampleAppUrlPaths.CookiesPage; - await SendGetRequestToSampleAppAndVerifyResponse(pathData.Uri, pathData.StatusCode); + await SendGetRequestToSampleAppAndVerifyResponse(pathData.Uri, pathData.StatusCode, false); await WaitAndCustomVerifyReceivedData(receivedData => { receivedData.Transactions.Count.Should().Be(1); @@ -31,9 +31,11 @@ await WaitAndCustomVerifyReceivedData(receivedData => receivedData.Transactions[0].Context.Request.Should().NotBeNull(); receivedData.Transactions[0].Context.Response.Headers["Set-Cookie"].Should().Be(Apm.Consts.Redacted); - }); + }, false); - await SendGetRequestToSampleAppAndVerifyResponse(pathData.Uri, pathData.StatusCode); + ClearState(); + + await SendGetRequestToSampleAppAndVerifyResponse(pathData.Uri, pathData.StatusCode, false); await WaitAndCustomVerifyReceivedData(receivedData => { receivedData.Transactions.Count.Should().Be(1); @@ -45,8 +47,8 @@ await WaitAndCustomVerifyReceivedData(receivedData => receivedData.Transactions[0].Context.Request.Headers["Cookie"].Should().Be(Apm.Consts.Redacted); receivedData.Transactions[0].Context.Request.Cookies["MySecureCookie"].Should().Be(Apm.Consts.Redacted); - receivedData.Transactions[0].Context.Request.Cookies["SafeCookie"].Should().Be("123"); - }); + receivedData.Transactions[0].Context.Request.Cookies["SafeCookie"].Should().Be("This is safe to record and should not be redacted."); + }, false); } } }