Migrate micrometer-core to jSpecify #6385
Merged
+973
−1,070
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shakuzen
commented
Jun 11, 2025
Member
Author
shakuzen
left a comment
shakuzen
left a comment
There was a problem hiding this comment.
I didn't get through everything but left some review comments in addition to the comments left in the code.
micrometer-core/src/main/java/io/micrometer/core/instrument/FunctionCounter.java
Show resolved
Hide resolved
micrometer-core/src/main/java/io/micrometer/core/lang/NonNullFields.java
Show resolved
Hide resolved
micrometer-core/src/main/java/io/micrometer/core/instrument/util/package-info.java
Show resolved
Hide resolved
micrometer-core/src/main/java/io/micrometer/core/instrument/search/MeterNotFoundException.java
Outdated
Show resolved
Hide resolved
micrometer-core/src/main/java/io/micrometer/core/instrument/FunctionCounter.java
Show resolved
Hide resolved
micrometer-core/src/main/java/io/micrometer/core/instrument/Meter.java
Outdated
Show resolved
Hide resolved
micrometer-core/src/main/java/io/micrometer/core/instrument/Meter.java
Outdated
Show resolved
Hide resolved
micrometer-core/src/main/java/io/micrometer/core/instrument/binder/cache/CacheMeterBinder.java
Outdated
Show resolved
Hide resolved
micrometer-core/src/main/java/io/micrometer/core/instrument/binder/cache/CacheMeterBinder.java
Show resolved
Hide resolved
shakuzen
force-pushed
the
core-specify
branch
4 times, most recently
from
3a4f6ef to
f59d80a
Compare
shakuzen
commented
Jun 12, 2025
Member
Author
shakuzen
left a comment
shakuzen
left a comment
There was a problem hiding this comment.
Another review in the meantime. I still haven't managed to resolve all the NullAway errors to apply the migration of @NonNullApi
micrometer-core/src/main/java/io/micrometer/core/instrument/LongTaskTimer.java
Outdated
Show resolved
Hide resolved
micrometer-core/src/main/java/io/micrometer/core/instrument/MeterRegistry.java
Outdated
Show resolved
Hide resolved
| */ | ||
| @Nullable | ||
| public <T> T gauge(String name, Iterable<Tag> tags, @Nullable T stateObject, ToDoubleFunction<T> valueFunction) { | ||
| public <T> @Nullable T gauge(String name, Iterable<Tag> tags, @Nullable T stateObject, |
Member
Author
There was a problem hiding this comment.
Probably should be consistent with Gauge and Function* types. I'd vote for marking the state object as non-nullable for the reasons stated elsewhere: if the user knows the state object is nullable, they may as well not register a meter with it.
micrometer-core/src/main/java/io/micrometer/core/instrument/Timer.java
Outdated
Show resolved
Hide resolved
micrometer-core/src/main/java/io/micrometer/core/instrument/Timer.java
Outdated
Show resolved
Hide resolved
...er-core/src/main/java/io/micrometer/core/instrument/config/MeterRegistryConfigValidator.java
Outdated
Show resolved
Hide resolved
...re/src/main/java/io/micrometer/core/instrument/distribution/AbstractTimeWindowHistogram.java
Outdated
Show resolved
Hide resolved
micrometer-core/src/main/java/io/micrometer/core/instrument/distribution/TimeWindowMax.java
Show resolved
Hide resolved
.../src/main/java/io/micrometer/core/instrument/observation/DefaultMeterObservationHandler.java
Show resolved
Hide resolved
micrometer-core/src/test/java/io/micrometer/core/instrument/push/PushMeterRegistryTest.java
Show resolved
Hide resolved
micrometer-core/src/test/java/io/micrometer/core/instrument/push/PushMeterRegistryTest.java
Show resolved
Hide resolved
micrometer-core/src/main/java/io/micrometer/core/instrument/FunctionCounter.java
Show resolved
Hide resolved
micrometer-core/src/main/java/io/micrometer/core/instrument/MeterRegistry.java
Outdated
Show resolved
Hide resolved
There are still a number of NullAway errors to take care of, but I'm committing the work-in-progress.
jonatan-ivanov
force-pushed
the
core-specify
branch
from
e3761e9 to
94f183b
Compare
It seems assertThat(obj).isNotNull(); does not qualify as a null-check for NullAway if obj is a collection. See uber/NullAway#1219
It seems <T extends @nullable Object> does not work well in some situations. See uber/NullAway#1075
jonatan-ivanov
force-pushed
the
core-specify
branch
from
94f183b to
fda7fdb
Compare
micrometer-core/src/main/java/io/micrometer/core/instrument/binder/system/ProcessorMetrics.java
Outdated
Show resolved
Hide resolved
samples/micrometer-samples-core/src/main/java/io/micrometer/core/samples/NullGaugeSample.java
Show resolved
Hide resolved
...er-core/src/main/java/io/micrometer/core/instrument/config/MeterRegistryConfigValidator.java
Show resolved
Hide resolved
shakuzen
changed the title
This was referenced Jun 16, 2025
This was referenced Jun 17, 2025
shakuzen
commented
Jun 17, 2025
| default Enum<?> overridesDefaultMetricFrom() { | ||
| // TODO should this be nullable? | ||
| default @Nullable Enum<?> overridesDefaultMetricFrom() { | ||
| return null; |
Member
Author
There was a problem hiding this comment.
I wasn't really sure how this is used and marking it @Nullable is probably fine. We can follow-up if we want to change it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Migrates from our custom nullability annotations to the jSpecify nullability annotations.
See #5547