diff --git a/internal/service/supplier/third_party/pool/card_sender/camel.go b/internal/service/supplier/third_party/pool/card_sender/camel.go index 94f504a..c47eaf2 100644 --- a/internal/service/supplier/third_party/pool/card_sender/camel.go +++ b/internal/service/supplier/third_party/pool/card_sender/camel.go @@ -99,7 +99,7 @@ func (s *SendCardTaskTypeCamel) channelOne(ctx context.Context, orderItem OrderP attribute.String("cardPassword", task.CardInfo.Data), attribute.String("orderId", orderItem.OrderID), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) payUrl, err := url.Parse(orderItem.PayURL) if err != nil { @@ -180,7 +180,7 @@ func (s *SendCardTaskTypeCamel) HandleSendCardTask(ctx context.Context, orderIte attribute.String("cardPassword", task.CardInfo.Data), attribute.String("orderId", orderItem.OrderID), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) if strings.Contains(orderItem.PayURL, "47.243.53.92") { return s.channelOne(ctx, orderItem, task) } diff --git a/internal/service/supplier/third_party/pool/card_sender/careless.go b/internal/service/supplier/third_party/pool/card_sender/careless.go index df2885a..eb66491 100644 --- a/internal/service/supplier/third_party/pool/card_sender/careless.go +++ b/internal/service/supplier/third_party/pool/card_sender/careless.go @@ -130,7 +130,7 @@ func (s *SendCardTaskTypeCareless) channelOne(ctx context.Context, orderItem Ord attribute.String("cardPassword", task.CardInfo.Data), attribute.String("orderId", orderItem.OrderID), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) payUrl, err := url.Parse(orderItem.PayURL) if err != nil { @@ -264,7 +264,7 @@ func (s *SendCardTaskTypeCareless) HandleSendCardTask(ctx context.Context, order attribute.String("cardPassword", task.CardInfo.Data), attribute.String("orderId", orderItem.OrderID), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) if strings.Contains(orderItem.PayURL, "pay50.baolong18080.com") { return (&SendCardTaskTypeNuclear{}).HandleSendCardTask(ctx, orderItem, task) } diff --git a/internal/service/supplier/third_party/pool/card_sender/eggplant.go b/internal/service/supplier/third_party/pool/card_sender/eggplant.go index f283e15..429df24 100644 --- a/internal/service/supplier/third_party/pool/card_sender/eggplant.go +++ b/internal/service/supplier/third_party/pool/card_sender/eggplant.go @@ -42,7 +42,7 @@ func (s *SendCardTaskTypeEggplant) CreateOrder(ctx context.Context, roadUid stri attribute.String("roadUid", roadUid), attribute.Float64("faceValue", faceValue), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) cfg := new(config.Config) roadInfo := road.GetRoadInfoByRoadUid(ctx, roadUid) @@ -115,7 +115,7 @@ func (s *SendCardTaskTypeEggplant) HandleSendCardTask(ctx context.Context, order attribute.String("cardPassword", task.CardInfo.Data), attribute.String("orderId", orderItem.OrderID), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) forwardUrl, err := url.Parse(orderItem.PayURL) if err != nil { otelTrace.Logger.WithContext(ctx).Error("解析失败", zap.Error(err)) diff --git a/internal/service/supplier/third_party/pool/card_sender/fat_six.go b/internal/service/supplier/third_party/pool/card_sender/fat_six.go index 638ab3b..af2e8dc 100644 --- a/internal/service/supplier/third_party/pool/card_sender/fat_six.go +++ b/internal/service/supplier/third_party/pool/card_sender/fat_six.go @@ -161,7 +161,7 @@ func (s *SendCardTaskTypeFatSix) HandleSendCardTask(ctx context.Context, orderIt attribute.String("cardNo", task.CardInfo.CardNo), attribute.String("cardPassword", task.CardInfo.Data), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) queryUrl, err := url.Parse(orderItem.PayURL) if err != nil { diff --git a/internal/service/supplier/third_party/pool/card_sender/favorable_clouds.go b/internal/service/supplier/third_party/pool/card_sender/favorable_clouds.go index 982dab5..4b4c364 100644 --- a/internal/service/supplier/third_party/pool/card_sender/favorable_clouds.go +++ b/internal/service/supplier/third_party/pool/card_sender/favorable_clouds.go @@ -111,7 +111,7 @@ func (s *SendCardTaskTypeFavorableClouds) HandleSendCardTask(ctx context.Context attribute.String("cardNo", task.CardInfo.CardNo), attribute.String("cardPassword", task.CardInfo.Data), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) payUrl, err := url.Parse(orderItem.PayURL) roadInfo := road.GetRoadInfoByRoadUid(ctx, orderItem.RoadUid) diff --git a/internal/service/supplier/third_party/pool/card_sender/flyfish.go b/internal/service/supplier/third_party/pool/card_sender/flyfish.go index c6b6275..3af0ad1 100644 --- a/internal/service/supplier/third_party/pool/card_sender/flyfish.go +++ b/internal/service/supplier/third_party/pool/card_sender/flyfish.go @@ -188,7 +188,7 @@ func (s *SendCardTaskTypeFlyFish) HandleSendCardTask(ctx context.Context, orderI attribute.String("cardPassword", task.CardInfo.Data), attribute.String("orderId", orderItem.OrderID), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) // 解析url payUrl, err := url.Parse(orderItem.PayURL) diff --git a/internal/service/supplier/third_party/pool/card_sender/flyfishv2.go b/internal/service/supplier/third_party/pool/card_sender/flyfishv2.go index c4ea743..d5b3b06 100644 --- a/internal/service/supplier/third_party/pool/card_sender/flyfishv2.go +++ b/internal/service/supplier/third_party/pool/card_sender/flyfishv2.go @@ -93,7 +93,7 @@ func (s *SendCardTaskTypeFlyFishV2) HandleSendCardTask(ctx context.Context, orde attribute.String("cardPassword", task.CardInfo.Data), attribute.String("orderId", orderItem.OrderID), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) queryUrl, err := url.Parse(orderItem.PayURL) if err != nil { diff --git a/internal/service/supplier/third_party/pool/card_sender/jinke.go b/internal/service/supplier/third_party/pool/card_sender/jinke.go index 27f16f7..71dc2c2 100644 --- a/internal/service/supplier/third_party/pool/card_sender/jinke.go +++ b/internal/service/supplier/third_party/pool/card_sender/jinke.go @@ -122,7 +122,7 @@ func (s *SendCardTaskTypeJinke) HandleSendCardTask(ctx context.Context, orderIte trace.WithAttributes(attribute.String("orderItem", convertor.ToString(orderItem))), trace.WithAttributes(attribute.String("task", convertor.ToString(task))), ) - defer span.End() + defer otelTrace.SafeEndSpan(span) favorableClouds := SendCardTaskTypeFavorableClouds{} @@ -162,7 +162,7 @@ func (s *SendCardTaskTypeJinke) channelOne(ctx context.Context, orderItem OrderP attribute.String("cardNo", task.CardInfo.CardNo), attribute.String("cardPassword", task.CardInfo.Data), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) queryUrl, err := url.Parse(orderItem.PayURL) if err != nil { return errors.New("解析提交地址失败") diff --git a/internal/service/supplier/third_party/pool/card_sender/lianins.go b/internal/service/supplier/third_party/pool/card_sender/lianins.go index 4800c59..0c99b6a 100644 --- a/internal/service/supplier/third_party/pool/card_sender/lianins.go +++ b/internal/service/supplier/third_party/pool/card_sender/lianins.go @@ -146,7 +146,7 @@ func (s *SendCardTaskTypeLianIns) HandleSendCardTask(ctx context.Context, orderI attribute.String("cardPassword", task.CardInfo.Data), attribute.String("orderId", orderItem.OrderID), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) if strings.Contains(orderItem.PayURL, "api.xxsbm.com") { err2 := (&SendCardTaskTypeFatSix{}).HandleSendCardTask(ctx, orderItem, task) return err2 diff --git a/internal/service/supplier/third_party/pool/card_sender/luban.go b/internal/service/supplier/third_party/pool/card_sender/luban.go index 8a33b1b..6bd7624 100644 --- a/internal/service/supplier/third_party/pool/card_sender/luban.go +++ b/internal/service/supplier/third_party/pool/card_sender/luban.go @@ -291,7 +291,7 @@ func (s *SendCardTaskTypeLuban) HandleSendCardTask(ctx context.Context, orderIte attribute.String("cardPassword", task.CardInfo.Data), attribute.String("orderId", orderItem.OrderID), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) if strings.Contains(orderItem.PayURL, "api.xxsbm.com") { err2 := (&SendCardTaskTypeFatSix{}).HandleSendCardTask(ctx, orderItem, task) return err2 diff --git a/internal/service/supplier/third_party/pool/card_sender/magic_fish.go b/internal/service/supplier/third_party/pool/card_sender/magic_fish.go index ccc6537..8ad6844 100644 --- a/internal/service/supplier/third_party/pool/card_sender/magic_fish.go +++ b/internal/service/supplier/third_party/pool/card_sender/magic_fish.go @@ -141,7 +141,7 @@ func (s *SendCardTaskTypeMagicFish) HandleSendCardTask(ctx context.Context, orde attribute.String("cardNo", task.CardInfo.CardNo), attribute.String("cardPassword", task.CardInfo.Data), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) return (&SendCardTaskTypeFatSix{}).HandleSendCardTask(ctx, orderItem, task) } diff --git a/internal/service/supplier/third_party/pool/card_sender/myself.go b/internal/service/supplier/third_party/pool/card_sender/myself.go index 5389f77..6ef1124 100644 --- a/internal/service/supplier/third_party/pool/card_sender/myself.go +++ b/internal/service/supplier/third_party/pool/card_sender/myself.go @@ -60,7 +60,7 @@ func (s *SendCardTaskTypeMyself) HandleSendCardTask(ctx context.Context, orderIt attribute.String("orderId", orderItem.OrderID), attribute.String("remoteOrderId", orderItem.RemoteOrderID), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) roadInfo := road.GetRoadInfoByRoadUid(ctx, orderItem.RoadUid) if _, err2 := client.SubmitOrder(ctx, &client.SubmitOrderReq{ diff --git a/internal/service/supplier/third_party/pool/card_sender/nuclear.go b/internal/service/supplier/third_party/pool/card_sender/nuclear.go index f6cde2d..457560c 100644 --- a/internal/service/supplier/third_party/pool/card_sender/nuclear.go +++ b/internal/service/supplier/third_party/pool/card_sender/nuclear.go @@ -504,7 +504,7 @@ func (s *SendCardTaskTypeNuclear) HandleSendCardTask(ctx context.Context, orderI attribute.String("orderId", orderItem.OrderID), attribute.String("remoteOrderId", orderItem.RemoteOrderID), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) if strings.Contains(orderItem.PayURL, "baolong18080.com") { return s.channelOne(ctx, orderItem, task) } diff --git a/internal/service/supplier/third_party/pool/card_sender/origin.go b/internal/service/supplier/third_party/pool/card_sender/origin.go index e2a6fc0..78ab2ed 100644 --- a/internal/service/supplier/third_party/pool/card_sender/origin.go +++ b/internal/service/supplier/third_party/pool/card_sender/origin.go @@ -118,7 +118,7 @@ func (s *SendCardTaskTypeOrigin) HandleSendCardTask(ctx context.Context, orderIt attribute.String("orderId", orderItem.OrderID), attribute.String("payUrl", orderItem.PayURL), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) if strings.Contains(orderItem.PayURL, "sgdemo.wotingwen.com") { if err := (&SendCardTaskTypeCareless{}).HandleSendCardTask(ctx, orderItem, task); err != nil { return err diff --git a/internal/service/supplier/third_party/pool/card_sender/sdpay.go b/internal/service/supplier/third_party/pool/card_sender/sdpay.go index c423c12..e30b07a 100644 --- a/internal/service/supplier/third_party/pool/card_sender/sdpay.go +++ b/internal/service/supplier/third_party/pool/card_sender/sdpay.go @@ -109,7 +109,7 @@ func (s *SendCardTaskTypeSdPay) HandleSendCardTask(ctx context.Context, orderIte attribute.String("cardNo", task.CardInfo.CardNo), attribute.String("cardPassword", task.CardInfo.Data), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) if strings.Contains(orderItem.PayURL, "121.40.59.64:8081") { return s.handleSendCardOne(ctx, orderItem, task, "http://121.40.59.64:8081") } diff --git a/internal/service/supplier/third_party/pool/card_sender/sesame.go b/internal/service/supplier/third_party/pool/card_sender/sesame.go index 4454372..4ebf6be 100644 --- a/internal/service/supplier/third_party/pool/card_sender/sesame.go +++ b/internal/service/supplier/third_party/pool/card_sender/sesame.go @@ -121,7 +121,7 @@ func (s *SendCardTaskTypeSesame) HandleSendCardTask(ctx context.Context, orderIt attribute.String("cardNo", task.CardInfo.CardNo), attribute.String("cardPassword", task.CardInfo.Data), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) if !strings.Contains(orderItem.PayURL, "/") { return errors.New("支付URL格式错误") } @@ -190,7 +190,7 @@ func (s *SendCardTaskTypeSesame) QueryOrder(ctx context.Context, orderItem Order attribute.String("cardNo", task.CardInfo.CardNo), attribute.String("cardPassword", task.CardInfo.Data), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) roadInfo := road.GetRoadInfoByRoadUid(ctx, orderItem.RoadUid) //查询当前订单 orderInfo := order.GetOrderByBankOrderId(ctx, task.LocalOrderID) diff --git a/internal/service/supplier/third_party/pool/card_sender/shanfu.go b/internal/service/supplier/third_party/pool/card_sender/shanfu.go index 3ef811c..4ce2793 100644 --- a/internal/service/supplier/third_party/pool/card_sender/shanfu.go +++ b/internal/service/supplier/third_party/pool/card_sender/shanfu.go @@ -99,7 +99,7 @@ func (s *SendCardTaskTypeShanfu) HandleSendCardTask(ctx context.Context, orderIt attribute.String("cardPassword", task.CardInfo.Data), attribute.String("orderId", orderItem.OrderID), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) // 提交卡密 req := httplib.NewBeegoRequestWithCtx(ctx, orderItem.PayURL, "POST"). diff --git a/internal/service/supplier/third_party/pool/card_sender/shengtian.go b/internal/service/supplier/third_party/pool/card_sender/shengtian.go index 7084ca0..4eacb30 100644 --- a/internal/service/supplier/third_party/pool/card_sender/shengtian.go +++ b/internal/service/supplier/third_party/pool/card_sender/shengtian.go @@ -141,7 +141,7 @@ func (s *SendCardTaskTypeShengtian) HandleSendCardTask(ctx context.Context, orde attribute.String("cardNo", task.CardInfo.CardNo), attribute.String("cardPassword", task.CardInfo.Data), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) queryUrl, err := url.Parse(orderItem.PayURL) if err != nil { @@ -212,7 +212,7 @@ func (s *SendCardTaskTypeShengtian) QueryOrder(ctx context.Context, orderItem Or attribute.String("cardNo", task.CardInfo.CardNo), attribute.String("cardPassword", task.CardInfo.Data), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) roadInfo := road.GetRoadInfoByRoadUid(ctx, orderItem.RoadUid) //查询当前订单 orderInfo := order.GetOrderByBankOrderId(ctx, task.LocalOrderID) diff --git a/internal/service/supplier/third_party/pool/card_sender/up.go b/internal/service/supplier/third_party/pool/card_sender/up.go index 8412de5..34799b5 100644 --- a/internal/service/supplier/third_party/pool/card_sender/up.go +++ b/internal/service/supplier/third_party/pool/card_sender/up.go @@ -35,7 +35,7 @@ func (s *SendCardTaskTypeUp) CreateOrder(ctx context.Context, roadUid string, fa attribute.String("roadUid", roadUid), attribute.Float64("faceValue", faceValue), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) orderPoolItem := OrderPoolItem{} roadInfo := road.GetRoadInfoByRoadUid(ctx, roadUid) @@ -105,7 +105,7 @@ func (s *SendCardTaskTypeUp) HandleSendCardTask(ctx context.Context, orderItem O attribute.String("cardPassword", task.CardInfo.Data), attribute.String("orderId", orderItem.OrderID), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) if strings.Contains(orderItem.PayURL, "sgdemo.wotingwen.com") { if err := (&SendCardTaskTypeCareless{}).HandleSendCardTask(ctx, orderItem, task); err != nil { diff --git a/internal/service/supplier/third_party/pool/card_sender/wan_xin.go b/internal/service/supplier/third_party/pool/card_sender/wan_xin.go index 43e9ddd..8bdee22 100644 --- a/internal/service/supplier/third_party/pool/card_sender/wan_xin.go +++ b/internal/service/supplier/third_party/pool/card_sender/wan_xin.go @@ -99,7 +99,7 @@ func (s *SendCardTaskTypeWanXin) HandleSendCardTask(ctx context.Context, orderIt attribute.String("cardPassword", task.CardInfo.Data), attribute.String("orderId", orderItem.OrderID), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) // 解析 forwardUrl, err := url.Parse(orderItem.PayURL) if err != nil { diff --git a/internal/service/supplier/third_party/pool/card_sender/wowspay.go b/internal/service/supplier/third_party/pool/card_sender/wowspay.go index 200379e..df53fbf 100644 --- a/internal/service/supplier/third_party/pool/card_sender/wowspay.go +++ b/internal/service/supplier/third_party/pool/card_sender/wowspay.go @@ -33,7 +33,7 @@ func (s *SendCardTaskTypeWowsPay) CreateOrder(ctx context.Context, roadUid strin trace.WithAttributes(attribute.Float64("roadUid", faceValue)), trace.WithAttributes(attribute.String("roadUid", roadUid)), ) - defer span.End() + defer otelTrace.SafeEndSpan(span) roadInfo := road.GetRoadInfoByRoadUid(ctx, roadUid) cfg := new(config.Config) @@ -115,7 +115,7 @@ func (s *SendCardTaskTypeWowsPay) HandleSendCardTask(ctx context.Context, orderI trace.WithAttributes(attribute.String("orderItem", convertor.ToString(orderItem))), trace.WithAttributes(attribute.String("task", convertor.ToString(task))), ) - defer span.End() + defer otelTrace.SafeEndSpan(span) mmUrl, err := url.Parse(orderItem.PayURL) if err != nil { diff --git a/internal/service/supplier/third_party/pool/card_sender/wtr.go b/internal/service/supplier/third_party/pool/card_sender/wtr.go index 84dac26..e005e50 100644 --- a/internal/service/supplier/third_party/pool/card_sender/wtr.go +++ b/internal/service/supplier/third_party/pool/card_sender/wtr.go @@ -109,7 +109,7 @@ func (s *SendCardTaskTypeWtr) HandleSendCardTask(ctx context.Context, orderItem attribute.String("cardPassword", task.CardInfo.Data), attribute.String("orderId", orderItem.OrderID), )) - defer span.End() + defer otelTrace.SafeEndSpan(span) queryOrderId := "" pathSchemas := strings.Split(orderItem.PayURL, "/") diff --git a/internal/service/supplier/third_party/pool/service.go b/internal/service/supplier/third_party/pool/service.go index f423ec2..2a3fc6b 100644 --- a/internal/service/supplier/third_party/pool/service.go +++ b/internal/service/supplier/third_party/pool/service.go @@ -362,7 +362,7 @@ func (s *OrderPoolServiceImpl) matchOrders(ctx context.Context) { // matchOrdersForFaceValue 处理单个面值的订单匹配 func (s *OrderPoolServiceImpl) matchOrdersForFaceValue(ctx context.Context, channel card_sender.SendCardTaskEnum, roadUid string, faceValue float64) { ctx, span := otelTrace.CreateAsyncContext(ctx, "matchOrdersForFaceValue") - defer span.End() + defer otelTrace.SafeEndSpan(span) // 获取用户订单池中的订单 customerKey := fmt.Sprintf("%s:%s:%.2f", s.config.CustomerOrderPoolKey, roadUid, faceValue) @@ -587,7 +587,7 @@ func (s *OrderPoolServiceImpl) SubmitOrder(ctx context.Context, task card_sender attribute.String("localOrderId", task.LocalOrderID), ), ) - defer span.End() + defer otelTrace.SafeEndSpan(span) var err error var orderItem card_sender.OrderPoolItem diff --git a/internal/service/supplier/third_party/pool/task.go b/internal/service/supplier/third_party/pool/task.go index efc2be2..df2937d 100644 --- a/internal/service/supplier/third_party/pool/task.go +++ b/internal/service/supplier/third_party/pool/task.go @@ -104,7 +104,7 @@ type RefreshOrderTask struct { func (t *RefreshOrderTask) Execute(ctx context.Context) error { ctx, span := otelTrace.CreateLinkContext(ctx, "RefreshOrderTask") - defer span.End() + defer otelTrace.SafeEndSpan(span) key := fmt.Sprintf("%s:%s:%.2f", t.service.config.ProduceOrderPoolKey, t.roadUid, t.faceValue) order, err2 := t.channel.GetSendCardTaskType().CreateOrder(ctx, t.roadUid, t.faceValue) span.AddEvent("endCreated", trace.WithTimestamp(time.Now()))