From 389cb2488b16cdc896fe6aa95cfb7667943305c2 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 19 Feb 2021 08:39:00 +0100 Subject: [PATCH] Update spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/wavefront/WavefrontSleuthSpanHandler.java Co-authored-by: Jonatan Ivanov --- .../autoconfig/wavefront/WavefrontSleuthSpanHandler.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/wavefront/WavefrontSleuthSpanHandler.java b/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/wavefront/WavefrontSleuthSpanHandler.java index 6d0812bc1..33525b5d1 100644 --- a/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/wavefront/WavefrontSleuthSpanHandler.java +++ b/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/wavefront/WavefrontSleuthSpanHandler.java @@ -458,7 +458,9 @@ public final class WavefrontSleuthSpanHandler implements Runnable, Closeable { // https://github.com/wavefrontHQ/wavefront-proxy/blob/3dd1fa11711a04de2d9d418e2269f0f9fb464f36/proxy/src/main/java/com/wavefront/agent/listeners/tracing/ZipkinPortUnificationHandler.java#L324-L327 if (span.getLocalIp() != null) { - add(Pair.of("ipv4", span.getLocalIp())); // NOTE: this could be IPv6!! + String localIp = span.getLocalIp(); + String version = localIp.contains(":") ? "ipv6" : "ipv4"; + add(Pair.of(version, localIp)); } }