fix: Use the revert check isVersionAtLeast -> isVersionBelow

Author: bric3

communication/src/main/java/datadog/communication/ddagent/AgentVersion.java

@@ -1,62 +1,73 @@
 package datadog.communication.ddagent;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class AgentVersion {
 
+  private static final Logger log = LoggerFactory.getLogger(AgentVersion.class);
+
   /**
-   * Checks if the given version string represents a version that is at least the specified major,
+   * Checks if the given version string represents a version that is below the specified major,
    * minor, and patch version.
    *
-   * @param version the version string to check (e.g., "7.65.0")
-   * @param minMajor minimum major version
-   * @param minMinor minimum minor version
-   * @param minPatch minimum patch version
-   * @return true if version is at least the specified minimum, false otherwise (including when
+   * @param version the version string to check (e.g., "7.64.0")
+   * @param maxMajor maximum major version (exclusive)
+   * @param maxMinor maximum minor version (exclusive)
+   * @param maxPatch maximum patch version (exclusive)
+   * @return true if version is below the specified maximum, false otherwise (including when
    *     version is null or unparseable)
    */
-  public static boolean isVersionAtLeast(String version, int minMajor, int minMinor, int minPatch) {
+  public static boolean isVersionBelow(String version, int maxMajor, int maxMinor, int maxPatch) {
     if (version == null || version.isEmpty()) {
-      return false;
+      return true;
     }
 
     try {
       // Parse version string in format "major.minor.patch" (e.g., "7.65.0")
+      // Assumes the 'version' is below if it can't be parsed.
       int majorDot = version.indexOf('.');
       if (majorDot == -1) {
-        return false;
+        return true;
       }
 
       int major = Integer.parseInt(version.substring(0, majorDot));
 
-      if (major > minMajor) {
+      if (major < maxMajor) {
         return true;
-      } else if (major < minMajor) {
+      } else if (major > maxMajor) {
         return false;
       }
 
-      // major == minMajor
+      // major == maxMajor
       int minorDot = version.indexOf('.', majorDot + 1);
       if (minorDot == -1) {
-        return false;
+        return true;
       }
 
       int minor = Integer.parseInt(version.substring(majorDot + 1, minorDot));
-      if (minor > minMinor) {
+      if (minor < maxMinor) {
         return true;
-      } else if (minor < minMinor) {
+      } else if (minor > maxMinor) {
         return false;
       }
 
-      // major == minMajor && minor == minMinor
+      // major == maxMajor && minor == maxMinor
       // Find end of patch version (may have suffix like "-rc.1")
       int patchEnd = minorDot + 1;
       while (patchEnd < version.length() && Character.isDigit(version.charAt(patchEnd))) {
         patchEnd++;
       }
 
       int patch = Integer.parseInt(version.substring(minorDot + 1, patchEnd));
-      return patch >= minPatch;
+      if (patch != maxPatch) {
+        return patch < maxPatch;
+      } else {
+        // If there's a suffix (like "-rc.1"), consider it below the non-suffixed version
+        return patchEnd < version.length();
+      }
     } catch (NumberFormatException | IndexOutOfBoundsException e) {
-      return false;
+      return true;
     }
   }
 }

communication/src/main/java/datadog/communication/ddagent/DDAgentFeaturesDiscovery.java

@@ -308,7 +308,7 @@ private boolean processInfoResponse(State newState, String response) {
 
       if (metricsEnabled) {
         newState.supportsClientSideStats =
-            AgentVersion.isVersionAtLeast(newState.version, 7, 65, 0);
+            !AgentVersion.isVersionBelow(newState.version, 7, 65, 0);
         Object canDrop = map.get("client_drop_p0s");
         newState.supportsDropping =
             null != canDrop

communication/src/test/java/datadog/communication/ddagent/AgentVersionTest.java

@@ -0,0 +1,64 @@
+package datadog.communication.ddagent;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+class AgentVersionTest {
+
+  @Test
+  void testIsVersionBelow_VersionBelowThreshold() {
+    assertTrue(AgentVersion.isVersionBelow("7.64.0", 7, 65, 0));
+    assertTrue(AgentVersion.isVersionBelow("7.64.9", 7, 65, 0));
+    assertTrue(AgentVersion.isVersionBelow("6.99.99", 7, 65, 0));
+    assertTrue(AgentVersion.isVersionBelow("7.0.0", 7, 65, 0));
+  }
+
+  @Test
+  void testIsVersionBelow_VersionEqualToThreshold() {
+    assertFalse(AgentVersion.isVersionBelow("7.65.0", 7, 65, 0));
+  }
+
+  @Test
+  void testIsVersionBelow_VersionAboveThreshold() {
+    assertFalse(AgentVersion.isVersionBelow("7.65.1", 7, 65, 0));
+    assertFalse(AgentVersion.isVersionBelow("7.66.0", 7, 65, 0));
+    assertFalse(AgentVersion.isVersionBelow("8.0.0", 7, 65, 0));
+    assertFalse(AgentVersion.isVersionBelow("7.65.10", 7, 65, 0));
+  }
+
+  @Test
+  void testIsVersionBelow_MajorVersionComparison() {
+    assertTrue(AgentVersion.isVersionBelow("6.100.100", 7, 0, 0));
+    assertFalse(AgentVersion.isVersionBelow("8.0.0", 7, 100, 100));
+  }
+
+  @Test
+  void testIsVersionBelow_MinorVersionComparison() {
+    assertTrue(AgentVersion.isVersionBelow("7.64.100", 7, 65, 0));
+    assertFalse(AgentVersion.isVersionBelow("7.66.0", 7, 65, 100));
+  }
+
+  @Test
+  void testIsVersionBelow_WithSuffix() {
+    assertTrue(AgentVersion.isVersionBelow("7.64.0-rc.1", 7, 65, 0));
+    assertTrue(AgentVersion.isVersionBelow("7.65.0-rc.1", 7, 65, 0));
+    assertFalse(AgentVersion.isVersionBelow("7.65.1-snapshot", 7, 65, 0));
+  }
+
+  @Test
+  void testIsVersionBelow_NullOrEmpty() {
+    assertTrue(AgentVersion.isVersionBelow(null, 7, 65, 0));
+    assertTrue(AgentVersion.isVersionBelow("", 7, 65, 0));
+  }
+
+  @Test
+  void testIsVersionBelow_InvalidFormat() {
+    assertTrue(AgentVersion.isVersionBelow("invalid", 7, 65, 0));
+    assertTrue(AgentVersion.isVersionBelow("7", 7, 65, 0));
+    assertTrue(AgentVersion.isVersionBelow("7.", 7, 65, 0));
+    assertTrue(AgentVersion.isVersionBelow("7.65", 7, 65, 0));
+    assertTrue(AgentVersion.isVersionBelow("7.65.", 7, 65, 0));
+    assertTrue(AgentVersion.isVersionBelow("a.b.c", 7, 65, 0));
+  }
+}