Fixing MeterCache mess.

Author: onukristo

.github/workflows/build.yaml

@@ -27,8 +27,8 @@ jobs:
       max-parallel: 100
       matrix:
         spring_boot_version:
-          - 3.4.6
-          - 3.5.0
+          - 3.4.8
+          - 3.5.4
 
     env:
       SPRING_BOOT_VERSION: ${{ matrix.spring_boot_version }}

CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.14.1] - 2025-07-24
+
+### Fixed
+- Flakiness of equals method in TagsSetArray.
+
 ## [1.14.0] - 2025-07-10
 
 ### Changed

build.libraries.gradle

@@ -1,11 +1,11 @@
 ext {
-    springBootVersion = "${System.getenv("SPRING_BOOT_VERSION") ?: "3.2.2"}"
+    springBootVersion = "${System.getenv("SPRING_BOOT_VERSION") ?: "3.4.8"}"
 
     libraries = [
             // version defined
-            awaitility            : "org.awaitility:awaitility:4.2.2",
-            commonsIo             : "commons-io:commons-io:2.17.0",
-            guava                 : 'com.google.guava:guava:33.3.1-jre',
+            awaitility            : "org.awaitility:awaitility:4.3.0",
+            commonsIo             : "commons-io:commons-io:2.20.0",
+            guava                 : 'com.google.guava:guava:33.4.0-jre',
             jakartaValidationApi  : 'jakarta.validation:jakarta.validation-api:3.0.2',
             javaxValidationApi    : "javax.validation:validation-api:2.0.1.Final",
             roaringBitmap         : 'org.roaringbitmap:RoaringBitmap:1.3.0',

gradle.properties

@@ -1 +1 @@
-version=1.14.0
+version=1.14.1

tw-base-utils/src/main/java/com/transferwise/common/baseutils/meters/cache/TagsSet.java

@@ -61,9 +61,10 @@ public boolean equals(Object other) {
       return Arrays.equals(this.tags, ((ArrayTagsSet) other).tags);
     }
 
+    // Cloning is necessary to avoid Micrometer sorting our own array, making equals method flaky.
     @Override
     public Tags getMicrometerTags() {
-      return Tags.of(tags);
+      return Tags.of(Arrays.copyOf(tags, tags.length));
     }
   }
 

tw-base-utils/src/test/java/com/transferwise/common/baseutils/meters/cache/MeterCacheTest.java

@@ -59,13 +59,14 @@ void counterCacheWorksWithTags() {
     final var tag2 = Tag.of("tag2", "tagValue2");
     final var counterName = "my.test.counter";
 
-    var counter0 = meterCache.counter(counterName, TagsSet.of(tag0, tag1));
-    var counter1 = meterCache.counter(counterName, TagsSet.of(tag0, tag1));
+    // Notice the reverse order of tags, so that micrometer will be reordering them.
+    var counter0 = meterCache.counter(counterName, TagsSet.of(tag1, tag0));
+    var counter1 = meterCache.counter(counterName, TagsSet.of(tag1, tag0));
 
     assertSame(counter0, counter1);
     assertEquals(1, meterCache.size());
 
-    var counter2 = meterCache.counter(counterName, TagsSet.of(tag1, tag0));
+    var counter2 = meterCache.counter(counterName, TagsSet.of(tag0, tag1));
     //Even when cache is different, the underlying meterRegistry provides same counter.
     assertSame(counter0, counter2);
     assertEquals(2, meterCache.size());