Beautify

Author: pbernet

src/main/resources/dashboard.html

@@ -259,8 +259,8 @@ <h3>🚦 Traffic data (last 100 requests)</h3>
         }
 
         const items = circuitBreakers.map(cb => {
-            const lastFailure = cb.lastFailure
-                ? new Date(cb.lastFailure).toLocaleString()
+            const closedSince = cb.closedSince
+                ? new Date(cb.closedSince).toLocaleString()
                 : '-';
 
             return `
@@ -270,7 +270,7 @@ <h3>🚦 Traffic data (last 100 requests)</h3>
                             <span class="cb-status ${cb.state.toLowerCase()}">${cb.state}</span>
                         </div>
                         <div class="cb-metrics">
-                            <span>Last Failure: ${lastFailure}</span>
+                            <span>Closed since: ${closedSince}</span>
                         </div>
                     </div>
                 `;

src/main/scala/akkahttp/ReverseProxy.scala

@@ -37,9 +37,9 @@ import scala.util.{Failure, Success}
   *  - CircuitBreaker per target server to avoid overload
   *  - HTTP Header `X-Correlation-ID` for tracing (only for Mode.local)
   *  - HTTP Header `X-Content-Hash` as an example of an on-the-fly processing scenario
-  *  - [[ReverseProxyMonitor]]
+  *  - Visualize traffic with [[ReverseProxyMonitor]]
   *
-  * Mode.local:
+  * Mode.local (default):
   * HTTP client(s) --> ReverseProxy --> local target server(s)
   *
   * Mode.remote:
@@ -51,7 +51,7 @@ import scala.util.{Failure, Success}
   *    e.g. for mode Local adjust [[responseCodes]]
   *  - On top of the built-in client, you may also try other clients, see below
   *  - This PoC may not scale well, because the 'round robin' implementation
-  *    with `requestCounter` means shared state
+  *    with [[requestCounter]] means shared state
   *
   * Gatling client: [[ReverseProxySimulation]]
   *
@@ -105,8 +105,8 @@ object ReverseProxy extends App {
 
   // Switch mode to let ReverseProxy forward client requests to local/remote target server(s)
   // Note that the remote servers can not interpret the X-Correlation-ID header
-  val mode = Mode.remote
-  clients(nbrOfClients = 10, requestsPerClient = 10, mode)
+  val mode = Mode.local
+  clients(nbrOfClients = 10, requestsPerClient = 100, mode)
   ReverseProxyMonitor.initializeWebUI(system, services(mode))
 
   sys.addShutdownHook {

src/main/scala/akkahttp/ReverseProxyMonitor.scala

@@ -63,7 +63,7 @@ object ReverseProxyMonitor {
   private case class CircuitBreakerStatus(
                                            target: String,
                                            state: String,
-                                           lastFailure: Option[Long]
+                                           closedSince: Option[Long]
                                          )
 
   private case class ProxyStats(
@@ -116,7 +116,7 @@ object ReverseProxyMonitor {
     binding
   }
 
-  def browserClient() = {
+  def browserClient(): AnyVal = {
     val os = System.getProperty("os.name").toLowerCase
     if (os == "mac os x") Process(s"open http://127.0.0.1:9000").!
     else if (os.startsWith("windows")) Seq("cmd", "/c", s"start http://127.0.0.1:9000").!
@@ -163,7 +163,7 @@ object ReverseProxyMonitor {
     val circuitBreakerStatus = CircuitBreakerStatus(
       target = target,
       state = state,
-      lastFailure = if (state.equals("OPENED")) Some(Instant.now().toEpochMilli) else None
+      closedSince = if (state.equals("CLOSED")) Some(Instant.now().toEpochMilli) else None
     )
     circuitBreakerStates.put(target, circuitBreakerStatus)
     logger.info(s"Circuit breaker for: $target changed to: $state")
@@ -206,8 +206,6 @@ object ReverseProxyMonitor {
       avgResponseTime = avgResponseTime,
       circuitBreakers = circuitBreakerStates.values().asScala.toList
     )
-
-
   }
 
   private def createRoutes(): Route = {
@@ -217,8 +215,7 @@ object ReverseProxyMonitor {
       path("traffic") {
         get {
           complete {
-            val recent = trafficHistory.asScala.takeRight(100).toList
-            recent.asJson.noSpaces
+            trafficHistory.asScala.takeRight(100).toList.asJson.noSpaces
           }
         }
       } ~