Skip to content

Enabling RuntimeEventSource in NativeAOT - #85424

Merged
LakshanF merged 11 commits into
dotnet:mainfrom
LakshanF:EnableCountersInEventPipe
May 11, 2023
Merged

Enabling RuntimeEventSource in NativeAOT#85424
LakshanF merged 11 commits into
dotnet:mainfrom
LakshanF:EnableCountersInEventPipe

Conversation

@LakshanF

@LakshanFLakshanF commented Apr 26, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

RuntimeEventSource wasn't enabled in NativeAOT due to not being initialized when EventSourceEnabled is set, missing metadata on critical payload types blocking reflection of these in EventSource.

Added a module initializer to Initialize RuntimeEventSource if EventSourceEnabled is set, made the required types visible to reflection, and also enabled some missing counters in NativeAOT.

@LakshanFLakshanF added this to the 8.0.0 milestone Apr 26, 2023
@LakshanFLakshanF self-assigned this Apr 26, 2023
@ghost

ghost commented Apr 26, 2023

Copy link
Copy Markdown

Tagging subscribers to this area: @agocke, @MichalStrehovsky, @jkotas
See info in area-owners.md if you want to be subscribed.

Issue Details

For a CI check

Author:LakshanF
Assignees:LakshanF
Labels:

area-NativeAOT-coreclr

Milestone:8.0.0

@LakshanF
LakshanF marked this pull request as draft April 26, 2023 22:17
@LakshanF
LakshanF requested a review from davmasonApril 26, 2023 22:18
davmason
davmason reviewed Apr 26, 2023
View reviewed changes
Comment threadsrc/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/CounterPayload.cs Outdated
This was referenced Apr 27, 2023
Closed
Closed
Closed
Closed
jkotas
jkotas reviewed Apr 27, 2023
View reviewed changes
Comment threadsrc/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/RuntimeEventSource.cs Outdated
jkotas
jkotas reviewed Apr 27, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/Assembly.NativeAot.cs Outdated
@LakshanF
LakshanF marked this pull request as ready for review April 27, 2023 22:07
agocke
agocke reviewed May 2, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/System.Private.CoreLib/src/System/Exception.NativeAot.cs Outdated
Comment threadsrc/coreclr/nativeaot/System.Private.CoreLib/src/System/Exception.NativeAot.cs Outdated
@build-analysisbuild-analysisBot mentioned this pull request May 9, 2023
Closed
MichalStrehovsky
MichalStrehovsky reviewed May 9, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/System.Private.CoreLib/src/CompatibilitySuppressions.xml Outdated
@LakshanFLakshanF mentioned this pull request May 9, 2023
Closed
@LakshanF
LakshanFforce-pushed the EnableCountersInEventPipe branch from df98b45 to 9c204cdCompareMay 9, 2023 21:02
agocke
agocke requested changes May 9, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/Assembly.NativeAot.cs Outdated
@ghostghost added the needs-author-action An issue or pull request that requires more info or actions from the author. label May 9, 2023
@ghostghost removed the needs-author-action An issue or pull request that requires more info or actions from the author. label May 9, 2023
agocke
agocke approved these changes May 10, 2023
View reviewed changes

@agockeagocke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm

MichalStrehovsky
MichalStrehovsky requested changes May 10, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/System.Private.CoreLib/src/System/GC.NativeAot.cs Outdated
Comment threadsrc/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/Assembly.NativeAot.cs Outdated
Comment threadsrc/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/RuntimeEventSource.cs Outdated
@ghostghost added the needs-author-action An issue or pull request that requires more info or actions from the author. label May 10, 2023
@LakshanF@MichalStrehovsky
Update src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflec…
158cc38
…tion/Assembly.NativeAot.cs
Co-authored-by: Michal Strehovský <MichalStrehovsky@users.noreply.github.com>
@ghostghost removed the needs-author-action An issue or pull request that requires more info or actions from the author. label May 10, 2023
jkotas
jkotas reviewed May 10, 2023
View reviewed changes
Comment threadsrc/coreclr/nativeaot/System.Private.CoreLib/src/CompatibilitySuppressions.xml Outdated
@runfoapprunfoappBot mentioned this pull request May 10, 2023
Closed
@build-analysisbuild-analysisBot mentioned this pull request May 10, 2023
Closed
MichalStrehovsky
MichalStrehovsky approved these changes May 11, 2023
View reviewed changes

@MichalStrehovskyMichalStrehovsky left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

Comment threadsrc/coreclr/nativeaot/System.Private.CoreLib/src/System/Exception.NativeAot.cs
Comment on lines +120 to +122
// track count for metrics
if (isFirstFrame && !isFirstRethrowFrame)
Interlocked.Increment(ref s_exceptionCount);

@MichalStrehovskyMichalStrehovskyMay 11, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm going to assume this matches how CoreCLR counts these wrt rethrow or ExceptionDispatchInfo.Throw.

@LakshanF
LakshanF merged commit c48716c into dotnet:mainMay 11, 2023
@ghostghost locked as resolved and limited conversation to collaborators Jun 10, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@jkotasjkotasjkotas left review comments
@agockeagockeagocke approved these changes
@MichalStrehovskyMichalStrehovskyMichalStrehovsky approved these changes
+1 more reviewer
@davmasondavmasondavmason left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@LakshanFLakshanF

Labels

area-NativeAOT-coreclr

Projects

AppModel
Status: Done

Milestone

8.0.0

Development

Successfully merging this pull request may close these issues.

5 participants

@LakshanF@agocke@jkotas@davmason@MichalStrehovsky