Support Golang parseDuration syntax for --max-age and --consumer-latency

Author: acogoluegnes

pom.xml

@@ -55,6 +55,7 @@
     <guava.version>33.4.0-jre</guava.version>
     <jgroups.version>5.4.1.Final</jgroups.version>
     <jgroups-kubernetes.version>2.0.2.Final</jgroups-kubernetes.version>
+    <threeten-extra.version>1.8.0</threeten-extra.version>
     <junit.jupiter.version>5.11.4</junit.jupiter.version>
     <assertj.version>3.27.3</assertj.version>
     <spotless.check.skip>true</spotless.check.skip>
@@ -161,6 +162,12 @@
       <version>${jgroups-kubernetes.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.threeten</groupId>
+      <artifactId>threeten-extra</artifactId>
+      <version>${threeten-extra.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>

src/main/java/com/rabbitmq/stream/perf/Converters.java

@@ -35,10 +35,14 @@
 import java.util.stream.IntStream;
 import javax.net.ssl.SNIHostName;
 import javax.net.ssl.SNIServerName;
+import org.threeten.extra.AmountFormats;
 import picocli.CommandLine;
 
 final class Converters {
 
+  private static final CommandLine.ITypeConverter<Duration> DURATION_TYPE_CONVERTER =
+      new DurationTypeConverter();
+
   private Converters() {}
 
   static void typeConversionException(String message) {
@@ -290,34 +294,48 @@ static class DurationTypeConverter implements CommandLine.ITypeConverter<Duratio
 
     @Override
     public Duration convert(String value) {
+      Duration duration = null;
       try {
-        Duration duration = Duration.parse(value);
-        if (duration.isNegative() || duration.isZero()) {
+        duration = AmountFormats.parseUnitBasedDuration(value);
+      } catch (DateTimeParseException e) {
+
+      }
+      if (duration == null) {
+        try {
+          duration = Duration.parse(value);
+        } catch (DateTimeParseException e) {
           throw new CommandLine.TypeConversionException(
-              "'" + value + "' is not valid, it must be positive");
+              "'" + value + "' is not valid, valid example values: PT15M, PT10H");
         }
-        return duration;
-      } catch (DateTimeParseException e) {
+      }
+      return duration;
+    }
+  }
+
+  static class PositiveDurationTypeConverter implements CommandLine.ITypeConverter<Duration> {
+
+    @Override
+    public Duration convert(String value) throws Exception {
+      Duration duration = DURATION_TYPE_CONVERTER.convert(value);
+      if (duration.isNegative() || duration.isZero()) {
         throw new CommandLine.TypeConversionException(
-            "'" + value + "' is not valid, valid example values: PT15M, PT10H");
+            "'" + value + "' is not valid, it must be positive");
       }
+      return duration;
     }
   }
 
-  static class MicroSecondsToDurationTypeConverter implements CommandLine.ITypeConverter<Duration> {
+  static class GreaterThanOrEqualToZeroDurationTypeConverter
+      implements CommandLine.ITypeConverter<Duration> {
 
     @Override
-    public Duration convert(String value) {
-      try {
-        Duration duration = Duration.ofNanos(Long.parseLong(value) * 1_000);
-        if (duration.isNegative()) {
-          throw new CommandLine.TypeConversionException(
-              "'" + value + "' is not valid, it must be greater than or equal to 0");
-        }
-        return duration;
-      } catch (NumberFormatException e) {
-        throw new CommandLine.TypeConversionException("'" + value + "' is not a valid number");
+    public Duration convert(String value) throws Exception {
+      Duration duration = DURATION_TYPE_CONVERTER.convert(value);
+      if (duration.isNegative()) {
+        throw new CommandLine.TypeConversionException(
+            "'" + value + "' is not valid, it must be greater than or equal to 0");
       }
+      return duration;
     }
   }
 

src/main/java/com/rabbitmq/stream/perf/StreamPerfTest.java

@@ -235,9 +235,10 @@ public class StreamPerfTest implements Callable<Integer> {
   @CommandLine.Option(
       names = {"--max-age", "-ma"},
       description =
-          "max age of segments using the ISO 8601 duration format, "
-              + "e.g. PT10M30S for 10 minutes 30 seconds, P5DT8H for 5 days 8 hours.",
-      converter = Converters.DurationTypeConverter.class)
+          "max age of segments using Golang parseDuration syntax or the ISO 8601 duration format, "
+              + "e.g. 10m30s for 10 minutes 30 seconds (d, w, y not supported) or "
+              + "PT10M30S for 10 minutes 30 seconds, P5DT8H for 5 days 8 hours.",
+      converter = Converters.PositiveDurationTypeConverter.class)
   private Duration maxAge;
 
   @CommandLine.Option(
@@ -558,8 +559,10 @@ static class InstanceSyncOptions {
 
   @CommandLine.Option(
       names = {"--consumer-latency", "-L"},
-      description = "consumer latency in microseconds",
-      converter = Converters.MicroSecondsToDurationTypeConverter.class,
+      description =
+          "consumer latency using Golang parseDuration syntax, "
+              + "e.g. 5 ms (d, w, y are not supported)",
+      converter = Converters.GreaterThanOrEqualToZeroDurationTypeConverter.class,
       defaultValue = "0")
   private Duration consumerLatency;
 

src/test/java/com/rabbitmq/stream/perf/ConvertersTest.java

@@ -208,20 +208,18 @@ void sniServerNamesConverter() {
   }
 
   @ParameterizedTest
-  @CsvSource({"5000,5", "0,0", "1000,1"})
-  void microSecondsToDurationTypeConverterOk(String value, long expectedInMs) {
-    Converters.MicroSecondsToDurationTypeConverter converter =
-        new Converters.MicroSecondsToDurationTypeConverter();
+  @CsvSource({"50ms,50", "0,0", "1s,1000", "10m30s,630000", "PT1M30S,90000"})
+  void durationTypeConverterOk(String value, long expectedInMs) {
+    Converters.DurationTypeConverter converter = new Converters.DurationTypeConverter();
     Duration duration = converter.convert(value);
     assertThat(duration).isNotNull();
     assertThat(duration).isEqualTo(Duration.ofMillis(expectedInMs));
   }
 
   @ParameterizedTest
-  @ValueSource(strings = {"-1000000", "abc", "1.5"})
-  void microSecondsToDurationTypeConverterKo(String value) {
-    Converters.MicroSecondsToDurationTypeConverter converter =
-        new Converters.MicroSecondsToDurationTypeConverter();
+  @ValueSource(strings = {"1", "abc", "1.5"})
+  void durationTypeConverterKo(String value) {
+    Converters.DurationTypeConverter converter = new Converters.DurationTypeConverter();
     assertThatThrownBy(() -> converter.convert(value))
         .isInstanceOf(CommandLine.TypeConversionException.class)
         .hasMessageContaining("valid");