Fixed dependency injection event source tests randomly failing.#107465

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
steveharter merged 2 commits into from
Oct 30, 2024
Merged

Fixed dependency injection event source tests randomly failing. #107465

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a1a55a
Fixed dependency injection event source tests randomly failing.
koenigst Sep 6, 2024
c50b64d
Implemented review suggestion.
koenigst Oct 26, 2024
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
123 changes: 75 additions & 48 deletions ...soft.Extensions.DependencyInjection/tests/DI.Tests/DependencyInjectionEventSourceTests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,31 +6,17 @@
using System.Collections.Generic;
using System.Diagnostics.Tracing;
using System.Linq;
using System.Reflection;
using Microsoft.Extensions.DependencyInjection.Specification.Fakes;
using Newtonsoft.Json.Linq;
using Xunit;

namespace Microsoft.Extensions.DependencyInjection.Tests
{
[CollectionDefinition(nameof(EventSourceTests), DisableParallelization = true)]
public class EventSourceTests : ICollectionFixture<EventSourceTests>
public class DependencyInjectionEventSourceTests(
DependencyInjectionEventSourceTests.TestEventListenerFixture fixture)
: IClassFixture<DependencyInjectionEventSourceTests.TestEventListenerFixture>
{
}

[Collection(nameof(EventSourceTests))]
public class DependencyInjectionEventSourceTests : IDisposable
{
private readonly TestEventListener _listener = new TestEventListener();

public DependencyInjectionEventSourceTests()
{
// clear the provider list in between tests
typeof(DependencyInjectionEventSource).GetField("_providers", BindingFlags.NonPublic | BindingFlags.Instance)
.SetValue(DependencyInjectionEventSource.Log, new List<WeakReference<ServiceProvider>>());
Comment thread
steveharter marked this conversation as resolved.

_listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
}
private TestEventListener Listener => fixture.Listener;

[Fact]
public void ExistsWithCorrectId()
Expand DownExpand Up@@ -58,9 +44,10 @@ public void EmitsCallSiteBuiltEvent()
serviceCollection.AddTransient<IFakeMultipleService, FakeDisposableCallbackInnerService>();
serviceCollection.AddSingleton<IFakeService, FakeDisposableCallbackInnerService>();

serviceCollection.BuildServiceProvider().GetService<IEnumerable<IFakeOuterService>>();
var serviceProvider = serviceCollection.BuildServiceProvider();
serviceProvider.GetService<IEnumerable<IFakeOuterService>>();

var callsiteBuiltEvent = _listener.EventData.Single(e => e.EventName == "CallSiteBuilt");
var callsiteBuiltEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "CallSiteBuilt");


Assert.Equal(
Expand DownExpand Up@@ -168,7 +155,7 @@ public void EmitsServiceResolvedEvent()
serviceProvider.GetService<IFakeService>();
serviceProvider.GetService<IFakeService>();

var serviceResolvedEvents = _listener.EventData.Where(e => e.EventName == "ServiceResolved").ToArray();
var serviceResolvedEvents = Listener.EventDataFor(serviceProvider).Where(e => e.EventName == "ServiceResolved").ToArray();

Assert.Equal(3, serviceResolvedEvents.Length);
foreach (var serviceResolvedEvent in serviceResolvedEvents)
Expand All@@ -189,15 +176,14 @@ public void EmitsExpressionTreeBuiltEvent()

serviceProvider.GetService<IFakeService>();

var expressionTreeGeneratedEvent = _listener.EventData.Single(e => e.EventName == "ExpressionTreeGenerated");
var expressionTreeGeneratedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "ExpressionTreeGenerated");

Assert.Equal("Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService", GetProperty<string>(expressionTreeGeneratedEvent, "serviceType"));
Assert.Equal(9, GetProperty<int>(expressionTreeGeneratedEvent, "nodeCount"));
Assert.Equal(3, expressionTreeGeneratedEvent.EventId);
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/35753", TestPlatforms.Windows)]
public void EmitsDynamicMethodBuiltEvent()
{
// Arrange
Expand All@@ -208,7 +194,7 @@ public void EmitsDynamicMethodBuiltEvent()

serviceProvider.GetService<IFakeService>();

var expressionTreeGeneratedEvent = _listener.EventData.Single(e => e.EventName == "DynamicMethodBuilt");
var expressionTreeGeneratedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "DynamicMethodBuilt");

Assert.Equal("Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService", GetProperty<string>(expressionTreeGeneratedEvent, "serviceType"));
Assert.Equal(12, GetProperty<int>(expressionTreeGeneratedEvent, "methodSize"));
Expand All@@ -228,7 +214,7 @@ public void EmitsScopeDisposedEvent()
scope.ServiceProvider.GetService<IFakeService>();
}

var scopeDisposedEvent = _listener.EventData.Single(e => e.EventName == "ScopeDisposed");
var scopeDisposedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "ScopeDisposed");

Assert.Equal(1, GetProperty<int>(scopeDisposedEvent, "scopedServicesResolved"));
Assert.Equal(1, GetProperty<int>(scopeDisposedEvent, "disposableServices"));
Expand All@@ -239,13 +225,15 @@ public void EmitsScopeDisposedEvent()
public void EmitsServiceRealizationFailedEvent()
{
var exception = new Exception("Test error.");
DependencyInjectionEventSource.Log.ServiceRealizationFailed(exception, 1234);
var serviceProvider = new ServiceCollection().BuildServiceProvider();
int hashCode = serviceProvider.GetHashCode();
DependencyInjectionEventSource.Log.ServiceRealizationFailed(exception, hashCode);

var eventName = nameof(DependencyInjectionEventSource.Log.ServiceRealizationFailed);
var serviceRealizationFailedEvent = _listener.EventData.Single(e => e.EventName == eventName);
var serviceRealizationFailedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == eventName);

Assert.Equal("System.Exception: Test error.", GetProperty<string>(serviceRealizationFailedEvent, "exceptionMessage"));
Assert.Equal(1234, GetProperty<int>(serviceRealizationFailedEvent, "serviceProviderHashCode"));
Assert.Equal(hashCode, GetProperty<int>(serviceRealizationFailedEvent, "serviceProviderHashCode"));
Comment thread
steveharter marked this conversation as resolved.
Assert.Equal(6, serviceRealizationFailedEvent.EventId);
}

Expand All@@ -266,7 +254,7 @@ public void EmitsServiceProviderBuilt()

using ServiceProvider provider = serviceCollection.BuildServiceProvider();

EventWrittenEventArgs serviceProviderBuiltEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderBuilt");
EventWrittenEventArgs serviceProviderBuiltEvent = Listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderBuilt");
GetProperty<int>(serviceProviderBuiltEvent, "serviceProviderHashCode"); // assert hashcode exists as an int
Assert.Equal(4, GetProperty<int>(serviceProviderBuiltEvent, "singletonServices"));
Assert.Equal(2, GetProperty<int>(serviceProviderBuiltEvent, "scopedServices"));
Expand All@@ -275,7 +263,7 @@ public void EmitsServiceProviderBuilt()
Assert.Equal(1, GetProperty<int>(serviceProviderBuiltEvent, "openGenericsServices"));
Assert.Equal(7, serviceProviderBuiltEvent.EventId);

