Use @EnableFeature annotation for enabling user_event_metrics

Signed-off-by: Michal Hajas <[email protected]>
bohmber · Oct 29, 2024 · 25a706d · 25a706d
1 parent b5c977a
commit 25a706d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...lian/tests/base/src/test/java/org/keycloak/testsuite/events/EventMetricsProviderTest.java b/...lian/tests/base/src/test/java/org/keycloak/testsuite/events/EventMetricsProviderTest.java
@@ -22,13 +22,15 @@
 import org.hamcrest.Matchers;
 import org.junit.After;
 import org.junit.Test;
+import org.keycloak.common.Profile;
 import org.keycloak.events.Details;
 import org.keycloak.events.Errors;
 import org.keycloak.events.EventBuilder;
 import org.keycloak.events.EventType;
 import org.keycloak.models.RealmModel;
 import org.keycloak.representations.idm.RealmRepresentation;
 import org.keycloak.testsuite.AbstractKeycloakTest;
+import org.keycloak.testsuite.arquillian.annotation.EnableFeature;
 import org.keycloak.testsuite.arquillian.containers.AbstractQuarkusDeployableContainer;
 import org.keycloak.testsuite.util.RealmBuilder;
 
@@ -40,6 +42,7 @@
 /**
  * @author aschwart
  */
+@EnableFeature(Profile.Feature.USER_EVENT_METRICS)
 public class EventMetricsProviderTest extends AbstractKeycloakTest {
 
     private final static String CLIENT_ID = "CLIENT_ID";
@@ -59,7 +62,6 @@ private void enableEventMetricsOptions(String tags, String events) {
         if (suiteContext.getAuthServerInfo().isQuarkus()) {
             AbstractQuarkusDeployableContainer container = (AbstractQuarkusDeployableContainer) suiteContext.getAuthServerInfo().getArquillianContainer().getDeployableContainer();
             List<String> args = new ArrayList<>();
-            args.add("--features=user-event-metrics");
             args.add("--metrics-enabled=true");
             args.add("--event-metrics-user-enabled=true");
             if (tags != null) {
@@ -71,7 +73,6 @@ private void enableEventMetricsOptions(String tags, String events) {
             container.setAdditionalBuildArgs(args);
         }
         else {
-            setConfigProperty("keycloak.features", "user-event-metrics");
             setConfigProperty("keycloak.metrics-enabled", "true");
             setConfigProperty("keycloak.event-metrics-user-enabled", "true");
         }
@@ -156,7 +157,6 @@ public void resetHostnameSettings() {
             AbstractQuarkusDeployableContainer container = (AbstractQuarkusDeployableContainer) suiteContext.getAuthServerInfo().getArquillianContainer().getDeployableContainer();
             container.resetConfiguration();
         } else {
-            setConfigProperty("keycloak.features", null);
             setConfigProperty("keycloak.metrics-enabled", null);
             setConfigProperty("keycloak.event-metrics-user-enabled", null);
         }