SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added support for Tomcat's Valve; fixes gh-1329

Browse Source
This commit is contained in:
Marcin Grzejszczak
2021-05-20 18:55:07 +02:00
parent c1bf0fb5db
commit 2dd82624e5
12 changed files with 375 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/brave/spring-cloud-sleuth-instrumentation-mvc-tests/src/test/java/org/springframework/cloud/sleuth/brave/instrument/web/TraceFilterWebIntegrationTests.java
View File

@@ -117,7 +117,7 @@ public class TraceFilterWebIntegrationTests {
}
@Test
public void exception_logging_span_handler_logs_synchronous_exceptions(CapturedOutput capture) {
public void should_instrument_logs_for_tomcat_entries(CapturedOutput capture) {
try {
new RestTemplate().getForObject("http://localhost:" + port() + "/", String.class);
BDDAssertions.fail("should fail due to runtime exception");
@@ -127,7 +127,7 @@ public class TraceFilterWebIntegrationTests {
then(this.currentTraceContext.get()).isNull();
MutableSpan fromFirstTraceFilterFlow = spanHandler.takeRemoteSpanWithErrorMessage(Kind.SERVER,
"Request processing failed; nested exception is java.lang.RuntimeException: Throwing exception");
"Throwing exception");
then(fromFirstTraceFilterFlow.tags()).containsEntry("http.method", "GET").containsEntry("mvc.controller.class",
"BasicErrorController");
// Trace IDs in logs: issue#714
@@ -137,7 +137,7 @@ public class TraceFilterWebIntegrationTests {
private void thenLogsForExceptionLoggingFilterContainTracingInformation(CapturedOutput capture, String hex) {
String[] split = capture.toString().split("\n");
List<String> list = Arrays.stream(split).filter(s -> s.contains("Uncaught exception thrown"))
List<String> list = Arrays.stream(split).filter(s -> s.contains("Servlet.service() for servlet"))
.filter(s -> s.contains(hex + "," + hex + "]")).collect(Collectors.toList());
then(list).isNotEmpty();
}