Skip to content

Commit 5e6113c

Browse files
committed
Return value of aspect-timed method is Nullable
It can cause issues in Kotlin for this to be incorrectly marked as `@NonNullApi`. Closes gh-3041
1 parent 2f0ea45 commit 5e6113c

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import io.micrometer.core.instrument.Timer;
2525
import io.micrometer.core.instrument.Metrics;
2626
import io.micrometer.core.lang.NonNullApi;
27+
import io.micrometer.core.lang.Nullable;
2728
import org.aspectj.lang.ProceedingJoinPoint;
2829
import org.aspectj.lang.annotation.Around;
2930
import org.aspectj.lang.annotation.Aspect;
@@ -151,6 +152,7 @@ public TimedAspect(MeterRegistry registry, Function<ProceedingJoinPoint, Iterabl
151152
}
152153

153154
@Around("execution (@io.micrometer.core.annotation.Timed * *.*(..))")
155+
@Nullable
154156
public Object timedMethod(ProceedingJoinPoint pjp) throws Throwable {
155157
if (shouldSkip.test(pjp)) {
156158
return pjp.proceed();

0 commit comments

Comments
 (0)