Skip to content

Event type IDs + event metadata incl. OTel context #2998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 27, 2025
Merged

Event type IDs + event metadata incl. OTel context #2998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79945c2
Event type IDs + event metadata incl. OTel context
adutra Oct 22, 2025
881a477
move event.id()
adutra Nov 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,16 @@

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import jakarta.annotation.Nullable;
import java.util.Map;

public class PolarisEvent {
// TODO: Look into using the CDI-managed `ObjectMapper` object
public static final String EMPTY_MAP_STRING = "{}";

// to serialize/deserialize properties
// TODO: Look into using the CDI-managed `ObjectMapper` object
private static final ObjectMapper MAPPER = new ObjectMapper();

// catalog id
Expand Down Expand Up @@ -116,6 +117,17 @@ public PolarisEvent(
this.resourceIdentifier = resourceIdentifier;
}

@JsonIgnore
public Map<String, String> getAdditionalPropertiesAsMap() {
String properties = getAdditionalProperties();
try {
return MAPPER.readValue(properties, new TypeReference<>() {});
} catch (JsonProcessingException ex) {
throw new IllegalStateException(
String.format("Failed to deserialize json. properties %s", properties), ex);
}
}

@JsonIgnore
public void setAdditionalProperties(Map<String, String> properties) {
try {
Expand Down
1 change: 1 addition & 0 deletions runtime/service/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ dependencies {
}

testImplementation(project(":polaris-api-management-model"))
testImplementation(project(":polaris-relational-jdbc"))
Copy link
Contributor

@dimas-b dimas-b Nov 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I might have missing this... How does JDBC get into tests now ? 😅

Copy link
Contributor Author

@adutra adutra Nov 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To test the persistence-in-memory-buffer event listener with H2: see InMemoryBufferEventListenerIntegrationTest.

Copy link
Contributor

@dimas-b dimas-b Nov 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thx!


testImplementation(project(":polaris-minio-testcontainer"))

Expand Down
72 changes: 46 additions & 26 deletions .../src/main/java/org/apache/polaris/service/admin/PolarisCatalogsEventServiceDelegator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import org.apache.polaris.core.entity.PolarisPrivilege;
import org.apache.polaris.service.admin.api.PolarisCatalogsApiService;
import org.apache.polaris.service.events.CatalogsServiceEvents;
import org.apache.polaris.service.events.PolarisEventMetadataFactory;
import org.apache.polaris.service.events.listeners.PolarisEventListener;

@Decorator
Expand All @@ -51,37 +52,44 @@ public class PolarisCatalogsEventServiceDelegator implements PolarisCatalogsApiS

@Inject @Delegate PolarisCatalogsApiService delegate;
@Inject PolarisEventListener polarisEventListener;
@Inject PolarisEventMetadataFactory eventMetadataFactory;

@Override
public Response createCatalog(
CreateCatalogRequest request, RealmContext realmContext, SecurityContext securityContext) {
polarisEventListener.onBeforeCreateCatalog(
new CatalogsServiceEvents.BeforeCreateCatalogEvent(request.getCatalog().getName()));
new CatalogsServiceEvents.BeforeCreateCatalogEvent(
eventMetadataFactory.create(), request.getCatalog().getName()));
Response resp = delegate.createCatalog(request, realmContext, securityContext);
polarisEventListener.onAfterCreateCatalog(
new CatalogsServiceEvents.AfterCreateCatalogEvent((Catalog) resp.getEntity()));
new CatalogsServiceEvents.AfterCreateCatalogEvent(
eventMetadataFactory.create(), (Catalog) resp.getEntity()));
return resp;
}

@Override
public Response deleteCatalog(
String catalogName, RealmContext realmContext, SecurityContext securityContext) {
polarisEventListener.onBeforeDeleteCatalog(
new CatalogsServiceEvents.BeforeDeleteCatalogEvent(catalogName));
new CatalogsServiceEvents.BeforeDeleteCatalogEvent(
eventMetadataFactory.create(), catalogName));
Response resp = delegate.deleteCatalog(catalogName, realmContext, securityContext);
polarisEventListener.onAfterDeleteCatalog(
new CatalogsServiceEvents.AfterDeleteCatalogEvent(catalogName));
new CatalogsServiceEvents.AfterDeleteCatalogEvent(
eventMetadataFactory.create(), catalogName));
return resp;
}

@Override
public Response getCatalog(
String catalogName, RealmContext realmContext, SecurityContext securityContext) {
polarisEventListener.onBeforeGetCatalog(
new CatalogsServiceEvents.BeforeGetCatalogEvent(catalogName));
new CatalogsServiceEvents.BeforeGetCatalogEvent(
eventMetadataFactory.create(), catalogName));
Response resp = delegate.getCatalog(catalogName, realmContext, securityContext);
polarisEventListener.onAfterGetCatalog(
new CatalogsServiceEvents.AfterGetCatalogEvent((Catalog) resp.getEntity()));
new CatalogsServiceEvents.AfterGetCatalogEvent(
eventMetadataFactory.create(), (Catalog) resp.getEntity()));
return resp;
}