EventWrittenEventArgs serviceProviderDescriptorsEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderDescriptors");
EventWrittenEventArgs serviceProviderDescriptorsEvent = Listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderDescriptors");
Assert.Equal(
string.Join(Environment.NewLine,
"{",
Expand DownExpand Up@@ -343,33 +331,77 @@ public void EmitsServiceProviderBuilt()
[Fact]
public void EmitsServiceProviderBuiltOnAttach()
{
_listener.DisableEvents(DependencyInjectionEventSource.Log);

ServiceCollection serviceCollection = new();
serviceCollection.AddSingleton(new FakeDisposeCallback());

using ServiceProvider provider = serviceCollection.BuildServiceProvider();

Assert.Empty(_listener.EventData);
using var listener = new TestEventListener();
listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
try
{
EventWrittenEventArgs serviceProviderBuiltEvent = listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderBuilt");
Assert.Equal(1, GetProperty<int>(serviceProviderBuiltEvent, "singletonServices"));

_listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
EventWrittenEventArgs serviceProviderDescriptorsEvent = listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderDescriptors");
Assert.NotNull(JObject.Parse(GetProperty<string>(serviceProviderDescriptorsEvent, "descriptors")));
Comment thread
steveharter marked this conversation as resolved.
}
finally
{
listener.DisableEvents(DependencyInjectionEventSource.Log);
}
}

EventWrittenEventArgs serviceProviderBuiltEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderBuilt");
Assert.Equal(1, GetProperty<int>(serviceProviderBuiltEvent, "singletonServices"));
private static bool TryGetProperty<T>(EventWrittenEventArgs data, string propName, out T result)
{
if (data.PayloadNames is { } names &&
data.Payload is { } payload &&
names.IndexOf(propName) is int index and >= 0 &&
payload[index] is T value)
{
result = value;
return true;
}

EventWrittenEventArgs serviceProviderDescriptorsEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderDescriptors");
Assert.NotNull(JObject.Parse(GetProperty<string>(serviceProviderDescriptorsEvent, "descriptors")));
result = default;
return false;
}

private T GetProperty<T>(EventWrittenEventArgs data, string propName)
=> (T)data.Payload[data.PayloadNames.IndexOf(propName)];
private static T GetProperty<T>(EventWrittenEventArgs data, string propName) =>
TryGetProperty(data, propName, out T result)
? result
: throw new ArgumentException($"No property {propName} with type {typeof(T)} found.");

public class TestEventListenerFixture : IDisposable
Comment thread
steveharter marked this conversation as resolved.
{
internal TestEventListener Listener { get; }

public TestEventListenerFixture()
{
Listener = new();
Listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
}

public void Dispose()
{
Listener.DisableEvents(DependencyInjectionEventSource.Log);
Listener.Dispose();
}
}

private class TestEventListener : EventListener
internal class TestEventListener : EventListener
Comment thread
steveharter marked this conversation as resolved.
{
private volatile bool _disposed;
private ConcurrentQueue<EventWrittenEventArgs> _events = new ConcurrentQueue<EventWrittenEventArgs>();
private readonly ConcurrentQueue<EventWrittenEventArgs> _events = new ConcurrentQueue<EventWrittenEventArgs>();

public IEnumerable<EventWrittenEventArgs> EventDataFor(IServiceProvider serviceProvider)
{
int hashCode = serviceProvider.GetHashCode();

public IEnumerable<EventWrittenEventArgs> EventData => _events;
return _events.Where(e =>
e.PayloadNames?.IndexOf("serviceProviderHashCode") is { } index and >= 0 &&
e.Payload?[index] as int? == hashCode);
}

protected override void OnEventWritten(EventWrittenEventArgs eventData)
{
Expand All@@ -385,10 +417,5 @@ public override void Dispose()
base.Dispose();
}
}

public void Dispose()
{
_listener.Dispose();
}
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fixed dependency injection event source tests randomly failing.#107465

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

steveharter
merged 2 commits into

from

Oct 30, 2024
 Merged


Fixed dependency injection event source tests randomly failing.
#107465
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3a1a55a

Fixed dependency injection event source tests randomly failing.


koenigst Sep 6, 2024
c50b64d

Implemented review suggestion.


koenigst Oct 26, 2024

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


123 changes: 75 additions & 48 deletions
...soft.Extensions.DependencyInjection/tests/DI.Tests/DependencyInjectionEventSourceTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,31 +6,17 @@
using System.Collections.Generic;
using System.Diagnostics.Tracing;
using System.Linq;
using System.Reflection;
using Microsoft.Extensions.DependencyInjection.Specification.Fakes;
using Newtonsoft.Json.Linq;
using Xunit;

namespace Microsoft.Extensions.DependencyInjection.Tests
{
 [CollectionDefinition(nameof(EventSourceTests), DisableParallelization = true)]
 public class EventSourceTests : ICollectionFixture<EventSourceTests>
 public class DependencyInjectionEventSourceTests(
 DependencyInjectionEventSourceTests.TestEventListenerFixture fixture)
 : IClassFixture<DependencyInjectionEventSourceTests.TestEventListenerFixture>
 {
 }

 [Collection(nameof(EventSourceTests))]
 public class DependencyInjectionEventSourceTests : IDisposable
 {
 private readonly TestEventListener _listener = new TestEventListener();

 public DependencyInjectionEventSourceTests()
 {
 // clear the provider list in between tests
 typeof(DependencyInjectionEventSource).GetField("_providers", BindingFlags.NonPublic | BindingFlags.Instance)
 .SetValue(DependencyInjectionEventSource.Log, new List<WeakReference<ServiceProvider>>());
Comment thread
steveharter marked this conversation as resolved.


 _listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 }
 private TestEventListener Listener => fixture.Listener;

 [Fact]
 public void ExistsWithCorrectId()
Expand DownExpand Up@@ -58,9 +44,10 @@ public void EmitsCallSiteBuiltEvent()
 serviceCollection.AddTransient<IFakeMultipleService, FakeDisposableCallbackInnerService>();
 serviceCollection.AddSingleton<IFakeService, FakeDisposableCallbackInnerService>();

 serviceCollection.BuildServiceProvider().GetService<IEnumerable<IFakeOuterService>>();
 var serviceProvider = serviceCollection.BuildServiceProvider();
 serviceProvider.GetService<IEnumerable<IFakeOuterService>>();

 var callsiteBuiltEvent = _listener.EventData.Single(e => e.EventName == "CallSiteBuilt");
 var callsiteBuiltEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "CallSiteBuilt");


 Assert.Equal(
Expand DownExpand Up@@ -168,7 +155,7 @@ public void EmitsServiceResolvedEvent()
 serviceProvider.GetService<IFakeService>();
 serviceProvider.GetService<IFakeService>();

 var serviceResolvedEvents = _listener.EventData.Where(e => e.EventName == "ServiceResolved").ToArray();
 var serviceResolvedEvents = Listener.EventDataFor(serviceProvider).Where(e => e.EventName == "ServiceResolved").ToArray();

 Assert.Equal(3, serviceResolvedEvents.Length);
 foreach (var serviceResolvedEvent in serviceResolvedEvents)
Expand All@@ -189,15 +176,14 @@ public void EmitsExpressionTreeBuiltEvent()

 serviceProvider.GetService<IFakeService>();

 var expressionTreeGeneratedEvent = _listener.EventData.Single(e => e.EventName == "ExpressionTreeGenerated");
 var expressionTreeGeneratedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "ExpressionTreeGenerated");

 Assert.Equal("Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService", GetProperty<string>(expressionTreeGeneratedEvent, "serviceType"));
 Assert.Equal(9, GetProperty<int>(expressionTreeGeneratedEvent, "nodeCount"));
 Assert.Equal(3, expressionTreeGeneratedEvent.EventId);
 }

 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/35753", TestPlatforms.Windows)]
 public void EmitsDynamicMethodBuiltEvent()
 {
 // Arrange
Expand All@@ -208,7 +194,7 @@ public void EmitsDynamicMethodBuiltEvent()

 serviceProvider.GetService<IFakeService>();

 var expressionTreeGeneratedEvent = _listener.EventData.Single(e => e.EventName == "DynamicMethodBuilt");
 var expressionTreeGeneratedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "DynamicMethodBuilt");

 Assert.Equal("Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService", GetProperty<string>(expressionTreeGeneratedEvent, "serviceType"));
 Assert.Equal(12, GetProperty<int>(expressionTreeGeneratedEvent, "methodSize"));
Expand All@@ -228,7 +214,7 @@ public void EmitsScopeDisposedEvent()
 scope.ServiceProvider.GetService<IFakeService>();
 }

 var scopeDisposedEvent = _listener.EventData.Single(e => e.EventName == "ScopeDisposed");
 var scopeDisposedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "ScopeDisposed");

 Assert.Equal(1, GetProperty<int>(scopeDisposedEvent, "scopedServicesResolved"));
 Assert.Equal(1, GetProperty<int>(scopeDisposedEvent, "disposableServices"));
Expand All@@ -239,13 +225,15 @@ public void EmitsScopeDisposedEvent()
 public void EmitsServiceRealizationFailedEvent()
 {
 var exception = new Exception("Test error.");
 DependencyInjectionEventSource.Log.ServiceRealizationFailed(exception, 1234);
 var serviceProvider = new ServiceCollection().BuildServiceProvider();
 int hashCode = serviceProvider.GetHashCode();
 DependencyInjectionEventSource.Log.ServiceRealizationFailed(exception, hashCode);

 var eventName = nameof(DependencyInjectionEventSource.Log.ServiceRealizationFailed);
 var serviceRealizationFailedEvent = _listener.EventData.Single(e => e.EventName == eventName);
 var serviceRealizationFailedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == eventName);

 Assert.Equal("System.Exception: Test error.", GetProperty<string>(serviceRealizationFailedEvent, "exceptionMessage"));
 Assert.Equal(1234, GetProperty<int>(serviceRealizationFailedEvent, "serviceProviderHashCode"));
 Assert.Equal(hashCode, GetProperty<int>(serviceRealizationFailedEvent, "serviceProviderHashCode"));
Comment thread
steveharter marked this conversation as resolved.

 Assert.Equal(6, serviceRealizationFailedEvent.EventId);
 }

Expand All@@ -266,7 +254,7 @@ public void EmitsServiceProviderBuilt()

 using ServiceProvider provider = serviceCollection.BuildServiceProvider();

 EventWrittenEventArgs serviceProviderBuiltEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderBuilt");
 EventWrittenEventArgs serviceProviderBuiltEvent = Listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderBuilt");
 GetProperty<int>(serviceProviderBuiltEvent, "serviceProviderHashCode"); // assert hashcode exists as an int
 Assert.Equal(4, GetProperty<int>(serviceProviderBuiltEvent, "singletonServices"));
 Assert.Equal(2, GetProperty<int>(serviceProviderBuiltEvent, "scopedServices"));
