[router] Alpini dead code removal (#1394)

Besides dead code removal, also moved a few functions from Alpini's CollectionUtil to Venice's CollectionUtils. Deleted the following entire modules: alpini-common-cli alpini-common-const alpini-common-io alpini-common-log alpini-common-native alpini-common-test Also removed the Alpini Functional Tests CI task, since there is no such test left, and made the Alpini Unit Tests run on every commit, rather than only when these files are modified, since they run pretty quickly now.
linkedin · Dec 14, 2024 · e27379d · e27379d
1 parent 2af0fa9
commit e27379d
Show file tree

Hide file tree

Showing 242 changed files with 210 additions and 52,025 deletions.
diff --git a/.github/workflows/VeniceCI-CompatibilityTests.yml b/.github/workflows/VeniceCI-CompatibilityTests.yml
@@ -55,27 +55,16 @@ jobs:
         jdk: [8, 11, 17]
     runs-on: ubuntu-latest
     timeout-minutes: 120
-    outputs:
-      alpini_touched: ${{ steps.check_alpini_files_changed.outputs.alpini }}
     steps:
       - uses: actions/checkout@v4
         with:
           # Checkout as many commits as needed for the diff
           fetch-depth: 2
-      - name: Check if files have changed
-        uses: dorny/paths-filter@v3
-        id: check_alpini_files_changed
-        with:
-          filters: |
-            alpini:
-              - 'internal/alpini/**'
       - uses: actions/checkout@v4
-        if: steps.check_alpini_files_changed.outputs.alpini == 'true'
         with:
           fetch-depth: 0
       - name: Set up JDK
         uses: actions/setup-java@v4
-        if: steps.check_alpini_files_changed.outputs.alpini == 'true'
         with:
           java-version: ${{ matrix.jdk }}
           distribution: 'temurin'
@@ -92,101 +81,27 @@ jobs:
       #     echo "java.security file after modifications: "
       #     cat "$JAVA_HOME/conf/security/java.security"
       - shell: bash
-        if: steps.check_alpini_files_changed.outputs.alpini == 'true'
         run: |
           git remote set-head origin --auto
           git remote add upstream https://github.com/linkedin/venice
           git fetch upstream
       - name: Setup Gradle
-        if: steps.check_alpini_files_changed.outputs.alpini == 'true'
         uses: gradle/actions/setup-gradle@v4
       - name: Run alpini unit tests
-        if: steps.check_alpini_files_changed.outputs.alpini == 'true'
         run: ./gradlew --continue --no-daemon -DmaxParallelForks=1 alpiniUnitTest
       - name: Package Build Artifacts
-        if: steps.check_alpini_files_changed.outputs.alpini == 'true' && (success() || failure())
+        if: (success() || failure())
         shell: bash
         run: |
           mkdir ${{ github.job }}-artifacts
           find . -path "**/build/reports/*" -or -path "**/build/test-results/*" > artifacts.list
           rsync -R --files-from=artifacts.list . ${{ github.job }}-artifacts
           tar -zcvf ${{ github.job }}-jdk${{ matrix.jdk }}-logs.tar.gz ${{ github.job }}-artifacts
       - name: Upload Build Artifacts
-        if: steps.check_alpini_files_changed.outputs.alpini == 'true' && (success() || failure())
+        if: (success() || failure())
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ github.job }}
-          path: ${{ github.job }}-jdk${{ matrix.jdk }}-logs.tar.gz
-          retention-days: 30
-
-  AlpiniFunctionalTests:
-    strategy:
-      fail-fast: false
-      matrix:
-        jdk: [17]
-    runs-on: ubuntu-latest
-    timeout-minutes: 120
-    outputs:
-      alpini_touched: ${{ steps.check_alpini_files_changed.outputs.alpini }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          # Checkout as many commits as needed for the diff
-          fetch-depth: 2
-      - name: Check if files have changed
-        uses: dorny/paths-filter@v3
-        id: check_alpini_files_changed
-        with:
-          filters: |
-            alpini:
-              - 'internal/alpini/**'
-      - uses: actions/checkout@v4
-        if: steps.check_alpini_files_changed.outputs.alpini == 'true'
-        with:
-          fetch-depth: 0
-      - name: Set up JDK
-        uses: actions/setup-java@v4
-        if: steps.check_alpini_files_changed.outputs.alpini == 'true'
-        with:
-          java-version: ${{ matrix.jdk }}
-          distribution: 'temurin'
-          cache: 'gradle'
-      # - name: Allow Deprecated TLS versions for Alpini tests
-      #   run: |
-      #     echo "java.security file before modifications: "
-      #     cat "$JAVA_HOME/conf/security/java.security"
-
-      #     # This is possibly flaky but
-      #     sed -i 's/TLSv1, //g' "$JAVA_HOME/conf/security/java.security" # Allow TLSv1
-      #     sed -i 's/TLSv1.1, //g' "$JAVA_HOME/conf/security/java.security" # Allow TLSv1.1
-
-      #     echo "java.security file after modifications: "
-      #     cat "$JAVA_HOME/conf/security/java.security"
-      - shell: bash
-        if: steps.check_alpini_files_changed.outputs.alpini == 'true'
-        run: |
-          git remote set-head origin --auto
-          git remote add upstream https://github.com/linkedin/venice
-          git fetch upstream
-      - name: Setup Gradle
-        if: steps.check_alpini_files_changed.outputs.alpini == 'true'
-        uses: gradle/actions/setup-gradle@v4
-      - name: Run alpini functional tests
-        if: steps.check_alpini_files_changed.outputs.alpini == 'true'
-        run: ./gradlew --continue --no-daemon -DmaxParallelForks=1 alpiniFunctionalTest
-      - name: Package Build Artifacts
-        if: steps.check_alpini_files_changed.outputs.alpini == 'true' && (success() || failure())
-        shell: bash
-        run: |
-          mkdir ${{ github.job }}-artifacts
-          find . -path "**/build/reports/*" -or -path "**/build/test-results/*" > artifacts.list
-          rsync -R --files-from=artifacts.list . ${{ github.job }}-artifacts
-          tar -zcvf ${{ github.job }}-jdk${{ matrix.jdk }}-logs.tar.gz ${{ github.job }}-artifacts
-      - name: Upload Build Artifacts
-        if: steps.check_alpini_files_changed.outputs.alpini == 'true' && (success() || failure())
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ github.job }}
+          name: ${{ github.job }}-jdk${{ matrix.jdk }}
           path: ${{ github.job }}-jdk${{ matrix.jdk }}-logs.tar.gz
           retention-days: 30
 
