Merge branch 'main' into QuickerNettyLeakTests

.github/workflows/CI.yml

@@ -24,6 +24,8 @@ jobs:
           gradle-version: ${{ env.gradle-version }}
       - name: Run Gradle Build
         run: ./gradlew spotlessCheck
+        env:
+          OS_MIGRATIONS_GRADLE_SCAN_TOS_AGREE_AND_ENABLED: ''
 
   python-lint:
     runs-on: ubuntu-latest
@@ -104,12 +106,12 @@ jobs:
           gradle-version: ${{ env.gradle-version }}
           gradle-home-cache-cleanup: true
       - name: Run Gradle Build
-        run: ./gradlew build -x test -x TrafficCapture:dockerSolution:build -x spotlessCheck --scan --stacktrace
+        run: ./gradlew build -x test -x TrafficCapture:dockerSolution:build -x spotlessCheck --stacktrace
         env:
           OS_MIGRATIONS_GRADLE_SCAN_TOS_AGREE_AND_ENABLED: ''
 
       - name: Run Tests with Coverage
-        run: ./gradlew mergeJacocoReports -x TrafficCapture:dockerSolution:build -x spotlessCheck --scan --stacktrace
+        run: ./gradlew mergeJacocoReports -x TrafficCapture:dockerSolution:build -x spotlessCheck --stacktrace
         env:
           OS_MIGRATIONS_GRADLE_SCAN_TOS_AGREE_AND_ENABLED: ''
 
@@ -156,7 +158,7 @@ jobs:
         with:
           key: docker-${{ runner.os }}-${{ steps.generate_cache_key.outputs.key }}
       - name: Start Docker Solution
-        run: ./gradlew -p TrafficCapture dockerSolution:ComposeUp -x test -x spotlessCheck --scan --info --stacktrace
+        run: ./gradlew -p TrafficCapture dockerSolution:ComposeUp -x test -x spotlessCheck --info --stacktrace
         env:
           OS_MIGRATIONS_GRADLE_SCAN_TOS_AGREE_AND_ENABLED: ''
       - name: Run E2E test script

DocumentsFromSnapshotMigration/src/test/java/com/rfs/PerformanceVerificationTest.java

@@ -148,7 +148,8 @@ protected Document getDocument(IndexReader reader, int docId, boolean isLive) {
         int docsFromBuffers = expectedBulkDocsBuffered * maxDocsPerBulkRequest;
         int numberOfSingleBufferSteps = 2; // calls like publishOn(scheduler, 1) holds a 1 item buffer
         int strictExpectedBufferedDocs = docsFromBuffers + expectedConcurrentDocReads + numberOfSingleBufferSteps;
-        assertEquals(strictExpectedBufferedDocs, bufferedDocs);
+        // Assert that the number of buffered documents is within 1 of the expected number
+        assertEquals(strictExpectedBufferedDocs, bufferedDocs, 1);
 
         // Verify the total number of ingested documents
         assertEquals(500_000, ingestedDocuments.get(), "Not all documents were ingested");

TrafficCapture/README.md

@@ -161,7 +161,7 @@ This command initiates all tests, ensuring thorough validation of the project. T
 
 ### Gradle Scans
 
-Gradle Scans offer a more intuitive understanding of build outputs. To enable Gradle Scans for enhanced output analysis, append `--scan` to your Gradle command.
+Gradle Scans offer a more intuitive understanding of build outputs.
 This action requires acceptance of the Gradle Scan terms of service.
 To automate this acceptance and enable scans by default, set the `OS_MIGRATIONS_GRADLE_SCAN_TOS_AGREE_AND_ENABLED` environment variable:
 

settings.gradle

@@ -9,10 +9,11 @@
 import java.nio.file.Paths
 
 plugins {
-    id("com.gradle.enterprise") version("3.16.2")
+    id("com.gradle.develocity") version("3.18.1")
     id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
 }
 
+
 void addSubProjects(String path, File dir) {
     if (dir.isDirectory() == false) {
         return;
@@ -61,11 +62,17 @@ include 'TrafficCapture:trafficReplayer'
 addSubProjects(':TrafficCapture', Paths.get(rootProject.projectDir.getPath(), 'TrafficCapture', 'transformationPlugins').toFile())
 
 if (System.getenv().containsKey("OS_MIGRATIONS_GRADLE_SCAN_TOS_AGREE_AND_ENABLED")) {
-    gradleEnterprise {
+    develocity {
+        buildScan {
+            publishing.onlyIf { true }
+            termsOfUseUrl = "https://gradle.com/help/legal-terms-of-use"
+            termsOfUseAgree = "yes"
+        }
+    }
+} else {
+    develocity {
         buildScan {
-            publishAlways()
-            termsOfServiceUrl = "https://gradle.com/terms-of-service"
-            termsOfServiceAgree = "yes"
+            publishing.onlyIf { false }
         }
     }
 }