optimize setup

Signed-off-by: Peter Siegmund <developer@mars3142.org>

Dockerfile

@@ -11,9 +11,11 @@ USER app
 
 # Copy all needed project files to a folder
 COPY --chown=app ./gradle/ ./gradle
-COPY --chown=app ./gradlew ./build.gradle ./settings.gradle ./app.json ./
+COPY --chown=app ./gradlew ./build.gradle ./settings.gradle ./
 COPY --chown=app ./src ./src
 
+RUN curl -OL https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar
+
 # Build the production package
 RUN ./gradlew clean build -x test
 
@@ -24,7 +26,8 @@ RUN useradd -m app
 USER app
 
 COPY --chown=app --from=build /usr/src/app/build/libs/*-SNAPSHOT.jar /usr/app/edge.jar
+COPY --chown=app --from=build /usr/src/app/opentelemetry-javaagent.jar /usr/app/opentelemetry-javaagent.jar
 
-HEALTHCHECK CMD curl --fail http://localhost:5000/actuator/health/liveness || exit 1
+HEALTHCHECK CMD curl --fail http://localhost:8080/actuator/health/liveness || exit 1
 
 CMD ["java", "-jar", "/usr/app/edge.jar"]

Makefile

@@ -1,2 +1,20 @@
-git_hash:
+REMOTE_HOST = mars3142@172.16.20.1
-	@git rev-parse --short HEAD
+PROJECT_NAME = firmware-hq
+SERVICE_NAME = edge-service
+RASPI_PATH = /mnt/data/${PROJECT_NAME}
+
+install: build deploy import cleanup
+
+build:
+	docker buildx build --platform linux/arm64 --no-cache -t ${PROJECT_NAME}/${SERVICE_NAME}:latest -o type=docker,dest=./${SERVICE_NAME}-arm64.tar .
+
+deploy:
+	scp ./${SERVICE_NAME}-arm64.tar ${REMOTE_HOST}:${RASPI_PATH}/
+
+import:
+	ssh ${REMOTE_HOST} "sudo docker load -i ${RASPI_PATH}/${SERVICE_NAME}-arm64.tar && rm ${RASPI_PATH}/${SERVICE_NAME}-arm64.tar"
+
+cleanup:
+	rm -f ${SERVICE_NAME}-arm64.tar
+
+.PHONY: build deploy import cleanup

app.json

@@ -1,14 +0,0 @@
-{
-  "healthchecks": {
-    "web": [
-      {
-        "type":        "readiness",
-        "name":        "web check",
-        "description": "Checking if the app responds to the /actuator/health/readiness endpoint",
-        "path":        "/actuator/health/readiness",
-        "port": 5000,
-        "attempts": 3
-      }
-    ]
-  }
-}

build.gradle

@@ -1,9 +1,8 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '3.3.4'
+    id 'org.springframework.boot' version '3.4.0'
     id 'io.spring.dependency-management' version '1.1.6'
     id 'idea'
-    id "io.sentry.jvm.gradle" version "4.11.0"
 }
 
 group = 'dev.mars3142.fhq'
@@ -26,34 +25,34 @@ repositories {
 }
 
 ext {
-    set('springCloudVersion', "2023.0.3")
+    set('springCloudVersion', "2024.0.0")
     set('springModulithVersion', "1.2.1")
-    set('springCloudGCPVersion', "5.4.1")
+    set('springCloudGCPVersion', "5.9.0")
 }
 
 dependencies {
-    implementation 'org.springframework.boot:spring-boot-starter-actuator'
+    annotationProcessor 'org.projectlombok:lombok'
-    implementation 'org.springframework.modulith:spring-modulith-starter-core'
-    implementation 'org.springframework.cloud:spring-cloud-starter-gateway'
-    implementation 'org.springframework.cloud:spring-cloud-starter-circuitbreaker-reactor-resilience4j'
-    implementation 'com.google.cloud:spring-cloud-gcp-starter'
-    implementation 'com.google.auth:google-auth-library-oauth2-http'
-    implementation 'io.grpc:grpc-netty'
-    implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap'
-    implementation 'io.netty:netty-all'
-    implementation 'com.nimbusds:nimbus-jose-jwt:9.41.2'
-    implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
-    implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-api:2.6.0'
-    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
-    implementation 'org.springframework.cloud:spring-cloud-starter-config'
-    testImplementation 'io.projectreactor:reactor-test'
     compileOnly 'org.projectlombok:lombok'
     developmentOnly 'org.springframework.boot:spring-boot-devtools'
+    implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
+    implementation 'com.google.auth:google-auth-library-oauth2-http'
+    implementation 'com.google.cloud:spring-cloud-gcp-starter'
+    implementation 'com.nimbusds:nimbus-jose-jwt:9.47'
+    implementation 'io.grpc:grpc-netty'
+    implementation 'io.netty:netty-all'
+    implementation 'org.springdoc:springdoc-openapi-starter-webflux-api:2.7.0'
+    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.7.0'
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+    implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap'
+    implementation 'org.springframework.cloud:spring-cloud-starter-circuitbreaker-reactor-resilience4j'
+    implementation 'org.springframework.cloud:spring-cloud-starter-config'
+    implementation 'org.springframework.cloud:spring-cloud-starter-gateway'
+    implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
+    implementation 'org.springframework.modulith:spring-modulith-starter-core'
     runtimeOnly 'org.springframework.modulith:spring-modulith-actuator'
     runtimeOnly 'org.springframework.modulith:spring-modulith-observability'
-    annotationProcessor 'org.projectlombok:lombok'
+    testImplementation 'io.projectreactor:reactor-test'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.modulith:spring-modulith-starter-test'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

src/main/resources/css/404.css

@@ -0,0 +1,19 @@
+body {
+  height: 100vh;
+  display: grid;
+  justify-content: center;
+  transition: background-color 1s;
+}
+
+canvas {
+  margin-top: -5em;
+  margin-bottom: -3em;
+  pointer-events: none;
+}
+
+.rive-canvas {
+  width: 100%;
+  height: 100%;
+  margin: auto;
+  display: block;
+}

src/main/resources/public/error/404.html

@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Rive Hello World</title>
-</head>
-<body>
-<div style="text-align: center">
-  <canvas id="canvas" width="400" height="400"></canvas>
-</div>
-<script src="https://unpkg.com/@rive-app/canvas@2.20.0"></script>
-<script>
-  const r = new rive.Rive({
-    src: "https://cdn.rive.app/animations/vehicles.riv",
-    canvas: document.getElementById("canvas"),
-    autoplay: true,
-    // artboard: "Arboard", // Optional. If not supplied the default is selected
-    stateMachines: "bumpy",
-    onLoad: () => {
-      // Ensure the drawing surface matches the canvas size and device pixel ratio
-      r.resizeDrawingSurfaceToCanvas();
-    },
-  });
-</script>
-</body>
-</html>

src/main/resources/static/error/404.html

@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8"/>
+  <meta content="IE=edge" http-equiv="X-UA-Compatible"/>
+  <meta content="width=device-width, initial-scale=1.0" name="viewport"/>
+  <title>404</title>
+  <link href="/css/404.css" rel="stylesheet"/>
+</head>
+<body style="background-color: #EB3A60;">
+<div style="text-align: center">
+  <canvas id="rive-canvas" style="width: 100%; height: 100%; margin: auto; display: block;"></canvas>
+</div>
+<script src="https://unpkg.com/@rive-app/canvas@2.20.0"></script>
+<script>
+  const r = new rive.Rive({
+    src: "https://cdn.rive.app/animations/vehicles.riv",
+    // OR the path to a discoverable and public Rive asset
+    // src: '/public/example.riv',
+    canvas: document.getElementById("rive-canvas"),
+    autoplay: true,
+    // artboard: "Arboard", // Optional. If not supplied the default is selected
+    stateMachines: "bumpy",
+    onLoad: () => {
+      r.resizeDrawingSurfaceToCanvas();
+    },
+  });
+</script>
+</body>
+</html>