Expand All@@ -275,7 +263,7 @@ public void EmitsServiceProviderBuilt()
 Assert.Equal(1, GetProperty<int>(serviceProviderBuiltEvent, "openGenericsServices"));
 Assert.Equal(7, serviceProviderBuiltEvent.EventId);

 EventWrittenEventArgs serviceProviderDescriptorsEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderDescriptors");
 EventWrittenEventArgs serviceProviderDescriptorsEvent = Listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderDescriptors");
 Assert.Equal(
 string.Join(Environment.NewLine,
 "{",
Expand DownExpand Up@@ -343,33 +331,77 @@ public void EmitsServiceProviderBuilt()
 [Fact]
 public void EmitsServiceProviderBuiltOnAttach()
 {
 _listener.DisableEvents(DependencyInjectionEventSource.Log);

 ServiceCollection serviceCollection = new();
 serviceCollection.AddSingleton(new FakeDisposeCallback());

 using ServiceProvider provider = serviceCollection.BuildServiceProvider();

 Assert.Empty(_listener.EventData);
 using var listener = new TestEventListener();
 listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 try
 {
 EventWrittenEventArgs serviceProviderBuiltEvent = listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderBuilt");
 Assert.Equal(1, GetProperty<int>(serviceProviderBuiltEvent, "singletonServices"));

 _listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 EventWrittenEventArgs serviceProviderDescriptorsEvent = listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderDescriptors");
 Assert.NotNull(JObject.Parse(GetProperty<string>(serviceProviderDescriptorsEvent, "descriptors")));
Comment thread
steveharter marked this conversation as resolved.

 }
 finally
 {
 listener.DisableEvents(DependencyInjectionEventSource.Log);
 }
 }

 EventWrittenEventArgs serviceProviderBuiltEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderBuilt");
 Assert.Equal(1, GetProperty<int>(serviceProviderBuiltEvent, "singletonServices"));
 private static bool TryGetProperty<T>(EventWrittenEventArgs data, string propName, out T result)
 {
 if (data.PayloadNames is { } names &&
 data.Payload is { } payload &&
 names.IndexOf(propName) is int index and >= 0 &&
 payload[index] is T value)
 {
 result = value;
 return true;
 }

EventWrittenEventArgs serviceProviderDescriptorsEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderDescriptors");
Assert.NotNull(JObject.Parse(GetProperty<string>(serviceProviderDescriptorsEvent, "descriptors")));
result = default;
return false;
 }

 private T GetProperty<T>(EventWrittenEventArgs data, string propName)
 => (T)data.Payload[data.PayloadNames.IndexOf(propName)];
 private static T GetProperty<T>(EventWrittenEventArgs data, string propName) =>
 TryGetProperty(data, propName, out T result)
 ? result
 : throw new ArgumentException($"No property {propName} with type {typeof(T)} found.");

 public class TestEventListenerFixture : IDisposable
Comment thread
steveharter marked this conversation as resolved.

 {
 internal TestEventListener Listener { get; }

 public TestEventListenerFixture()
 {
 Listener = new();
 Listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 }

 public void Dispose()
 {
 Listener.DisableEvents(DependencyInjectionEventSource.Log);
 Listener.Dispose();
 }
 }

private class TestEventListener : EventListener
internal class TestEventListener : EventListener
Comment thread
steveharter marked this conversation as resolved.

 {
 private volatile bool _disposed;
 private ConcurrentQueue<EventWrittenEventArgs> _events = new ConcurrentQueue<EventWrittenEventArgs>();
 private readonly ConcurrentQueue<EventWrittenEventArgs> _events = new ConcurrentQueue<EventWrittenEventArgs>();

 public IEnumerable<EventWrittenEventArgs> EventDataFor(IServiceProvider serviceProvider)
 {
 int hashCode = serviceProvider.GetHashCode();

 public IEnumerable<EventWrittenEventArgs> EventData => _events;
 return _events.Where(e =>
 e.PayloadNames?.IndexOf("serviceProviderHashCode") is { } index and >= 0 &&
 e.Payload?[index] as int? == hashCode);
 }

 protected override void OnEventWritten(EventWrittenEventArgs eventData)
 {
Expand All@@ -385,10 +417,5 @@ public override void Dispose()
 base.Dispose();
 }
 }

 public void Dispose()
 {
 _listener.Dispose();
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fixed dependency injection event source tests randomly failing.#107465

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

steveharter
merged 2 commits into

from

Oct 30, 2024
 Merged


Fixed dependency injection event source tests randomly failing.
#107465
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3a1a55a

Fixed dependency injection event source tests randomly failing.


koenigst Sep 6, 2024
c50b64d

Implemented review suggestion.


koenigst Oct 26, 2024

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


123 changes: 75 additions & 48 deletions
...soft.Extensions.DependencyInjection/tests/DI.Tests/DependencyInjectionEventSourceTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,31 +6,17 @@
using System.Collections.Generic;
using System.Diagnostics.Tracing;
using System.Linq;
using System.Reflection;
using Microsoft.Extensions.DependencyInjection.Specification.Fakes;
using Newtonsoft.Json.Linq;
using Xunit;

namespace Microsoft.Extensions.DependencyInjection.Tests
{
 [CollectionDefinition(nameof(EventSourceTests), DisableParallelization = true)]
 public class EventSourceTests : ICollectionFixture<EventSourceTests>
 public class DependencyInjectionEventSourceTests(
 DependencyInjectionEventSourceTests.TestEventListenerFixture fixture)
 : IClassFixture<DependencyInjectionEventSourceTests.TestEventListenerFixture>
 {
 }

 [Collection(nameof(EventSourceTests))]
 public class DependencyInjectionEventSourceTests : IDisposable
 {
 private readonly TestEventListener _listener = new TestEventListener();

 public DependencyInjectionEventSourceTests()
 {
 // clear the provider list in between tests
 typeof(DependencyInjectionEventSource).GetField("_providers", BindingFlags.NonPublic | BindingFlags.Instance)
 .SetValue(DependencyInjectionEventSource.Log, new List<WeakReference<ServiceProvider>>());
Comment thread
steveharter marked this conversation as resolved.


 _listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 }
 private TestEventListener Listener => fixture.Listener;

 [Fact]
 public void ExistsWithCorrectId()
Expand DownExpand Up@@ -58,9 +44,10 @@ public void EmitsCallSiteBuiltEvent()
 serviceCollection.AddTransient<IFakeMultipleService, FakeDisposableCallbackInnerService>();
 serviceCollection.AddSingleton<IFakeService, FakeDisposableCallbackInnerService>();

 serviceCollection.BuildServiceProvider().GetService<IEnumerable<IFakeOuterService>>();
 var serviceProvider = serviceCollection.BuildServiceProvider();
 serviceProvider.GetService<IEnumerable<IFakeOuterService>>();

 var callsiteBuiltEvent = _listener.EventData.Single(e => e.EventName == "CallSiteBuilt");
 var callsiteBuiltEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "CallSiteBuilt");


 Assert.Equal(
Expand DownExpand Up@@ -168,7 +155,7 @@ public void EmitsServiceResolvedEvent()
 serviceProvider.GetService<IFakeService>();
 serviceProvider.GetService<IFakeService>();

 var serviceResolvedEvents = _listener.EventData.Where(e => e.EventName == "ServiceResolved").ToArray();
 var serviceResolvedEvents = Listener.EventDataFor(serviceProvider).Where(e => e.EventName == "ServiceResolved").ToArray();

 Assert.Equal(3, serviceResolvedEvents.Length);
 foreach (var serviceResolvedEvent in serviceResolvedEvents)
Expand All@@ -189,15 +176,14 @@ public void EmitsExpressionTreeBuiltEvent()

 serviceProvider.GetService<IFakeService>();

 var expressionTreeGeneratedEvent = _listener.EventData.Single(e => e.EventName == "ExpressionTreeGenerated");
 var expressionTreeGeneratedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "ExpressionTreeGenerated");

 Assert.Equal("Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService", GetProperty<string>(expressionTreeGeneratedEvent, "serviceType"));
 Assert.Equal(9, GetProperty<int>(expressionTreeGeneratedEvent, "nodeCount"));
 Assert.Equal(3, expressionTreeGeneratedEvent.EventId);
 }

 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/35753", TestPlatforms.Windows)]
 public void EmitsDynamicMethodBuiltEvent()
 {
 // Arrange
Expand All@@ -208,7 +194,7 @@ public void EmitsDynamicMethodBuiltEvent()

 serviceProvider.GetService<IFakeService>();

 var expressionTreeGeneratedEvent = _listener.EventData.Single(e => e.EventName == "DynamicMethodBuilt");
 var expressionTreeGeneratedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "DynamicMethodBuilt");

 Assert.Equal("Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService", GetProperty<string>(expressionTreeGeneratedEvent, "serviceType"));
 Assert.Equal(12, GetProperty<int>(expressionTreeGeneratedEvent, "methodSize"));
Expand All@@ -228,7 +214,7 @@ public void EmitsScopeDisposedEvent()
 scope.ServiceProvider.GetService<IFakeService>();
 }

 var scopeDisposedEvent = _listener.EventData.Single(e => e.EventName == "ScopeDisposed");
 var scopeDisposedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "ScopeDisposed");

 Assert.Equal(1, GetProperty<int>(scopeDisposedEvent, "scopedServicesResolved"));
 Assert.Equal(1, GetProperty<int>(scopeDisposedEvent, "disposableServices"));
Expand All@@ -239,13 +225,15 @@ public void EmitsScopeDisposedEvent()
 public void EmitsServiceRealizationFailedEvent()
 {
 var exception = new Exception("Test error.");
 DependencyInjectionEventSource.Log.ServiceRealizationFailed(exception, 1234);
 var serviceProvider = new ServiceCollection().BuildServiceProvider();
 int hashCode = serviceProvider.GetHashCode();
 DependencyInjectionEventSource.Log.ServiceRealizationFailed(exception, hashCode);

 var eventName = nameof(DependencyInjectionEventSource.Log.ServiceRealizationFailed);
 var serviceRealizationFailedEvent = _listener.EventData.Single(e => e.EventName == eventName);
 var serviceRealizationFailedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == eventName);

 Assert.Equal("System.Exception: Test error.", GetProperty<string>(serviceRealizationFailedEvent, "exceptionMessage"));
 Assert.Equal(1234, GetProperty<int>(serviceRealizationFailedEvent, "serviceProviderHashCode"));
 Assert.Equal(hashCode, GetProperty<int>(serviceRealizationFailedEvent, "serviceProviderHashCode"));
Comment thread
steveharter marked this conversation as resolved.

 Assert.Equal(6, serviceRealizationFailedEvent.EventId);
 }

Expand All@@ -266,7 +254,7 @@ public void EmitsServiceProviderBuilt()

 using ServiceProvider provider = serviceCollection.BuildServiceProvider();

 EventWrittenEventArgs serviceProviderBuiltEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderBuilt");
 EventWrittenEventArgs serviceProviderBuiltEvent = Listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderBuilt");
 GetProperty<int>(serviceProviderBuiltEvent, "serviceProviderHashCode"); // assert hashcode exists as an int
 Assert.Equal(4, GetProperty<int>(serviceProviderBuiltEvent, "singletonServices"));
 Assert.Equal(2, GetProperty<int>(serviceProviderBuiltEvent, "scopedServices"));
