APPENG-1218: Ignore show databases queries from table access statistics (#49)

* APPENG-1218: Ignore show databases queries from table access statistics
* APPENG-1218: Update outdated github actions

Author: normanma-tw

.github/workflows/build.yml

@@ -32,40 +32,30 @@ jobs:
           MYSQL_DATABASE: mydb
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'zulu'
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v4
         with:
           gradle-home-cache-cleanup: true
           # Comment out when you are upgrading gradle in a branch and doing tons of commits you would need to test.
           # cache-read-only: false
       - name: "Assemble jar"
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: assemble --console=plain --info --stacktrace --parallel
+        run: ./gradlew assemble --console=plain --info --stacktrace --parallel
       - name: "Compile tests"
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: compileTest --console=plain --info --stacktrace --parallel
+        run: ./gradlew compileTest --console=plain --info --stacktrace --parallel
       - name: "Run checks"
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: check -x test --console=plain --stacktrace
+        run: ./gradlew check -x test --console=plain --stacktrace
       - name: "Run tests"
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: -Dspring.profiles.include=continuous-integration test --console=plain --info --stacktrace
+        run: ./gradlew -Dspring.profiles.include=continuous-integration test --console=plain --info --stacktrace
       - name: "Test if publishing works"
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: publishToMavenLocal --console=plain --info --stacktrace
+        run: ./gradlew publishToMavenLocal --console=plain --info --stacktrace
       - name: "Publish Test Report"
-        uses: mikepenz/action-junit-report@v3
+        uses: mikepenz/action-junit-report@v5
         if: always()
         with:
           check_name: Test Report-(${{ matrix.spring_boot_version }})
@@ -89,7 +79,7 @@ jobs:
           tar -zcvf all-test-reports-${{ matrix.spring_boot_version }}.tar.gz **/build/reports
         if: always()
       - name: "Store test results"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: all-test-reports-${{ matrix.spring_boot_version }}
@@ -109,9 +99,9 @@ jobs:
         if: ${{ needs.matrix_build.result != 'success' }}
         run: exit 1
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v4
         with:
           gradle-home-cache-cleanup: true
           # Comment out when you are upgrading gradle in a branch and doing tons of commits you would need to test.

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres
 to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.16.5] - 2025-05-08
+
+### Changed
+
+* Ignore "SHOW DATABASES ..." queries, which are generated by flyway-mysql 10.15.1+ and fail to be parsed by JSQLParser
+
 ## [2.16.4] - 2024-12-06
 
 ### Added

gradle.properties

@@ -1 +1 @@
-version=2.16.4
+version=2.16.5

tw-entrypoints/src/main/java/com/transferwise/common/entrypoints/tableaccessstatistics/DefaultTasQueryParsingInterceptor.java

@@ -5,7 +5,7 @@
 
 public class DefaultTasQueryParsingInterceptor implements TasQueryParsingInterceptor {
 
-  private static final Pattern PG_SET_PATTERN = Pattern.compile("(?is)SET\\s+[a-z_]*\\s+TO\\s+.*|EXPLAIN\\s+.*");
+  private static final Pattern PG_SET_PATTERN = Pattern.compile("(?is)SET\\s+[a-z_]*\\s+TO\\s+.*|EXPLAIN\\s+.*|SHOW DATABASES\\s+.*");
 
   @Override
   public InterceptResult intercept(String sql) {

tw-entrypoints/src/test/java/com/transferwise/common/entrypoints/tableaccessstatistics/SqlParserUtilsTest.java

@@ -50,6 +50,8 @@ void testJSqlParser() {
     testCases.add(new TestCase("explain (FORMAT JSON) select * from fx.request where id = 1",
         List.of()));
 
+    testCases.add(new TestCase("SHOW DATABASES LIKE 'RDSAdmin'", List.of()));
+
     testCases.add(new TestCase("insert into fin_unique_tw_task_key(task_id,key_hash,key) values(?, ?, ?) on conflict (key_hash, key) do nothing",
         List.of("fin_unique_tw_task_key")));