Revert DCR circuit breaker switch and configuration changes (#26918)

guardian · Feb 21, 2024 · e033472 · e033472
1 parent 9e7d2d1
commit e033472
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/common/app/common/configuration.scala b/common/app/common/configuration.scala
@@ -156,7 +156,7 @@ class GuardianConfiguration extends GuLogging {
     lazy val sentryHost = configuration.getMandatoryStringProperty("rendering.sentryHost")
     lazy val sentryPublicApiKey = configuration.getMandatoryStringProperty("rendering.sentryPublicApiKey")
     lazy val timeout = 2.seconds
-    lazy val circuitBreakerMaxFailures = 50
+    lazy val circuitBreakerMaxFailures = 10 // we should increase this as DCR sees increasing usage
   }
 
   object contributionsService {

diff --git a/common/app/conf/switches/PerformanceSwitches.scala b/common/app/conf/switches/PerformanceSwitches.scala
@@ -66,16 +66,6 @@ trait PerformanceSwitches {
     exposeClientSide = false,
   )
 
-  val DCRCircuitBreakerSwitch = Switch(
-    SwitchGroup.Performance,
-    "dcr-circuit-breaker",
-    "If this switch is switched on then the DCR circuit breaker will be operational",
-    owners = Seq(Owner.withEmail("[email protected]")),
-    safeState = On,
-    sellByDate = never,
-    exposeClientSide = false,
-  )
-
   val AutoRefreshSwitch = Switch(
     SwitchGroup.Performance,
     "auto-refresh",

diff --git a/common/app/renderers/DotcomRenderingService.scala b/common/app/renderers/DotcomRenderingService.scala
@@ -5,7 +5,7 @@ import com.gu.contentapi.client.model.v1.{Block, Blocks, Content}
 import common.{DCRMetrics, GuLogging}
 import concurrent.CircuitBreakerRegistry
 import conf.Configuration
-import conf.switches.Switches.DCRCircuitBreakerSwitch
+import conf.switches.Switches.CircuitBreakerSwitch
 import crosswords.CrosswordPageWithContent
 import http.{HttpPreconnections, ResultWithPreconnectPreload}
 import model.Cached.{RevalidatableResult, WithoutRevalidationResult}
@@ -133,7 +133,7 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload
       }
     }
 
-    if (DCRCircuitBreakerSwitch.isSwitchedOn) {
+    if (CircuitBreakerSwitch.isSwitchedOn) {
       circuitBreaker.withCircuitBreaker(postWithoutHandler(ws, payload, endpoint, timeout)).map(handler)
     } else {
       postWithoutHandler(ws, payload, endpoint, timeout).map(handler)