Expand All@@ -275,7 +263,7 @@ public void EmitsServiceProviderBuilt()
 Assert.Equal(1, GetProperty<int>(serviceProviderBuiltEvent, "openGenericsServices"));
 Assert.Equal(7, serviceProviderBuiltEvent.EventId);

 EventWrittenEventArgs serviceProviderDescriptorsEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderDescriptors");
 EventWrittenEventArgs serviceProviderDescriptorsEvent = Listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderDescriptors");
 Assert.Equal(
 string.Join(Environment.NewLine,
 "{",
Expand DownExpand Up@@ -343,33 +331,77 @@ public void EmitsServiceProviderBuilt()
 [Fact]
 public void EmitsServiceProviderBuiltOnAttach()
 {
 _listener.DisableEvents(DependencyInjectionEventSource.Log);

 ServiceCollection serviceCollection = new();
 serviceCollection.AddSingleton(new FakeDisposeCallback());

 using ServiceProvider provider = serviceCollection.BuildServiceProvider();

 Assert.Empty(_listener.EventData);
 using var listener = new TestEventListener();
 listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 try
 {
 EventWrittenEventArgs serviceProviderBuiltEvent = listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderBuilt");
 Assert.Equal(1, GetProperty<int>(serviceProviderBuiltEvent, "singletonServices"));

 _listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 EventWrittenEventArgs serviceProviderDescriptorsEvent = listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderDescriptors");
 Assert.NotNull(JObject.Parse(GetProperty<string>(serviceProviderDescriptorsEvent, "descriptors")));
Comment thread
steveharter marked this conversation as resolved.

 }
 finally
 {
 listener.DisableEvents(DependencyInjectionEventSource.Log);
 }
 }

 EventWrittenEventArgs serviceProviderBuiltEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderBuilt");
 Assert.Equal(1, GetProperty<int>(serviceProviderBuiltEvent, "singletonServices"));
 private static bool TryGetProperty<T>(EventWrittenEventArgs data, string propName, out T result)
 {
 if (data.PayloadNames is { } names &&
 data.Payload is { } payload &&
 names.IndexOf(propName) is int index and >= 0 &&
 payload[index] is T value)
 {
 result = value;
 return true;
 }

EventWrittenEventArgs serviceProviderDescriptorsEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderDescriptors");
Assert.NotNull(JObject.Parse(GetProperty<string>(serviceProviderDescriptorsEvent, "descriptors")));
result = default;
return false;
 }

 private T GetProperty<T>(EventWrittenEventArgs data, string propName)
 => (T)data.Payload[data.PayloadNames.IndexOf(propName)];
 private static T GetProperty<T>(EventWrittenEventArgs data, string propName) =>
 TryGetProperty(data, propName, out T result)
 ? result
 : throw new ArgumentException($"No property {propName} with type {typeof(T)} found.");

 public class TestEventListenerFixture : IDisposable
Comment thread
steveharter marked this conversation as resolved.

 {
 internal TestEventListener Listener { get; }

 public TestEventListenerFixture()
 {
 Listener = new();
 Listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 }

 public void Dispose()
 {
 Listener.DisableEvents(DependencyInjectionEventSource.Log);
 Listener.Dispose();
 }
 }

private class TestEventListener : EventListener
internal class TestEventListener : EventListener
Comment thread
steveharter marked this conversation as resolved.

 {
 private volatile bool _disposed;
 private ConcurrentQueue<EventWrittenEventArgs> _events = new ConcurrentQueue<EventWrittenEventArgs>();
 private readonly ConcurrentQueue<EventWrittenEventArgs> _events = new ConcurrentQueue<EventWrittenEventArgs>();

 public IEnumerable<EventWrittenEventArgs> EventDataFor(IServiceProvider serviceProvider)
 {
 int hashCode = serviceProvider.GetHashCode();

 public IEnumerable<EventWrittenEventArgs> EventData => _events;
 return _events.Where(e =>
 e.PayloadNames?.IndexOf("serviceProviderHashCode") is { } index and >= 0 &&
 e.Payload?[index] as int? == hashCode);
 }

 protected override void OnEventWritten(EventWrittenEventArgs eventData)
 {
Expand All@@ -385,10 +417,5 @@ public override void Dispose()
 base.Dispose();
 }
 }

 public void Dispose()
 {
 _listener.Dispose();
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fixed dependency injection event source tests randomly failing.#107465

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

steveharter
merged 2 commits into

from

Oct 30, 2024
 Merged


Fixed dependency injection event source tests randomly failing.
#107465
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3a1a55a

Fixed dependency injection event source tests randomly failing.


koenigst Sep 6, 2024
c50b64d

Implemented review suggestion.


koenigst Oct 26, 2024

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


123 changes: 75 additions & 48 deletions
...soft.Extensions.DependencyInjection/tests/DI.Tests/DependencyInjectionEventSourceTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,31 +6,17 @@
using System.Collections.Generic;
using System.Diagnostics.Tracing;
using System.Linq;
using System.Reflection;
using Microsoft.Extensions.DependencyInjection.Specification.Fakes;
using Newtonsoft.Json.Linq;
using Xunit;

namespace Microsoft.Extensions.DependencyInjection.Tests
{
 [CollectionDefinition(nameof(EventSourceTests), DisableParallelization = true)]
 public class EventSourceTests : ICollectionFixture<EventSourceTests>
 public class DependencyInjectionEventSourceTests(
 DependencyInjectionEventSourceTests.TestEventListenerFixture fixture)
 : IClassFixture<DependencyInjectionEventSourceTests.TestEventListenerFixture>
 {
 }

 [Collection(nameof(EventSourceTests))]
 public class DependencyInjectionEventSourceTests : IDisposable
 {
 private readonly TestEventListener _listener = new TestEventListener();

 public DependencyInjectionEventSourceTests()
 {
 // clear the provider list in between tests
 typeof(DependencyInjectionEventSource).GetField("_providers", BindingFlags.NonPublic | BindingFlags.Instance)
 .SetValue(DependencyInjectionEventSource.Log, new List<WeakReference<ServiceProvider>>());
Comment thread
steveharter marked this conversation as resolved.


 _listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 }
 private TestEventListener Listener => fixture.Listener;

 [Fact]
 public void ExistsWithCorrectId()
Expand DownExpand Up@@ -58,9 +44,10 @@ public void EmitsCallSiteBuiltEvent()
 serviceCollection.AddTransient<IFakeMultipleService, FakeDisposableCallbackInnerService>();
 serviceCollection.AddSingleton<IFakeService, FakeDisposableCallbackInnerService>();

 serviceCollection.BuildServiceProvider().GetService<IEnumerable<IFakeOuterService>>();
 var serviceProvider = serviceCollection.BuildServiceProvider();
 serviceProvider.GetService<IEnumerable<IFakeOuterService>>();

 var callsiteBuiltEvent = _listener.EventData.Single(e => e.EventName == "CallSiteBuilt");
 var callsiteBuiltEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "CallSiteBuilt");


 Assert.Equal(
Expand DownExpand Up@@ -168,7 +155,7 @@ public void EmitsServiceResolvedEvent()
 serviceProvider.GetService<IFakeService>();
 serviceProvider.GetService<IFakeService>();

 var serviceResolvedEvents = _listener.EventData.Where(e => e.EventName == "ServiceResolved").ToArray();
 var serviceResolvedEvents = Listener.EventDataFor(serviceProvider).Where(e => e.EventName == "ServiceResolved").ToArray();

 Assert.Equal(3, serviceResolvedEvents.Length);
 foreach (var serviceResolvedEvent in serviceResolvedEvents)
Expand All@@ -189,15 +176,14 @@ public void EmitsExpressionTreeBuiltEvent()

 serviceProvider.GetService<IFakeService>();

 var expressionTreeGeneratedEvent = _listener.EventData.Single(e => e.EventName == "ExpressionTreeGenerated");
 var expressionTreeGeneratedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "ExpressionTreeGenerated");

 Assert.Equal("Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService", GetProperty<string>(expressionTreeGeneratedEvent, "serviceType"));
 Assert.Equal(9, GetProperty<int>(expressionTreeGeneratedEvent, "nodeCount"));
 Assert.Equal(3, expressionTreeGeneratedEvent.EventId);
 }

 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/35753", TestPlatforms.Windows)]
 public void EmitsDynamicMethodBuiltEvent()
 {
 // Arrange
Expand All@@ -208,7 +194,7 @@ public void EmitsDynamicMethodBuiltEvent()

 serviceProvider.GetService<IFakeService>();

 var expressionTreeGeneratedEvent = _listener.EventData.Single(e => e.EventName == "DynamicMethodBuilt");
 var expressionTreeGeneratedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "DynamicMethodBuilt");

 Assert.Equal("Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService", GetProperty<string>(expressionTreeGeneratedEvent, "serviceType"));
 Assert.Equal(12, GetProperty<int>(expressionTreeGeneratedEvent, "methodSize"));
Expand All@@ -228,7 +214,7 @@ public void EmitsScopeDisposedEvent()
 scope.ServiceProvider.GetService<IFakeService>();
 }

 var scopeDisposedEvent = _listener.EventData.Single(e => e.EventName == "ScopeDisposed");
 var scopeDisposedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "ScopeDisposed");

 Assert.Equal(1, GetProperty<int>(scopeDisposedEvent, "scopedServicesResolved"));
 Assert.Equal(1, GetProperty<int>(scopeDisposedEvent, "disposableServices"));
Expand All@@ -239,13 +225,15 @@ public void EmitsScopeDisposedEvent()
 public void EmitsServiceRealizationFailedEvent()
 {
 var exception = new Exception("Test error.");
 DependencyInjectionEventSource.Log.ServiceRealizationFailed(exception, 1234);
 var serviceProvider = new ServiceCollection().BuildServiceProvider();
 int hashCode = serviceProvider.GetHashCode();
 DependencyInjectionEventSource.Log.ServiceRealizationFailed(exception, hashCode);

 var eventName = nameof(DependencyInjectionEventSource.Log.ServiceRealizationFailed);
 var serviceRealizationFailedEvent = _listener.EventData.Single(e => e.EventName == eventName);
 var serviceRealizationFailedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == eventName);

 Assert.Equal("System.Exception: Test error.", GetProperty<string>(serviceRealizationFailedEvent, "exceptionMessage"));
 Assert.Equal(1234, GetProperty<int>(serviceRealizationFailedEvent, "serviceProviderHashCode"));
 Assert.Equal(hashCode, GetProperty<int>(serviceRealizationFailedEvent, "serviceProviderHashCode"));
Comment thread
steveharter marked this conversation as resolved.

 Assert.Equal(6, serviceRealizationFailedEvent.EventId);
 }

Expand All@@ -266,7 +254,7 @@ public void EmitsServiceProviderBuilt()

 using ServiceProvider provider = serviceCollection.BuildServiceProvider();

 EventWrittenEventArgs serviceProviderBuiltEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderBuilt");
 EventWrittenEventArgs serviceProviderBuiltEvent = Listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderBuilt");
 GetProperty<int>(serviceProviderBuiltEvent, "serviceProviderHashCode"); // assert hashcode exists as an int
 Assert.Equal(4, GetProperty<int>(serviceProviderBuiltEvent, "singletonServices"));
 Assert.Equal(2, GetProperty<int>(serviceProviderBuiltEvent, "scopedServices"));
