log exception along the message

GoogleCloudPlatform · Dec 16, 2024 · f9f6601 · f9f6601
1 parent 0d826d1
commit f9f6601
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/.../java/com/google/cloud/spring/pubsub/integration/inbound/PubSubInboundChannelAdapter.java b/.../java/com/google/cloud/spring/pubsub/integration/inbound/PubSubInboundChannelAdapter.java
@@ -24,8 +24,6 @@
 import com.google.cloud.spring.pubsub.support.GcpPubSubHeaders;
 import com.google.cloud.spring.pubsub.support.converter.ConvertedBasicAcknowledgeablePubsubMessage;
 import com.google.pubsub.v1.ProjectSubscriptionName;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.util.Map;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -177,14 +175,10 @@ private void logWarning(
     // so we explicitly log failure messages.
     // See https://github.com/spring-projects/spring-framework/issues/25162 for more info.
     if (re instanceof MessageDeliveryException messageDeliveryException) {
-      LOGGER.warn(messageDeliveryException.getFailedMessage());
+      LOGGER.warn(messageDeliveryException.getFailedMessage(), messageDeliveryException);
     } else {
-      LOGGER.warn(re.getMessage());
+      LOGGER.warn(re.getMessage(), re);
     }
-    // Log the stacktrace for troubleshoot.
-    StringWriter stringWriter = new StringWriter();
-    re.printStackTrace(new PrintWriter(stringWriter));
-    LOGGER.warn(stringWriter.toString());
   }
 
   private void addToHealthRegistry() {

diff --git a/.../com/google/cloud/spring/pubsub/integration/inbound/PubSubInboundChannelAdapterTests.java b/.../com/google/cloud/spring/pubsub/integration/inbound/PubSubInboundChannelAdapterTests.java
@@ -166,8 +166,10 @@ void testAckModeAuto_nacksWhenDownstreamProcessingFailsWhenContextShutdown(Captu
     verify(mockAcknowledgeableMessage, times(0)).ack();
 
     // original message handling exception
-    assertThat(capturedOutput).contains("failed; message nacked automatically").contains(EXCEPTION_MESSAGE);
-    assertThat(capturedOutput).contains("Caused by");
+    assertThat(capturedOutput)
+        .contains("failed; message nacked automatically")
+        .contains(EXCEPTION_MESSAGE)
+        .contains("Caused by");
   }
 
   @Test