diff --git a/db/kafka/carrier.go b/db/kafka/carrier.go new file mode 100644 index 0000000..e1b6ee5 --- /dev/null +++ b/db/kafka/carrier.go @@ -0,0 +1,41 @@ +package kafka + +import ( + "context" + "github.com/IBM/sarama" + "go.opentelemetry.io/otel" + "go.opentelemetry.io/otel/propagation" +) + +type Carrier struct { +} + +func NewCarrier() *Carrier { + return &Carrier{} +} + +func (c *Carrier) Inject(ctx context.Context) []sarama.RecordHeader { + headers := make([]sarama.RecordHeader, 0) + carrier := propagation.MapCarrier{} + otel.GetTextMapPropagator().Inject(ctx, carrier) + for k, v := range carrier { + headers = append(headers, sarama.RecordHeader{Key: []byte(k), Value: []byte(v)}) + } + return headers +} + +func (c *Carrier) ExtractConsumer(headers []*sarama.RecordHeader) context.Context { + carrier := propagation.MapCarrier{} + for _, header := range headers { + carrier[string(header.Key)] = string(header.Value) + } + return otel.GetTextMapPropagator().Extract(context.Background(), carrier) +} + +func (c *Carrier) ExtractProducer(headers []sarama.RecordHeader) context.Context { + carrier := propagation.MapCarrier{} + for _, header := range headers { + carrier[string(header.Key)] = string(header.Value) + } + return otel.GetTextMapPropagator().Extract(context.Background(), carrier) +} diff --git a/db/kafka/consumer.go b/db/kafka/consumer.go index 0b9367d..98c573d 100644 --- a/db/kafka/consumer.go +++ b/db/kafka/consumer.go @@ -10,7 +10,6 @@ import ( "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" otelcodes "go.opentelemetry.io/otel/codes" - "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/trace" "time" ) @@ -63,11 +62,7 @@ func (h *handler) Cleanup(sess sarama.ConsumerGroupSession) error { func (h *handler) ConsumeClaim(sess sarama.ConsumerGroupSession, claim sarama.ConsumerGroupClaim) error { for message := range claim.Messages() { - carrier := propagation.MapCarrier{} - for _, header := range message.Headers { - carrier[string(header.Key)] = string(header.Value) - } - ctx := otel.GetTextMapPropagator().Extract(context.Background(), carrier) + ctx := NewCarrier().ExtractConsumer(message.Headers) _, span := otel.Tracer(client.serverName).Start(ctx, "kafka.consume") if err := h.handler(ctx, message); err != nil { if stack, ok := err.(interface{ StackTrace() string }); ok { diff --git a/db/kafka/producer.go b/db/kafka/producer.go index 9f5e7d5..96f0a39 100644 --- a/db/kafka/producer.go +++ b/db/kafka/producer.go @@ -2,10 +2,9 @@ package kafka import ( "context" - "git.hlsq.asia/mmorpg/service-common/log" "github.com/IBM/sarama" "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/propagation" + otelcodes "go.opentelemetry.io/otel/codes" ) func NewProducer() *Producer { @@ -19,19 +18,16 @@ func (c *Producer) Produce(ctx context.Context, topic, value string) { msg := &sarama.ProducerMessage{ Topic: topic, Value: sarama.StringEncoder(value), - Headers: make([]sarama.RecordHeader, 0), - } - // 注入链路信息 - carrier := propagation.MapCarrier{} - otel.GetTextMapPropagator().Inject(ctx, carrier) - for k, v := range carrier { - msg.Headers = append(msg.Headers, sarama.RecordHeader{Key: []byte(k), Value: []byte(v)}) + Headers: NewCarrier().Inject(ctx), } client.producer.Input() <- msg } func producerError() { for err := range client.producer.Errors() { - log.Errorf("kafka producer error: %v", err) + ctx := NewCarrier().ExtractProducer(err.Msg.Headers) + _, span := otel.Tracer(client.serverName).Start(ctx, "kafka.producer") + span.SetStatus(otelcodes.Error, err.Error()) + span.End() } }