Skip to content

Check Tags instanceof check before iterator empty check in Tags.of() #6148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 1.13.x
Choose a base branch
from
+4 −1
Open

Check Tags instanceof check before iterator empty check in Tags.of() #6148

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion micrometer-core/src/main/java/io/micrometer/core/instrument/Tags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,15 @@ public static Tags concat(@Nullable Iterable<? extends Tag> tags, @Nullable Stri
* @return a new {@code Tags} instance
*/
public static Tags of(@Nullable Iterable<? extends Tag> tags) {
if (tags == null || tags == EMPTY || !tags.iterator().hasNext()) {
if (tags == null || tags == EMPTY) {
return Tags.empty();
}
else if (tags instanceof Tags) {
return (Tags) tags;
}
else if (!tags.iterator().hasNext()) {
return Tags.empty();
}
else if (tags instanceof Collection) {
Collection<? extends Tag> tagsCollection = (Collection<? extends Tag>) tags;
return new Tags(tagsCollection.toArray(new Tag[0]));
Expand Down