Skip to content

S
spring-cloud-netflix
Unverified Commit 9b1d3b36 by Spencer Gibb
Options

Uses default /actuator prefix for hystrix.stream

fixes gh-2784
parent 3ce65f69
Showing with 11 additions and 11 deletions
spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/SpringClusterMonitor.java
......@@ -51,7 +51,7 @@ public class SpringClusterMonitor extends AggregateClusterMonitor {
private final DynamicStringProperty defaultUrlClosureConfig = DynamicPropertyFactory
.getInstance().getStringProperty("turbine.instanceUrlSuffix",
"hystrix.stream");
"actuator/hystrix.stream");
private final DynamicBooleanProperty instanceInsertPort = DynamicPropertyFactory
.getInstance().getBooleanProperty("turbine.instanceInsertPort", true);
......
spring-cloud-netflix-turbine/src/test/java/org/springframework/cloud/netflix/turbine/CommonsInstanceDiscoveryTests.java
......@@ -55,7 +55,7 @@ public class CommonsInstanceDiscoveryTests {
assertEquals("securePort is wrong", String.valueOf(port), instance.getAttributes().get("securePort"));
String urlPath = SpringClusterMonitor.ClusterConfigBasedUrlClosure.getUrlPath(instance);
assertEquals("url is wrong", "https://"+hostName+":"+port+"/hystrix.stream", urlPath);
assertEquals("url is wrong", "https://"+hostName+":"+port+"/actuator/hystrix.stream", urlPath);
}
@Test
......@@ -71,7 +71,7 @@ public class CommonsInstanceDiscoveryTests {
assertEquals("port is wrong", String.valueOf(port), instance.getAttributes().get("port"));
String urlPath = SpringClusterMonitor.ClusterConfigBasedUrlClosure.getUrlPath(instance);
assertEquals("url is wrong", "http://"+hostName+":"+port+"/hystrix.stream", urlPath);
assertEquals("url is wrong", "http://"+hostName+":"+port+"/actuator/hystrix.stream", urlPath);
String clusterName = discovery.getClusterName(serviceInstance);
assertEquals("clusterName is wrong", appName, clusterName);
......@@ -97,7 +97,7 @@ public class CommonsInstanceDiscoveryTests {
assertEquals("port is wrong", String.valueOf(port), instance.getAttributes().get("port"));
String urlPath = SpringClusterMonitor.ClusterConfigBasedUrlClosure.getUrlPath(instance);
assertEquals("url is wrong", "http://"+hostName+":"+port+"/hystrix.stream", urlPath);
assertEquals("url is wrong", "http://"+hostName+":"+port+"/actuator/hystrix.stream", urlPath);
}
@Test
......@@ -113,7 +113,7 @@ public class CommonsInstanceDiscoveryTests {
assertEquals("port is wrong", String.valueOf(managementPort), instance.getAttributes().get("port"));
String urlPath = SpringClusterMonitor.ClusterConfigBasedUrlClosure.getUrlPath(instance);
assertEquals("url is wrong", "http://"+hostName+":"+managementPort+"/hystrix.stream", urlPath);
assertEquals("url is wrong", "http://"+hostName+":"+managementPort+"/actuator/hystrix.stream", urlPath);
}
@Test
......@@ -129,7 +129,7 @@ public class CommonsInstanceDiscoveryTests {
assertEquals("securePort is wrong", String.valueOf(port), instance.getAttributes().get("securePort"));
String urlPath = SpringClusterMonitor.ClusterConfigBasedUrlClosure.getUrlPath(instance);
assertEquals("url is wrong", "https://"+hostName+":"+port+"/hystrix.stream", urlPath);
assertEquals("url is wrong", "https://"+hostName+":"+port+"/actuator/hystrix.stream", urlPath);
}
@Test
......
spring-cloud-netflix-turbine/src/test/java/org/springframework/cloud/netflix/turbine/EurekaInstanceDiscoveryTests.java
......@@ -62,7 +62,7 @@ public class EurekaInstanceDiscoveryTests {
assertEquals("securePort is wrong", String.valueOf(securePort), instance.getAttributes().get("securePort"));
String urlPath = SpringClusterMonitor.ClusterConfigBasedUrlClosure.getUrlPath(instance);
assertEquals("url is wrong", "https://"+hostName+":"+securePort+"/hystrix.stream", urlPath);
assertEquals("url is wrong", "https://"+hostName+":"+securePort+"/actuator/hystrix.stream", urlPath);
}
@Test
......@@ -82,7 +82,7 @@ public class EurekaInstanceDiscoveryTests {
assertEquals("port is wrong", String.valueOf(port), instance.getAttributes().get("port"));
String urlPath = SpringClusterMonitor.ClusterConfigBasedUrlClosure.getUrlPath(instance);
assertEquals("url is wrong", "http://"+hostName+":"+port+"/hystrix.stream", urlPath);
assertEquals("url is wrong", "http://"+hostName+":"+port+"/actuator/hystrix.stream", urlPath);
String clusterName = discovery.getClusterName(instanceInfo);
assertEquals("clusterName is wrong", appName.toUpperCase(), clusterName);
......@@ -106,7 +106,7 @@ public class EurekaInstanceDiscoveryTests {
String urlPath = SpringClusterMonitor.ClusterConfigBasedUrlClosure.getUrlPath(instance);
assertEquals("url is wrong",
"http://" + hostName + ":" + managementPort + "/hystrix.stream", urlPath);
"http://" + hostName + ":" + managementPort + "/actuator/hystrix.stream", urlPath);
String clusterName = discovery.getClusterName(instanceInfo);
assertEquals("clusterName is wrong", appName.toUpperCase(), clusterName);
......@@ -137,7 +137,7 @@ public class EurekaInstanceDiscoveryTests {
assertEquals("port is wrong", String.valueOf(port), instance.getAttributes().get("port"));
String urlPath = SpringClusterMonitor.ClusterConfigBasedUrlClosure.getUrlPath(instance);
assertEquals("url is wrong", "http://"+hostName+":"+port+"/hystrix.stream", urlPath);
assertEquals("url is wrong", "http://"+hostName+":"+port+"/actuator/hystrix.stream", urlPath);
}
@Test
......@@ -159,7 +159,7 @@ public class EurekaInstanceDiscoveryTests {
assertEquals("securePort is wrong", String.valueOf(securePort), instance.getAttributes().get("securePort"));
String urlPath = SpringClusterMonitor.ClusterConfigBasedUrlClosure.getUrlPath(instance);
assertEquals("url is wrong", "https://"+hostName+":"+securePort+"/hystrix.stream", urlPath);
assertEquals("url is wrong", "https://"+hostName+":"+securePort+"/actuator/hystrix.stream", urlPath);
}
@Test
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment