Addressing comments from @singhpk234

Author: adnanhemani

runtime/service/src/main/java/org/apache/polaris/service/events/jsonEventListener/aws/cloudwatch/AwsCloudWatchEventListener.java

@@ -33,6 +33,7 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Supplier;
+import org.apache.polaris.core.auth.PolarisPrincipal;
 import org.apache.polaris.core.context.CallContext;
 import org.apache.polaris.service.config.PolarisIcebergObjectMapperCustomizer;
 import org.apache.polaris.service.events.jsonEventListener.PropertyMapEventListener;
@@ -146,19 +147,23 @@ private static void ensureResourceExists(
   void shutdown() {
     if (client != null) {
       client.close();
+      client = null;
     }
   }
 
   @Override
   protected void transformAndSendEvent(HashMap<String, Object> properties) {
     properties.put("realm_id", callContext.getRealmContext().getRealmIdentifier());
     properties.put("principal", securityContext.getUserPrincipal().getName());
+    properties.put(
+        "activated_roles", ((PolarisPrincipal) securityContext.getUserPrincipal()).getRoles());
     // TODO: Add request ID when it is available
     String eventAsJson;
     try {
       eventAsJson = objectMapper.writeValueAsString(properties);
     } catch (JsonProcessingException e) {
       LOGGER.error("Error processing event into JSON string: ", e);
+      LOGGER.debug("Failed to convert the following object into JSON string: {}", properties);
       return;
     }
     InputLogEvent inputLogEvent =

runtime/service/src/test/java/org/apache/polaris/service/events/jsonEventListener/aws/cloudwatch/AwsCloudWatchEventListenerTest.java

@@ -30,11 +30,13 @@
 import java.security.Principal;
 import java.time.Clock;
 import java.time.Duration;
+import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import org.apache.iceberg.catalog.TableIdentifier;
 import org.apache.polaris.core.PolarisCallContext;
+import org.apache.polaris.core.auth.PolarisPrincipal;
 import org.apache.polaris.core.context.CallContext;
 import org.apache.polaris.core.context.RealmContext;
 import org.apache.polaris.service.config.PolarisIcebergObjectMapperCustomizer;
@@ -141,12 +143,13 @@ protected CloudWatchLogsAsyncClient createCloudWatchAsyncClient() {
     PolarisCallContext polarisCallContext = Mockito.mock(PolarisCallContext.class);
     RealmContext realmContext = Mockito.mock(RealmContext.class);
     SecurityContext securityContext = Mockito.mock(SecurityContext.class);
-    Principal principal = Mockito.mock(Principal.class);
+    Principal principal = Mockito.mock(PolarisPrincipal.class);
     when(callContext.getRealmContext()).thenReturn(realmContext);
     when(callContext.getPolarisCallContext()).thenReturn(polarisCallContext);
     when(realmContext.getRealmIdentifier()).thenReturn(REALM);
     when(securityContext.getUserPrincipal()).thenReturn(principal);
     when(principal.getName()).thenReturn(TEST_USER);
+    when(((PolarisPrincipal) principal).getRoles()).thenReturn(Set.of("role1", "role2"));
     listener.callContext = callContext;
     listener.securityContext = securityContext;