Expand All@@ -275,7 +263,7 @@ public void EmitsServiceProviderBuilt()
 Assert.Equal(1, GetProperty<int>(serviceProviderBuiltEvent, "openGenericsServices"));
 Assert.Equal(7, serviceProviderBuiltEvent.EventId);

 EventWrittenEventArgs serviceProviderDescriptorsEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderDescriptors");
 EventWrittenEventArgs serviceProviderDescriptorsEvent = Listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderDescriptors");
 Assert.Equal(
 string.Join(Environment.NewLine,
 "{",
Expand DownExpand Up@@ -343,33 +331,77 @@ public void EmitsServiceProviderBuilt()
 [Fact]
 public void EmitsServiceProviderBuiltOnAttach()
 {
 _listener.DisableEvents(DependencyInjectionEventSource.Log);

 ServiceCollection serviceCollection = new();
 serviceCollection.AddSingleton(new FakeDisposeCallback());

 using ServiceProvider provider = serviceCollection.BuildServiceProvider();

 Assert.Empty(_listener.EventData);
 using var listener = new TestEventListener();
 listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 try
 {
 EventWrittenEventArgs serviceProviderBuiltEvent = listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderBuilt");
 Assert.Equal(1, GetProperty<int>(serviceProviderBuiltEvent, "singletonServices"));

 _listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 EventWrittenEventArgs serviceProviderDescriptorsEvent = listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderDescriptors");
 Assert.NotNull(JObject.Parse(GetProperty<string>(serviceProviderDescriptorsEvent, "descriptors")));
Comment thread
steveharter marked this conversation as resolved.

 }
 finally
 {
 listener.DisableEvents(DependencyInjectionEventSource.Log);
 }
 }

 EventWrittenEventArgs serviceProviderBuiltEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderBuilt");
 Assert.Equal(1, GetProperty<int>(serviceProviderBuiltEvent, "singletonServices"));
 private static bool TryGetProperty<T>(EventWrittenEventArgs data, string propName, out T result)
 {
 if (data.PayloadNames is { } names &&
 data.Payload is { } payload &&
 names.IndexOf(propName) is int index and >= 0 &&
 payload[index] is T value)
 {
 result = value;
 return true;
 }

EventWrittenEventArgs serviceProviderDescriptorsEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderDescriptors");
Assert.NotNull(JObject.Parse(GetProperty<string>(serviceProviderDescriptorsEvent, "descriptors")));
result = default;
return false;
 }

 private T GetProperty<T>(EventWrittenEventArgs data, string propName)
 => (T)data.Payload[data.PayloadNames.IndexOf(propName)];
 private static T GetProperty<T>(EventWrittenEventArgs data, string propName) =>
 TryGetProperty(data, propName, out T result)
 ? result
 : throw new ArgumentException($"No property {propName} with type {typeof(T)} found.");

 public class TestEventListenerFixture : IDisposable
Comment thread
steveharter marked this conversation as resolved.

 {
 internal TestEventListener Listener { get; }

 public TestEventListenerFixture()
 {
 Listener = new();
 Listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 }

 public void Dispose()
 {
 Listener.DisableEvents(DependencyInjectionEventSource.Log);
 Listener.Dispose();
 }
 }

private class TestEventListener : EventListener
internal class TestEventListener : EventListener
Comment thread
steveharter marked this conversation as resolved.

 {
 private volatile bool _disposed;
 private ConcurrentQueue<EventWrittenEventArgs> _events = new ConcurrentQueue<EventWrittenEventArgs>();
 private readonly ConcurrentQueue<EventWrittenEventArgs> _events = new ConcurrentQueue<EventWrittenEventArgs>();

 public IEnumerable<EventWrittenEventArgs> EventDataFor(IServiceProvider serviceProvider)
 {
 int hashCode = serviceProvider.GetHashCode();

 public IEnumerable<EventWrittenEventArgs> EventData => _events;
 return _events.Where(e =>
 e.PayloadNames?.IndexOf("serviceProviderHashCode") is { } index and >= 0 &&
 e.Payload?[index] as int? == hashCode);
 }

 protected override void OnEventWritten(EventWrittenEventArgs eventData)
 {
Expand All@@ -385,10 +417,5 @@ public override void Dispose()
 base.Dispose();
 }
 }

 public void Dispose()
 {
 _listener.Dispose();
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fixed dependency injection event source tests randomly failing.#107465

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

steveharter
merged 2 commits into

from

Oct 30, 2024
 Merged


Fixed dependency injection event source tests randomly failing.
#107465
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3a1a55a

Fixed dependency injection event source tests randomly failing.


koenigst Sep 6, 2024
c50b64d

Implemented review suggestion.


koenigst Oct 26, 2024

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


123 changes: 75 additions & 48 deletions
...soft.Extensions.DependencyInjection/tests/DI.Tests/DependencyInjectionEventSourceTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,31 +6,17 @@
using System.Collections.Generic;
using System.Diagnostics.Tracing;
using System.Linq;
using System.Reflection;
using Microsoft.Extensions.DependencyInjection.Specification.Fakes;
using Newtonsoft.Json.Linq;
using Xunit;

namespace Microsoft.Extensions.DependencyInjection.Tests
{
 [CollectionDefinition(nameof(EventSourceTests), DisableParallelization = true)]
 public class EventSourceTests : ICollectionFixture<EventSourceTests>
 public class DependencyInjectionEventSourceTests(
 DependencyInjectionEventSourceTests.TestEventListenerFixture fixture)
 : IClassFixture<DependencyInjectionEventSourceTests.TestEventListenerFixture>
 {
 }

 [Collection(nameof(EventSourceTests))]
 public class DependencyInjectionEventSourceTests : IDisposable
 {
 private readonly TestEventListener _listener = new TestEventListener();

 public DependencyInjectionEventSourceTests()
 {
 // clear the provider list in between tests
 typeof(DependencyInjectionEventSource).GetField("_providers", BindingFlags.NonPublic | BindingFlags.Instance)
 .SetValue(DependencyInjectionEventSource.Log, new List<WeakReference<ServiceProvider>>());
Comment thread
steveharter marked this conversation as resolved.


 _listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 }
 private TestEventListener Listener => fixture.Listener;

 [Fact]
 public void ExistsWithCorrectId()
Expand DownExpand Up@@ -58,9 +44,10 @@ public void EmitsCallSiteBuiltEvent()
 serviceCollection.AddTransient<IFakeMultipleService, FakeDisposableCallbackInnerService>();
 serviceCollection.AddSingleton<IFakeService, FakeDisposableCallbackInnerService>();

 serviceCollection.BuildServiceProvider().GetService<IEnumerable<IFakeOuterService>>();
 var serviceProvider = serviceCollection.BuildServiceProvider();
 serviceProvider.GetService<IEnumerable<IFakeOuterService>>();

 var callsiteBuiltEvent = _listener.EventData.Single(e => e.EventName == "CallSiteBuilt");
 var callsiteBuiltEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "CallSiteBuilt");


 Assert.Equal(
Expand DownExpand Up@@ -168,7 +155,7 @@ public void EmitsServiceResolvedEvent()
 serviceProvider.GetService<IFakeService>();
 serviceProvider.GetService<IFakeService>();

 var serviceResolvedEvents = _listener.EventData.Where(e => e.EventName == "ServiceResolved").ToArray();
 var serviceResolvedEvents = Listener.EventDataFor(serviceProvider).Where(e => e.EventName == "ServiceResolved").ToArray();

 Assert.Equal(3, serviceResolvedEvents.Length);
 foreach (var serviceResolvedEvent in serviceResolvedEvents)
Expand All@@ -189,15 +176,14 @@ public void EmitsExpressionTreeBuiltEvent()

 serviceProvider.GetService<IFakeService>();

 var expressionTreeGeneratedEvent = _listener.EventData.Single(e => e.EventName == "ExpressionTreeGenerated");
 var expressionTreeGeneratedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "ExpressionTreeGenerated");

 Assert.Equal("Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService", GetProperty<string>(expressionTreeGeneratedEvent, "serviceType"));
 Assert.Equal(9, GetProperty<int>(expressionTreeGeneratedEvent, "nodeCount"));
 Assert.Equal(3, expressionTreeGeneratedEvent.EventId);
 }

 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/35753", TestPlatforms.Windows)]
 public void EmitsDynamicMethodBuiltEvent()
 {
 // Arrange
Expand All@@ -208,7 +194,7 @@ public void EmitsDynamicMethodBuiltEvent()

 serviceProvider.GetService<IFakeService>();

 var expressionTreeGeneratedEvent = _listener.EventData.Single(e => e.EventName == "DynamicMethodBuilt");
 var expressionTreeGeneratedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "DynamicMethodBuilt");

 Assert.Equal("Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService", GetProperty<string>(expressionTreeGeneratedEvent, "serviceType"));
 Assert.Equal(12, GetProperty<int>(expressionTreeGeneratedEvent, "methodSize"));
Expand All@@ -228,7 +214,7 @@ public void EmitsScopeDisposedEvent()
 scope.ServiceProvider.GetService<IFakeService>();
 }

 var scopeDisposedEvent = _listener.EventData.Single(e => e.EventName == "ScopeDisposed");
 var scopeDisposedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "ScopeDisposed");

 Assert.Equal(1, GetProperty<int>(scopeDisposedEvent, "scopedServicesResolved"));
 Assert.Equal(1, GetProperty<int>(scopeDisposedEvent, "disposableServices"));
Expand All@@ -239,13 +225,15 @@ public void EmitsScopeDisposedEvent()
 public void EmitsServiceRealizationFailedEvent()
 {
 var exception = new Exception("Test error.");
 DependencyInjectionEventSource.Log.ServiceRealizationFailed(exception, 1234);
 var serviceProvider = new ServiceCollection().BuildServiceProvider();
 int hashCode = serviceProvider.GetHashCode();
 DependencyInjectionEventSource.Log.ServiceRealizationFailed(exception, hashCode);

 var eventName = nameof(DependencyInjectionEventSource.Log.ServiceRealizationFailed);
 var serviceRealizationFailedEvent = _listener.EventData.Single(e => e.EventName == eventName);
 var serviceRealizationFailedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == eventName);

 Assert.Equal("System.Exception: Test error.", GetProperty<string>(serviceRealizationFailedEvent, "exceptionMessage"));
 Assert.Equal(1234, GetProperty<int>(serviceRealizationFailedEvent, "serviceProviderHashCode"));
 Assert.Equal(hashCode, GetProperty<int>(serviceRealizationFailedEvent, "serviceProviderHashCode"));
Comment thread
steveharter marked this conversation as resolved.

 Assert.Equal(6, serviceRealizationFailedEvent.EventId);
 }

Expand All@@ -266,7 +254,7 @@ public void EmitsServiceProviderBuilt()

 using ServiceProvider provider = serviceCollection.BuildServiceProvider();

 EventWrittenEventArgs serviceProviderBuiltEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderBuilt");
 EventWrittenEventArgs serviceProviderBuiltEvent = Listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderBuilt");
 GetProperty<int>(serviceProviderBuiltEvent, "serviceProviderHashCode"); // assert hashcode exists as an int
 Assert.Equal(4, GetProperty<int>(serviceProviderBuiltEvent, "singletonServices"));
 Assert.Equal(2, GetProperty<int>(serviceProviderBuiltEvent, "scopedServices"));
