Fix invalid logging time (#472)

* skyapm dotnet 对接日志记录 * feat : Remove MSLogger, implementation SkyApm.ILogger, Add Extension for AddPushSkyApmLogger * feat : add a copyright header to all new files * feat : add a copyright header to all new files * feat : Clean up code format * feat : Modify log docking, separate the docking log item. * feat : Fix invalid logging time Co-authored-by: 吴晟 Wu Sheng <[email protected]>
SkyAPM · May 4, 2022 · 8cfe8e8 · 8cfe8e8
1 parent 9da12cb
commit 8cfe8e8
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 1 deletion.
diff --git a/src/SkyApm.Abstractions/Tracing/Segments/LoggerContext.cs b/src/SkyApm.Abstractions/Tracing/Segments/LoggerContext.cs
@@ -16,6 +16,7 @@
  *
  */
 
+using System;
 using System.Collections.Generic;
 
 namespace SkyApm.Tracing.Segments
@@ -25,5 +26,7 @@ public class LoggerContext
         public Dictionary<string, object> Logs { get; set; }
 
         public SegmentContext SegmentContext { get; set; }
+
+        public long Date { get; set; }
     }
 }
diff --git a/src/SkyApm.Abstractions/Transport/LoggerRequest.cs b/src/SkyApm.Abstractions/Transport/LoggerRequest.cs
@@ -27,5 +27,7 @@ public class LoggerRequest
         public Dictionary<string, object> Logs { get; set; }
 
         public SegmentRequest SegmentRequest { get; set; }
+
+        public long Date { get; set; }
     }
 }
diff --git a/src/SkyApm.Core/Transport/LoggerContextContextMapper.cs b/src/SkyApm.Core/Transport/LoggerContextContextMapper.cs
@@ -36,6 +36,7 @@ public LoggerRequest Map(LoggerContext loggerContext)
             {
                 Logs = loggerContext.Logs,
                 SegmentRequest = segmentRequest,
+                Date = loggerContext.Date,
             };
         }
     }

diff --git a/src/SkyApm.Diagnostics.Logging/SkyApmLogger.cs b/src/SkyApm.Diagnostics.Logging/SkyApmLogger.cs
@@ -62,6 +62,7 @@ private void SendLog(string logLevel, string message)
                 {
                     Logs = logs,
                     SegmentContext = _entrySegmentContextAccessor.Context,
+                    Date = DateTimeOffset.UtcNow.Offset.Ticks
                 };
                 _skyApmLogDispatcher.Dispatch(logContext);
             }

diff --git a/src/SkyApm.Transport.Grpc/V8/LoggerReporter.cs b/src/SkyApm.Transport.Grpc/V8/LoggerReporter.cs
@@ -73,7 +73,7 @@ public async Task ReportAsync(IReadOnlyCollection<LoggerRequest> loggerRequests,
                                 TraceSegmentId = loggerRequest.SegmentRequest.Segment.SegmentId,
                                 //SpanId=item.Segment
                             },
-                            Timestamp = DateTimeOffset.UtcNow.Ticks,
+                            Timestamp = loggerRequest.Date,
                             Service = loggerRequest.SegmentRequest.Segment.ServiceId,
                             ServiceInstance = loggerRequest.SegmentRequest.Segment.ServiceInstanceId,
                             Endpoint = "",
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,6 +36,7 @@ public LoggerRequest Map(LoggerContext loggerContext) @@
                 {
                     Logs = loggerContext.Logs,
                     SegmentRequest = segmentRequest,
+                    Date = loggerContext.Date,
                 };
             }
         }
@@ Expand Down @@