Fix changes in micrometer

- Fixes #410
This commit is contained in:
Janne Valkealahti
2017-11-04 11:26:45 +00:00
parent be57d1a42e
commit 39f1e6e7ca
2 changed files with 4 additions and 4 deletions

View File

@@ -31,7 +31,6 @@ import org.springframework.util.ObjectUtils;
import io.micrometer.core.instrument.Counter;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.Timer;
import io.micrometer.core.instrument.stats.hist.Histogram;
/**
* Implementation of a {@link StateMachineMonitor} which converts monitoring
@@ -95,7 +94,7 @@ public class BootStateMachineMonitor<S, E> extends AbstractStateMachineMonitor<S
Timer.Builder builder = Timer.builder("ssm.transition.duration")
.tags("transitionName", transitionName)
.description("Timer of Transition");
builder.histogram(Histogram.percentilesTime());
builder.publishPercentileHistogram();
return builder;
}
@@ -112,7 +111,7 @@ public class BootStateMachineMonitor<S, E> extends AbstractStateMachineMonitor<S
Timer.Builder builder = Timer.builder("ssm.action.duration")
.tags("actionName", actionName)
.description("Timer of Action");
builder.histogram(Histogram.percentilesTime());
builder.publishPercentileHistogram();
return builder;
}

View File

@@ -17,6 +17,7 @@ package demo.monitoring;
import static org.hamcrest.CoreMatchers.hasItems;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.containsString;
@@ -87,7 +88,7 @@ public class MonitoringTests {
perform(get("/application/metrics/ssm.transition.transit")).
andDo(print()).
andExpect(jsonPath("$.name", is("ssm.transition.transit"))).
andExpect(jsonPath("$.measurements[0].value", is(2.0))).
andExpect(jsonPath("$.measurements[0].value", notNullValue())).
andExpect(jsonPath("$.availableTags[0].tag", is("transitionName"))).
andExpect(jsonPath("$.availableTags[0].values", hasItems("EXTERNAL_S1_S2","INITIAL_S1")));
}