Merge pull request #959 from rabbitmq/improve-broker-version-detection

Improve broker version detection

Author: acogoluegnes

src/main/java/com/rabbitmq/stream/impl/Utils.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2025 Broadcom. All Rights Reserved.
+// Copyright (c) 2020-2026 Broadcom. All Rights Reserved.
 // The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 //
 // This software, the RabbitMQ Stream Java client library, is dual-licensed under the
@@ -64,6 +64,8 @@
 import java.util.function.LongSupplier;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import javax.net.ssl.X509TrustManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -496,20 +498,14 @@ static boolean offsetBefore(long x, long y) {
     return Long.compareUnsigned(x, y) < 0;
   }
 
-  private static String currentVersion(String currentVersion) {
-    // versions built from source: 3.7.0+rc.1.4.gedc5d96
-    if (currentVersion.contains("+")) {
-      currentVersion = currentVersion.substring(0, currentVersion.indexOf("+"));
-    }
-    // alpha (snapshot) versions: 3.7.0~alpha.449-1
-    if (currentVersion.contains("~")) {
-      currentVersion = currentVersion.substring(0, currentVersion.indexOf("~"));
-    }
-    // alpha (snapshot) versions: 3.7.1-alpha.40
-    if (currentVersion.contains("-")) {
-      currentVersion = currentVersion.substring(0, currentVersion.indexOf("-"));
+  private static final Pattern SEMVER_PATTERN = Pattern.compile("(\\d+\\.\\d+\\.\\d+)");
+
+  static String currentVersion(String currentVersion) {
+    Matcher matcher = SEMVER_PATTERN.matcher(currentVersion);
+    if (matcher.find()) {
+      return matcher.group(1);
     }
-    return currentVersion;
+    throw new IllegalArgumentException("No semver pattern found in: " + currentVersion);
   }
 
   /**
@@ -534,7 +530,12 @@ static int versionCompare(String str1, String str2) {
   }
 
   static boolean is3_11_OrMore(String brokerVersion) {
-    return versionCompare(currentVersion(brokerVersion), "3.11.0") >= 0;
+    try {
+      return versionCompare(currentVersion(brokerVersion), "3.11.0") >= 0;
+    } catch (Exception e) {
+      LOGGER.debug("Unable to parse broker version {}", brokerVersion, e);
+      return true;
+    }
   }
 
   static Client.ClientParameters maybeSetUpClientParametersFromUris(

src/test/java/com/rabbitmq/stream/impl/UtilsTest.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2025 Broadcom. All Rights Reserved.
+// Copyright (c) 2020-2026 Broadcom. All Rights Reserved.
 // The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 //
 // This software, the RabbitMQ Stream Java client library, is dual-licensed under the
@@ -118,6 +118,7 @@ void testOffsetBefore() {
     "3.9.21,false",
     "3.9.22-alpha.13,false",
     "3.10.6,false",
+    "tanzu+rabbitmq.v3.10.6.dev.1.179.g335e26b,false",
     "3.11.0-alpha.15,true",
     "3.11.0,true",
     "3.11.1,true",
@@ -127,11 +128,33 @@ void testOffsetBefore() {
     "4.1.0-alpha.15,true",
     "4.1.0,true",
     "4.1.1,true",
+    "tanzu+rabbitmq.v4.3.0.dev.1.179.g335e26b,true",
   })
   void is_3_11_OrMore(String input, boolean expected) {
     assertThat(Utils.is3_11_OrMore(input)).isEqualTo(expected);
   }
 
+  @ParameterizedTest
+  @CsvSource({
+    "4.3.0,4.3.0",
+    "3.13.6,3.13.6",
+    "3.13.6.2,3.13.6",
+    "3.13.6-alpha.0,3.13.6",
+    "3.13.6~beta-1,3.13.6",
+    "3.13.6+funky-metadata-1,3.13.6",
+    "3.7.0+rc.1.4.gedc5d96,3.7.0",
+    "tanzu+rabbitmq.v4.3.0.dev.1.179.g335e26b,4.3.0"
+  })
+  void currentVersionExtraction(String input, String expected) {
+    assertThat(Utils.currentVersion(input)).isEqualTo(expected);
+  }
+
+  @ParameterizedTest
+  @CsvSource({"tanzu+rabbitmq", "not-a-version", "abc"})
+  void versionCheckReturnsTrueWhenVersionCannotBeParsed(String brokerVersion) {
+    assertThat(Utils.is3_11_OrMore(brokerVersion)).isTrue();
+  }
+
   @Test
   void maybeSetUpClientParametersFromUrisShouldKeepCredentialsIfNotInUri() {
     String u = UUID.randomUUID().toString();