ConsoleExporter Log minor cosmetic improvement. (#3211)

open-telemetry · Apr 20, 2022 · 50baa25 · 50baa25
1 parent 1916cc9
commit 50baa25
Showing 1 changed file with 20 additions and 8 deletions.
diff --git a/src/OpenTelemetry.Exporter.Console/ConsoleLogRecordExporter.cs b/src/OpenTelemetry.Exporter.Console/ConsoleLogRecordExporter.cs
@@ -22,7 +22,7 @@ namespace OpenTelemetry.Exporter
 {
     public class ConsoleLogRecordExporter : ConsoleExporter<LogRecord>
     {
-        private const int RightPaddingLength = 30;
+        private const int RightPaddingLength = 35;
 
         public ConsoleLogRecordExporter(ConsoleExporterOptions options)
             : base(options)
@@ -33,14 +33,17 @@ public override ExportResult Export(in Batch<LogRecord> batch)
         {
             foreach (var logRecord in batch)
             {
-                this.WriteLine($"{"LogRecord.TraceId:",-RightPaddingLength}{logRecord.TraceId}");
-                this.WriteLine($"{"LogRecord.SpanId:",-RightPaddingLength}{logRecord.SpanId}");
                 this.WriteLine($"{"LogRecord.Timestamp:",-RightPaddingLength}{logRecord.Timestamp:yyyy-MM-ddTHH:mm:ss.fffffffZ}");
-                this.WriteLine($"{"LogRecord.EventId:",-RightPaddingLength}{logRecord.EventId.Id}");
-                this.WriteLine($"{"LogRecord.EventName:",-RightPaddingLength}{logRecord.EventId.Name}");
+
+                if (logRecord.TraceId != default)
+                {
+                    this.WriteLine($"{"LogRecord.TraceId:",-RightPaddingLength}{logRecord.TraceId}");
+                    this.WriteLine($"{"LogRecord.SpanId:",-RightPaddingLength}{logRecord.SpanId}");
+                    this.WriteLine($"{"LogRecord.TraceFlags:",-RightPaddingLength}{logRecord.TraceFlags}");
+                }
+
                 this.WriteLine($"{"LogRecord.CategoryName:",-RightPaddingLength}{logRecord.CategoryName}");
                 this.WriteLine($"{"LogRecord.LogLevel:",-RightPaddingLength}{logRecord.LogLevel}");
-                this.WriteLine($"{"LogRecord.TraceFlags:",-RightPaddingLength}{logRecord.TraceFlags}");
                 if (logRecord.FormattedMessage != null)
                 {
                     this.WriteLine($"{"LogRecord.FormattedMessage:",-RightPaddingLength}{logRecord.FormattedMessage}");
@@ -59,6 +62,15 @@ public override ExportResult Export(in Batch<LogRecord> batch)
                     }
                 }
 
+                if (logRecord.EventId != default)
+                {
+                    this.WriteLine($"{"LogRecord.EventId:",-RightPaddingLength}{logRecord.EventId.Id}");
+                    if (string.IsNullOrEmpty(logRecord.EventId.Name))
+                    {
+                        this.WriteLine($"{"LogRecord.EventName:",-RightPaddingLength}{logRecord.EventId.Name}");
+                    }
+                }
+
                 if (logRecord.Exception is { })
                 {
                     this.WriteLine($"{"LogRecord.Exception:",-RightPaddingLength}{logRecord.Exception?.Message}");
@@ -84,10 +96,10 @@ void ProcessScope(LogRecordScope scope, ConsoleLogRecordExporter exporter)
                 var resource = this.ParentProvider.GetResource();
                 if (resource != Resource.Empty)
                 {
-                    this.WriteLine("Resource associated with LogRecord:");
+                    this.WriteLine("\nResource associated with LogRecord:");
                     foreach (var resourceAttribute in resource.Attributes)
                     {
-                        this.WriteLine($"    {resourceAttribute.Key}: {resourceAttribute.Value}");
+                        this.WriteLine($"{resourceAttribute.Key}: {resourceAttribute.Value}");
                     }
                 }