diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index dd84d43..86a8eb1 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -50,7 +50,9 @@ jobs: - 23.0.7 - 24.0.5 - 25.0.6 - - 26.0.7 + - 26.0.8 + - 26.1.5 + - 26.2.1 steps: - uses: actions/checkout@v4 - uses: actions/setup-java@v4 diff --git a/pom.xml b/pom.xml index 0115bd3..a5d8e5d 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ - 26.1.4 + 26.2.1 ${version.org.keycloak} 1.18.3 diff --git a/src/main/java/io/kokuwa/keycloak/metrics/stats/MetricsStatsTask.java b/src/main/java/io/kokuwa/keycloak/metrics/stats/MetricsStatsTask.java index db75da8..e16188d 100644 --- a/src/main/java/io/kokuwa/keycloak/metrics/stats/MetricsStatsTask.java +++ b/src/main/java/io/kokuwa/keycloak/metrics/stats/MetricsStatsTask.java @@ -66,6 +66,7 @@ public class MetricsStatsTask implements Provider, ScheduledTask { private void scrape(KeycloakSession session) { session.realms().getRealmsStream().forEach(realm -> { + session.getContext().setRealm(realm); log.tracev("Scrape for realm {0}.", realm.getName()); var tagRealm = Tag.of("realm", realm.getName()); gauge("keycloak_users", Set.of(tagRealm), session.users().getUsersCount(realm), true); diff --git a/src/test/java/io/kokuwa/keycloak/metrics/stats/MetricsStatsTaskTest.java b/src/test/java/io/kokuwa/keycloak/metrics/stats/MetricsStatsTaskTest.java index 63201ce..9d696e7 100644 --- a/src/test/java/io/kokuwa/keycloak/metrics/stats/MetricsStatsTaskTest.java +++ b/src/test/java/io/kokuwa/keycloak/metrics/stats/MetricsStatsTaskTest.java @@ -16,6 +16,7 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientProvider; +import org.keycloak.models.KeycloakContext; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.RealmProvider; @@ -121,6 +122,7 @@ public class MetricsStatsTaskTest extends AbstractMockitoTest { when(session.clients()).thenReturn(clientProvider); when(session.users()).thenReturn(userProvider); when(session.sessions()).thenReturn(sessionProvider); + when(session.getContext()).thenReturn(mock(KeycloakContext.class)); when(realmProvider.getRealmsStream()).then(i -> Stream.of(realmModel)); // empty realm