Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Diaganostics and metrics clean up #47679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 14, 2023
Merged

Diaganostics and metrics clean up #47679

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5f851a9
WIP
JamesNK Apr 13, 2023
95e44b8
Update
JamesNK Apr 13, 2023
a50d1d0
Clean up
JamesNK Apr 13, 2023
d0554ea
Fix tests
JamesNK Apr 13, 2023
f17ba95
Add logging to tests
JamesNK Apr 14, 2023
a1bf686
Revert "Add logging to tests"
JamesNK Apr 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Revert "Add logging to tests" 
This reverts commit f17ba95.
  • Loading branch information
@JamesNK
JamesNK committed Apr 14, 2023
commit a1bf6863f546206e5d494db08e88e832368312ca
21 changes: 8 additions & 13 deletions src/Hosting/Hosting/test/HostingApplicationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,14 @@
using Microsoft.AspNetCore.Http.Features;
using Microsoft.AspNetCore.Testing;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Microsoft.Extensions.Metrics;
using Moq;
using static Microsoft.AspNetCore.Hosting.HostingApplication;

namespace Microsoft.AspNetCore.Hosting.Tests;

public class HostingApplicationTests : LoggedTest
public class HostingApplicationTests
{
[Fact]
public void Metrics()
Expand Down Expand Up @@ -214,11 +213,9 @@ public void CreateContextCreatesNewContextIfNotUsingDefaultHttpContextFactory()
hostingApplication.DisposeContext(context, null);
}

[Theory]
[InlineData(true)]
[InlineData(false)]
[Fact]
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/35142")]
public void IHttpActivityFeatureIsPopulated(bool enableLogging)
public void IHttpActivityFeatureIsPopulated()
{
var testSource = new ActivitySource(Path.GetRandomFileName());
var dummySource = new ActivitySource(Path.GetRandomFileName());
Expand All @@ -230,8 +227,7 @@ public void IHttpActivityFeatureIsPopulated(bool enableLogging)
};
ActivitySource.AddActivityListener(listener);

var loggerFactory = enableLogging ? LoggerFactory : NullLoggerFactory.Instance;
var hostingApplication = CreateApplication(activitySource: testSource, loggerFactory: loggerFactory);
var hostingApplication = CreateApplication(activitySource: testSource);
var httpContext = new DefaultHttpContext();
var context = hostingApplication.CreateContext(httpContext.Features);

Expand Down Expand Up @@ -293,7 +289,7 @@ public void IHttpActivityFeatureNotUsedFromFeatureCollection()
[Fact]
public void IHttpActivityFeatureIsNotPopulatedWithoutAListener()
{
var hostingApplication = CreateApplication(loggerFactory: NullLoggerFactory.Instance);
var hostingApplication = CreateApplication();
var httpContext = new DefaultHttpContext();
httpContext.Features.Set<IHttpActivityFeature>(new TestHttpActivityFeature());
var context = hostingApplication.CreateContext(httpContext.Features);
Expand All @@ -306,8 +302,8 @@ public void IHttpActivityFeatureIsNotPopulatedWithoutAListener()
hostingApplication.DisposeContext(context, null);
}

private HostingApplication CreateApplication(IHttpContextFactory httpContextFactory = null, bool useHttpContextAccessor = false,
ActivitySource activitySource = null, IMeterFactory meterFactory = null, ILoggerFactory loggerFactory = null)
private static HostingApplication CreateApplication(IHttpContextFactory httpContextFactory = null, bool useHttpContextAccessor = false,
ActivitySource activitySource = null, IMeterFactory meterFactory = null)
{
var services = new ServiceCollection();
services.AddOptions();
Expand All @@ -317,11 +313,10 @@ private HostingApplication CreateApplication(IHttpContextFactory httpContextFact
}

httpContextFactory ??= new DefaultHttpContextFactory(services.BuildServiceProvider());
loggerFactory ??= LoggerFactory;

var hostingApplication = new HostingApplication(
ctx => Task.CompletedTask,
loggerFactory.CreateLogger("Microsoft.AspNetCore.Hosting.Diagnostics"),
NullLogger.Instance,
new DiagnosticListener("Microsoft.AspNetCore"),
activitySource ?? new ActivitySource("Microsoft.AspNetCore"),
DistributedContextPropagator.CreateDefaultPropagator(),
Expand Down