Expand All @@ -92,19 +100,23 @@ public Response updateCatalog(
RealmContext realmContext,
SecurityContext securityContext) {
polarisEventListener.onBeforeUpdateCatalog(
new CatalogsServiceEvents.BeforeUpdateCatalogEvent(catalogName, updateRequest));
new CatalogsServiceEvents.BeforeUpdateCatalogEvent(
eventMetadataFactory.create(), catalogName, updateRequest));
Response resp =
delegate.updateCatalog(catalogName, updateRequest, realmContext, securityContext);
polarisEventListener.onAfterUpdateCatalog(
new CatalogsServiceEvents.AfterUpdateCatalogEvent((Catalog) resp.getEntity()));
new CatalogsServiceEvents.AfterUpdateCatalogEvent(
eventMetadataFactory.create(), (Catalog) resp.getEntity()));
return resp;
}

@Override
public Response listCatalogs(RealmContext realmContext, SecurityContext securityContext) {
polarisEventListener.onBeforeListCatalogs(new CatalogsServiceEvents.BeforeListCatalogsEvent());
polarisEventListener.onBeforeListCatalogs(
new CatalogsServiceEvents.BeforeListCatalogsEvent(eventMetadataFactory.create()));
Response resp = delegate.listCatalogs(realmContext, securityContext);
polarisEventListener.onAfterListCatalogs(new CatalogsServiceEvents.AfterListCatalogsEvent());
polarisEventListener.onAfterListCatalogs(
new CatalogsServiceEvents.AfterListCatalogsEvent(eventMetadataFactory.create()));
return resp;
}

Expand All @@ -116,11 +128,11 @@ public Response createCatalogRole(
SecurityContext securityContext) {
polarisEventListener.onBeforeCreateCatalogRole(
new CatalogsServiceEvents.BeforeCreateCatalogRoleEvent(
catalogName, request.getCatalogRole().getName()));
eventMetadataFactory.create(), catalogName, request.getCatalogRole().getName()));
Response resp = delegate.createCatalogRole(catalogName, request, realmContext, securityContext);
polarisEventListener.onAfterCreateCatalogRole(
new CatalogsServiceEvents.AfterCreateCatalogRoleEvent(
catalogName, (CatalogRole) resp.getEntity()));
eventMetadataFactory.create(), catalogName, (CatalogRole) resp.getEntity()));
return resp;
}

Expand All @@ -131,11 +143,13 @@ public Response deleteCatalogRole(
RealmContext realmContext,
SecurityContext securityContext) {
polarisEventListener.onBeforeDeleteCatalogRole(
new CatalogsServiceEvents.BeforeDeleteCatalogRoleEvent(catalogName, catalogRoleName));
new CatalogsServiceEvents.BeforeDeleteCatalogRoleEvent(
eventMetadataFactory.create(), catalogName, catalogRoleName));
Response resp =
delegate.deleteCatalogRole(catalogName, catalogRoleName, realmContext, securityContext);
polarisEventListener.onAfterDeleteCatalogRole(
new CatalogsServiceEvents.AfterDeleteCatalogRoleEvent(catalogName, catalogRoleName));
new CatalogsServiceEvents.AfterDeleteCatalogRoleEvent(
eventMetadataFactory.create(), catalogName, catalogRoleName));
return resp;
}

Expand All @@ -146,12 +160,13 @@ public Response getCatalogRole(
RealmContext realmContext,
SecurityContext securityContext) {
polarisEventListener.onBeforeGetCatalogRole(
new CatalogsServiceEvents.BeforeGetCatalogRoleEvent(catalogName, catalogRoleName));
new CatalogsServiceEvents.BeforeGetCatalogRoleEvent(
eventMetadataFactory.create(), catalogName, catalogRoleName));
Response resp =
delegate.getCatalogRole(catalogName, catalogRoleName, realmContext, securityContext);
polarisEventListener.onAfterGetCatalogRole(
new CatalogsServiceEvents.AfterGetCatalogRoleEvent(
catalogName, (CatalogRole) resp.getEntity()));
eventMetadataFactory.create(), catalogName, (CatalogRole) resp.getEntity()));
return resp;
}

