Remove AnonymousType ILLinkTrim entry for EventSource

Instead of using an anonymous type to do the logging, just pass the string directly. Contributes to dotnet#35199
eerhardt · May 27, 2020 · d33af56 · d33af56
1 parent 6d25c29
commit d33af56
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/coreclr/src/System.Private.CoreLib/ILLinkTrim.xml b/src/coreclr/src/System.Private.CoreLib/ILLinkTrim.xml
@@ -55,8 +55,6 @@
     <!-- Accessed via private reflection and by native code. -->
     <type fullname="System.Diagnostics.Tracing.RuntimeEventSource" />
     <type fullname="System.Diagnostics.Tracing.NativeRuntimeEventSource" />
-    <!-- Accessed via reflection in TraceLogging-style EventSource events. -->
-    <type fullname="*f__AnonymousType*" />
     <type fullname="System.Diagnostics.Tracing.PropertyValue/ReferenceTypeHelper`1">
       <!-- Instantiated via reflection -->
       <method name=".ctor" />

diff --git a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource.cs b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource.cs
@@ -2178,9 +2178,8 @@ private unsafe void WriteEventString(string msgString)
                     Keywords = (EventKeywords)unchecked(keywords),
                     Level = level
                 };
-                var msg = new { message = msgString };
-                var tlet = new TraceLoggingEventTypes(EventName, EventTags.None, new Type[] { msg.GetType() });
-                WriteMultiMergeInner(EventName, ref opt, tlet, null, null, msg);
+                var tlet = new TraceLoggingEventTypes(EventName, EventTags.None, new Type[] { typeof(string) });
+                WriteMultiMergeInner(EventName, ref opt, tlet, null, null, msgString);
             }
             else
             {

diff --git a/...ies/System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/SimpleTypeInfos.cs b/...ies/System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/SimpleTypeInfos.cs
@@ -147,7 +147,11 @@ public override void WriteMetadata(
             string? name,
             EventFieldFormat format)
         {
-            collector.AddNullTerminatedString(name!, Statics.MakeDataType(TraceLoggingDataType.Utf16String, format));
+            // name can be null if the string was used as a top-level object in an event.
+            // In that case, use 'message' as the name of the field.
+            name ??= "message";
+
+            collector.AddNullTerminatedString(name, Statics.MakeDataType(TraceLoggingDataType.Utf16String, format));
         }
 
         public override void WriteData(TraceLoggingDataCollector collector, PropertyValue value)