fix dependencies

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

Dockerfile

@@ -9,12 +9,12 @@ WORKDIR /usr/src/app/
 RUN chown app:app /usr/src/app/
 USER app
 
-# Copy pom.xml and prefetch dependencies so a repeated build can continue from the next step with existing dependencies
-COPY --chown=app ./gradle/ ./gradle
-COPY --chown=app ./gradlew ./build.gradle ./settings.gradle ./
-
 # Copy all needed project files to a folder
-COPY --chown=app:app ./src ./src
+COPY --chown=app ./gradle/ ./gradle
+COPY --chown=app ./gradlew ./build.gradle ./settings.gradle ./app.json ./
+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
@@ -26,6 +26,13 @@ RUN useradd -m app
 USER app
 
 COPY --chown=app --from=build /usr/src/app/build/libs/*-SNAPSHOT.jar /usr/app/eureka.jar
+COPY --chown=app --from=build /usr/src/app/opentelemetry-javaagent.jar /usr/app/opentelemetry-javaagent.jar
+
+ENV JAVA_TOOL_OPTIONS="-javaagent:/usr/app/opentelemetry-javaagent.jar"
+ENV OTEL_SERVICE_NAME="eureka-service"
+ENV OTEL_EXPORTER_OTLP_ENDPOINT="http://opentelemetry-collector.web:4318"
+
+HEALTHCHECK CMD curl --fail http://localhost:8761/actuator/health/liveness || exit 1
 
 EXPOSE 8761
 CMD ["java", "-jar", "/usr/app/eureka.jar"]

build.gradle

@@ -1,8 +1,7 @@
 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 "io.sentry.jvm.gradle" version "4.11.0"
 }
 
 group = 'dev.mars3142.fhq'
@@ -19,7 +18,7 @@ repositories {
 }
 
 ext {
-	set('springCloudVersion', "2023.0.3")
+	set('springCloudVersion', "2024.0.0")
 }
 
 dependencies {

src/main/resources/application.yaml

@@ -37,10 +37,12 @@ spring:
     name: eureka-service
 
 eureka:
+  instance:
+    hostname: localhost
   client:
     registerWithEureka: false
     fetchRegistry: false
+    serviceUrl:
+      defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/
   datacenter: hel1-dc2
   environment: production
-  instance:
-    instanceId: ${spring.application.name}:${spring.application.instance_id:${random.value}}