diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs index 9090ffa7..8c3aa60c 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs +++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs @@ -550,11 +550,10 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe //轨迹推送失败(被拦截) private void TrackPushFailedPublicTopic(string failedMessage, TrackPushEvent @event, OrderEntity order) { - using var activity = ActivityHelper.CreateSpanActivity("TrackPushEventHandler"); - activity.SetTag("TrackPushFailedPublicTopic", failedMessage); + using var activity = ActivityHelper.CreateSpanActivity("TrackPushFailedPublicTopic"); activity.SetTag("failedMessage", failedMessage); - activity.SetTag("@event", @event); - activity.SetTag("order", order); + activity.SetTag("order", order.ToJson()); + activity.SetTag("@event", @event.ToJson()); _broadcastingService.TrackPushFailedPubilcTopic(new TrackPushRecordDto { SubSystemCode = @event.SubSystemCode, @@ -587,10 +586,9 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe List pushOrUpdateInputs ) { - using var activity = ActivityHelper.CreateSpanActivity("TrackPushEventHandler"); - activity.SetTag("TrackPushFailedPublicTopic", failedMessage); - activity.SetTag("failedMessage", failedMessage); - activity.SetTag("@event", @event); + using var activity = ActivityHelper.CreateSpanActivity("TrackPushFailedPublicTopic"); + activity.SetTag("failedMessage", failedMessage.ToJson()); + activity.SetTag("@event", @event.ToJson()); foreach (var pushInput in pushOrUpdateInputs) { _broadcastingService.TrackPushFailedPubilcTopic(new TrackPushRecordDto diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs index 181e671b..f3b51b24 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs +++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs @@ -308,14 +308,15 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe // 修改了extra,要校验修改后的extra是否存在 || (!string.IsNullOrWhiteSpace(@event.NewExtra) && x.Extra == @event.NewExtra)).ToList(); - using var activity = ActivityHelper.CreateSpanActivity("TrackUpsertEventHandler"); + using var activity = ActivityHelper.CreateSpanActivity("TrackUpsertEventHandler.UpsertTrackAsync"); if (@event.IsAdd) { if (existTracks.Count > 0) { _logger.LogInformation("订单已经存在不允许重复的轨迹,不允许重复添加:{@event}", @event); activity.SetTag("errorMsg", "订单已经存在不允许重复的轨迹,不允许重复添加"); - activity.SetTag("@event", @event); + activity.SetTag("order", order.ToJson()); + activity.SetTag("@event", @event.ToJson()); continue; } @@ -328,7 +329,8 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe { _logger.LogInformation("订单不存在轨迹,不允许修改:{@event}", @event); activity.SetTag("errorMsg", "订单不存在轨迹,不允许修改"); - activity.SetTag("@event", @event); + activity.SetTag("order", order.ToJson()); + activity.SetTag("@event", @event.ToJson()); continue; } @@ -336,7 +338,8 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe { _logger.LogInformation("订单存在多条轨迹不允许修改:{@event}", @event); activity.SetTag("errorMsg", "订单存在多条轨迹不允许修改"); - activity.SetTag("@event", @event); + activity.SetTag("order", order.ToJson()); + activity.SetTag("@event", @event.ToJson()); continue; } diff --git a/src/SJZY.Track.Application/Rabbit/TrackPushCompletedEventHandler.cs b/src/SJZY.Track.Application/Rabbit/TrackPushCompletedEventHandler.cs index 58274152..8561d827 100644 --- a/src/SJZY.Track.Application/Rabbit/TrackPushCompletedEventHandler.cs +++ b/src/SJZY.Track.Application/Rabbit/TrackPushCompletedEventHandler.cs @@ -201,7 +201,7 @@ public class TrackPushCompletedEventHandler : ITransientDependency, IRabbitHandl OperationMan = log.CreateUser, PushTime = DateTime.Now, OptionType = log.OptionType, - IsManualPush = !string.Equals(log.CreateUser, GlobalConst.SystemUser), //操作人不为系统用户,则认为是仍推送 + IsManualPush = !string.Equals(log.CreateUser, GlobalConst.SystemUser), //操作人不为系统用户,则认为是人推送 PushContent = log.PushContent, OrderNo = log.OrderNo, TrackStatus = log.TrackStatus,