Add application name

gradle/libs.versions.toml

@@ -38,6 +38,7 @@ spring-boot-oauth2-resource-server = { module = "org.springframework.boot:spring
 spring-boot-config = { module = "org.springframework.boot:spring-boot-configuration-processor", version.ref = "spring-boot" }
 spring-cloud = { module = "org.springframework.cloud:spring-cloud-dependencies", version.ref = "spring-cloud" }
 spring-cloud-starter = { module = "org.springframework.cloud:spring-cloud-starter" }
+spring-cloud-starter-bus-kafka = { module = "org.springframework.cloud:spring-cloud-starter-bus-kafka" }
 spring-cloud-starter-config = { module = "org.springframework.cloud:spring-cloud-starter-config" }
 spring-cloud-config-server = { module = "org.springframework.cloud:spring-cloud-config-server" }
 spring-boot-starter = { module = "org.springframework.boot:spring-boot-starter" }

module-server/server.gradle.kts

@@ -10,4 +10,5 @@ dependencies {
     annotationProcessor(libs.mapstruct.processor)
     kapt(libs.mapstruct.processor)
     implementation(libs.spring.cloud.starter.config)
+    implementation(libs.spring.cloud.starter.bus.kafka)
 }

module-server/src/main/kotlin/de/twomartens/wahlrecht/monitoring/actuator/RestHealthIndicator.kt

@@ -1,6 +1,7 @@
 package de.twomartens.wahlrecht.monitoring.actuator
 
 import de.twomartens.wahlrecht.interceptor.HeaderInterceptorRest
+import de.twomartens.wahlrecht.property.ServiceProperties
 import org.springframework.boot.actuate.health.Health
 import org.springframework.boot.actuate.health.HealthIndicator
 import org.springframework.boot.actuate.health.Status
@@ -28,8 +29,10 @@ import java.time.Clock
  */
 @Component
 class RestHealthIndicator(
-    clock: Clock, interceptor: HeaderInterceptorRest,
+        clock: Clock, interceptor: HeaderInterceptorRest,
-    serverProperties: ServerProperties, private val restTemplateRestHealthIndicator: RestTemplate
+        serverProperties: ServerProperties,
+        private val restTemplateRestHealthIndicator: RestTemplate,
+        private val serviceProperties: ServiceProperties
 ) : AbstractHealthIndicator(clock, Preparable { interceptor.markAsHealthCheck() }), HealthIndicator {
     private val randomizer = SecureRandom()
     private val urlPrefix: String = (HTTP_PREFIX + HOST + HOST_PORT_SEPARATOR
@@ -43,10 +46,10 @@ class RestHealthIndicator(
         val random = randomizer.nextInt(100000, 999999).toString()
         val url = "$urlPrefix{random}"
         val response = restTemplateRestHealthIndicator.getForEntity(url, String::class.java, random)
-        val status = if (response.body == random) Status.UP else Status.DOWN
+        val status = if (response.body == serviceProperties.greeting.format(random)) Status.UP else Status.DOWN
         return Health.status(status)
-            .withDetail(DETAIL_ENDPOINT_KEY, url)
+                .withDetail(DETAIL_ENDPOINT_KEY, url)
-            .build()
+                .build()
     }
 
     companion object {

module-server/src/main/kotlin/de/twomartens/wahlrecht/service/PropertyReloadService.kt

@@ -1,41 +0,0 @@
-package de.twomartens.wahlrecht.service
-
-import mu.KotlinLogging
-import org.apache.logging.log4j.message.StringMapMessage
-import org.springframework.beans.factory.annotation.Qualifier
-import org.springframework.cloud.context.refresh.ContextRefresher
-import org.springframework.scheduling.annotation.Scheduled
-import org.springframework.stereotype.Service
-import java.util.concurrent.TimeUnit
-
-/**
- * automatically reloads application*.yaml. reload can also be triggered manually by doing a post
- * request on http://localhost:12001/actuator/refresh
- */
-@Service
-class PropertyReloadService(@Qualifier("configDataContextRefresher") private val contextRefresher: ContextRefresher) {
-    @Scheduled(
-        fixedDelay = REFRESH_SECONDS.toLong(),
-        initialDelay = REFRESH_SECONDS.toLong(),
-        timeUnit = TimeUnit.SECONDS
-    )
-    fun refresh() {
-        val properties = contextRefresher.refresh()
-        if (properties.isNotEmpty()) {
-            log.info(
-                StringMapMessage()
-                    .with(PARAM_MESSAGE, "properties changed")
-                    .with(PARAM_PROPERTIES, properties.joinToString("\n"))
-                    .asString()
-            )
-        }
-    }
-
-    companion object {
-        const val REFRESH_SECONDS = 60
-        const val PARAM_MESSAGE = "message"
-        const val PARAM_PROPERTIES = "labels.properties"
-
-        private val log = KotlinLogging.logger {}
-    }
-}

module-server/src/main/resources/application-dev.yaml

@@ -1,2 +1,9 @@
 server.port: 12000
 management.server.port: 12001
+
+
+spring:
+  config:
+    import:
+      - "classpath:config/wahlrecht.yaml"
+      - "optional:configserver:http://localhost:8888/config"

module-server/src/main/resources/application.yaml

@@ -23,11 +23,15 @@ management:
     http.server.requests: true
 
 spring:
-  config:
+  cloud:
-    import:
+    config:
-      - "classpath:config/wahlrecht.yaml"
+      name: wahlrecht
   main:
     banner-mode: off
+  kafka:
+    bootstrap-servers:
+      - localhost:9092
+      - kafka:9092
   profiles:
     default: dev
   data.mongodb:
@@ -41,7 +45,6 @@ spring:
   application:
     name: wahlrecht
 
-
 springdoc:
   swagger-ui:
     display-request-duration: true

module-server/src/main/resources/config/wahlrecht-prod.yaml

@@ -1,2 +1,2 @@
 de.twomartens.wahlrecht:
-  greeting: "Moin %s"
+  greeting: "Moin %s, you are prod"

module-server/src/main/resources/config/wahlrecht.yaml

@@ -1,6 +1,6 @@
 de.twomartens.wahlrecht:
   defaultTimeZone: Europe/Berlin
-  greeting: "Hello %s"
+  greeting: "Hello %s, on millenium"
   statusprobe:
     scheduleDuration: 60
     maxKafkaFailureDuration: 5