Updating Frozen Play Session Test Cookie

Running

Prometheus metric sampler now has two samples which was breaking tests

browser-test/src/support/config.ts

@@ -11,5 +11,5 @@ export const {
   // This value was extracted from the browser test env via:
   //
   // python -c "import requests;print(requests.Session().get('http://localhost:9999').cookies.get_dict()['PLAY_SESSION'])"
-  FROZEN_PLAY_SESSION_COOKIE_VALUE = 'eyJhbGciOiJIUzI1NiJ9.eyJkYXRhIjp7InNlc3Npb25JZCI6IjU1MTMwZDYyLTA3M2QtNDQwNi05MGI5LWJkOWU0NjNhM2U5NyIsInBhYzRqIjoiWDFBM1Z6YnVUOVJLZ24xNmZ1QXNCT25DY0swb1BwcFA3NTlUMzR1NXAvTndMNk5qS2ovL0dyZDhaUUN5UU1FcUhvbXJsTEV0VXJPYnFZRlp4dXlOck8wb3Boayt2eFhYY3dzWis4YUZxeHpLWnkvdlBtcnIvd3FVT21SRjhPNm1SZzBqQ2hZRjB4ZFdBa0lQNGlnNUhkZW5tZlptSHcyYmg2N2JVWnB1MGlMREFTQmdGbHhEaDdDamdHRXNGZnRGYmVSRWtoVjFUdzZacWxDZTM3MFR3dXg2NmNmSWp2c092NHN4Q0FMVG4wVGVxbUR4K2tpM29ibWQ1TFNyLzhhb1RBY2kzTGFoOERLczQrVWxKUHpKOGZLVHZkTzFXS0kwSjZ0MjdBbGx2T2N1ZkxtRVJXM0Y2dnpVU0l5bTVMa1ZSS01hUlFWOG9Da1JESlQrV09xQk1qTDBJdXJ3SUFrQ3UyZCtqUmxTZklqTnBISWVvcDFrUTNEa1BMejM0QVNvNEVNWml1VUhER3lWZkZhWW5aK2YyVWZESkxWeWs2ZmhRNjBZTWlXRG5OMUtHSGlON3UzcVIzZ3grSVZ3OWtONGVQMm5SbmRuTWluQnZnem9qUlE3VXlFcE55eHUvQnBDQTlBRXlLcENpTkxudmJvTmh4UWw2d0MxSmN1Z0NHK1lwRFkycEhOcTl3UXNRZktRRDQwdlo5eGlPRXhHV0tzdkFQTGZ6dllwVFhFMTFjRkdJVTJ4cUgrZW9yelNGMjFqa2laSVlqQmM0N3NpS25HVWordHlVbUh3K0pLdnlqUDhiajB2WUhiN0kzRUJkbERhaTVHTnRNK3BDU0l1Zkg0Mkg1OEtOSkRiMWdKdzRocXl4QzBqL0ZMQmtibUR6SXNwTW16WEY4U3lDT0FvV0o4bjZVZFpyOG52MjVleUVDMDR5VlF1SlVBR3BwZzdnYktqdXd0VnBmN0tlNXowaExiMWpyT05yTFFBQWFSckYzVTZRSm0vVEE9PSIsImNzcmZUb2tlbiI6Ijc2ZWNlNWZlZTRkNzgwZDEzZTZjZmJiODAzMWI3YTFmMWZjODM2Y2YtMTcwNTcxOTg2NjUzNy01MDJjNWZiZTlmNmFhMmRhYzhhMGE1NDQifSwibmJmIjoxNzA1NzE5ODY2LCJpYXQiOjE3MDU3MTk4NjZ9.WYG9_nsRo4Bjev7IG3rK4JJJfWWBJGhkT1wZDecKmVs',
+  FROZEN_PLAY_SESSION_COOKIE_VALUE = 'eyJhbGciOiJIUzI1NiJ9.eyJkYXRhIjp7InBhYzRqIjoiMUJNeGdQeWovbXZ1c01xSml6SHU4d0Y2TTFPblVqVVYrQXNieHAzd2lybSsybTdKZDA4cnFsL1g0eEE1eStMY0JrdmRObTlvNmdjZGFvYTE4UVBzb25CZnNzODd5RmpVOUdMVDg0NVEzQXd4Ty9weGtzVUZlR28xZkpud2hOWjV5cW5IZENsY0VTVXBXdk1sZjdmSHZYRFV4TEJFZ1FBMWJVby9iK2hJK2FOQndxYmhPYTZVUDJrSWtVT1lTdWV0bEhtdi9TSUtQZzJURzVQeElFTEl0UHYrb0gyYmdiOFA2UmtpVElaeDFrM0M5ZzBDcmc4VmE4YTJmY0hOM2VzYkx5L0p1eTBJVHMwT0pZV3FCcFFNV055dm5lMWtWTi9TVUNXWmZGY3lsb2poWjdZYjdvM2Y5UzExcEJKSkhndGVVb3JjZnBRTUwvMnNQNDZmbm5ETzI2TmttZ1hneC9DVGZ0N3lWbXpRVGFVZ1VOTUYxcHJ4RVIxTVM1aDF3THEzcFdNamp6NTZFWlpCblE1NmswQm81d2gzaUJ6ci9PWXpQT2R6L3pqZWNKSlpMZCttK1gwQWdxbm1mL3B3WTBRZVJUOWgyR2ZFRnFoWXM0bFVaeVdFSWxCUW1Tc0tmYm9TZXo3RE92NmhTT1ZWZVhzeUFOWm9SUXRFZE9WWlZtdy8xQlpxWU9hb0NLRHhrVmdaaDhrUUJVdUkyckNTb015cC9OSndpakxOUXpSK1hab3ZCRkZUcFZFcGFreEtwb2RtditRakhOdE03a1p3MjE3WjlETWcrTVhuK2pneHhuZEtraVdDWVo1T0luMGVyOVZxaXdPOWo0RWtOQWpuY3RlZVp1S29RUmdUWEZ1ejNpbEdOVFB2dmlkREw5MEg4WjYxSWNMeE42bGp1SW5LZFFQL2VxVjlUK2JMc0gwUnBLK2tMbnNtVWd0ZE4ybFJxUm05Vm90b2lKdGJYUTI2MFF2ZS9SMjZFMUdyUXc9PSIsImNzcmZUb2tlbiI6ImQ4OGJmYWI4NTUzYTRlMzkwNDYwZTgzMmMyYjhjZjI2ZjY0ZjFjMmYtMTcxNTU0Njk0Mzc1Ny05YmQxMTg5NzJkNGU0ZGVhYzYyMjFjN2QifSwibmJmIjoxNzE1NTQ2OTQzLCJpYXQiOjE3MTU1NDY5NDN9.66hG4yG3ogUdG15qecQ-0LvGKz0CMnjNQRs_m9Tkl9c',
 } = process.env