Expand All @@ -164,24 +179,26 @@ public Response updateCatalogRole(
SecurityContext securityContext) {
polarisEventListener.onBeforeUpdateCatalogRole(
new CatalogsServiceEvents.BeforeUpdateCatalogRoleEvent(
catalogName, catalogRoleName, updateRequest));
eventMetadataFactory.create(), catalogName, catalogRoleName, updateRequest));
Response resp =
delegate.updateCatalogRole(
catalogName, catalogRoleName, updateRequest, realmContext, securityContext);
polarisEventListener.onAfterUpdateCatalogRole(
new CatalogsServiceEvents.AfterUpdateCatalogRoleEvent(
catalogName, (CatalogRole) resp.getEntity()));
eventMetadataFactory.create(), catalogName, (CatalogRole) resp.getEntity()));
return resp;
}

@Override
public Response listCatalogRoles(
String catalogName, RealmContext realmContext, SecurityContext securityContext) {
polarisEventListener.onAfterListCatalogRoles(
new CatalogsServiceEvents.AfterListCatalogRolesEvent(catalogName));
new CatalogsServiceEvents.AfterListCatalogRolesEvent(
eventMetadataFactory.create(), catalogName));
Response resp = delegate.listCatalogRoles(catalogName, realmContext, securityContext);
polarisEventListener.onBeforeListCatalogRoles(
new CatalogsServiceEvents.BeforeListCatalogRolesEvent(catalogName));
new CatalogsServiceEvents.BeforeListCatalogRolesEvent(
eventMetadataFactory.create(), catalogName));
return resp;
}

Expand All @@ -194,13 +211,14 @@ public Response addGrantToCatalogRole(
SecurityContext securityContext) {
polarisEventListener.onBeforeAddGrantToCatalogRole(
new CatalogsServiceEvents.BeforeAddGrantToCatalogRoleEvent(
catalogName, catalogRoleName, grantRequest));
eventMetadataFactory.create(), catalogName, catalogRoleName, grantRequest));
Response resp =
delegate.addGrantToCatalogRole(
catalogName, catalogRoleName, grantRequest, realmContext, securityContext);
GrantResource grantResource = grantRequest.getGrant();
polarisEventListener.onAfterAddGrantToCatalogRole(
new CatalogsServiceEvents.AfterAddGrantToCatalogRoleEvent(
eventMetadataFactory.create(),
catalogName,
catalogRoleName,
getPrivilegeFromGrantResource(grantResource),
Expand All @@ -218,13 +236,14 @@ public Response revokeGrantFromCatalogRole(
SecurityContext securityContext) {
polarisEventListener.onBeforeRevokeGrantFromCatalogRole(
new CatalogsServiceEvents.BeforeRevokeGrantFromCatalogRoleEvent(
catalogName, catalogRoleName, grantRequest, cascade));
eventMetadataFactory.create(), catalogName, catalogRoleName, grantRequest, cascade));
Response resp =
delegate.revokeGrantFromCatalogRole(
catalogName, catalogRoleName, cascade, grantRequest, realmContext, securityContext);
GrantResource grantResource = grantRequest.getGrant();
polarisEventListener.onAfterRevokeGrantFromCatalogRole(
new CatalogsServiceEvents.AfterRevokeGrantFromCatalogRoleEvent(
eventMetadataFactory.create(),
catalogName,
catalogRoleName,
getPrivilegeFromGrantResource(grantResource),
Expand All @@ -241,13 +260,13 @@ public Response listAssigneePrincipalRolesForCatalogRole(
SecurityContext securityContext) {
polarisEventListener.onBeforeListAssigneePrincipalRolesForCatalogRole(
new CatalogsServiceEvents.BeforeListAssigneePrincipalRolesForCatalogRoleEvent(
catalogName, catalogRoleName));
eventMetadataFactory.create(), catalogName, catalogRoleName));
Response resp =
delegate.listAssigneePrincipalRolesForCatalogRole(
catalogName, catalogRoleName, realmContext, securityContext);
polarisEventListener.onAfterListAssigneePrincipalRolesForCatalogRole(
new CatalogsServiceEvents.AfterListAssigneePrincipalRolesForCatalogRoleEvent(
catalogName, catalogRoleName));
eventMetadataFactory.create(), catalogName, catalogRoleName));
return resp;
}

Expand All @@ -259,12 +278,13 @@ public Response listGrantsForCatalogRole(
SecurityContext securityContext) {
polarisEventListener.onBeforeListGrantsForCatalogRole(
new CatalogsServiceEvents.BeforeListGrantsForCatalogRoleEvent(
catalogName, catalogRoleName));
eventMetadataFactory.create(), catalogName, catalogRoleName));
Response resp =
delegate.listGrantsForCatalogRole(
catalogName, catalogRoleName, realmContext, securityContext);
polarisEventListener.onAfterListGrantsForCatalogRole(
new CatalogsServiceEvents.AfterListGrantsForCatalogRoleEvent(catalogName, catalogRoleName));
new CatalogsServiceEvents.AfterListGrantsForCatalogRoleEvent(
eventMetadataFactory.create(), catalogName, catalogRoleName));
return resp;
}

Expand Down
Loading