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

Merge branch '2.2.x'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-08-05 18:29:44 +02:00
parent 965d22ff08 f31df6b3e2
commit 3ecd34d9c2
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebFilter.java
View File

@@ -351,6 +351,14 @@ final class TraceWebFilter implements WebFilter, Ordered {
@Override
public boolean parseClientIpAndPort(Span span) {
boolean clientIpAndPortParsed = super.parseClientIpAndPort(span);
if (clientIpAndPortParsed) {
return true;
}
return resolveFromInetAddress(span);
}
private boolean resolveFromInetAddress(Span span) {
InetSocketAddress addr = delegate.getRemoteAddress();
if (addr == null) {
return false;

22
tests/spring-cloud-sleuth-instrumentation-webflux-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceWebFluxTests.java
View File

@@ -92,6 +92,11 @@ public class TraceWebFluxTests {
// then
thenNoSpanWasReported(spans, skippedPatternResponse, controller2);
// when (issue #1683)
response = whenRequestWithXForwardedForIsSent(port, "/api/fn/20");
// then
thenSpanWasReportedWithRemoteIpTags(spans, response);
// cleanup
context.close();
}
@@ -109,6 +114,15 @@ public class TraceWebFluxTests {
then(spans.get(0).name()).isEqualTo("GET /api/c2/{id}");
then(spans.get(0).tags()).containsEntry("mvc.controller.method", "successful")
.containsEntry("mvc.controller.class", "Controller2");
then(spans.get(0).remoteIp()).isEqualTo("127.0.0.1");
}
private void thenSpanWasReportedWithRemoteIpTags(TestSpanHandler spans,
ClientResponse response) {
Awaitility.await()
.untilAsserted(() -> then(response.statusCode().value()).isEqualTo(200));
then(spans).hasSize(1);
then(spans.get(0).remoteIp()).isEqualTo("203.0.113.195");
}
private void thenFunctionalSpanWasReportedWithTags(TestSpanHandler spans,
@@ -137,6 +151,14 @@ public class TraceWebFluxTests {
return exchange.block();
}
private ClientResponse whenRequestWithXForwardedForIsSent(int port, String path) {
Mono<ClientResponse> exchange = WebClient.create().get()
.uri("http://localhost:" + port + path)
.header("X-Forwarded-For", "203.0.113.195, 70.41.3.18, 150.172.238.178")
.exchange();
return exchange.block();
}
private ClientResponse whenRequestIsSentToSkippedPattern(int port) {
Mono<ClientResponse> exchange = WebClient.create().get()
.uri("http://localhost:" + port + "/skipped").exchange();