@@ -257,7 +172,7 @@ jobs:
     strategy:
       fail-fast: false
     runs-on: ubuntu-latest
-    needs: [AvroCompatibilityTests, AlpiniUnitTests, AlpiniFunctionalTests, PulsarVeniceIntegrationTests]
+    needs: [AvroCompatibilityTests, AlpiniUnitTests, PulsarVeniceIntegrationTests]
     timeout-minutes: 120
     steps:
       - name: AllIsWell

diff --git a/build.gradle b/build.gradle
@@ -387,7 +387,6 @@ subprojects {
   def ALPINI_TEST_FILTER = 'com.linkedin.alpini.*'
   def ALPINI_NETTY_TEST_FILTER = 'io.netty.*'
   def ALPINI_UNIT_TEST_TASK_NAME = 'alpiniUnitTest'
-  def ALPINI_FUNCTIONAL_TEST_TASK_NAME = 'alpiniFunctionalTest'
 
   tasks.withType(Test) {
     mustRunAfter tasks.withType(SpotBugsTask)
@@ -419,7 +418,7 @@ subprojects {
       println "jvmArgs=$allJvmArgs"
     }
 
-    if (name != ALPINI_UNIT_TEST_TASK_NAME && name != ALPINI_FUNCTIONAL_TEST_TASK_NAME) {
+    if (name != ALPINI_UNIT_TEST_TASK_NAME) {
       filter {
         excludeTestsMatching ALPINI_TEST_FILTER
         excludeTestsMatching ALPINI_NETTY_TEST_FILTER
@@ -564,17 +563,6 @@ subprojects {
     }
   }
 
-  task "$ALPINI_FUNCTIONAL_TEST_TASK_NAME"(type: Test) {
-    useTestNG() {
-      includeGroups 'functional'
-    }
-    filter {
-      includeTestsMatching ALPINI_TEST_FILTER
-      includeTestsMatching ALPINI_NETTY_TEST_FILTER
-      failOnNoMatchingTests = false
-    }
-  }
-
   tasks.withType(Jar) {
     zip64 = true
     duplicatesStrategy = DuplicatesStrategy.FAIL

diff --git a/gradle/spotbugs/exclude.xml b/gradle/spotbugs/exclude.xml
@@ -258,6 +258,12 @@
       </Class>
     </Or>
   </Match>
+  <Match>
+    <Bug pattern="RC_REF_COMPARISON"/>
+    <Or>
+      <Class name="com.linkedin.venice.utils.CollectionUtilsTest"/>
+    </Or>
+  </Match>
   <Match>
     <!--Auto-generated classes. No plan to fix-->
     <Bug pattern="RI_REDUNDANT_INTERFACES"/>

diff --git a/internal/alpini/common/alpini-common-base/build.gradle b/internal/alpini/common/alpini-common-base/build.gradle
@@ -4,7 +4,6 @@ configurations {
 
 dependencies {
   testImplementation libraries.testng
-  implementation project(':internal:alpini:common:alpini-common-const')
   implementation libraries.jacksonDatabind
   implementation libraries.jsr305
   implementation libraries.log4j2api