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

Merge branch 'master' into 2.0.x

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-10-18 19:04:22 +02:00
parent 0439a7c7b0 c3f8c2d8e5
commit 16220f6df8
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-sleuth-stream/src/main/java/org/springframework/cloud/sleuth/stream/ServerPropertiesHostLocator.java
View File

@@ -25,7 +25,6 @@ import org.springframework.boot.web.servlet.context.ServletWebServerInitializedE
import org.springframework.cloud.commons.util.InetUtils;
import org.springframework.cloud.commons.util.InetUtilsProperties;
import org.springframework.cloud.sleuth.Span;
import org.springframework.context.EnvironmentAware;
import org.springframework.context.event.EventListener;
import org.springframework.core.env.Environment;
import org.springframework.util.StringUtils;
@@ -44,7 +43,7 @@ import org.springframework.util.StringUtils;
* @author Dave Syer
* @since 1.0.0
*/
public class ServerPropertiesHostLocator implements HostLocator, EnvironmentAware {
public class ServerPropertiesHostLocator implements HostLocator {
private static final Log log = LogFactory.getLog(MethodHandles.lookup().lookupClass());
private static final String IP_ADDRESS_PROP_NAME = "spring.cloud.client.ipAddress";
@@ -52,8 +51,8 @@ public class ServerPropertiesHostLocator implements HostLocator, EnvironmentAwar
private final ServerProperties serverProperties; // Nullable
private final InetUtils inetUtils;
private final ZipkinProperties zipkinProperties;
private final Environment environment;
private Integer port; // Lazy assigned
private Environment environment;
public ServerPropertiesHostLocator(ServerProperties serverProperties,
Environment environment, ZipkinProperties zipkinProperties, InetUtils inetUtils) {
@@ -124,9 +123,4 @@ public class ServerPropertiesHostLocator implements HostLocator, EnvironmentAwar
}
return serviceName;
}
@Override
public void setEnvironment(Environment environment) {
this.environment = environment;
}
}