WIP migrate micrometer-core to jSpecify

There are still a number of NullAway errors to take care of, but I'm committing the work-in-progress.

Author: shakuzen

docs/src/test/java/io/micrometer/docs/metrics/SpelValueExpressionResolver.java

@@ -16,10 +16,10 @@
 package io.micrometer.docs.metrics;
 
 import io.micrometer.common.annotation.ValueExpressionResolver;
-import io.micrometer.common.lang.NonNull;
-import io.micrometer.common.lang.Nullable;
 import io.micrometer.common.util.internal.logging.InternalLogger;
 import io.micrometer.common.util.internal.logging.InternalLoggerFactory;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 import org.springframework.expression.Expression;
 import org.springframework.expression.ExpressionParser;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
@@ -29,9 +29,8 @@ class SpelValueExpressionResolver implements ValueExpressionResolver {
 
     private static final InternalLogger log = InternalLoggerFactory.getInstance(SpelValueExpressionResolver.class);
 
-    @NonNull
     @Override
-    public String resolve(@NonNull String expression, @Nullable Object parameter) {
+    public @NonNull String resolve(@NonNull String expression, @Nullable Object parameter) {
         try {
             SimpleEvaluationContext context = SimpleEvaluationContext.forReadOnlyDataBinding().build();
             ExpressionParser expressionParser = new SpelExpressionParser();

implementations/micrometer-registry-statsd/src/test/java/io/micrometer/statsd/StatsdMeterRegistryPublishTest.java

@@ -15,7 +15,6 @@
  */
 package io.micrometer.statsd;
 
-import io.micrometer.common.lang.Nullable;
 import io.micrometer.core.Issue;
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.Counter;
@@ -25,6 +24,7 @@
 import io.netty.channel.unix.DomainSocketAddress;
 import io.netty.handler.logging.LogLevel;
 import io.netty.handler.logging.LoggingHandler;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.params.ParameterizedTest;

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

@@ -17,14 +17,14 @@
 
 import io.micrometer.common.KeyValue;
 import io.micrometer.common.lang.NonNullApi;
-import io.micrometer.common.lang.Nullable;
 import io.micrometer.common.util.internal.logging.WarnThenDebugLogger;
 import io.micrometer.core.annotation.Counted;
 import io.micrometer.core.instrument.*;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.jspecify.annotations.Nullable;
 
 import java.lang.reflect.Method;
 import java.util.concurrent.CompletionStage;
@@ -189,8 +189,7 @@ private Function<ProceedingJoinPoint, Iterable<Tag>> makeSafe(
     }
 
     @Around("@within(io.micrometer.core.annotation.Counted) && !@annotation(io.micrometer.core.annotation.Counted) && execution(* *(..))")
-    @Nullable
-    public Object countedClass(ProceedingJoinPoint pjp) throws Throwable {
+    public @Nullable Object countedClass(ProceedingJoinPoint pjp) throws Throwable {
         if (shouldSkip.test(pjp)) {
             return pjp.proceed();
         }
@@ -224,17 +223,15 @@ public Object countedClass(ProceedingJoinPoint pjp) throws Throwable {
      * @throws Throwable When the intercepted method throws one.
      */
     @Around(value = "@annotation(counted) && execution(* *(..))", argNames = "pjp,counted")
-    @Nullable
-    public Object interceptAndRecord(ProceedingJoinPoint pjp, Counted counted) throws Throwable {
+    public @Nullable Object interceptAndRecord(ProceedingJoinPoint pjp, Counted counted) throws Throwable {
         if (shouldSkip.test(pjp)) {
             return pjp.proceed();
         }
 
         return perform(pjp, counted);
     }
 
-    @Nullable
-    private Object perform(ProceedingJoinPoint pjp, Counted counted) throws Throwable {
+    private @Nullable Object perform(ProceedingJoinPoint pjp, Counted counted) throws Throwable {
         final Method method = ((MethodSignature) pjp.getSignature()).getMethod();
         final boolean stopWhenCompleted = CompletionStage.class.isAssignableFrom(method.getReturnType());
 

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

@@ -17,7 +17,6 @@
 
 import io.micrometer.common.KeyValue;
 import io.micrometer.common.lang.NonNullApi;
-import io.micrometer.common.lang.Nullable;
 import io.micrometer.common.util.internal.logging.WarnThenDebugLogger;
 import io.micrometer.core.annotation.Incubating;
 import io.micrometer.core.annotation.Timed;
@@ -27,6 +26,7 @@
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.jspecify.annotations.Nullable;
 
 import java.lang.reflect.Method;
 import java.time.Duration;
@@ -185,8 +185,7 @@ private Function<ProceedingJoinPoint, Iterable<Tag>> makeSafe(
     }
 
     @Around("@within(io.micrometer.core.annotation.Timed) && !@annotation(io.micrometer.core.annotation.Timed) && execution(* *(..))")
-    @Nullable
-    public Object timedClass(ProceedingJoinPoint pjp) throws Throwable {
+    public @Nullable Object timedClass(ProceedingJoinPoint pjp) throws Throwable {
         if (shouldSkip.test(pjp)) {
             return pjp.proceed();
         }
@@ -202,8 +201,7 @@ public Object timedClass(ProceedingJoinPoint pjp) throws Throwable {
     }
 
     @Around("execution (@io.micrometer.core.annotation.Timed * *.*(..))")
-    @Nullable
-    public Object timedMethod(ProceedingJoinPoint pjp) throws Throwable {
+    public @Nullable Object timedMethod(ProceedingJoinPoint pjp) throws Throwable {
         if (shouldSkip.test(pjp)) {
             return pjp.proceed();
         }
@@ -218,8 +216,7 @@ public Object timedMethod(ProceedingJoinPoint pjp) throws Throwable {
         return perform(pjp, timed, method);
     }
 
-    @Nullable
-    private Object perform(ProceedingJoinPoint pjp, Timed timed, Method method) throws Throwable {
+    private @Nullable Object perform(ProceedingJoinPoint pjp, Timed timed, Method method) throws Throwable {
         final String metricName = timed.value().isEmpty() ? DEFAULT_METRIC_NAME : timed.value();
         final boolean stopWhenCompleted = CompletionStage.class.isAssignableFrom(method.getReturnType());
 
@@ -231,9 +228,8 @@ private Object perform(ProceedingJoinPoint pjp, Timed timed, Method method) thro
         }
     }
 
-    @Nullable
-    private Object processWithTimer(ProceedingJoinPoint pjp, Timed timed, String metricName, boolean stopWhenCompleted)
-            throws Throwable {
+    private @Nullable Object processWithTimer(ProceedingJoinPoint pjp, Timed timed, String metricName,
+            boolean stopWhenCompleted) throws Throwable {
 
         Timer.Sample sample = Timer.start(registry);
 
@@ -316,8 +312,7 @@ private String getExceptionTag(Throwable throwable) {
         return throwable.getCause().getClass().getSimpleName();
     }
 
-    @Nullable
-    private Object processWithLongTaskTimer(ProceedingJoinPoint pjp, Timed timed, String metricName,
+    private @Nullable Object processWithLongTaskTimer(ProceedingJoinPoint pjp, Timed timed, String metricName,
             boolean stopWhenCompleted) throws Throwable {
 
         Optional<LongTaskTimer.Sample> sample = buildLongTaskTimer(pjp, timed, metricName).map(LongTaskTimer::start);

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

@@ -15,8 +15,8 @@
  */
 package io.micrometer.core.instrument;
 
-import io.micrometer.common.lang.Nullable;
 import io.micrometer.core.instrument.distribution.*;
+import org.jspecify.annotations.Nullable;
 
 public abstract class AbstractDistributionSummary extends AbstractMeter implements DistributionSummary {
 

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

@@ -15,8 +15,8 @@
  */
 package io.micrometer.core.instrument;
 
-import io.micrometer.common.lang.Nullable;
 import io.micrometer.core.instrument.util.MeterEquivalence;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Base class for {@link Meter} implementations.

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

@@ -15,7 +15,6 @@
  */
 package io.micrometer.core.instrument;
 
-import io.micrometer.common.lang.Nullable;
 import io.micrometer.common.util.internal.logging.WarnThenDebugLogger;
 import io.micrometer.core.instrument.distribution.*;
 import io.micrometer.core.instrument.distribution.pause.ClockDriftPauseDetector;
@@ -24,6 +23,7 @@
 import org.LatencyUtils.IntervalEstimator;
 import org.LatencyUtils.SimplePauseDetector;
 import org.LatencyUtils.TimeCappedMovingAverageIntervalEstimator;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Map;
 import java.util.concurrent.Callable;
@@ -48,11 +48,9 @@ public abstract class AbstractTimer extends AbstractMeter implements Timer {
     private final TimeUnit baseTimeUnit;
 
     // Only used when pause detection is enabled
-    @Nullable
-    private Object intervalEstimator;
+    private @Nullable Object intervalEstimator;
 
-    @Nullable
-    private org.LatencyUtils.PauseDetector pauseDetector;
+    private org.LatencyUtils.@Nullable PauseDetector pauseDetector;
 
     /**
      * Creates a new timer.

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

@@ -15,9 +15,9 @@
  */
 package io.micrometer.core.instrument;
 
-import io.micrometer.common.lang.Nullable;
 import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
 import io.micrometer.core.instrument.distribution.pause.PauseDetector;
+import org.jspecify.annotations.Nullable;
 
 import java.time.Duration;
 import java.util.Arrays;
@@ -38,11 +38,9 @@ public abstract class AbstractTimerBuilder<B extends AbstractTimerBuilder<B>> {
 
     protected final DistributionStatisticConfig.Builder distributionConfigBuilder;
 
-    @Nullable
-    protected String description;
+    protected @Nullable String description;
 
-    @Nullable
-    protected PauseDetector pauseDetector;
+    protected @Nullable PauseDetector pauseDetector;
 
     protected AbstractTimerBuilder(String name) {
         this.name = name;
@@ -89,7 +87,7 @@ public B tag(String key, String value) {
      * be expressed as {@code 0.95}.
      * @return This builder.
      */
-    public B publishPercentiles(@Nullable double... percentiles) {
+    public B publishPercentiles(double @Nullable ... percentiles) {
         this.distributionConfigBuilder.percentiles(percentiles);
         return (B) this;
     }
@@ -145,7 +143,7 @@ public B publishPercentileHistogram(@Nullable Boolean enabled) {
      * are the threshold we intend to measure against, then.
      */
     @Deprecated
-    public B sla(@Nullable Duration... sla) {
+    public B sla(Duration @Nullable ... sla) {
         return serviceLevelObjectives(sla);
     }
 
@@ -160,7 +158,7 @@ public B sla(@Nullable Duration... sla) {
      * @return This builder.
      * @since 1.5.0
      */
-    public B serviceLevelObjectives(@Nullable Duration... slos) {
+    public B serviceLevelObjectives(Duration @Nullable ... slos) {
         if (slos != null) {
             this.distributionConfigBuilder
                 .serviceLevelObjectives(Arrays.stream(slos).mapToDouble(Duration::toNanos).toArray());

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

@@ -15,7 +15,7 @@
  */
 package io.micrometer.core.instrument;
 
-import io.micrometer.common.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Collections;
 
@@ -64,11 +64,9 @@ class Builder {
 
         private Tags tags = Tags.empty();
 
-        @Nullable
-        private String description;
+        private @Nullable String description;
 
-        @Nullable
-        private String baseUnit;
+        private @Nullable String baseUnit;
 
         private Builder(String name) {
             this.name = name;

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

@@ -15,11 +15,11 @@
  */
 package io.micrometer.core.instrument;
 
-import io.micrometer.common.lang.Nullable;
 import io.micrometer.core.instrument.distribution.CountAtBucket;
 import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
 import io.micrometer.core.instrument.distribution.HistogramSupport;
 import io.micrometer.core.instrument.distribution.ValueAtPercentile;
+import org.jspecify.annotations.Nullable;
 
 import java.time.Duration;
 import java.util.Arrays;
@@ -121,11 +121,9 @@ class Builder {
 
         private DistributionStatisticConfig.Builder distributionConfigBuilder = DistributionStatisticConfig.builder();
 
-        @Nullable
-        private String description;
+        private @Nullable String description;
 
-        @Nullable
-        private String baseUnit;
+        private @Nullable String baseUnit;
 
         private double scale = 1.0;
 
@@ -189,7 +187,7 @@ public Builder baseUnit(@Nullable String unit) {
          * should be expressed as {@code 0.95}.
          * @return This builder.
          */
-        public Builder publishPercentiles(@Nullable double... percentiles) {
+        public Builder publishPercentiles(double @Nullable ... percentiles) {
             this.distributionConfigBuilder.percentiles(percentiles);
             return this;
         }
@@ -284,7 +282,7 @@ public Builder sla(@Nullable double... sla) {
          * @return This builder.
          * @since 1.5.0
          */
-        public Builder serviceLevelObjectives(@Nullable double... slos) {
+        public Builder serviceLevelObjectives(double @Nullable ... slos) {
             this.distributionConfigBuilder.serviceLevelObjectives(slos);
             return this;
         }