server/app/durablejobs/DurableJob.java

@@ -3,11 +3,11 @@
 import models.PersistedDurableJobModel;
 
 /**
- * Represents code that runs in a background thread. In contrast to Akka tasks, they are backed by
- * {@link PersistedDurableJobModel} records in the database, making them durable to server failures
- * and allowing automated retry logic. The behavior of a {@code DurableJob} is determined by its
- * implementing class, which is identified by its associated {@link PersistedDurableJobModel} record
- * via the {@code jobName} attribute.
+ * Represents code that runs in a background thread. In contrast to org.apache.pekko tasks, they are
+ * backed by {@link PersistedDurableJobModel} records in the database, making them durable to server
+ * failures and allowing automated retry logic. The behavior of a {@code DurableJob} is determined
+ * by its implementing class, which is identified by its associated {@link PersistedDurableJobModel}
+ * record via the {@code jobName} attribute.
  */
 public abstract class DurableJob {
 

server/app/durablejobs/DurableJobExecutionContext.java

@@ -2,9 +2,9 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import akka.actor.ActorSystem;
 import javax.inject.Inject;
 import javax.inject.Singleton;
+import org.apache.pekko.actor.ActorSystem;
 import play.libs.concurrent.CustomExecutionContext;
 
 /** Thread pool for executing durable jobs. */

server/app/filters/ApiKeyUsageFilter.java

@@ -11,7 +11,7 @@
 import javax.inject.Provider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import play.api.libs.concurrent.AkkaSchedulerProvider;
+import play.api.libs.concurrent.PekkoSchedulerProvider;
 import play.mvc.EssentialAction;
 import play.mvc.EssentialFilter;
 import play.mvc.Http;
@@ -28,7 +28,7 @@
  */
 public class ApiKeyUsageFilter extends EssentialFilter {
 
-  private final AkkaSchedulerProvider akkaSchedulerProvider;
+  private final PekkoSchedulerProvider pekkoSchedulerProvider;
   private final Provider<ApiKeyService> apiKeyServiceProvider;
   private final Executor exec;
   private final Provider<ProfileUtils> profileUtilsProvider;
@@ -37,12 +37,12 @@ public class ApiKeyUsageFilter extends EssentialFilter {
 
   @Inject
   public ApiKeyUsageFilter(
-      AkkaSchedulerProvider akkaSchedulerProvider,
+      PekkoSchedulerProvider pekkoSchedulerProvider,
       Provider<ApiKeyService> apiKeyServiceProvider,
       Executor exec,
       Provider<ProfileUtils> profileUtilsProvider,
       ClientIpResolver clientIpResolver) {
-    this.akkaSchedulerProvider = checkNotNull(akkaSchedulerProvider);
+    this.pekkoSchedulerProvider = checkNotNull(pekkoSchedulerProvider);
     this.apiKeyServiceProvider = checkNotNull(apiKeyServiceProvider);
     this.exec = checkNotNull(exec);
     this.profileUtilsProvider = checkNotNull(profileUtilsProvider);
@@ -67,7 +67,7 @@ public EssentialAction apply(EssentialAction next) {
                           if (maybeApiKeyId.isPresent()) {
                             String remoteAddress = clientIpResolver.resolveClientIp(request);
 
-                            akkaSchedulerProvider
+                            pekkoSchedulerProvider
                                 .get()
                                 .scheduleOnce(
                                     Duration.ZERO,

server/app/filters/CiviFormProfileFilter.java

@@ -4,14 +4,14 @@
 import static controllers.CallbackController.REDIRECT_TO_SESSION_KEY;
 import static play.mvc.Results.redirect;
 
-import akka.stream.Materializer;
 import auth.GuestClient;
 import auth.ProfileUtils;
 import com.google.inject.Inject;
 import controllers.routes;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.function.Function;
+import org.apache.pekko.stream.Materializer;
 import play.mvc.Filter;
 import play.mvc.Http;
 import play.mvc.Result;

server/app/filters/SettingsFilter.java

@@ -2,10 +2,10 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import akka.stream.Materializer;
 import com.google.common.collect.ImmutableList;
 import javax.inject.Inject;
 import javax.inject.Provider;
+import org.apache.pekko.stream.Materializer;
 import play.libs.streams.Accumulator;
 import play.mvc.EssentialAction;
 import play.mvc.EssentialFilter;

server/app/modules/DatabaseSeedModule.java

@@ -1,10 +1,10 @@
 package modules;
 
-import akka.actor.ActorSystem;
 import com.google.inject.AbstractModule;
 import com.google.inject.Inject;
 import java.time.Duration;
 import javax.inject.Provider;
+import org.apache.pekko.actor.ActorSystem;
 import scala.concurrent.ExecutionContext;
 import services.seeding.DatabaseSeedTask;
 

server/app/modules/DurableJobModule.java

@@ -1,6 +1,5 @@
 package modules;
 
-import akka.actor.ActorSystem;
 import annotations.BindingAnnotations;
 import com.google.inject.AbstractModule;
 import com.google.inject.Inject;
@@ -20,6 +19,7 @@
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.Random;
+import org.apache.pekko.actor.ActorSystem;
 import repository.AccountRepository;
 import repository.PersistedDurableJobRepository;
 import repository.ReportingRepository;
@@ -41,7 +41,9 @@ protected void configure() {
     bind(DurableJobRunnerScheduler.class).asEagerSingleton();
   }
 
-  /** Schedules the job runner to run on an interval using the akka scheduling system. */
+  /**
+   * Schedules the job runner to run on an interval using the org.apache.pekko scheduling system.
+   */
   public static final class DurableJobRunnerScheduler {
 
     @Inject

server/app/modules/SettingsMigrationModule.java

@@ -1,10 +1,10 @@
 package modules;
 
-import akka.actor.ActorSystem;
 import com.google.inject.AbstractModule;
 import com.google.inject.Inject;
 import java.time.Duration;
 import javax.inject.Provider;
+import org.apache.pekko.actor.ActorSystem;
 import scala.concurrent.ExecutionContext;
 import services.settings.SettingsService;
 

server/app/repository/DatabaseExecutionContext.java

@@ -2,9 +2,9 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import akka.actor.ActorSystem;
 import javax.inject.Inject;
 import javax.inject.Singleton;
+import org.apache.pekko.actor.ActorSystem;
 import play.libs.concurrent.CustomExecutionContext;
 
 /** Custom execution context wired to "database.dispatcher" thread pool */

server/app/services/program/ActiveAndDraftPrograms.java

@@ -2,7 +2,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import akka.japi.Pair;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -14,6 +13,7 @@
 import java.util.function.Function;
 import models.DisplayMode;
 import models.VersionModel;
+import org.apache.pekko.japi.Pair;
 import repository.VersionRepository;
 
 /**

server/app/services/question/ActiveAndDraftQuestions.java

@@ -1,6 +1,5 @@
 package services.question;
 
-import akka.japi.Pair;
 import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -9,6 +8,7 @@
 import java.util.Optional;
 import java.util.function.Function;
 import models.VersionModel;
+import org.apache.pekko.japi.Pair;
 import repository.VersionRepository;
 import services.DeletionStatus;
 import services.program.ProgramDefinition;

server/build.sbt

@@ -54,7 +54,7 @@ lazy val root = (project in file("."))
       "com.h2database" % "h2" % "2.2.224" % Test,
 
       // Metrics collection and export for Prometheus
-      "io.github.jyllands-posten" %% "play-prometheus-filters" % "0.6.1",
+      "io.github.jyllands-posten" %% "play-prometheus-filters" % "1.0.2",
 
       // Parameterized testing
       "pl.pragmatists" % "JUnitParams" % "1.1.1" % Test,
@@ -74,7 +74,7 @@ lazy val root = (project in file("."))
 
       // Security libraries
       // pac4j core (https://github.com/pac4j/play-pac4j)
-      "org.pac4j" %% "play-pac4j" % "12.0.0-PLAY2.9",
+      "org.pac4j" %% "play-pac4j" % "12.0.0-PLAY3.0",
       "org.pac4j" % "pac4j-core" % "6.0.2",
       // basic http authentication (for the anonymous client)
       "org.pac4j" % "pac4j-http" % "6.0.2",

server/conf/application.conf

@@ -27,20 +27,20 @@ include "helper/whitelabel.conf"
 ## filters/LoggingFilter configuration. Overrided in application.dev.conf.
 filters.LoggingFilter.enable_request_session_logging = false
 
-## Akka
-# https://www.playframework.com/documentation/latest/ScalaAkka#Configuration
-# https://www.playframework.com/documentation/latest/JavaAkka#Configuration
+## Pekko
+# https://www.playframework.com/documentation/latest/ScalaPekko#Configuration
+# https://www.playframework.com/documentation/latest/JavaPekko#Configuration
 # ~~~~~
-# Play uses Akka internally and exposes Akka Streams and actors in Websockets and
+# Play uses Pekko internally and exposes Pekko Streams and actors in Websockets and
 # other streaming HTTP responses.
-akka {
-  # "akka.log-config-on-start" is extraordinarly useful because it log the complete
+pekko {
+  # "pekko.log-config-on-start" is extraordinarly useful because it log the complete
   # configuration at INFO level, including defaults and overrides, so it s worth
   # putting at the very top.
   #
   # Put the following in your conf/logback.xml file:
   #
-  # <logger name="akka.actor" level="INFO" />
+  # <logger name="org.apache.pekko.actor" level="INFO" />
   #
   # And then uncomment this line to debug the configuration.
   #

server/project/plugins.sbt

@@ -1,6 +1,6 @@
 // Play plugins
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.2")
-addSbtPlugin("com.typesafe.play" % "sbt-play-ebean" % "7.3.0")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.3")
+addSbtPlugin("org.playframework" % "sbt-play-ebean" % "8.3.0")
 
 // Dependency tree plugin. To use, open an sbt shell and run dependencyBrowseTree
 addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1")

server/test/controllers/applicant/ApplicantRoutesTest.java

@@ -40,6 +40,10 @@ private Counts getApplicantIdInProfileCounts() {
     for (MetricFamilySamples mfs : Collections.list(registry.metricFamilySamples())) {
       if (mfs.name.equals("applicant_id_in_profile")) {
         for (MetricFamilySamples.Sample sample : mfs.samples) {
+          if (!sample.name.equals("applicant_id_in_profile_total")) {
+            continue;
+          }
+
           if (sample.labelValues.contains("present")) {
             counts.present = sample.value;
           } else if (sample.labelValues.contains("absent")) {

server/test/filters/RecordCookieSizeFilterTest.java

@@ -3,11 +3,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static play.test.Helpers.fakeRequest;
 
-import akka.stream.testkit.NoMaterializer$;
 import com.google.common.collect.ImmutableList;
 import io.prometheus.client.CollectorRegistry;
 import java.util.List;
 import java.util.stream.Collectors;
+import org.apache.pekko.stream.testkit.NoMaterializer$;
 import org.junit.Before;
 import org.junit.Test;
 import play.libs.streams.Accumulator;

server/test/filters/UnsupportedBrowserFilterTest.java

@@ -3,10 +3,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static play.test.Helpers.fakeRequest;
 
-import akka.stream.testkit.NoMaterializer$;
 import com.google.common.collect.ImmutableList;
 import junitparams.JUnitParamsRunner;
 import junitparams.Parameters;
+import org.apache.pekko.stream.testkit.NoMaterializer$;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import play.libs.streams.Accumulator;

server/test/repository/ResetPostgres.java

@@ -2,7 +2,6 @@
 
 import static play.test.Helpers.fakeApplication;
 
-import akka.stream.Materializer;
 import io.ebean.DB;
 import io.ebean.Database;
 import java.time.Clock;
@@ -11,6 +10,7 @@
 import models.LifecycleStage;
 import models.Models;
 import models.VersionModel;
+import org.apache.pekko.stream.Materializer;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;