-
Notifications
You must be signed in to change notification settings - Fork 5.1k
Introduce EventSource.IsSupported feature switch #38129
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.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
8fb187b
Introduce EventSource.IsSupported feature switch
eerhardt bb7f5f3
First round of PR feedback.
eerhardt bbd26fc
Fix unintended changes
eerhardt 1e19884
Add test when EventSource IsSupported feature switch is disabled.
eerhardt 395887f
Update RemoteExecutor version and enable EventSource test
eerhardt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestNotSupported.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
// See the LICENSE file in the project root for more information. | ||
|
||
using System.Collections.Generic; | ||
using Xunit; | ||
using SdtEventSources; | ||
using Microsoft.DotNet.RemoteExecutor; | ||
#if USE_MDT_EVENTSOURCE | ||
using Microsoft.Diagnostics.Tracing; | ||
#else | ||
using System.Diagnostics.Tracing; | ||
#endif | ||
|
||
namespace BasicEventSourceTests | ||
{ | ||
public class TestNotSupported | ||
{ | ||
/// <summary> | ||
/// Tests using EventSource when the System.Diagnostics.Tracing.EventSource.IsSupported | ||
/// feature switch is set to disable all EventSource operations. | ||
/// </summary> | ||
[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))] | ||
public void TestBasicOperations_IsSupported_False() | ||
{ | ||
RemoteInvokeOptions options = new RemoteInvokeOptions(); | ||
options.RuntimeConfigurationOptions.Add("System.Diagnostics.Tracing.EventSource.IsSupported", false); | ||
|
||
RemoteExecutor.Invoke(() => | ||
{ | ||
using (var log = new EventSourceTest()) | ||
{ | ||
using (var listener = new LoudListener(log)) | ||
{ | ||
IEnumerable<EventSource> sources = EventSource.GetSources(); | ||
Assert.Empty(sources); | ||
|
||
Assert.Null(EventSource.GenerateManifest(typeof(SimpleEventSource), string.Empty, EventManifestOptions.OnlyIfNeededForRegistration)); | ||
Assert.Null(EventSource.GenerateManifest(typeof(EventSourceTest), string.Empty, EventManifestOptions.AllCultures)); | ||
|
||
log.Event0(); | ||
Assert.Null(LoudListener.LastEvent); | ||
|
||
EventSource.SendCommand(log, EventCommand.Enable, commandArguments: null); | ||
Assert.False(log.IsEnabled()); | ||
} | ||
} | ||
}, options).Dispose(); | ||
} | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Substitutions.Shared.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.