Skip to content

Commit 1485ba1

Browse files
committed
Fixing broken tests
1 parent 9a840e9 commit 1485ba1

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

micrometer-core/src/main/java/io/micrometer/core/aop/TimedAspect.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,12 @@ private Timer.Builder recordBuilder(ProceedingJoinPoint pjp, Timed timed, String
258258
.tags(EXCEPTION_TAG, exceptionClass)
259259
.tags(tagsBasedOnJoinPoint.apply(pjp))
260260
.publishPercentileHistogram(timed.histogram())
261-
.serviceLevelObjectives((Duration[]) Arrays.stream(timed.serviceLevelObjectives())
262-
.mapToObj(s -> Duration.ofNanos((long) TimeUtils.secondsToUnit(s, TimeUnit.NANOSECONDS)))
263-
.toArray());
261+
.serviceLevelObjectives(timed.serviceLevelObjectives().length > 0 ?
262+
(Duration[]) Arrays.stream(timed.serviceLevelObjectives())
263+
.mapToObj(s -> Duration.ofNanos((long) TimeUtils.secondsToUnit(s, TimeUnit.NANOSECONDS)))
264+
.toArray()
265+
: null
266+
);
264267

265268
if (meterTagAnnotationHandler != null) {
266269
meterTagAnnotationHandler.addAnnotatedParameters(builder, pjp);

micrometer-core/src/main/java/io/micrometer/core/instrument/Timer.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,12 @@ static Builder builder(Timed timed, String defaultName) {
102102
.description(timed.description().isEmpty() ? null : timed.description())
103103
.publishPercentileHistogram(timed.histogram())
104104
.publishPercentiles(timed.percentiles().length > 0 ? timed.percentiles() : null)
105-
.serviceLevelObjectives((Duration[]) Arrays.stream(timed.serviceLevelObjectives())
106-
.mapToObj(s -> Duration.ofNanos((long) TimeUtils.secondsToUnit(s, TimeUnit.NANOSECONDS)))
107-
.toArray());
105+
.serviceLevelObjectives(timed.serviceLevelObjectives().length > 0 ?
106+
(Duration[]) Arrays.stream(timed.serviceLevelObjectives())
107+
.mapToObj(s -> Duration.ofNanos((long) TimeUtils.secondsToUnit(s, TimeUnit.NANOSECONDS)))
108+
.toArray()
109+
: null
110+
);
108111
}
109112

110113
/**

0 commit comments

Comments
 (0)