Expand All@@ -275,7 +263,7 @@ public void EmitsServiceProviderBuilt()
 Assert.Equal(1, GetProperty<int>(serviceProviderBuiltEvent, "openGenericsServices"));
 Assert.Equal(7, serviceProviderBuiltEvent.EventId);

 EventWrittenEventArgs serviceProviderDescriptorsEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderDescriptors");
 EventWrittenEventArgs serviceProviderDescriptorsEvent = Listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderDescriptors");
 Assert.Equal(
 string.Join(Environment.NewLine,
 "{",
Expand DownExpand Up@@ -343,33 +331,77 @@ public void EmitsServiceProviderBuilt()
 [Fact]
 public void EmitsServiceProviderBuiltOnAttach()
 {
 _listener.DisableEvents(DependencyInjectionEventSource.Log);

 ServiceCollection serviceCollection = new();
 serviceCollection.AddSingleton(new FakeDisposeCallback());

 using ServiceProvider provider = serviceCollection.BuildServiceProvider();

 Assert.Empty(_listener.EventData);
 using var listener = new TestEventListener();
 listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 try
 {
 EventWrittenEventArgs serviceProviderBuiltEvent = listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderBuilt");
 Assert.Equal(1, GetProperty<int>(serviceProviderBuiltEvent, "singletonServices"));

 _listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 EventWrittenEventArgs serviceProviderDescriptorsEvent = listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderDescriptors");
 Assert.NotNull(JObject.Parse(GetProperty<string>(serviceProviderDescriptorsEvent, "descriptors")));
Comment thread
steveharter marked this conversation as resolved.

 }
 finally
 {
 listener.DisableEvents(DependencyInjectionEventSource.Log);
 }
 }

 EventWrittenEventArgs serviceProviderBuiltEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderBuilt");
 Assert.Equal(1, GetProperty<int>(serviceProviderBuiltEvent, "singletonServices"));
 private static bool TryGetProperty<T>(EventWrittenEventArgs data, string propName, out T result)
 {
 if (data.PayloadNames is { } names &&
 data.Payload is { } payload &&
 names.IndexOf(propName) is int index and >= 0 &&
 payload[index] is T value)
 {
 result = value;
 return true;
 }

EventWrittenEventArgs serviceProviderDescriptorsEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderDescriptors");
Assert.NotNull(JObject.Parse(GetProperty<string>(serviceProviderDescriptorsEvent, "descriptors")));
result = default;
return false;
 }

 private T GetProperty<T>(EventWrittenEventArgs data, string propName)
 => (T)data.Payload[data.PayloadNames.IndexOf(propName)];
 private static T GetProperty<T>(EventWrittenEventArgs data, string propName) =>
 TryGetProperty(data, propName, out T result)
 ? result
 : throw new ArgumentException($"No property {propName} with type {typeof(T)} found.");

 public class TestEventListenerFixture : IDisposable
Comment thread
steveharter marked this conversation as resolved.

 {
 internal TestEventListener Listener { get; }

 public TestEventListenerFixture()
 {
 Listener = new();
 Listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 }

 public void Dispose()
 {
 Listener.DisableEvents(DependencyInjectionEventSource.Log);
 Listener.Dispose();
 }
 }

private class TestEventListener : EventListener
internal class TestEventListener : EventListener
Comment thread
steveharter marked this conversation as resolved.

 {
 private volatile bool _disposed;
 private ConcurrentQueue<EventWrittenEventArgs> _events = new ConcurrentQueue<EventWrittenEventArgs>();
 private readonly ConcurrentQueue<EventWrittenEventArgs> _events = new ConcurrentQueue<EventWrittenEventArgs>();

 public IEnumerable<EventWrittenEventArgs> EventDataFor(IServiceProvider serviceProvider)
 {
 int hashCode = serviceProvider.GetHashCode();

 public IEnumerable<EventWrittenEventArgs> EventData => _events;
 return _events.Where(e =>
 e.PayloadNames?.IndexOf("serviceProviderHashCode") is { } index and >= 0 &&
 e.Payload?[index] as int? == hashCode);
 }

 protected override void OnEventWritten(EventWrittenEventArgs eventData)
 {
Expand All@@ -385,10 +417,5 @@ public override void Dispose()
 base.Dispose();
 }
 }

 public void Dispose()
 {
 _listener.Dispose();
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fixed dependency injection event source tests randomly failing.#107465

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

steveharter
merged 2 commits into

from

Oct 30, 2024
 Merged


Fixed dependency injection event source tests randomly failing.
#107465
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3a1a55a

Fixed dependency injection event source tests randomly failing.


koenigst Sep 6, 2024
c50b64d

Implemented review suggestion.


koenigst Oct 26, 2024

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


123 changes: 75 additions & 48 deletions
...soft.Extensions.DependencyInjection/tests/DI.Tests/DependencyInjectionEventSourceTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,31 +6,17 @@
using System.Collections.Generic;
using System.Diagnostics.Tracing;
using System.Linq;
using System.Reflection;
using Microsoft.Extensions.DependencyInjection.Specification.Fakes;
using Newtonsoft.Json.Linq;
using Xunit;

namespace Microsoft.Extensions.DependencyInjection.Tests
{
 [CollectionDefinition(nameof(EventSourceTests), DisableParallelization = true)]
 public class EventSourceTests : ICollectionFixture<EventSourceTests>
 public class DependencyInjectionEventSourceTests(
 DependencyInjectionEventSourceTests.TestEventListenerFixture fixture)
 : IClassFixture<DependencyInjectionEventSourceTests.TestEventListenerFixture>
 {
 }

 [Collection(nameof(EventSourceTests))]
 public class DependencyInjectionEventSourceTests : IDisposable
 {
 private readonly TestEventListener _listener = new TestEventListener();

 public DependencyInjectionEventSourceTests()
 {
 // clear the provider list in between tests
 typeof(DependencyInjectionEventSource).GetField("_providers", BindingFlags.NonPublic | BindingFlags.Instance)
 .SetValue(DependencyInjectionEventSource.Log, new List<WeakReference<ServiceProvider>>());
Comment thread
steveharter marked this conversation as resolved.


 _listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 }
 private TestEventListener Listener => fixture.Listener;

 [Fact]
 public void ExistsWithCorrectId()
Expand DownExpand Up@@ -58,9 +44,10 @@ public void EmitsCallSiteBuiltEvent()
 serviceCollection.AddTransient<IFakeMultipleService, FakeDisposableCallbackInnerService>();
 serviceCollection.AddSingleton<IFakeService, FakeDisposableCallbackInnerService>();

 serviceCollection.BuildServiceProvider().GetService<IEnumerable<IFakeOuterService>>();
 var serviceProvider = serviceCollection.BuildServiceProvider();
 serviceProvider.GetService<IEnumerable<IFakeOuterService>>();

 var callsiteBuiltEvent = _listener.EventData.Single(e => e.EventName == "CallSiteBuilt");
 var callsiteBuiltEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "CallSiteBuilt");


 Assert.Equal(
Expand DownExpand Up@@ -168,7 +155,7 @@ public void EmitsServiceResolvedEvent()
 serviceProvider.GetService<IFakeService>();
 serviceProvider.GetService<IFakeService>();

 var serviceResolvedEvents = _listener.EventData.Where(e => e.EventName == "ServiceResolved").ToArray();
 var serviceResolvedEvents = Listener.EventDataFor(serviceProvider).Where(e => e.EventName == "ServiceResolved").ToArray();

 Assert.Equal(3, serviceResolvedEvents.Length);
 foreach (var serviceResolvedEvent in serviceResolvedEvents)
Expand All@@ -189,15 +176,14 @@ public void EmitsExpressionTreeBuiltEvent()

 serviceProvider.GetService<IFakeService>();

 var expressionTreeGeneratedEvent = _listener.EventData.Single(e => e.EventName == "ExpressionTreeGenerated");
 var expressionTreeGeneratedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "ExpressionTreeGenerated");

 Assert.Equal("Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService", GetProperty<string>(expressionTreeGeneratedEvent, "serviceType"));
 Assert.Equal(9, GetProperty<int>(expressionTreeGeneratedEvent, "nodeCount"));
 Assert.Equal(3, expressionTreeGeneratedEvent.EventId);
 }

 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/35753", TestPlatforms.Windows)]
 public void EmitsDynamicMethodBuiltEvent()
 {
 // Arrange
Expand All@@ -208,7 +194,7 @@ public void EmitsDynamicMethodBuiltEvent()

 serviceProvider.GetService<IFakeService>();

 var expressionTreeGeneratedEvent = _listener.EventData.Single(e => e.EventName == "DynamicMethodBuilt");
 var expressionTreeGeneratedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "DynamicMethodBuilt");

 Assert.Equal("Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService", GetProperty<string>(expressionTreeGeneratedEvent, "serviceType"));
 Assert.Equal(12, GetProperty<int>(expressionTreeGeneratedEvent, "methodSize"));
Expand All@@ -228,7 +214,7 @@ public void EmitsScopeDisposedEvent()
 scope.ServiceProvider.GetService<IFakeService>();
 }

 var scopeDisposedEvent = _listener.EventData.Single(e => e.EventName == "ScopeDisposed");
 var scopeDisposedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "ScopeDisposed");

 Assert.Equal(1, GetProperty<int>(scopeDisposedEvent, "scopedServicesResolved"));
 Assert.Equal(1, GetProperty<int>(scopeDisposedEvent, "disposableServices"));
Expand All@@ -239,13 +225,15 @@ public void EmitsScopeDisposedEvent()
 public void EmitsServiceRealizationFailedEvent()
 {
 var exception = new Exception("Test error.");
 DependencyInjectionEventSource.Log.ServiceRealizationFailed(exception, 1234);
 var serviceProvider = new ServiceCollection().BuildServiceProvider();
 int hashCode = serviceProvider.GetHashCode();
 DependencyInjectionEventSource.Log.ServiceRealizationFailed(exception, hashCode);

 var eventName = nameof(DependencyInjectionEventSource.Log.ServiceRealizationFailed);
 var serviceRealizationFailedEvent = _listener.EventData.Single(e => e.EventName == eventName);
 var serviceRealizationFailedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == eventName);

 Assert.Equal("System.Exception: Test error.", GetProperty<string>(serviceRealizationFailedEvent, "exceptionMessage"));
 Assert.Equal(1234, GetProperty<int>(serviceRealizationFailedEvent, "serviceProviderHashCode"));
 Assert.Equal(hashCode, GetProperty<int>(serviceRealizationFailedEvent, "serviceProviderHashCode"));
Comment thread
steveharter marked this conversation as resolved.

 Assert.Equal(6, serviceRealizationFailedEvent.EventId);
 }

Expand All@@ -266,7 +254,7 @@ public void EmitsServiceProviderBuilt()

 using ServiceProvider provider = serviceCollection.BuildServiceProvider();

 EventWrittenEventArgs serviceProviderBuiltEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderBuilt");
 EventWrittenEventArgs serviceProviderBuiltEvent = Listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderBuilt");
 GetProperty<int>(serviceProviderBuiltEvent, "serviceProviderHashCode"); // assert hashcode exists as an int
 Assert.Equal(4, GetProperty<int>(serviceProviderBuiltEvent, "singletonServices"));
 Assert.Equal(2, GetProperty<int>(serviceProviderBuiltEvent, "scopedServices"));
