Avoid custom attribute routine in NetEventSource (#120422)

EgorBo · web-flow · commit 8304b036d770 · 2025-10-06T10:27:11.000+02:00
* Avoid custom attribute routine in NetEventSource

* add EventSourceSettings.EtwManifestEventFormat

* Apply Miha's FB

* revert

* More event sources

* fix whitespace

* use EtwManifestEventFormat

* DiagnosticSourceEvent uses self-describing one
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/DiagnosticSourceEventSource.cs b/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/DiagnosticSourceEventSource.cs
@@ -159,9 +159,11 @@ namespace System.Diagnostics
     ///
     /// See the DiagnosticSourceEventSourceBridgeTest.cs for more explicit examples of using this bridge.
     /// </summary>
-    [EventSource(Name = "Microsoft-Diagnostics-DiagnosticSource")]
+    [EventSource(Name = DiagnosticSourceEventSourceName)]
     internal sealed class DiagnosticSourceEventSource : EventSource
     {
+        private const string DiagnosticSourceEventSourceName = "Microsoft-Diagnostics-DiagnosticSource";
+
         public static readonly DiagnosticSourceEventSource Log = new DiagnosticSourceEventSource();
 
         public static class Keywords
@@ -405,7 +407,7 @@ protected override void OnEventCommand(EventCommandEventArgs command)
         private DiagnosticSourceEventSource()
             // This constructor uses EventSourceSettings which is only available on V4.6 and above
             // Use the EventSourceSettings to turn on support for complex types, if available (v4.6 and above).
-            : base(EventSourceSettings.EtwSelfDescribingEventFormat)
+            : base(DiagnosticSourceEventSourceName, EventSourceSettings.EtwSelfDescribingEventFormat)
         {
         }
 
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Metrics/MetricsEventSource.cs b/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Metrics/MetricsEventSource.cs
@@ -48,9 +48,11 @@ namespace System.Diagnostics.Metrics
     ///         not counting the special zero bucket. The default value is 160.
     ///       o reportDeltas - If true, the histogram will report deltas instead of whole accumulated values. The default value is false.
     /// </summary>
-    [EventSource(Name = "System.Diagnostics.Metrics")]
+    [EventSource(Name = MetricsEventSourceName)]
     internal sealed class MetricsEventSource : EventSource
     {
+        private const string MetricsEventSourceName = "System.Diagnostics.Metrics";
+
         public static readonly MetricsEventSource Log = new();
 
         // Although this API isn't public, it is invoked via reflection from System.Private.CoreLib and needs the same back-compat
@@ -96,7 +98,10 @@ private CommandHandler Handler
             }
         }
 
-        private MetricsEventSource() { }
+        private MetricsEventSource()
+            : base(MetricsEventSourceName, EventSourceSettings.EtwManifestEventFormat)
+        {
+        }
 
         /// <summary>
         /// Used to send ad-hoc diagnostics to humans.
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/NetEventSource.WinHttpHandler.cs b/src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/NetEventSource.WinHttpHandler.cs
@@ -5,6 +5,11 @@
 
 namespace System.Net
 {
-    [EventSource(Name = "Private.InternalDiagnostics.System.Net.Http.WinHttpHandler")]
-    internal sealed partial class NetEventSource { }
+    [EventSource(Name = NetEventSourceName)]
+    internal sealed partial class NetEventSource
+    {
+        private const string NetEventSourceName = "Private.InternalDiagnostics.System.Net.Http.WinHttpHandler";
+
+        public NetEventSource() : base(NetEventSourceName, EventSourceSettings.EtwManifestEventFormat) { }
+    }
 }
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/HttpTelemetry.cs b/src/libraries/System.Net.Http/src/System/Net/Http/HttpTelemetry.cs
@@ -9,9 +9,16 @@
 
 namespace System.Net.Http
 {
-    [EventSource(Name = "System.Net.Http")]
+    [EventSource(Name = HttpTelemetryName)]
     internal sealed partial class HttpTelemetry : EventSource
     {
+        private const string HttpTelemetryName = "System.Net.Http";
+
+        public HttpTelemetry()
+            : base(HttpTelemetryName, EventSourceSettings.EtwManifestEventFormat)
+        {
+        }
+
         public static readonly HttpTelemetry Log = new HttpTelemetry();
 
         public static class Keywords
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/NetEventSource.Http.cs b/src/libraries/System.Net.Http/src/System/Net/Http/NetEventSource.Http.cs
@@ -7,9 +7,13 @@
 
 namespace System.Net
 {
-    [EventSource(Name = "Private.InternalDiagnostics.System.Net.Http")]
+    [EventSource(Name = NetEventSourceName)]
     internal sealed partial class NetEventSource
     {
+        private const string NetEventSourceName = "Private.InternalDiagnostics.System.Net.Http";
+
+        public NetEventSource() : base(NetEventSourceName, EventSourceSettings.EtwManifestEventFormat) { }
+
         private const int UriBaseAddressId = NextAvailableEventId;
         private const int ContentNullId = UriBaseAddressId + 1;
         private const int HeadersInvalidValueId = ContentNullId + 1;
diff --git a/src/libraries/System.Net.HttpListener/src/System/Net/NetEventSource.HttpListener.cs b/src/libraries/System.Net.HttpListener/src/System/Net/NetEventSource.HttpListener.cs
@@ -5,6 +5,11 @@
 
 namespace System.Net
 {
-    [EventSource(Name = "Private.InternalDiagnostics.System.Net.HttpListener")]
-    internal sealed partial class NetEventSource { }
+    [EventSource(Name = NetEventSourceName)]
+    internal sealed partial class NetEventSource
+    {
+        private const string NetEventSourceName = "Private.InternalDiagnostics.System.Net.HttpListener";
+
+        public NetEventSource() : base(NetEventSourceName, EventSourceSettings.EtwManifestEventFormat) { }
+    }
 }
diff --git a/src/libraries/System.Net.Mail/src/System/Net/Mail/NetEventSource.Mail.cs b/src/libraries/System.Net.Mail/src/System/Net/Mail/NetEventSource.Mail.cs
@@ -7,6 +7,11 @@
 
 namespace System.Net
 {
-    [EventSource(Name = "Private.InternalDiagnostics.System.Net.Mail")]
-    internal sealed partial class NetEventSource { }
+    [EventSource(Name = NetEventSourceName)]
+    internal sealed partial class NetEventSource
+    {
+        private const string NetEventSourceName = "Private.InternalDiagnostics.System.Net.Mail";
+
+        public NetEventSource() : base(NetEventSourceName, EventSourceSettings.EtwManifestEventFormat) { }
+    }
 }
diff --git a/src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionTelemetry.cs b/src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionTelemetry.cs
@@ -9,9 +9,16 @@
 
 namespace System.Net
 {
-    [EventSource(Name = "System.Net.NameResolution")]
+    [EventSource(Name = NameResolutionTelemetryName)]
     internal sealed class NameResolutionTelemetry : EventSource
     {
+        private const string NameResolutionTelemetryName = "System.Net.NameResolution";
+
+        public NameResolutionTelemetry()
+            : base(NameResolutionTelemetryName, EventSourceSettings.EtwManifestEventFormat)
+        {
+        }
+
         public static readonly NameResolutionTelemetry Log = new NameResolutionTelemetry();
 
         private const int ResolutionStartEventId = 1;
diff --git a/src/libraries/System.Net.NameResolution/src/System/Net/NetEventSource.NameResolution.cs b/src/libraries/System.Net.NameResolution/src/System/Net/NetEventSource.NameResolution.cs
@@ -5,6 +5,11 @@
 
 namespace System.Net
 {
-    [EventSource(Name = "Private.InternalDiagnostics.System.Net.NameResolution")]
-    internal sealed partial class NetEventSource { }
+    [EventSource(Name = NetEventSourceName)]
+    internal sealed partial class NetEventSource
+    {
+        private const string NetEventSourceName = "Private.InternalDiagnostics.System.Net.NameResolution";
+
+        public NetEventSource() : base(NetEventSourceName, EventSourceSettings.EtwManifestEventFormat) { }
+    }
 }
diff --git a/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetEventSource.NetworkInformation.cs b/src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/NetEventSource.NetworkInformation.cs
@@ -7,9 +7,13 @@
 
 namespace System.Net
 {
-    [EventSource(Name = "Private.InternalDiagnostics.System.Net.NetworkInformation")]
+    [EventSource(Name = NetEventSourceName)]
     internal sealed class NetEventSource : EventSource
     {
+        private const string NetEventSourceName = "Private.InternalDiagnostics.System.Net.NetworkInformation";
+
+        public NetEventSource() : base(NetEventSourceName, EventSourceSettings.EtwManifestEventFormat) { }
+
         public static readonly NetEventSource Log = new NetEventSource();
 
         private const int ErrorEventId = 2;
diff --git a/src/libraries/System.Net.Primitives/src/System/Net/NetEventSource.Primitives.cs b/src/libraries/System.Net.Primitives/src/System/Net/NetEventSource.Primitives.cs
@@ -5,6 +5,11 @@
 
 namespace System.Net
 {
-    [EventSource(Name = "Private.InternalDiagnostics.System.Net.Primitives")]
-    internal sealed partial class NetEventSource { }
+    [EventSource(Name = NetEventSourceName)]
+    internal sealed partial class NetEventSource
+    {
+        private const string NetEventSourceName = "Private.InternalDiagnostics.System.Net.Primitives";
+
+        public NetEventSource() : base(NetEventSourceName, EventSourceSettings.EtwManifestEventFormat) { }
+    }
 }
diff --git a/src/libraries/System.Net.Quic/src/System/Net/Quic/NetEventSource.Quic.cs b/src/libraries/System.Net.Quic/src/System/Net/Quic/NetEventSource.Quic.cs
@@ -6,9 +6,13 @@
 
 namespace System.Net
 {
-    [EventSource(Name = "Private.InternalDiagnostics.System.Net.Quic")]
+    [EventSource(Name = NetEventSourceName)]
     internal sealed partial class NetEventSource
     {
+        private const string NetEventSourceName = "Private.InternalDiagnostics.System.Net.Quic";
+
+        public NetEventSource() : base(NetEventSourceName, EventSourceSettings.EtwManifestEventFormat) { }
+
         static partial void AdditionalCustomizedToString(object value, ref string? result)
         {
             if (value is MsQuicSafeHandle safeHandle)
diff --git a/src/libraries/System.Net.Requests/src/System/Net/NetEventSource.Requests.cs b/src/libraries/System.Net.Requests/src/System/Net/NetEventSource.Requests.cs
@@ -5,6 +5,11 @@
 
 namespace System.Net
 {
-    [EventSource(Name = "Private.InternalDiagnostics.System.Net.Requests")]
-    internal sealed partial class NetEventSource { }
+    [EventSource(Name = NetEventSourceName)]
+    internal sealed partial class NetEventSource
+    {
+        private const string NetEventSourceName = "Private.InternalDiagnostics.System.Net.Requests";
+
+        public NetEventSource() : base(NetEventSourceName, EventSourceSettings.EtwManifestEventFormat) { }
+    }
 }
diff --git a/src/libraries/System.Net.Security/src/System/Net/Security/NetEventSource.Security.cs b/src/libraries/System.Net.Security/src/System/Net/Security/NetEventSource.Security.cs
@@ -11,9 +11,13 @@
 
 namespace System.Net
 {
-    [EventSource(Name = "Private.InternalDiagnostics.System.Net.Security")]
+    [EventSource(Name = NetEventSourceName)]
     internal sealed partial class NetEventSource
     {
+        private const string NetEventSourceName = "Private.InternalDiagnostics.System.Net.Security";
+
+        public NetEventSource() : base(NetEventSourceName, EventSourceSettings.EtwManifestEventFormat) { }
+
 #if WINDOWS
         // More events are defined in NetEventSource.Security.Windows.cs
         private const int LocatingPrivateKeyId = OperationReturnedSomethingId + 1;
diff --git a/src/libraries/System.Net.Security/src/System/Net/Security/NetSecurityTelemetry.cs b/src/libraries/System.Net.Security/src/System/Net/Security/NetSecurityTelemetry.cs
@@ -9,9 +9,16 @@
 
 namespace System.Net.Security
 {
-    [EventSource(Name = "System.Net.Security")]
+    [EventSource(Name = NetSecurityTelemetryName)]
     internal sealed class NetSecurityTelemetry : EventSource
     {
+        private const string NetSecurityTelemetryName = "System.Net.Security";
+
+        public NetSecurityTelemetry()
+            : base(NetSecurityTelemetryName, EventSourceSettings.EtwManifestEventFormat)
+        {
+        }
+
         private const string ActivitySourceName = "Experimental.System.Net.Security";
         private const string ActivityName = ActivitySourceName + ".TlsHandshake";
 
diff --git a/src/libraries/System.Net.Sockets/src/System/Net/Sockets/NetEventSource.Sockets.cs b/src/libraries/System.Net.Sockets/src/System/Net/Sockets/NetEventSource.Sockets.cs
@@ -7,9 +7,13 @@
 
 namespace System.Net
 {
-    [EventSource(Name = "Private.InternalDiagnostics.System.Net.Sockets")]
+    [EventSource(Name = NetEventSourceName)]
     internal sealed partial class NetEventSource
     {
+        private const string NetEventSourceName = "Private.InternalDiagnostics.System.Net.Sockets";
+
+        public NetEventSource() : base(NetEventSourceName, EventSourceSettings.EtwManifestEventFormat) { }
+
         private const int AcceptedId = NextAvailableEventId;
         private const int ConnectedId = AcceptedId + 1;
         private const int ConnectedAsyncDnsId = ConnectedId + 1;
diff --git a/src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketsTelemetry.cs b/src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketsTelemetry.cs
@@ -7,9 +7,16 @@
 
 namespace System.Net.Sockets
 {
-    [EventSource(Name = "System.Net.Sockets")]
+    [EventSource(Name = SocketsTelemetryName)]
     internal sealed class SocketsTelemetry : EventSource
     {
+        private const string SocketsTelemetryName = "System.Net.Sockets";
+
+        public SocketsTelemetry()
+            : base(SocketsTelemetryName, EventSourceSettings.EtwManifestEventFormat)
+        {
+        }
+
         private const string ActivitySourceName = "Experimental.System.Net.Sockets";
         private const string ConnectActivityName = ActivitySourceName + ".Connect";
         private static readonly ActivitySource s_connectActivitySource = new ActivitySource(ActivitySourceName);
diff --git a/src/libraries/System.Net.WebSockets/src/System/Net/WebSockets/NetEventSource.WebSockets.cs b/src/libraries/System.Net.WebSockets/src/System/Net/WebSockets/NetEventSource.WebSockets.cs
@@ -8,9 +8,13 @@
 
 namespace System.Net
 {
-    [EventSource(Name = "Private.InternalDiagnostics.System.Net.WebSockets")]
+    [EventSource(Name = NetEventSourceName)]
     internal sealed partial class NetEventSource
     {
+        private const string NetEventSourceName = "Private.InternalDiagnostics.System.Net.WebSockets";
+
+        public NetEventSource() : base(NetEventSourceName, EventSourceSettings.EtwManifestEventFormat) { }
+
         // NOTE
         // - The 'Start' and 'Stop' suffixes on the following event names have special meaning in EventSource. They
         //   enable creating 'activities'.
diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Serialization/XmlSerializationEventSource.cs b/src/libraries/System.Private.Xml/src/System/Xml/Serialization/XmlSerializationEventSource.cs
@@ -5,10 +5,16 @@
 
 namespace System.Xml.Serialization
 {
-    [EventSource(
-        Name = "System.Xml.Serialzation.XmlSerialization")]
+    [EventSource(Name = XmlSerializationEventSourceName)]
     internal sealed class XmlSerializationEventSource : EventSource
     {
+        private const string XmlSerializationEventSourceName = "System.Xml.Serialzation.XmlSerialization";
+
+        public XmlSerializationEventSource()
+            : base(XmlSerializationEventSourceName, EventSourceSettings.EtwManifestEventFormat)
+        {
+        }
+
         internal static readonly XmlSerializationEventSource Log = new XmlSerializationEventSource();
 
         [Event(EventIds.XmlSerializerExpired, Level = EventLevel.Informational)]
diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/OpenSslX509ChainEventSource.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/OpenSslX509ChainEventSource.cs
@@ -7,9 +7,16 @@
 
 namespace System.Security.Cryptography.X509Certificates
 {
-    [EventSource(Name = "System.Security.Cryptography.X509Certificates.X509Chain.OpenSsl")]
+    [EventSource(Name = OpenSslX509ChainEventSourceName)]
     internal sealed class OpenSslX509ChainEventSource : EventSource
     {
+        private const string OpenSslX509ChainEventSourceName = "System.Security.Cryptography.X509Certificates.X509Chain.OpenSsl";
+
+        public OpenSslX509ChainEventSource()
+            : base(OpenSslX509ChainEventSourceName, EventSourceSettings.EtwManifestEventFormat)
+        {
+        }
+
         internal static readonly OpenSslX509ChainEventSource Log = new OpenSslX509ChainEventSource();
 
         private const int EventId_ChainStart = 1;

Original file line number	Diff line number	Diff line change
`@@ -159,9 +159,11 @@ namespace System.Diagnostics`
`159`	`159`	`///`
`160`	`160`	`/// See the DiagnosticSourceEventSourceBridgeTest.cs for more explicit examples of using this bridge.`
`161`	`161`	`/// </summary>`
`162`		`- [EventSource(Name = "Microsoft-Diagnostics-DiagnosticSource")]`
	`162`	`+ [EventSource(Name = DiagnosticSourceEventSourceName)]`
`163`	`163`	`internal sealed class DiagnosticSourceEventSource : EventSource`
`164`	`164`	`{`
	`165`	`+ private const string DiagnosticSourceEventSourceName = "Microsoft-Diagnostics-DiagnosticSource";`
	`166`	`+`
`165`	`167`	`public static readonly DiagnosticSourceEventSource Log = new DiagnosticSourceEventSource();`
`166`	`168`
`167`	`169`	`public static class Keywords`
`@@ -405,7 +407,7 @@ protected override void OnEventCommand(EventCommandEventArgs command)`
`405`	`407`	`private DiagnosticSourceEventSource()`
`406`	`408`	`// This constructor uses EventSourceSettings which is only available on V4.6 and above`
`407`	`409`	`// Use the EventSourceSettings to turn on support for complex types, if available (v4.6 and above).`
`408`		`- : base(EventSourceSettings.EtwSelfDescribingEventFormat)`
	`410`	`+ : base(DiagnosticSourceEventSourceName, EventSourceSettings.EtwSelfDescribingEventFormat)`
`409`	`411`	`{`
`410`	`412`	`}`
`411`	`413`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,11 @@`
`5`	`5`
`6`	`6`	`namespace System.Net`
`7`	`7`	`{`
`8`		`- [EventSource(Name = "Private.InternalDiagnostics.System.Net.Http.WinHttpHandler")]`
`9`		`- internal sealed partial class NetEventSource { }`
	`8`	`+ [EventSource(Name = NetEventSourceName)]`
	`9`	`+ internal sealed partial class NetEventSource`
	`10`	`+ {`
	`11`	`+ private const string NetEventSourceName = "Private.InternalDiagnostics.System.Net.Http.WinHttpHandler";`
	`12`	`+`
	`13`	`+ public NetEventSource() : base(NetEventSourceName, EventSourceSettings.EtwManifestEventFormat) { }`
	`14`	`+ }`
`10`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,13 @@`
`7`	`7`
`8`	`8`	`namespace System.Net`
`9`	`9`	`{`
`10`		`- [EventSource(Name = "Private.InternalDiagnostics.System.Net.Http")]`
	`10`	`+ [EventSource(Name = NetEventSourceName)]`
`11`	`11`	`internal sealed partial class NetEventSource`
`12`	`12`	`{`
	`13`	`+ private const string NetEventSourceName = "Private.InternalDiagnostics.System.Net.Http";`
	`14`	`+`
	`15`	`+ public NetEventSource() : base(NetEventSourceName, EventSourceSettings.EtwManifestEventFormat) { }`
	`16`	`+`
`13`	`17`	`private const int UriBaseAddressId = NextAvailableEventId;`
`14`	`18`	`private const int ContentNullId = UriBaseAddressId + 1;`
`15`	`19`	`private const int HeadersInvalidValueId = ContentNullId + 1;`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,11 @@`
`7`	`7`
`8`	`8`	`namespace System.Net`
`9`	`9`	`{`
`10`		`- [EventSource(Name = "Private.InternalDiagnostics.System.Net.Mail")]`
`11`		`- internal sealed partial class NetEventSource { }`
	`10`	`+ [EventSource(Name = NetEventSourceName)]`
	`11`	`+ internal sealed partial class NetEventSource`
	`12`	`+ {`
	`13`	`+ private const string NetEventSourceName = "Private.InternalDiagnostics.System.Net.Mail";`
	`14`	`+`
	`15`	`+ public NetEventSource() : base(NetEventSourceName, EventSourceSettings.EtwManifestEventFormat) { }`
	`16`	`+ }`
`12`	`17`	`}`