feat: trace when sending notidy

Author: setcy

notify/notify.go

@@ -1,8 +1,11 @@
 package notify
 
 import (
+	"context"
 	"errors"
 	"github.com/parnurzeal/gorequest"
+	"go.opentelemetry.io/otel"
+	"go.opentelemetry.io/otel/propagation"
 	"sync"
 )
 
@@ -53,6 +56,7 @@ type SendResult struct {
 }
 
 type Template struct {
+	ctx      context.Context
 	StaffID  []string            `json:"StaffID"`
 	WeChat   *WeChatNoticeBody   `json:"template,omitempty"`
 	DingTalk *DingTalkNoticeBody `json:"dingtalk,omitempty"`
@@ -63,6 +67,11 @@ func New() *Template {
 	return &Template{}
 }
 
+func (t *Template) WithContext(ctx context.Context) *Template {
+	t.ctx = ctx
+	return t
+}
+
 func (t *Template) Receiver(staffId ...string) *Template {
 	t.StaffID = append(t.StaffID, staffId...)
 	return t
@@ -95,8 +104,12 @@ func (t *Template) Send() error {
 
 	notifier := notifierPool.Get().(*gorequest.SuperAgent)
 	defer notifierPool.Put(notifier)
-	_, _, errs := notifier.Send(t).EndStruct(result)
 
+	// Add tracing information to the request header.
+	propagator := otel.GetTextMapPropagator()
+	propagator.Inject(t.ctx, propagation.HeaderCarrier(notifier.Header))
+
+	_, _, errs := notifier.Send(t).EndStruct(result)
 	if errs != nil || result.Msg != "success" || result.Data.Failed != 0 {
 		return errors.New("send notify failed")
 	}

transfer/option.go

@@ -2,7 +2,6 @@ package transfer
 
 import (
 	"github.com/pkg/errors"
-	"go.opentelemetry.io/otel/propagation"
 	"log"
 	"net"
 	"net/url"
@@ -52,15 +51,3 @@ func (s Cache) apply(request *Request) {
 		request.SuperAgent.Header.Del("x-hduhelp-cache")
 	}
 }
-
-type PropagatorManager struct {
-	propagator propagation.TextMapPropagator
-}
-
-func WithPropagator(propagator propagation.TextMapPropagator) interface{ apply() } {
-	return PropagatorManager{propagator: propagator}
-}
-
-func (p PropagatorManager) apply() {
-	instance.propagator = p.propagator
-}

transfer/service.go

@@ -1,10 +1,5 @@
 package transfer
 
-import (
-	"go.opentelemetry.io/otel"
-	"go.opentelemetry.io/otel/propagation"
-)
-
 var instance *Server
 
 type Server struct {
@@ -13,8 +8,6 @@ type Server struct {
 	endpoint string
 
 	debug bool
-
-	propagator propagation.TextMapPropagator
 }
 
 func Init(appID, appKey string, options ...interface {
@@ -38,10 +31,3 @@ func defaultServer() *Server {
 		endpoint: "https://api.hduhelp.com/transfer",
 	}
 }
-
-func (s *Server) getPropagator() propagation.TextMapPropagator {
-	if s.propagator == nil {
-		return otel.GetTextMapPropagator()
-	}
-	return s.propagator
-}

transfer/transfer.go

@@ -141,7 +141,7 @@ func (r *Request) EndStruct(data interface{}) error {
 	defer span.End()
 
 	r.make() // 会把 SuperAgent 清空
-	instance.getPropagator().Inject(newCtx, propagation.HeaderCarrier(r.SuperAgent.Header))
+	otel.GetTextMapPropagator().Inject(newCtx, propagation.HeaderCarrier(r.SuperAgent.Header))
 
 	var bytes []byte
 	r.ResponseData = new(Response)