Adjust memory and cpu for quotes-backend

Author: Starefossen

quotes-backend/.nais/app.yaml

@@ -46,7 +46,7 @@ spec:
     limits:
       memory: "256Mi"
     requests:
-      cpu: "10m"
+      cpu: "100m"
       memory: "128Mi"
   accessPolicy:
     inbound:

quotes-backend/src/main/kotlin/io/nais/quotesbackend/Application.kt

@@ -8,78 +8,62 @@ import io.ktor.server.netty.Netty
 import io.ktor.server.plugins.BadRequestException
 import io.ktor.server.plugins.contentnegotiation.*
 import io.ktor.server.plugins.openapi.*
-import io.ktor.server.plugins.statuspages.* // Added import for StatusPages
+import io.ktor.server.plugins.statuspages.*
 import io.ktor.server.plugins.swagger.*
 import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.random.Random
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.SerializationException // Added import for SerializationException
+import kotlinx.serialization.SerializationException
 import kotlinx.serialization.json.Json
 
-// Define globalErrorRate at the top level
-var globalErrorRate: Double = 0.1 // Default value, can be overridden in tests
+var globalErrorRate: Double = 0.1
 
 @Serializable data class Quote(val id: String? = null, val text: String, val author: String)
 
 fun main() {
-  // You might want to set globalErrorRate from command-line args here if needed for
-  // standalone runs
-  // For example, by parsing args or environment variables.
-  // This example focuses on test override, so we leave it as is for main.
   embeddedServer(Netty, port = 8080, module = Application::module).start(wait = true)
 }
 
 fun Application.module() {
   log.info("Using global error rate: $globalErrorRate")
 
-  // Conditionally install StatusPages to prevent DuplicatePluginException
-  if (pluginOrNull(StatusPages) == null) {
-    install(StatusPages) {
-      exception<BadRequestException> { call, cause ->
-        call.application.log.warn("Bad request for ${call.request.path()}: ${cause.message}")
-        call.respond(
-                HttpStatusCode.BadRequest,
-                mapOf(
-                        "error" to "BAD_REQUEST",
-                        "message" to (cause.message ?: "Invalid or missing request body.")
-                )
-        )
-      }
-      exception<SerializationException> { call, cause ->
-        call.application.log.warn(
-                "Request deserialization failed for ${call.request.path()}: ${cause.message}"
-        )
-        call.respond(
-                HttpStatusCode.BadRequest,
-                mapOf(
-                        "error" to "DESERIALIZATION_ERROR",
-                        "message" to (cause.message ?: "Invalid request format or missing fields.")
-                )
-        )
-      }
+  install(StatusPages) {
+    exception<BadRequestException> { call, cause ->
+      call.application.log.warn("Bad request for ${call.request.path()}: ${cause.message}")
+      call.respond(
+              HttpStatusCode.BadRequest,
+              mapOf(
+                      "error" to "BAD_REQUEST",
+                      "message" to (cause.message ?: "Invalid or missing request body.")
+              )
+      )
     }
-  } else {
-    // Optional: Log or handle the case where StatusPages is already installed,
-    // potentially by the test harness. We might need to ensure our specific
-    // handlers are added/merged if the test harness installs a default one.
-    log.debug("StatusPages plugin already installed. Skipping re-installation by module.")
-  }
-
-  // Conditionally install ContentNegotiation to prevent DuplicatePluginException
-  if (pluginOrNull(ContentNegotiation) == null) {
-    install(ContentNegotiation) {
-      json(
-              Json {
-                prettyPrint = true
-                isLenient = true
-              }
+    exception<SerializationException> { call, cause ->
+      call.application.log.warn(
+              "Request deserialization failed for ${call.request.path()}: ${cause.message}"
+      )
+      call.respond(
+              HttpStatusCode.BadRequest,
+              mapOf(
+                      "error" to "DESERIALIZATION_ERROR",
+                      "message" to (cause.message ?: "Invalid request format or missing fields.")
+              )
       )
     }
   }
 
+  install(ContentNegotiation) {
+    json(
+            Json {
+              prettyPrint = true
+              isLenient = true
+            }
+    )
+  }
+
   val quotes =
           ConcurrentHashMap<String, Quote>().apply {
             put(
@@ -127,7 +111,7 @@ fun Application.module() {
   routing {
     route("/api/quotes") {
       get {
-        if (Random.nextDouble() < globalErrorRate) { // Use globalErrorRate
+        if (Random.nextDouble() < globalErrorRate) {
           call.respond(
                   HttpStatusCode.InternalServerError,
                   "Simulated error for observability testing"
@@ -138,7 +122,7 @@ fun Application.module() {
       }
 
       post {
-        if (Random.nextDouble() < globalErrorRate) { // Use globalErrorRate
+        if (Random.nextDouble() < globalErrorRate) {
           call.respond(
                   HttpStatusCode.InternalServerError,
                   "Simulated error for observability testing"
@@ -172,14 +156,13 @@ fun Application.module() {
         }
         quotes[newId] = newQuote
 
-        // Log the quote that will actually be sent in the response
         application.log.info("Responding with: $newQuote")
         call.respond(HttpStatusCode.Created, newQuote)
       }
     }
 
     get("/api/quotes/{id}") {
-      if (Random.nextDouble() < globalErrorRate) { // Use globalErrorRate
+      if (Random.nextDouble() < globalErrorRate) {
         call.respond(
                 HttpStatusCode.InternalServerError,
                 "Simulated error for observability testing"
@@ -188,24 +171,22 @@ fun Application.module() {
       }
       val id =
               call.parameters["id"]
-                      ?: return@get call.respond( // Changed to respond with JSON
+                      ?: return@get call.respond(
                               HttpStatusCode.BadRequest,
                               mapOf("error" to "MISSING_ID", "message" to "Missing ID")
                       )
       val quote =
               quotes[id]
-                      ?: return@get call.respond( // Changed to respond with JSON
+                      ?: return@get call.respond(
                               HttpStatusCode.NotFound,
                               mapOf("error" to "NOT_FOUND", "message" to "Quote not found")
                       )
       call.respond(quote)
     }
 
-    // Add OpenAPI and Swagger support
     openAPI(path = "openapi")
     swaggerUI(path = "swagger")
 
-    // Liveness and Readiness endpoint
     route("/internal") {
       get("/health") { call.respond(HttpStatusCode.OK, "Application is healthy") }
     }