From c22398ef60cd4f96f9c21acbd9012eaf25469955 Mon Sep 17 00:00:00 2001
From: hemantxpatel <141825885+hemantxpatel@users.noreply.github.com>
Date: Mon, 22 Jul 2024 12:51:46 +0530
Subject: [PATCH] fix: Update Backend Service Java Version (#392)

* Add readiness / liveness check for backend service

* Add pod logs

* Update Java Version for backend service

* Remove pod logs
---
 mxd/backend-service.tf                        | 22 +++++++++++++++++++
 mxd/backend-service/Dockerfile                |  2 +-
 mxd/backend-service/build.gradle.kts          |  1 +
 mxd/backend-service/gradle/libs.versions.toml |  1 +
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/mxd/backend-service.tf b/mxd/backend-service.tf
index d7099843..10fbedc9 100644
--- a/mxd/backend-service.tf
+++ b/mxd/backend-service.tf
@@ -70,6 +70,28 @@ resource "kubernetes_deployment" "backend-service" {
             name  = "JAVA_TOOL_OPTIONS"
             value = "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1044"
           }
+          readiness_probe {
+            http_get {
+              path = "/api/check/readiness"
+              port = 8080
+            }
+            initial_delay_seconds = 30
+            period_seconds        = 10
+            timeout_seconds       = 5
+            failure_threshold     = 10
+            success_threshold     = 1
+          }
+          liveness_probe {
+            http_get {
+              path = "/api/check/liveness"
+              port = 8080
+            }
+            initial_delay_seconds = 30
+            period_seconds        = 10
+            timeout_seconds       = 5
+            failure_threshold     = 10
+            success_threshold     = 1
+          }
         }
       }
     }
diff --git a/mxd/backend-service/Dockerfile b/mxd/backend-service/Dockerfile
index d96f3c53..93d24cc5 100644
--- a/mxd/backend-service/Dockerfile
+++ b/mxd/backend-service/Dockerfile
@@ -12,7 +12,7 @@
 #
 #
 
-FROM eclipse-temurin:21.0.2_13-jre-alpine
+FROM eclipse-temurin:22.0.1_8-jre-alpine
 
 WORKDIR /app
 
diff --git a/mxd/backend-service/build.gradle.kts b/mxd/backend-service/build.gradle.kts
index bad86d49..b7c4f6b5 100644
--- a/mxd/backend-service/build.gradle.kts
+++ b/mxd/backend-service/build.gradle.kts
@@ -44,6 +44,7 @@ dependencies {
     implementation(libs.apache.commons)
     implementation(libs.postgresql)
     implementation(libs.edc.boot)
+    runtimeOnly(libs.edc.api.observability)
 
     testImplementation(libs.junit.jupiter.params)
     testImplementation(libs.assertj)
diff --git a/mxd/backend-service/gradle/libs.versions.toml b/mxd/backend-service/gradle/libs.versions.toml
index b2fe0624..bcd5d695 100644
--- a/mxd/backend-service/gradle/libs.versions.toml
+++ b/mxd/backend-service/gradle/libs.versions.toml
@@ -20,6 +20,7 @@ edc-http = { module = "org.eclipse.edc:http", version.ref = "edc" }
 edc-http-lib = { module = "org.eclipse.edc:http-lib", version.ref = "edc" }
 edc-connector-core = { module = "org.eclipse.edc:connector-core", version.ref = "edc" }
 edc-sql-core = {module = "org.eclipse.edc:sql-core",version.ref = "edc"}
+edc-api-observability = { module = "org.eclipse.edc:api-observability", version.ref = "edc" }
 apache-commons = { module = "org.apache.commons:commons-dbcp2", version.ref = "commons" }
 edc-configuration-filesystem = { module = "org.eclipse.edc:configuration-filesystem", version.ref = "edc" }
 postgres-containers = { module = "org.testcontainers:postgresql", version.ref = "testcontainers" }