Expand All@@ -275,7 +263,7 @@ public void EmitsServiceProviderBuilt()
 Assert.Equal(1, GetProperty<int>(serviceProviderBuiltEvent, "openGenericsServices"));
 Assert.Equal(7, serviceProviderBuiltEvent.EventId);

 EventWrittenEventArgs serviceProviderDescriptorsEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderDescriptors");
 EventWrittenEventArgs serviceProviderDescriptorsEvent = Listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderDescriptors");
 Assert.Equal(
 string.Join(Environment.NewLine,
 "{",
Expand DownExpand Up@@ -343,33 +331,77 @@ public void EmitsServiceProviderBuilt()
 [Fact]
 public void EmitsServiceProviderBuiltOnAttach()
 {
 _listener.DisableEvents(DependencyInjectionEventSource.Log);

 ServiceCollection serviceCollection = new();
 serviceCollection.AddSingleton(new FakeDisposeCallback());

 using ServiceProvider provider = serviceCollection.BuildServiceProvider();

 Assert.Empty(_listener.EventData);
 using var listener = new TestEventListener();
 listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 try
 {
 EventWrittenEventArgs serviceProviderBuiltEvent = listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderBuilt");
 Assert.Equal(1, GetProperty<int>(serviceProviderBuiltEvent, "singletonServices"));

 _listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 EventWrittenEventArgs serviceProviderDescriptorsEvent = listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderDescriptors");
 Assert.NotNull(JObject.Parse(GetProperty<string>(serviceProviderDescriptorsEvent, "descriptors")));
Comment thread
steveharter marked this conversation as resolved.

 }
 finally
 {
 listener.DisableEvents(DependencyInjectionEventSource.Log);
 }
 }

 EventWrittenEventArgs serviceProviderBuiltEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderBuilt");
 Assert.Equal(1, GetProperty<int>(serviceProviderBuiltEvent, "singletonServices"));
 private static bool TryGetProperty<T>(EventWrittenEventArgs data, string propName, out T result)
 {
 if (data.PayloadNames is { } names &&
 data.Payload is { } payload &&
 names.IndexOf(propName) is int index and >= 0 &&
 payload[index] is T value)
 {
 result = value;
 return true;
 }

EventWrittenEventArgs serviceProviderDescriptorsEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderDescriptors");
Assert.NotNull(JObject.Parse(GetProperty<string>(serviceProviderDescriptorsEvent, "descriptors")));
result = default;
return false;
 }

 private T GetProperty<T>(EventWrittenEventArgs data, string propName)
 => (T)data.Payload[data.PayloadNames.IndexOf(propName)];
 private static T GetProperty<T>(EventWrittenEventArgs data, string propName) =>
 TryGetProperty(data, propName, out T result)
 ? result
 : throw new ArgumentException($"No property {propName} with type {typeof(T)} found.");

 public class TestEventListenerFixture : IDisposable
Comment thread
steveharter marked this conversation as resolved.

 {
 internal TestEventListener Listener { get; }

 public TestEventListenerFixture()
 {
 Listener = new();
 Listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 }

 public void Dispose()
 {
 Listener.DisableEvents(DependencyInjectionEventSource.Log);
 Listener.Dispose();
 }
 }

private class TestEventListener : EventListener
internal class TestEventListener : EventListener
Comment thread
steveharter marked this conversation as resolved.

 {
 private volatile bool _disposed;
 private ConcurrentQueue<EventWrittenEventArgs> _events = new ConcurrentQueue<EventWrittenEventArgs>();
 private readonly ConcurrentQueue<EventWrittenEventArgs> _events = new ConcurrentQueue<EventWrittenEventArgs>();

 public IEnumerable<EventWrittenEventArgs> EventDataFor(IServiceProvider serviceProvider)
 {
 int hashCode = serviceProvider.GetHashCode();

 public IEnumerable<EventWrittenEventArgs> EventData => _events;
 return _events.Where(e =>
 e.PayloadNames?.IndexOf("serviceProviderHashCode") is { } index and >= 0 &&
 e.Payload?[index] as int? == hashCode);
 }

 protected override void OnEventWritten(EventWrittenEventArgs eventData)
 {
Expand All@@ -385,10 +417,5 @@ public override void Dispose()
 base.Dispose();
 }
 }

 public void Dispose()
 {
 _listener.Dispose();
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fixed dependency injection event source tests randomly failing.#107465

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

steveharter
merged 2 commits into

from

Oct 30, 2024
 Merged


Fixed dependency injection event source tests randomly failing.
#107465
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3a1a55a

Fixed dependency injection event source tests randomly failing.


koenigst Sep 6, 2024
c50b64d

Implemented review suggestion.


koenigst Oct 26, 2024

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


123 changes: 75 additions & 48 deletions
...soft.Extensions.DependencyInjection/tests/DI.Tests/DependencyInjectionEventSourceTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,31 +6,17 @@
using System.Collections.Generic;
using System.Diagnostics.Tracing;
using System.Linq;
using System.Reflection;
using Microsoft.Extensions.DependencyInjection.Specification.Fakes;
using Newtonsoft.Json.Linq;
using Xunit;

namespace Microsoft.Extensions.DependencyInjection.Tests
{
 [CollectionDefinition(nameof(EventSourceTests), DisableParallelization = true)]
 public class EventSourceTests : ICollectionFixture<EventSourceTests>
 public class DependencyInjectionEventSourceTests(
 DependencyInjectionEventSourceTests.TestEventListenerFixture fixture)
 : IClassFixture<DependencyInjectionEventSourceTests.TestEventListenerFixture>
 {
 }

 [Collection(nameof(EventSourceTests))]
 public class DependencyInjectionEventSourceTests : IDisposable
 {
 private readonly TestEventListener _listener = new TestEventListener();

 public DependencyInjectionEventSourceTests()
 {
 // clear the provider list in between tests
 typeof(DependencyInjectionEventSource).GetField("_providers", BindingFlags.NonPublic | BindingFlags.Instance)
 .SetValue(DependencyInjectionEventSource.Log, new List<WeakReference<ServiceProvider>>());
Comment thread
steveharter marked this conversation as resolved.


 _listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 }
 private TestEventListener Listener => fixture.Listener;

 [Fact]
 public void ExistsWithCorrectId()
Expand DownExpand Up@@ -58,9 +44,10 @@ public void EmitsCallSiteBuiltEvent()
 serviceCollection.AddTransient<IFakeMultipleService, FakeDisposableCallbackInnerService>();
 serviceCollection.AddSingleton<IFakeService, FakeDisposableCallbackInnerService>();

 serviceCollection.BuildServiceProvider().GetService<IEnumerable<IFakeOuterService>>();
 var serviceProvider = serviceCollection.BuildServiceProvider();
 serviceProvider.GetService<IEnumerable<IFakeOuterService>>();

 var callsiteBuiltEvent = _listener.EventData.Single(e => e.EventName == "CallSiteBuilt");
 var callsiteBuiltEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "CallSiteBuilt");


 Assert.Equal(
Expand DownExpand Up@@ -168,7 +155,7 @@ public void EmitsServiceResolvedEvent()
 serviceProvider.GetService<IFakeService>();
 serviceProvider.GetService<IFakeService>();

 var serviceResolvedEvents = _listener.EventData.Where(e => e.EventName == "ServiceResolved").ToArray();
 var serviceResolvedEvents = Listener.EventDataFor(serviceProvider).Where(e => e.EventName == "ServiceResolved").ToArray();

 Assert.Equal(3, serviceResolvedEvents.Length);
 foreach (var serviceResolvedEvent in serviceResolvedEvents)
Expand All@@ -189,15 +176,14 @@ public void EmitsExpressionTreeBuiltEvent()

 serviceProvider.GetService<IFakeService>();

 var expressionTreeGeneratedEvent = _listener.EventData.Single(e => e.EventName == "ExpressionTreeGenerated");
 var expressionTreeGeneratedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "ExpressionTreeGenerated");

 Assert.Equal("Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService", GetProperty<string>(expressionTreeGeneratedEvent, "serviceType"));
 Assert.Equal(9, GetProperty<int>(expressionTreeGeneratedEvent, "nodeCount"));
 Assert.Equal(3, expressionTreeGeneratedEvent.EventId);
 }

 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/35753", TestPlatforms.Windows)]
 public void EmitsDynamicMethodBuiltEvent()
 {
 // Arrange
Expand All@@ -208,7 +194,7 @@ public void EmitsDynamicMethodBuiltEvent()

 serviceProvider.GetService<IFakeService>();

 var expressionTreeGeneratedEvent = _listener.EventData.Single(e => e.EventName == "DynamicMethodBuilt");
 var expressionTreeGeneratedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "DynamicMethodBuilt");

 Assert.Equal("Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService", GetProperty<string>(expressionTreeGeneratedEvent, "serviceType"));
 Assert.Equal(12, GetProperty<int>(expressionTreeGeneratedEvent, "methodSize"));
Expand All@@ -228,7 +214,7 @@ public void EmitsScopeDisposedEvent()
 scope.ServiceProvider.GetService<IFakeService>();
 }

 var scopeDisposedEvent = _listener.EventData.Single(e => e.EventName == "ScopeDisposed");
 var scopeDisposedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "ScopeDisposed");

 Assert.Equal(1, GetProperty<int>(scopeDisposedEvent, "scopedServicesResolved"));
 Assert.Equal(1, GetProperty<int>(scopeDisposedEvent, "disposableServices"));
Expand All@@ -239,13 +225,15 @@ public void EmitsScopeDisposedEvent()
 public void EmitsServiceRealizationFailedEvent()
 {
 var exception = new Exception("Test error.");
 DependencyInjectionEventSource.Log.ServiceRealizationFailed(exception, 1234);
 var serviceProvider = new ServiceCollection().BuildServiceProvider();
 int hashCode = serviceProvider.GetHashCode();
 DependencyInjectionEventSource.Log.ServiceRealizationFailed(exception, hashCode);

 var eventName = nameof(DependencyInjectionEventSource.Log.ServiceRealizationFailed);
 var serviceRealizationFailedEvent = _listener.EventData.Single(e => e.EventName == eventName);
 var serviceRealizationFailedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == eventName);

 Assert.Equal("System.Exception: Test error.", GetProperty<string>(serviceRealizationFailedEvent, "exceptionMessage"));
 Assert.Equal(1234, GetProperty<int>(serviceRealizationFailedEvent, "serviceProviderHashCode"));
 Assert.Equal(hashCode, GetProperty<int>(serviceRealizationFailedEvent, "serviceProviderHashCode"));
Comment thread
steveharter marked this conversation as resolved.

 Assert.Equal(6, serviceRealizationFailedEvent.EventId);
 }

Expand All@@ -266,7 +254,7 @@ public void EmitsServiceProviderBuilt()

 using ServiceProvider provider = serviceCollection.BuildServiceProvider();

 EventWrittenEventArgs serviceProviderBuiltEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderBuilt");
 EventWrittenEventArgs serviceProviderBuiltEvent = Listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderBuilt");
 GetProperty<int>(serviceProviderBuiltEvent, "serviceProviderHashCode"); // assert hashcode exists as an int
 Assert.Equal(4, GetProperty<int>(serviceProviderBuiltEvent, "singletonServices"));
 Assert.Equal(2, GetProperty<int>(serviceProviderBuiltEvent, "scopedServices"));
