From 19ae79be7dc322acf1da548c380ee3a28166cd60 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 14 Feb 2018 16:24:17 +0100 Subject: [PATCH] Retreiving service instance URI directly; fixes gh-840 --- .../sleuth/zipkin/LoadBalancerClientZipkinLoadBalancer.java | 2 +- .../zipkin2/sender/LoadBalancerClientZipkinLoadBalancer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-sleuth-zipkin-legacy/src/main/java/org/springframework/cloud/sleuth/zipkin/LoadBalancerClientZipkinLoadBalancer.java b/spring-cloud-sleuth-zipkin-legacy/src/main/java/org/springframework/cloud/sleuth/zipkin/LoadBalancerClientZipkinLoadBalancer.java index fa9d68c43..c65c33156 100644 --- a/spring-cloud-sleuth-zipkin-legacy/src/main/java/org/springframework/cloud/sleuth/zipkin/LoadBalancerClientZipkinLoadBalancer.java +++ b/spring-cloud-sleuth-zipkin-legacy/src/main/java/org/springframework/cloud/sleuth/zipkin/LoadBalancerClientZipkinLoadBalancer.java @@ -23,7 +23,7 @@ class LoadBalancerClientZipkinLoadBalancer implements ZipkinLoadBalancer { String host = uri.getHost(); ServiceInstance instance = this.loadBalancerClient.choose(host); if (instance != null) { - return URI.create(String.format("http://%s:%s", instance.getHost(), instance.getPort())); + return instance.getUri(); } } return URI.create(this.zipkinProperties.getBaseUrl()); diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/LoadBalancerClientZipkinLoadBalancer.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/LoadBalancerClientZipkinLoadBalancer.java index 9ef97f125..7239f9693 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/LoadBalancerClientZipkinLoadBalancer.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/LoadBalancerClientZipkinLoadBalancer.java @@ -25,7 +25,7 @@ class LoadBalancerClientZipkinLoadBalancer implements ZipkinLoadBalancer { String host = uri.getHost(); ServiceInstance instance = this.loadBalancerClient.choose(host); if (instance != null) { - return URI.create(String.format("http://%s:%s", instance.getHost(), instance.getPort())); + return instance.getUri(); } } return URI.create(this.zipkinProperties.getBaseUrl());