Upgrade to boot 2.0.0.M7

- Fix monitoring sample for changes.
- Fixes #450
This commit is contained in:
Janne Valkealahti
2017-11-30 09:24:44 +00:00
parent 4467e58fd9
commit f0b27cde10
3 changed files with 8 additions and 4 deletions

View File

@@ -1,7 +1,7 @@
buildscript {
ext {
log4jVersion = '1.2.17'
springBootVersion = '2.0.0.M6'
springBootVersion = '2.0.0.M7'
eclipsePersistenceVersion = '2.1.1'
kryoVersion = '3.0.3'
springCloudClusterVersion = '1.0.2.RELEASE'

View File

@@ -9,3 +9,7 @@ endpoints:
default:
web:
enabled: true
management:
endpoints:
web:
expose: metrics,trace

View File

@@ -82,10 +82,10 @@ public class MonitoringTests {
perform(get("/state").param("events", "E1")).
andExpect(status().isOk());
mvc.
perform(get("/application/metrics")).
perform(get("/actuator/metrics")).
andExpect(jsonPath("$.names", hasItems("ssm.transition.duration", "ssm.transition.transit")));
mvc.
perform(get("/application/metrics/ssm.transition.transit")).
perform(get("/actuator/metrics/ssm.transition.transit")).
andDo(print()).
andExpect(jsonPath("$.name", is("ssm.transition.transit"))).
andExpect(jsonPath("$.measurements[0].value", notNullValue())).
@@ -99,7 +99,7 @@ public class MonitoringTests {
perform(get("/state")).
andExpect(status().isOk());
mvc.
perform(get("/application/trace")).
perform(get("/actuator/trace")).
andExpect(jsonPath("$.traces.*.info.transition", containsInAnyOrder("INITIAL_S1")));
}