Fix send result header propagation and use raw message ID in observation

Author: jm0514

docs/src/main/asciidoc/sqs.adoc

@@ -324,6 +324,9 @@ For convenience, the `additionalInformation` parameters can be found as constant
 By default, Spring Cloud AWS SQS expects the message ID returned by SQS to be a valid UUID.
 If a non-UUID message ID is received, an error is thrown with instructions to enable non-UUID support.
 
+The raw provider message ID is always stored in the `Sqs_RawMessageId` header, regardless of whether UUID conversion is enabled or disabled.
+Access the raw ID via `MessageHeaderUtils.getRawMessageId(message)`.
+
 To enable non-UUID message ID support (e.g., for Yandex Message Queue or other SQS-compatible providers):
 
 [source,properties]
@@ -333,12 +336,10 @@ spring.cloud.aws.sqs.convert-message-id-to-uuid=false
 
 When disabled:
 
-* **Receive side**: The raw provider message ID is stored in the `Sqs_RawMessageId` header.
-  A deterministic UUID derived from the raw ID is used as the Spring `MessageHeaders.ID`.
-  Access the raw ID via `MessageHeaderUtils.getRawMessageId(message)`.
+* **Receive side**: A deterministic UUID derived from the raw ID is used as the Spring `MessageHeaders.ID`.
 * **Send side**: If the send response contains a non-UUID message ID,
   `SendResult.messageId()` returns a deterministic UUID and the raw ID is available
-  in `SendResult.additionalInformation()` under the `rawMessageId` key.
+  in the `SendResult.message()` headers.
 
 [[template-message-conversion]]
 ==== Template Message Conversion

spring-cloud-aws-sqs/src/main/java/io/awspring/cloud/sqs/operations/SqsTemplate.java

@@ -343,11 +343,13 @@ private <T> SendResult<T> createSendResult(String rawMessageId, @Nullable String
 		MessageHeaders resolvedHeaders = SqsMessageIdResolver.resolveAndAddMessageId(rawMessageId,
 				originalMessage.getHeaders(), this.convertMessageIdToUuid);
 		UUID messageId = resolvedHeaders.getId();
+		org.springframework.messaging.Message<T> messageWithHeaders = MessageBuilder.createMessage(
+				originalMessage.getPayload(), resolvedHeaders);
 		Map<String, Object> additionalInfo = new HashMap<>();
 		if (sequenceNumber != null) {
 			additionalInfo.put(SqsTemplateParameters.SEQUENCE_NUMBER_PARAMETER_NAME, sequenceNumber);
 		}
-		return new SendResult<>(messageId, endpointName, originalMessage,
+		return new SendResult<>(messageId, endpointName, messageWithHeaders,
 				additionalInfo.isEmpty() ? Collections.emptyMap() : additionalInfo);
 	}
 

spring-cloud-aws-sqs/src/main/java/io/awspring/cloud/sqs/support/converter/SqsMessageIdResolver.java

@@ -18,6 +18,7 @@
 import io.awspring.cloud.sqs.MessageHeaderUtils;
 import io.awspring.cloud.sqs.listener.SqsHeaders;
 import java.nio.charset.StandardCharsets;
+import java.util.Optional;
 import java.util.UUID;
 import org.springframework.messaging.MessageHeaders;
 import org.springframework.messaging.MessagingException;
@@ -53,8 +54,9 @@ public static MessageHeaders resolveAndAddMessageId(String messageId, MessageHea
 			boolean convertMessageIdToUuid) {
 		MessageHeaders withRawId = MessageHeaderUtils.addHeaderIfAbsent(headers, SqsHeaders.SQS_RAW_MESSAGE_ID_HEADER,
 				messageId);
-		if (isValidUuid(messageId)) {
-			return new MessagingMessageHeaders(withRawId, UUID.fromString(messageId));
+		Optional<UUID> uuid = tryParseUuid(messageId);
+		if (uuid.isPresent()) {
+			return new MessagingMessageHeaders(withRawId, uuid.get());
 		}
 		if (convertMessageIdToUuid) {
 			throw new MessagingException(String.format(
@@ -85,13 +87,12 @@ public static void configureMessageIdResolution(MessagingMessageConverter<Messag
 		}
 	}
 
-	private static boolean isValidUuid(String value) {
+	private static Optional<UUID> tryParseUuid(String value) {
 		try {
-			UUID.fromString(value);
-			return true;
+			return Optional.of(UUID.fromString(value));
 		}
 		catch (IllegalArgumentException e) {
-			return false;
+			return Optional.empty();
 		}
 	}
 

spring-cloud-aws-sqs/src/main/java/io/awspring/cloud/sqs/support/observation/AbstractListenerObservation.java

@@ -29,6 +29,7 @@
  * Observation for Message Listener Containers.
  *
  * @author Tomaz Fernandes
+ * @author Jeongmin Kim
  * @since 3.4
  */
 public abstract class AbstractListenerObservation {
@@ -234,7 +235,7 @@ protected Context(Message<?> message, String sourceName) {
 			super((carrier, key) -> carrier.getHeaders().get(key, String.class));
 			setCarrier(message);
 			this.message = message;
-			this.messageId = MessageHeaderUtils.getId(message);
+			this.messageId = MessageHeaderUtils.getRawMessageId(message);
 			this.sourceName = sourceName;
 		}