optimize setup

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

Dockerfile

@@ -11,11 +11,13 @@ USER app
 
 # Copy all needed project files to a folder
 COPY --chown=app ./.mvn/ .mvn
-COPY --chown=app ./mvnw ./pom.xml ./app.json ./
+COPY --chown=app ./mvnw ./pom.xml ./
 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 ./mvnw --batch-mode clean verify -Pproduction  -DskipTests
+RUN ./mvnw --batch-mode clean verify -Pproduction -DskipTests
 
 # Running stage: the part that is used for running the application
 FROM eclipse-temurin:21-jre-noble
@@ -24,7 +26,8 @@ RUN useradd -m app
 USER app
 
 COPY --chown=app --from=build /usr/src/app/target/*.jar /usr/app/website.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 || exit 1
 
 CMD ["java", "-jar", "/usr/app/website.jar"]

Makefile

@@ -0,0 +1,20 @@
+REMOTE_HOST = mars3142@172.16.20.1
+PROJECT_NAME = firmware-hq
+SERVICE_NAME = website
+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
-      }
-    ]
-  }
-}

pom.xml

@@ -12,16 +12,16 @@
 
   <properties>
     <java.version>21</java.version>
-    <vaadin.version>24.5.0.beta3</vaadin.version>
+    <vaadin.version>24.6.0.alpha1</vaadin.version>
     <spring-cloud.version>2023.0.3</spring-cloud.version>
     <spring-cloud-gcp.version>5.4.1</spring-cloud-gcp.version>
-    <spring-modulith.version>1.2.4</spring-modulith.version>
+    <spring-modulith.version>1.2.5</spring-modulith.version>
   </properties>
 
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <repositories>

src/main/java/dev/mars3142/fhq/client/AuthClient.java

@@ -0,0 +1,9 @@
+package dev.mars3142.fhq.client;
+
+import org.springframework.web.service.annotation.GetExchange;
+
+public interface AuthClient {
+
+  @GetExchange("/v1/auth")
+  String getAuth();
+}

src/main/java/dev/mars3142/fhq/client/TimeZoneClient.java

@@ -1,9 +1,16 @@
 package dev.mars3142.fhq.client;
 
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.service.annotation.GetExchange;
 
 public interface TimeZoneClient {
 
   @GetExchange("/v1/timezone")
   String getTimeZone();
+
+  @GetExchange("/v1/timezone/{area}")
+  String getTimeZone(@PathVariable String area);
+
+  @GetExchange("/v1/timezone/{area}/{location}")
+  String getTimeZone(@PathVariable String area, @PathVariable String location);
 }

src/main/java/dev/mars3142/fhq/config/RestClientConfig.java

@@ -1,6 +1,9 @@
 package dev.mars3142.fhq.config;
 
+import dev.mars3142.fhq.client.AuthClient;
 import dev.mars3142.fhq.client.TimeZoneClient;
+import dev.mars3142.fhq.config.interceptor.AuthInterceptor;
+import lombok.val;
 import org.springframework.boot.web.client.ClientHttpRequestFactories;
 import org.springframework.boot.web.client.ClientHttpRequestFactorySettings;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
@@ -17,22 +20,34 @@ public class RestClientConfig {
   @LoadBalanced
   @Bean
   RestClient.Builder restClientBuilder() {
-    return RestClient.builder();
+    return RestClient.builder()
+        .requestInterceptor(new AuthInterceptor());
   }
 
   @Bean
-  public TimeZoneClient timeZoneClient(RestClient.Builder restClientBuilder) {
-    RestClient restClient = restClientBuilder
+  public AuthClient authClient(RestClient.Builder builder) {
+    val restClient = builder
+        .baseUrl("http://auth-service")
+        .requestFactory(getClientRequestFactory())
+        .build();
+    val restClientAdapter = RestClientAdapter.create(restClient);
+    val httpServiceProxyFactory = HttpServiceProxyFactory.builderFor(restClientAdapter).build();
+    return httpServiceProxyFactory.createClient(AuthClient.class);
+  }
+
+  @Bean
+  public TimeZoneClient timeZoneClient(RestClient.Builder builder) {
+    val restClient = builder
         .baseUrl("http://timezone-service")
         .requestFactory(getClientRequestFactory())
         .build();
-    var restClientAdapter = RestClientAdapter.create(restClient);
-    var httpServiceProxyFactory = HttpServiceProxyFactory.builderFor(restClientAdapter).build();
+    val restClientAdapter = RestClientAdapter.create(restClient);
+    val httpServiceProxyFactory = HttpServiceProxyFactory.builderFor(restClientAdapter).build();
     return httpServiceProxyFactory.createClient(TimeZoneClient.class);
   }
 
   private ClientHttpRequestFactory getClientRequestFactory() {
-    ClientHttpRequestFactorySettings clientHttpRequestFactorySettings = ClientHttpRequestFactorySettings.DEFAULTS;
+    val clientHttpRequestFactorySettings = ClientHttpRequestFactorySettings.DEFAULTS;
     return ClientHttpRequestFactories.get(clientHttpRequestFactorySettings);
   }
 }

src/main/java/dev/mars3142/fhq/config/interceptor/AuthInterceptor.java

@@ -0,0 +1,19 @@
+package dev.mars3142.fhq.config.interceptor;
+
+import java.io.IOException;
+import lombok.val;
+import org.springframework.http.HttpRequest;
+import org.springframework.http.client.ClientHttpRequestExecution;
+import org.springframework.http.client.ClientHttpRequestInterceptor;
+import org.springframework.http.client.ClientHttpResponse;
+
+public class AuthInterceptor implements ClientHttpRequestInterceptor {
+
+  @Override
+  public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
+      throws IOException {
+    val headers = request.getHeaders();
+    headers.add("X-FHQ-USER-ID", "Vaadin");
+    return execution.execute(request, body);
+  }
+}

src/main/java/dev/mars3142/fhq/views/landing_page/LandingPageView.java

@@ -15,7 +15,7 @@ import lombok.val;
 public class LandingPageView extends Composite<VerticalLayout> {
 
     public LandingPageView(TimeZoneClient client) {
-        val timeZone = client.getTimeZone();
+        val timeZone = client.getTimeZone("Europe", "Berlin");
         val verticalLayout = new VerticalLayout();
         verticalLayout.setSizeFull();
         verticalLayout.add(new Text(timeZone));

src/main/resources/_application-dev.yaml

@@ -1,15 +0,0 @@
-server:
-  port: ${PORT:8090}
-
-vaadin:
-  # To improve the performance during development.
-  # For more information https://vaadin.com/docs/latest/integrations/spring/configuration#special-configuration-parameters
-  allowed-packages : com.vaadin,org.vaadin,dev.hilla,dev.mars3142
-
-backend:
-  uri: http://localhost:8091/v1
-
-eureka:
-  client:
-    service-url:
-      defaultZone: http://localhost:8761/eureka

src/main/resources/_application.yaml

@@ -1,52 +0,0 @@
-logging:
-  level:
-    org:atmosphere: warn
-
-spring:
-  application:
-    name: website
-  mustache:
-    check-template-location: false
-  jpa:
-    defer-datasource-initialization: true
-
-backend:
-  uri: https://api.firmware-hq.dev/v1
-
-eureka:
-  client:
-    register-with-eureka: true
-    fetch-registry: true
-    service-url:
-      defaultZone: http://eureka-service.web:8761/eureka
-  instance:
-    instanceId: ${spring.application.name}:${spring.application.instance_id:${random.value}}
-
-info:
-  application:
-    name: ${spring.application.name}
-    version: '@project.version@'
-    spring-cloud-version: '@spring-cloud.version@'
-    spring-boot-version: '@project.parent.version@'
-
-management:
-  endpoint:
-    health:
-      probes:
-        enabled: true
-
-server:
-  port: ${PORT:8080}
-  shutdown: graceful
-  error:
-    include-message: on_param
-    include-stacktrace: on_param
-
-sentry:
-  dsn: https://354321d371291036cffcdb5b1a72fd6e@o394865.ingest.us.sentry.io/4507718826262528
-  environment: edge-service
-
-  # Set traces_sample_rate to 1.0 to capture 100%
-  # of transactions for tracing.
-  # We recommend adjusting this value in production.
-  tracesSampleRate: 1.0

src/test/resources/bootstrap.yml

@@ -0,0 +1,6 @@
+eureka:
+  client:
+    register-with-eureka: false
+    fetch-registry: false
+    service-url:
+      defaultZone: ${EUREKA}