feat: use semconv v1.26.0

acknowledger.go

@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"go.opentelemetry.io/otel/codes"
+	semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
 	"go.opentelemetry.io/otel/trace"
 
 	"github.com/rabbitmq/amqp091-go"
@@ -19,9 +20,9 @@ type acknowledger struct {
 func (a *acknowledger) Ack(tag uint64, multiple bool) error {
 	err := a.acker.Ack(tag, multiple)
 	if multiple {
-		a.endMultiple(tag, codes.Ok, "", err)
+		a.endMultiple(tag, codes.Ok, "ack", err)
 	} else {
-		a.endOne(tag, codes.Ok, "", err)
+		a.endOne(tag, codes.Ok, "ack", err)
 	}
 	return err
 }
@@ -47,6 +48,7 @@ func (a *acknowledger) endMultiple(lastTag uint64, code codes.Code, desc string,
 	defer a.ch.m.Unlock()
 
 	for tag, span := range a.ch.spanMap {
+		span.SetAttributes(semconv.MessagingOperationName(desc))
 		if tag <= lastTag {
 			if err != nil {
 				span.RecordError(err)
@@ -62,6 +64,7 @@ func (a *acknowledger) endOne(tag uint64, code codes.Code, desc string, err erro
 	a.ch.m.Lock()
 	defer a.ch.m.Unlock()
 
+	a.span.SetAttributes(semconv.MessagingOperationName(desc))
 	if err != nil {
 		a.span.RecordError(err)
 	}

channel.go

@@ -7,15 +7,14 @@
 
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
-	semconv "go.opentelemetry.io/otel/semconv/v1.25.0"
+	semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
 	"go.opentelemetry.io/otel/trace"
 
 	"github.com/rabbitmq/amqp091-go"
 )
 
 const (
 	netProtocolVer = "0.9.1"
-	messageSystem  = "rabbitmq"
 )
 
 func queueAnonymous(queue string) bool {
@@ -87,12 +86,11 @@
 	attrs := []attribute.KeyValue{
 		operation,
 		semconv.MessagingDestinationAnonymous(queueAnonymous(queue)),
-		// fixme messaging.destination.name MUST be set to the name of the exchange.
 		semconv.MessagingDestinationName(queue),
 		semconv.MessagingDestinationPublishAnonymous(msg.Exchange == ""),
 		semconv.MessagingDestinationPublishName(msg.Exchange),
+		// todo messaging.client.id
 		semconv.MessagingRabbitmqDestinationRoutingKey(msg.RoutingKey),
-		// todo messaging.client_id
 	}
 	if msg.MessageCount != 0 {
 		attrs = append(attrs, semconv.MessagingBatchMessageCount(int(msg.MessageCount)))
@@ -136,7 +134,7 @@
 	newDeliveries := make(chan amqp091.Delivery)
 	go func() {
 		for msg := range deliveries {
-			ch.startConsumerSpan(&msg, queue, semconv.MessagingOperationDeliver)
+			ch.startConsumerSpan(&msg, queue, semconv.MessagingOperationTypeDeliver)
 			newDeliveries <- msg
 		}
 		close(newDeliveries)
@@ -156,11 +154,12 @@
 ) (*amqp091.DeferredConfirmation, error) {
 	// Create a span.
 	attrs := []attribute.KeyValue{
-		semconv.MessagingOperationPublish,
+		semconv.MessagingOperationTypePublish,
+		semconv.MessagingOperationName("send"),
 		semconv.MessagingDestinationAnonymous(exchange == ""),
 		semconv.MessagingDestinationName(exchange),
+		// todo messaging.client.id
 		semconv.MessagingRabbitmqDestinationRoutingKey(key),
-		// todo messaging.client_id
 	}
 	if msg.CorrelationId != "" {
 		attrs = append(attrs, semconv.MessagingMessageConversationID(msg.CorrelationId))
@@ -194,6 +193,6 @@
 	if err != nil || !ok {
 		return
 	}
-	ch.startConsumerSpan(&msg, queue, semconv.MessagingOperationReceive)
+	ch.startConsumerSpan(&msg, queue, semconv.MessagingOperationTypeReceive)
 	return msg, ok, err
 }