Always overwrite event.Transaction.Message when isMessaging

carsonip · Jan 26, 2024 · bb8d9f9 · bb8d9f9
1 parent bd314dd
commit bb8d9f9
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/input/otlp/traces.go b/input/otlp/traces.go
@@ -252,6 +252,7 @@ func TranslateTransaction(
 	)
 
 	var isHTTP, isRPC, isMessaging bool
+	var messagingQueueName string
 
 	var samplerType, samplerParam pcommon.Value
 	attributes.Range(func(kDots string, v pcommon.Value) bool {
@@ -410,11 +411,8 @@ func TranslateTransaction(
 
 			// messaging.*
 			case "message_bus.destination", semconv.AttributeMessagingDestination:
-				if event.Transaction.Message == nil {
-					event.Transaction.Message = modelpb.MessageFromVTPool()
-				}
-				event.Transaction.Message.QueueName = stringval
 				isMessaging = true
+				messagingQueueName = stringval
 			case semconv.AttributeMessagingSystem:
 				isMessaging = true
 				modelpb.Labels(event.Labels).Set(k, stringval)
@@ -502,6 +500,14 @@ func TranslateTransaction(
 		}
 		event.Url = modelpb.ParseURL(httpURL, httpHost, httpScheme)
 	}
+	if isMessaging {
+		// Overwrite existing event.Transaction.Message
+		event.Transaction.Message = nil
+		if messagingQueueName != "" {
+			event.Transaction.Message = modelpb.MessageFromVTPool()
+			event.Transaction.Message.QueueName = messagingQueueName
+		}
+	}
 
 	if event.Client == nil && event.Source != nil {
 		event.Client = modelpb.ClientFromVTPool()