Enable increasing load from switchboard

common/app/conf/switches/PerformanceSwitches.scala

@@ -206,4 +206,24 @@ trait PerformanceSwitches {
     sellByDate = never,
     exposeClientSide = true,
   )
+
+  val ShorterSurrogateCacheForRecentArticles = Switch(
+    SwitchGroup.Performance,
+    "shorter-surrogate-cache-for-recent-articles",
+    "Shorten the surrogate cache time for recent articles for load testing",
+    owners = Seq(Owner.withEmail("[email protected]")),
+    safeState = Off,
+    sellByDate = LocalDate.of(2024, 7, 1),
+    exposeClientSide = false,
+  )
+
+  val ShorterSurrogateCacheForOlderArticles = Switch(
+    SwitchGroup.Performance,
+    "shorter-surrogate-cache-for-older-articles",
+    "Shorten the surrogate cache time for older articles for load testing",
+    owners = Seq(Owner.withEmail("[email protected]")),
+    safeState = Off,
+    sellByDate = LocalDate.of(2024, 7, 1),
+    exposeClientSide = false,
+  )
 }

common/app/model/Cached.scala

@@ -1,6 +1,8 @@
 package model
 
 import conf.switches.Switches.LongCacheSwitch
+import conf.switches.Switches.ShorterSurrogateCacheForOlderArticles
+import conf.switches.Switches.ShorterSurrogateCacheForRecentArticles
 import org.joda.time.DateTime
 import play.api.http.Writeable
 import play.api.mvc._
@@ -17,17 +19,17 @@ object CacheTime {
 
   object Default extends CacheTime(60)
   object LiveBlogActive extends CacheTime(5, Some(60))
-  object RecentlyUpdated extends CacheTime(60)
+  def RecentlyUpdated = CacheTime(60, if (ShorterSurrogateCacheForRecentArticles.isSwitchedOn) Some(30) else None)
   // There is lambda which invalidates the cache on press events, so the facia cache time can be high.
   object Facia extends CacheTime(60, Some(900))
   object ArchiveRedirect extends CacheTime(60, Some(300))
   object ShareCount extends CacheTime(60, Some(600))
   object NotFound extends CacheTime(10) // This will be overwritten by fastly
   object DiscussionDefault extends CacheTime(60)
   object DiscussionClosed extends CacheTime(60, Some(longCacheTime))
-
-  def LastDayUpdated: CacheTime = CacheTime(60, Some(longCacheTime))
-  def NotRecentlyUpdated: CacheTime = CacheTime(60, Some(longCacheTime))
+  private def oldArticleCacheTime = if (ShorterSurrogateCacheForOlderArticles.isSwitchedOn) 60 else longCacheTime
+  def LastDayUpdated = CacheTime(60, Some(oldArticleCacheTime))
+  def NotRecentlyUpdated = CacheTime(60, Some(oldArticleCacheTime))
 }
 
 object Cached extends implicits.Dates {
@@ -111,8 +113,10 @@ object Cached extends implicits.Dates {
   private def cacheHeaders(cacheTime: CacheTime, result: Result, maybeEtag: Option[String]): Result = {
     val now = DateTime.now
 
-    val surrogateMaxAge =
-      cacheTime.surrogateSeconds.filter(_ => LongCacheSwitch.isSwitchedOn).getOrElse(cacheTime.cacheSeconds)
+    val surrogateMaxAge = cacheTime.surrogateSeconds match {
+      case Some(age) if LongCacheSwitch.isSwitchedOn => age
+      case _                                         => cacheTime.cacheSeconds
+    }
 
     val etagHeaderString: String = maybeEtag.getOrElse(
       s""""guRandomEtag${scala.util.Random.nextInt()}${scala.util.Random