You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polaris.apache.org by di...@apache.org on 2025/09/30 19:15:36 UTC

(polaris) branch main updated: TestEventsListener - reduce memory pressure (#2724)

This is an automated email from the ASF dual-hosted git repository.

dimas pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/polaris.git


The following commit(s) were added to refs/heads/main by this push:
     new ea50fe351 TestEventsListener - reduce memory pressure (#2724)
ea50fe351 is described below

commit ea50fe351f19b177460a713cfb524b96d94aba2b
Author: Robert Stupp <sn...@snazy.de>
AuthorDate: Tue Sep 30 21:15:31 2025 +0200

    TestEventsListener - reduce memory pressure (#2724)
    
    Only the last events are needed, so it's enough to keep only the last events by type. Also adds a `.clear()` function to clear the captured events for a deterministic (empty) state for each test case.
    
    Also uses a thread-safe collection now.
---
 .../events/listeners/TestPolarisEventListener.java | 326 +++++++++++----------
 .../iceberg/AbstractIcebergCatalogTest.java        |   1 +
 .../iceberg/AbstractIcebergCatalogViewTest.java    |   1 +
 3 files changed, 170 insertions(+), 158 deletions(-)

diff --git a/runtime/service/src/main/java/org/apache/polaris/service/events/listeners/TestPolarisEventListener.java b/runtime/service/src/main/java/org/apache/polaris/service/events/listeners/TestPolarisEventListener.java
index 579fe1bf9..2bf500967 100644
--- a/runtime/service/src/main/java/org/apache/polaris/service/events/listeners/TestPolarisEventListener.java
+++ b/runtime/service/src/main/java/org/apache/polaris/service/events/listeners/TestPolarisEventListener.java
@@ -18,11 +18,10 @@
  */
 package org.apache.polaris.service.events.listeners;
 
-import com.google.common.collect.Streams;
 import io.smallrye.common.annotation.Identifier;
 import jakarta.enterprise.context.ApplicationScoped;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import org.apache.polaris.service.events.AfterAttemptTaskEvent;
 import org.apache.polaris.service.events.BeforeAttemptTaskEvent;
 import org.apache.polaris.service.events.BeforeLimitRequestRateEvent;
@@ -38,816 +37,827 @@ import org.apache.polaris.service.events.PrincipalsServiceEvents;
 @ApplicationScoped
 @Identifier("test")
 public class TestPolarisEventListener implements PolarisEventListener {
-  private final List<PolarisEvent> history = new ArrayList<>();
+  private final Map<Class<? extends PolarisEvent>, PolarisEvent> latestEvents =
+      new ConcurrentHashMap<>();
+
+  private void recordEvent(PolarisEvent event) {
+    latestEvents.put(event.getClass(), event);
+  }
+
+  public void clear() {
+    latestEvents.clear();
+  }
 
   public <T> T getLatest(Class<T> type) {
-    return Streams.findLast(history.stream().filter(type::isInstance))
-        .map(type::cast)
-        .orElseThrow();
+    var latest = latestEvents.get(type);
+    if (latest == null) {
+      throw new IllegalStateException("No event of type " + type + " recorded");
+    }
+    return type.cast(latest);
   }
 
   @Override
   public void onBeforeCreateCatalog(CatalogsServiceEvents.BeforeCreateCatalogEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterCreateCatalog(CatalogsServiceEvents.AfterCreateCatalogEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeDeleteCatalog(CatalogsServiceEvents.BeforeDeleteCatalogEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterDeleteCatalog(CatalogsServiceEvents.AfterDeleteCatalogEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeGetCatalog(CatalogsServiceEvents.BeforeGetCatalogEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterGetCatalog(CatalogsServiceEvents.AfterGetCatalogEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeUpdateCatalog(CatalogsServiceEvents.BeforeUpdateCatalogEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterUpdateCatalog(CatalogsServiceEvents.AfterUpdateCatalogEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeListCatalogs(CatalogsServiceEvents.BeforeListCatalogsEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterListCatalogs(CatalogsServiceEvents.AfterListCatalogsEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeCreatePrincipal(PrincipalsServiceEvents.BeforeCreatePrincipalEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterCreatePrincipal(PrincipalsServiceEvents.AfterCreatePrincipalEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeDeletePrincipal(PrincipalsServiceEvents.BeforeDeletePrincipalEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterDeletePrincipal(PrincipalsServiceEvents.AfterDeletePrincipalEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeGetPrincipal(PrincipalsServiceEvents.BeforeGetPrincipalEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterGetPrincipal(PrincipalsServiceEvents.AfterGetPrincipalEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeUpdatePrincipal(PrincipalsServiceEvents.BeforeUpdatePrincipalEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterUpdatePrincipal(PrincipalsServiceEvents.AfterUpdatePrincipalEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeRotateCredentials(
       PrincipalsServiceEvents.BeforeRotateCredentialsEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterRotateCredentials(PrincipalsServiceEvents.AfterRotateCredentialsEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeListPrincipals(PrincipalsServiceEvents.BeforeListPrincipalsEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterListPrincipals(PrincipalsServiceEvents.AfterListPrincipalsEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeResetCredentials(PrincipalsServiceEvents.BeforeResetCredentialsEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterResetCredentials(PrincipalsServiceEvents.AfterResetCredentialsEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeAssignPrincipalRole(
       PrincipalsServiceEvents.BeforeAssignPrincipalRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterAssignPrincipalRole(
       PrincipalsServiceEvents.AfterAssignPrincipalRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeRevokePrincipalRole(
       PrincipalsServiceEvents.BeforeRevokePrincipalRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterRevokePrincipalRole(
       PrincipalsServiceEvents.AfterRevokePrincipalRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeListAssignedPrincipalRoles(
       PrincipalsServiceEvents.BeforeListAssignedPrincipalRolesEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterListAssignedPrincipalRoles(
       PrincipalsServiceEvents.AfterListAssignedPrincipalRolesEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeCreatePrincipalRole(
       PrincipalRolesServiceEvents.BeforeCreatePrincipalRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterCreatePrincipalRole(
       PrincipalRolesServiceEvents.AfterCreatePrincipalRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeDeletePrincipalRole(
       PrincipalRolesServiceEvents.BeforeDeletePrincipalRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterDeletePrincipalRole(
       PrincipalRolesServiceEvents.AfterDeletePrincipalRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeGetPrincipalRole(
       PrincipalRolesServiceEvents.BeforeGetPrincipalRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterGetPrincipalRole(
       PrincipalRolesServiceEvents.AfterGetPrincipalRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeUpdatePrincipalRole(
       PrincipalRolesServiceEvents.BeforeUpdatePrincipalRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterUpdatePrincipalRole(
       PrincipalRolesServiceEvents.AfterUpdatePrincipalRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeListPrincipalRoles(
       PrincipalRolesServiceEvents.BeforeListPrincipalRolesEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterListPrincipalRoles(
       PrincipalRolesServiceEvents.AfterListPrincipalRolesEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeCreateCatalogRole(CatalogsServiceEvents.BeforeCreateCatalogRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterCreateCatalogRole(CatalogsServiceEvents.AfterCreateCatalogRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeDeleteCatalogRole(CatalogsServiceEvents.BeforeDeleteCatalogRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterDeleteCatalogRole(CatalogsServiceEvents.AfterDeleteCatalogRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeGetCatalogRole(CatalogsServiceEvents.BeforeGetCatalogRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterGetCatalogRole(CatalogsServiceEvents.AfterGetCatalogRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeUpdateCatalogRole(CatalogsServiceEvents.BeforeUpdateCatalogRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterUpdateCatalogRole(CatalogsServiceEvents.AfterUpdateCatalogRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeListCatalogRoles(CatalogsServiceEvents.BeforeListCatalogRolesEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterListCatalogRoles(CatalogsServiceEvents.AfterListCatalogRolesEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeAssignCatalogRoleToPrincipalRole(
       PrincipalRolesServiceEvents.BeforeAssignCatalogRoleToPrincipalRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterAssignCatalogRoleToPrincipalRole(
       PrincipalRolesServiceEvents.AfterAssignCatalogRoleToPrincipalRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeRevokeCatalogRoleFromPrincipalRole(
       PrincipalRolesServiceEvents.BeforeRevokeCatalogRoleFromPrincipalRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterRevokeCatalogRoleFromPrincipalRole(
       PrincipalRolesServiceEvents.AfterRevokeCatalogRoleFromPrincipalRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeListAssigneePrincipalsForPrincipalRole(
       PrincipalRolesServiceEvents.BeforeListAssigneePrincipalsForPrincipalRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterListAssigneePrincipalsForPrincipalRole(
       PrincipalRolesServiceEvents.AfterListAssigneePrincipalsForPrincipalRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeListCatalogRolesForPrincipalRole(
       PrincipalRolesServiceEvents.BeforeListCatalogRolesForPrincipalRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterListCatalogRolesForPrincipalRole(
       PrincipalRolesServiceEvents.AfterListCatalogRolesForPrincipalRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeAddGrantToCatalogRole(
       CatalogsServiceEvents.BeforeAddGrantToCatalogRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterAddGrantToCatalogRole(
       CatalogsServiceEvents.AfterAddGrantToCatalogRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeRevokeGrantFromCatalogRole(
       CatalogsServiceEvents.BeforeRevokeGrantFromCatalogRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterRevokeGrantFromCatalogRole(
       CatalogsServiceEvents.AfterRevokeGrantFromCatalogRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeListAssigneePrincipalRolesForCatalogRole(
       CatalogsServiceEvents.BeforeListAssigneePrincipalRolesForCatalogRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterListAssigneePrincipalRolesForCatalogRole(
       CatalogsServiceEvents.AfterListAssigneePrincipalRolesForCatalogRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeListGrantsForCatalogRole(
       CatalogsServiceEvents.BeforeListGrantsForCatalogRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterListGrantsForCatalogRole(
       CatalogsServiceEvents.AfterListGrantsForCatalogRoleEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeCreateNamespace(IcebergRestCatalogEvents.BeforeCreateNamespaceEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterCreateNamespace(IcebergRestCatalogEvents.AfterCreateNamespaceEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeListNamespaces(IcebergRestCatalogEvents.BeforeListNamespacesEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterListNamespaces(IcebergRestCatalogEvents.AfterListNamespacesEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeLoadNamespaceMetadata(
       IcebergRestCatalogEvents.BeforeLoadNamespaceMetadataEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterLoadNamespaceMetadata(
       IcebergRestCatalogEvents.AfterLoadNamespaceMetadataEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeCheckExistsNamespace(
       IcebergRestCatalogEvents.BeforeCheckExistsNamespaceEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterCheckExistsNamespace(
       IcebergRestCatalogEvents.AfterCheckExistsNamespaceEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeDropNamespace(IcebergRestCatalogEvents.BeforeDropNamespaceEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterDropNamespace(IcebergRestCatalogEvents.AfterDropNamespaceEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeUpdateNamespaceProperties(
       IcebergRestCatalogEvents.BeforeUpdateNamespacePropertiesEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterUpdateNamespaceProperties(
       IcebergRestCatalogEvents.AfterUpdateNamespacePropertiesEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeCreateTable(IcebergRestCatalogEvents.BeforeCreateTableEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterCreateTable(IcebergRestCatalogEvents.AfterCreateTableEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeCommitTable(IcebergRestCatalogEvents.BeforeCommitTableEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterCommitTable(IcebergRestCatalogEvents.AfterCommitTableEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeRefreshTable(IcebergRestCatalogEvents.BeforeRefreshTableEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterRefreshTable(IcebergRestCatalogEvents.AfterRefreshTableEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeListTables(IcebergRestCatalogEvents.BeforeListTablesEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterListTables(IcebergRestCatalogEvents.AfterListTablesEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeLoadTable(IcebergRestCatalogEvents.BeforeLoadTableEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterLoadTable(IcebergRestCatalogEvents.AfterLoadTableEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeCheckExistsTable(IcebergRestCatalogEvents.BeforeCheckExistsTableEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterCheckExistsTable(IcebergRestCatalogEvents.AfterCheckExistsTableEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeDropTable(IcebergRestCatalogEvents.BeforeDropTableEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterDropTable(IcebergRestCatalogEvents.AfterDropTableEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeRegisterTable(IcebergRestCatalogEvents.BeforeRegisterTableEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterRegisterTable(IcebergRestCatalogEvents.AfterRegisterTableEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeRenameTable(IcebergRestCatalogEvents.BeforeRenameTableEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterRenameTable(IcebergRestCatalogEvents.AfterRenameTableEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeUpdateTable(IcebergRestCatalogEvents.BeforeUpdateTableEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterUpdateTable(IcebergRestCatalogEvents.AfterUpdateTableEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeCreateView(IcebergRestCatalogEvents.BeforeCreateViewEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterCreateView(IcebergRestCatalogEvents.AfterCreateViewEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeCommitView(IcebergRestCatalogEvents.BeforeCommitViewEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterCommitView(IcebergRestCatalogEvents.AfterCommitViewEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeRefreshView(IcebergRestCatalogEvents.BeforeRefreshViewEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterRefreshView(IcebergRestCatalogEvents.AfterRefreshViewEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeListViews(IcebergRestCatalogEvents.BeforeListViewsEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterListViews(IcebergRestCatalogEvents.AfterListViewsEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeLoadView(IcebergRestCatalogEvents.BeforeLoadViewEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterLoadView(IcebergRestCatalogEvents.AfterLoadViewEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeCheckExistsView(IcebergRestCatalogEvents.BeforeCheckExistsViewEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterCheckExistsView(IcebergRestCatalogEvents.AfterCheckExistsViewEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeDropView(IcebergRestCatalogEvents.BeforeDropViewEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterDropView(IcebergRestCatalogEvents.AfterDropViewEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeRenameView(IcebergRestCatalogEvents.BeforeRenameViewEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterRenameView(IcebergRestCatalogEvents.AfterRenameViewEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeReplaceView(IcebergRestCatalogEvents.BeforeReplaceViewEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterReplaceView(IcebergRestCatalogEvents.AfterReplaceViewEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeLoadCredentials(IcebergRestCatalogEvents.BeforeLoadCredentialsEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterLoadCredentials(IcebergRestCatalogEvents.AfterLoadCredentialsEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeCommitTransaction(
       IcebergRestCatalogEvents.BeforeCommitTransactionEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterCommitTransaction(IcebergRestCatalogEvents.AfterCommitTransactionEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeSendNotification(IcebergRestCatalogEvents.BeforeSendNotificationEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterSendNotification(IcebergRestCatalogEvents.AfterSendNotificationEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeGetConfig(IcebergRestCatalogEvents.BeforeGetConfigEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterGetConfig(IcebergRestCatalogEvents.AfterGetConfigEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeCreatePolicy(CatalogPolicyServiceEvents.BeforeCreatePolicyEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterCreatePolicy(CatalogPolicyServiceEvents.AfterCreatePolicyEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeListPolicies(CatalogPolicyServiceEvents.BeforeListPoliciesEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterListPolicies(CatalogPolicyServiceEvents.AfterListPoliciesEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeLoadPolicy(CatalogPolicyServiceEvents.BeforeLoadPolicyEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterLoadPolicy(CatalogPolicyServiceEvents.AfterLoadPolicyEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeUpdatePolicy(CatalogPolicyServiceEvents.BeforeUpdatePolicyEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterUpdatePolicy(CatalogPolicyServiceEvents.AfterUpdatePolicyEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeDropPolicy(CatalogPolicyServiceEvents.BeforeDropPolicyEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterDropPolicy(CatalogPolicyServiceEvents.AfterDropPolicyEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeAttachPolicy(CatalogPolicyServiceEvents.BeforeAttachPolicyEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterAttachPolicy(CatalogPolicyServiceEvents.AfterAttachPolicyEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeDetachPolicy(CatalogPolicyServiceEvents.BeforeDetachPolicyEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterDetachPolicy(CatalogPolicyServiceEvents.AfterDetachPolicyEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeGetApplicablePolicies(
       CatalogPolicyServiceEvents.BeforeGetApplicablePoliciesEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterGetApplicablePolicies(
       CatalogPolicyServiceEvents.AfterGetApplicablePoliciesEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeCreateGenericTable(
       CatalogGenericTableServiceEvents.BeforeCreateGenericTableEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterCreateGenericTable(
       CatalogGenericTableServiceEvents.AfterCreateGenericTableEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeDropGenericTable(
       CatalogGenericTableServiceEvents.BeforeDropGenericTableEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterDropGenericTable(
       CatalogGenericTableServiceEvents.AfterDropGenericTableEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeListGenericTables(
       CatalogGenericTableServiceEvents.BeforeListGenericTablesEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterListGenericTables(
       CatalogGenericTableServiceEvents.AfterListGenericTablesEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeLoadGenericTable(
       CatalogGenericTableServiceEvents.BeforeLoadGenericTableEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterLoadGenericTable(
       CatalogGenericTableServiceEvents.AfterLoadGenericTableEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeAttemptTask(BeforeAttemptTaskEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onAfterAttemptTask(AfterAttemptTaskEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 
   @Override
   public void onBeforeLimitRequestRate(BeforeLimitRequestRateEvent event) {
-    history.add(event);
+    recordEvent(event);
   }
 }
diff --git a/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/AbstractIcebergCatalogTest.java b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/AbstractIcebergCatalogTest.java
index 1c9a43898..6da607f0f 100644
--- a/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/AbstractIcebergCatalogTest.java
+++ b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/AbstractIcebergCatalogTest.java
@@ -372,6 +372,7 @@ public abstract class AbstractIcebergCatalogTest extends CatalogTests<IcebergCat
 
     this.catalog = initCatalog("my-catalog", ImmutableMap.of());
     testPolarisEventListener = (TestPolarisEventListener) polarisEventListener;
+    testPolarisEventListener.clear();
   }
 
   @AfterEach
diff --git a/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/AbstractIcebergCatalogViewTest.java b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/AbstractIcebergCatalogViewTest.java
index 2514dc664..36718a855 100644
--- a/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/AbstractIcebergCatalogViewTest.java
+++ b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/AbstractIcebergCatalogViewTest.java
@@ -208,6 +208,7 @@ public abstract class AbstractIcebergCatalogViewTest extends ViewCatalogTests<Ic
         new DefaultFileIOFactory(storageCredentialCache, metaStoreManagerFactory);
 
     testPolarisEventListener = (TestPolarisEventListener) polarisEventListener;
+    testPolarisEventListener.clear();
     this.catalog =
         new IcebergCatalog(
             diagServices,