Expand All@@ -275,7 +263,7 @@ public void EmitsServiceProviderBuilt()
 Assert.Equal(1, GetProperty<int>(serviceProviderBuiltEvent, "openGenericsServices"));
 Assert.Equal(7, serviceProviderBuiltEvent.EventId);

 EventWrittenEventArgs serviceProviderDescriptorsEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderDescriptors");
 EventWrittenEventArgs serviceProviderDescriptorsEvent = Listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderDescriptors");
 Assert.Equal(
 string.Join(Environment.NewLine,
 "{",
Expand DownExpand Up@@ -343,33 +331,77 @@ public void EmitsServiceProviderBuilt()
 [Fact]
 public void EmitsServiceProviderBuiltOnAttach()
 {
 _listener.DisableEvents(DependencyInjectionEventSource.Log);

 ServiceCollection serviceCollection = new();
 serviceCollection.AddSingleton(new FakeDisposeCallback());

 using ServiceProvider provider = serviceCollection.BuildServiceProvider();

 Assert.Empty(_listener.EventData);
 using var listener = new TestEventListener();
 listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 try
 {
 EventWrittenEventArgs serviceProviderBuiltEvent = listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderBuilt");
 Assert.Equal(1, GetProperty<int>(serviceProviderBuiltEvent, "singletonServices"));

 _listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 EventWrittenEventArgs serviceProviderDescriptorsEvent = listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderDescriptors");
 Assert.NotNull(JObject.Parse(GetProperty<string>(serviceProviderDescriptorsEvent, "descriptors")));
Comment thread
steveharter marked this conversation as resolved.

 }
 finally
 {
 listener.DisableEvents(DependencyInjectionEventSource.Log);
 }
 }

 EventWrittenEventArgs serviceProviderBuiltEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderBuilt");
 Assert.Equal(1, GetProperty<int>(serviceProviderBuiltEvent, "singletonServices"));
 private static bool TryGetProperty<T>(EventWrittenEventArgs data, string propName, out T result)
 {
 if (data.PayloadNames is { } names &&
 data.Payload is { } payload &&
 names.IndexOf(propName) is int index and >= 0 &&
 payload[index] is T value)
 {
 result = value;
 return true;
 }

EventWrittenEventArgs serviceProviderDescriptorsEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderDescriptors");
Assert.NotNull(JObject.Parse(GetProperty<string>(serviceProviderDescriptorsEvent, "descriptors")));
result = default;
return false;
 }

 private T GetProperty<T>(EventWrittenEventArgs data, string propName)
 => (T)data.Payload[data.PayloadNames.IndexOf(propName)];
 private static T GetProperty<T>(EventWrittenEventArgs data, string propName) =>
 TryGetProperty(data, propName, out T result)
 ? result
 : throw new ArgumentException($"No property {propName} with type {typeof(T)} found.");

 public class TestEventListenerFixture : IDisposable
Comment thread
steveharter marked this conversation as resolved.

 {
 internal TestEventListener Listener { get; }

 public TestEventListenerFixture()
 {
 Listener = new();
 Listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 }

 public void Dispose()
 {
 Listener.DisableEvents(DependencyInjectionEventSource.Log);
 Listener.Dispose();
 }
 }

private class TestEventListener : EventListener
internal class TestEventListener : EventListener
Comment thread
steveharter marked this conversation as resolved.

 {
 private volatile bool _disposed;
 private ConcurrentQueue<EventWrittenEventArgs> _events = new ConcurrentQueue<EventWrittenEventArgs>();
 private readonly ConcurrentQueue<EventWrittenEventArgs> _events = new ConcurrentQueue<EventWrittenEventArgs>();

 public IEnumerable<EventWrittenEventArgs> EventDataFor(IServiceProvider serviceProvider)
 {
 int hashCode = serviceProvider.GetHashCode();

 public IEnumerable<EventWrittenEventArgs> EventData => _events;
 return _events.Where(e =>
 e.PayloadNames?.IndexOf("serviceProviderHashCode") is { } index and >= 0 &&
 e.Payload?[index] as int? == hashCode);
 }

 protected override void OnEventWritten(EventWrittenEventArgs eventData)
 {
Expand All@@ -385,10 +417,5 @@ public override void Dispose()
 base.Dispose();
 }
 }

 public void Dispose()
 {
 _listener.Dispose();
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fixed dependency injection event source tests randomly failing.#107465

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

steveharter
merged 2 commits into

from

Oct 30, 2024
 Merged


Fixed dependency injection event source tests randomly failing.
#107465
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3a1a55a

Fixed dependency injection event source tests randomly failing.


koenigst Sep 6, 2024
c50b64d

Implemented review suggestion.


koenigst Oct 26, 2024

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


123 changes: 75 additions & 48 deletions
...soft.Extensions.DependencyInjection/tests/DI.Tests/DependencyInjectionEventSourceTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,31 +6,17 @@
using System.Collections.Generic;
using System.Diagnostics.Tracing;
using System.Linq;
using System.Reflection;
using Microsoft.Extensions.DependencyInjection.Specification.Fakes;
using Newtonsoft.Json.Linq;
using Xunit;

namespace Microsoft.Extensions.DependencyInjection.Tests
{
 [CollectionDefinition(nameof(EventSourceTests), DisableParallelization = true)]
 public class EventSourceTests : ICollectionFixture<EventSourceTests>
 public class DependencyInjectionEventSourceTests(
 DependencyInjectionEventSourceTests.TestEventListenerFixture fixture)
 : IClassFixture<DependencyInjectionEventSourceTests.TestEventListenerFixture>
 {
 }

 [Collection(nameof(EventSourceTests))]
 public class DependencyInjectionEventSourceTests : IDisposable
 {
 private readonly TestEventListener _listener = new TestEventListener();

 public DependencyInjectionEventSourceTests()
 {
 // clear the provider list in between tests
 typeof(DependencyInjectionEventSource).GetField("_providers", BindingFlags.NonPublic | BindingFlags.Instance)
 .SetValue(DependencyInjectionEventSource.Log, new List<WeakReference<ServiceProvider>>());
Comment thread
steveharter marked this conversation as resolved.


 _listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 }
 private TestEventListener Listener => fixture.Listener;

 [Fact]
 public void ExistsWithCorrectId()
Expand DownExpand Up@@ -58,9 +44,10 @@ public void EmitsCallSiteBuiltEvent()
 serviceCollection.AddTransient<IFakeMultipleService, FakeDisposableCallbackInnerService>();
 serviceCollection.AddSingleton<IFakeService, FakeDisposableCallbackInnerService>();

 serviceCollection.BuildServiceProvider().GetService<IEnumerable<IFakeOuterService>>();
 var serviceProvider = serviceCollection.BuildServiceProvider();
 serviceProvider.GetService<IEnumerable<IFakeOuterService>>();

 var callsiteBuiltEvent = _listener.EventData.Single(e => e.EventName == "CallSiteBuilt");
 var callsiteBuiltEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "CallSiteBuilt");


 Assert.Equal(
Expand DownExpand Up@@ -168,7 +155,7 @@ public void EmitsServiceResolvedEvent()
 serviceProvider.GetService<IFakeService>();
 serviceProvider.GetService<IFakeService>();

 var serviceResolvedEvents = _listener.EventData.Where(e => e.EventName == "ServiceResolved").ToArray();
 var serviceResolvedEvents = Listener.EventDataFor(serviceProvider).Where(e => e.EventName == "ServiceResolved").ToArray();

 Assert.Equal(3, serviceResolvedEvents.Length);
 foreach (var serviceResolvedEvent in serviceResolvedEvents)
Expand All@@ -189,15 +176,14 @@ public void EmitsExpressionTreeBuiltEvent()

 serviceProvider.GetService<IFakeService>();

 var expressionTreeGeneratedEvent = _listener.EventData.Single(e => e.EventName == "ExpressionTreeGenerated");
 var expressionTreeGeneratedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "ExpressionTreeGenerated");

 Assert.Equal("Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService", GetProperty<string>(expressionTreeGeneratedEvent, "serviceType"));
 Assert.Equal(9, GetProperty<int>(expressionTreeGeneratedEvent, "nodeCount"));
 Assert.Equal(3, expressionTreeGeneratedEvent.EventId);
 }

 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/35753", TestPlatforms.Windows)]
 public void EmitsDynamicMethodBuiltEvent()
 {
 // Arrange
Expand All@@ -208,7 +194,7 @@ public void EmitsDynamicMethodBuiltEvent()

 serviceProvider.GetService<IFakeService>();

 var expressionTreeGeneratedEvent = _listener.EventData.Single(e => e.EventName == "DynamicMethodBuilt");
 var expressionTreeGeneratedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "DynamicMethodBuilt");

 Assert.Equal("Microsoft.Extensions.DependencyInjection.Specification.Fakes.IFakeService", GetProperty<string>(expressionTreeGeneratedEvent, "serviceType"));
 Assert.Equal(12, GetProperty<int>(expressionTreeGeneratedEvent, "methodSize"));
Expand All@@ -228,7 +214,7 @@ public void EmitsScopeDisposedEvent()
 scope.ServiceProvider.GetService<IFakeService>();
 }

 var scopeDisposedEvent = _listener.EventData.Single(e => e.EventName == "ScopeDisposed");
 var scopeDisposedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == "ScopeDisposed");

 Assert.Equal(1, GetProperty<int>(scopeDisposedEvent, "scopedServicesResolved"));
 Assert.Equal(1, GetProperty<int>(scopeDisposedEvent, "disposableServices"));
Expand All@@ -239,13 +225,15 @@ public void EmitsScopeDisposedEvent()
 public void EmitsServiceRealizationFailedEvent()
 {
 var exception = new Exception("Test error.");
 DependencyInjectionEventSource.Log.ServiceRealizationFailed(exception, 1234);
 var serviceProvider = new ServiceCollection().BuildServiceProvider();
 int hashCode = serviceProvider.GetHashCode();
 DependencyInjectionEventSource.Log.ServiceRealizationFailed(exception, hashCode);

 var eventName = nameof(DependencyInjectionEventSource.Log.ServiceRealizationFailed);
 var serviceRealizationFailedEvent = _listener.EventData.Single(e => e.EventName == eventName);
 var serviceRealizationFailedEvent = Listener.EventDataFor(serviceProvider).Single(e => e.EventName == eventName);

 Assert.Equal("System.Exception: Test error.", GetProperty<string>(serviceRealizationFailedEvent, "exceptionMessage"));
 Assert.Equal(1234, GetProperty<int>(serviceRealizationFailedEvent, "serviceProviderHashCode"));
 Assert.Equal(hashCode, GetProperty<int>(serviceRealizationFailedEvent, "serviceProviderHashCode"));
Comment thread
steveharter marked this conversation as resolved.

 Assert.Equal(6, serviceRealizationFailedEvent.EventId);
 }

Expand All@@ -266,7 +254,7 @@ public void EmitsServiceProviderBuilt()

 using ServiceProvider provider = serviceCollection.BuildServiceProvider();

 EventWrittenEventArgs serviceProviderBuiltEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderBuilt");
 EventWrittenEventArgs serviceProviderBuiltEvent = Listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderBuilt");
 GetProperty<int>(serviceProviderBuiltEvent, "serviceProviderHashCode"); // assert hashcode exists as an int
 Assert.Equal(4, GetProperty<int>(serviceProviderBuiltEvent, "singletonServices"));
 Assert.Equal(2, GetProperty<int>(serviceProviderBuiltEvent, "scopedServices"));
Expand All@@ -275,7 +263,7 @@ public void EmitsServiceProviderBuilt()
 Assert.Equal(1, GetProperty<int>(serviceProviderBuiltEvent, "openGenericsServices"));
 Assert.Equal(7, serviceProviderBuiltEvent.EventId);

 EventWrittenEventArgs serviceProviderDescriptorsEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderDescriptors");
 EventWrittenEventArgs serviceProviderDescriptorsEvent = Listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderDescriptors");
 Assert.Equal(
 string.Join(Environment.NewLine,
 "{",
Expand DownExpand Up@@ -343,33 +331,77 @@ public void EmitsServiceProviderBuilt()
 [Fact]
 public void EmitsServiceProviderBuiltOnAttach()
 {
 _listener.DisableEvents(DependencyInjectionEventSource.Log);

 ServiceCollection serviceCollection = new();
 serviceCollection.AddSingleton(new FakeDisposeCallback());

 using ServiceProvider provider = serviceCollection.BuildServiceProvider();

 Assert.Empty(_listener.EventData);
 using var listener = new TestEventListener();
 listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 try
 {
 EventWrittenEventArgs serviceProviderBuiltEvent = listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderBuilt");
 Assert.Equal(1, GetProperty<int>(serviceProviderBuiltEvent, "singletonServices"));

 _listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 EventWrittenEventArgs serviceProviderDescriptorsEvent = listener.EventDataFor(provider).Single(e => e.EventName == "ServiceProviderDescriptors");
 Assert.NotNull(JObject.Parse(GetProperty<string>(serviceProviderDescriptorsEvent, "descriptors")));
Comment thread
steveharter marked this conversation as resolved.

 }
 finally
 {
 listener.DisableEvents(DependencyInjectionEventSource.Log);
 }
 }

 EventWrittenEventArgs serviceProviderBuiltEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderBuilt");
 Assert.Equal(1, GetProperty<int>(serviceProviderBuiltEvent, "singletonServices"));
 private static bool TryGetProperty<T>(EventWrittenEventArgs data, string propName, out T result)
 {
 if (data.PayloadNames is { } names &&
 data.Payload is { } payload &&
 names.IndexOf(propName) is int index and >= 0 &&
 payload[index] is T value)
 {
 result = value;
 return true;
 }

EventWrittenEventArgs serviceProviderDescriptorsEvent = _listener.EventData.Single(e => e.EventName == "ServiceProviderDescriptors");
Assert.NotNull(JObject.Parse(GetProperty<string>(serviceProviderDescriptorsEvent, "descriptors")));
result = default;
return false;
 }

 private T GetProperty<T>(EventWrittenEventArgs data, string propName)
 => (T)data.Payload[data.PayloadNames.IndexOf(propName)];
 private static T GetProperty<T>(EventWrittenEventArgs data, string propName) =>
 TryGetProperty(data, propName, out T result)
 ? result
 : throw new ArgumentException($"No property {propName} with type {typeof(T)} found.");

 public class TestEventListenerFixture : IDisposable
Comment thread
steveharter marked this conversation as resolved.

 {
 internal TestEventListener Listener { get; }

 public TestEventListenerFixture()
 {
 Listener = new();
 Listener.EnableEvents(DependencyInjectionEventSource.Log, EventLevel.Verbose);
 }

 public void Dispose()
 {
 Listener.DisableEvents(DependencyInjectionEventSource.Log);
 Listener.Dispose();
 }
 }

private class TestEventListener : EventListener
internal class TestEventListener : EventListener
Comment thread
steveharter marked this conversation as resolved.

 {
 private volatile bool _disposed;
 private ConcurrentQueue<EventWrittenEventArgs> _events = new ConcurrentQueue<EventWrittenEventArgs>();
 private readonly ConcurrentQueue<EventWrittenEventArgs> _events = new ConcurrentQueue<EventWrittenEventArgs>();

 public IEnumerable<EventWrittenEventArgs> EventDataFor(IServiceProvider serviceProvider)
 {
 int hashCode = serviceProvider.GetHashCode();

 public IEnumerable<EventWrittenEventArgs> EventData => _events;
 return _events.Where(e =>
 e.PayloadNames?.IndexOf("serviceProviderHashCode") is { } index and >= 0 &&
 e.Payload?[index] as int? == hashCode);
 }

 protected override void OnEventWritten(EventWrittenEventArgs eventData)
 {
Expand All@@ -385,10 +417,5 @@ public override void Dispose()
 base.Dispose();
 }
 }

 public void Dispose()
 {
 _listener.Dispose();
 }
 }
}