Merge pull request spring-projects#44398 from typat

* pr/44398: Ensure StandardStackTracePrinter respects stacktrace.root configuration property Closes spring-projectsgh-44398
dmitrysulman · Feb 25, 2025 · 2ec99a7 · 2ec99a7
2 parents bde4fb0 + 9199fec
commit 2ec99a7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/...ain/java/org/springframework/boot/logging/structured/StructuredLoggingJsonProperties.java b/...ain/java/org/springframework/boot/logging/structured/StructuredLoggingJsonProperties.java
@@ -120,7 +120,7 @@ private boolean hasAnyOtherProperty() {
 		}
 
 		private StandardStackTracePrinter createStandardPrinter() {
-			StandardStackTracePrinter printer = (root() != Root.FIRST) ? StandardStackTracePrinter.rootFirst()
+			StandardStackTracePrinter printer = (root() == Root.FIRST) ? StandardStackTracePrinter.rootFirst()
 					: StandardStackTracePrinter.rootLast();
 			PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
 			printer = map.from(this::maxLength).to(printer, StandardStackTracePrinter::withMaximumLength);

diff --git a/...ava/org/springframework/boot/logging/structured/StructuredLoggingJsonPropertiesTests.java b/...ava/org/springframework/boot/logging/structured/StructuredLoggingJsonPropertiesTests.java
@@ -152,12 +152,11 @@ void createPrinterWhenStandardAppliesCustomizations() {
 				.withLineSeparator("\n");
 			String actual = TestException.withoutLineNumbers(printer.printStackTraceToString(exception));
 			assertThat(actual).isEqualToNormalizingNewlines("""
-					java.lang.RuntimeException: exception
-						at org.springframework.boot.logging.TestException.actualCreateException(TestException.java:NN)
-						at org.springframework.boot.logging.TestException.createException(TestException.java:NN)
-						... 2 filtered
-						Suppressed: java.lang.RuntimeException: supressed
-							at o...""");
+					java.lang.RuntimeException: root
+						at org.springframework.boot.logging.TestException.createTestException(TestException.java:NN)
+						at org.springframework.boot.logging.TestException$CreatorThread.run(TestException.java:NN)
+					Wrapped by: java.lang.RuntimeException: cause
+						at org.springframework.boot.log...""");
 		}
 
 		@Test
@@ -184,8 +183,7 @@ void createPrinterWhenClassNameInjectsConfiguredPrinter() {
 					true, null);
 			StackTracePrinter printer = properties.createPrinter();
 			String actual = TestException.withoutLineNumbers(printer.printStackTraceToString(exception));
-			assertThat(actual).isEqualTo("RuntimeExceptionexception!	at org.spr...");
-
+			assertThat(actual).isEqualTo("RuntimeExceptionroot!	at org.springfr...");
 		}
 
 		@Test