Update Actuator Config to add Info

Removed Heroku related config files since this newer versions are no longer supported to deploy on Heroku since it is FREE anymore

Author: RawSanj

.directory

@@ -2,7 +2,7 @@
 
 [![Docker JVM Build](https://img.shields.io/github/actions/workflow/status/RawSanj/spring-redis-websocket/docker-jvm-image.yml?style=flat-square&logo=docker&label=jvm%20build)](https://github.com/RawSanj/spring-redis-websocket/actions/workflows/docker-jvm-image.yml)
 [![Docker GraalVM Native Build](https://img.shields.io/github/actions/workflow/status/RawSanj/spring-redis-websocket/docker-graalvm-native-image.yml?style=flat-square&logo=docker&label=graalvm%20build)](https://github.com/RawSanj/spring-redis-websocket/actions/workflows/docker-graalvm-native-image.yml)
-[![Docker Pulls](https://img.shields.io/docker/pulls/rawsanj/spring-redis-websocket?style=flat-square&logo=docker&color=orange)](https://hub.docker.com/repository/docker/rawsanj/spring-redis-websocket/general)
+[![Docker Pulls](https://img.shields.io/docker/pulls/rawsanj/spring-redis-websocket?style=flat-square&logo=docker&color=orange)](https://hub.docker.com/r/rawsanj/spring-redis-websocket)
 [![Discord Server](https://img.shields.io/discord/465093591002513418?style=flat-square&logo=discord&label=discord)](https://discord.gg/4ebNhud)
 [![GitHub License](https://img.shields.io/github/license/rawsanj/spring-redis-websocket?style=flat-square&logo=apache&logoColor=red)](https://github.com/RawSanj/spring-redis-websocket?tab=Apache-2.0-1-ov-file)
 [![Spring Chat Website](https://img.shields.io/website?url=https%3A%2F%2Fchat.apps.dedyn.io%2Factuator%2Fhealth&up_message=online&up_color=green&down_message=offline&down_color=red&style=flat-square&logo=signal&logoColor=white&label=DEMO%20Chat&labelColor=purple)](https://chat.apps.dedyn.io)

Procfile

@@ -20,6 +20,7 @@
 
 	<properties>
 		<java.version>21</java.version>
+		<git-commit-id-maven-plugin.version>7.0.0</git-commit-id-maven-plugin.version>
 		<registry.image.name>rawsanj/spring-redis-websocket</registry.image.name>
 		<skipNativeImage>true</skipNativeImage>
 	</properties>
@@ -104,6 +105,34 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>io.github.git-commit-id</groupId>
+				<artifactId>git-commit-id-maven-plugin</artifactId>
+				<version>${git-commit-id-maven-plugin.version}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>revision</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<failOnNoGitDirectory>true</failOnNoGitDirectory>
+					<failOnUnableToExtractRepoInfo>true</failOnUnableToExtractRepoInfo>
+					<generateGitPropertiesFile>true</generateGitPropertiesFile>
+					<commitIdGenerationMode>full</commitIdGenerationMode>
+					<includeOnlyProperties>
+						<includeOnlyProperty>^git.branch$</includeOnlyProperty>
+						<includeOnlyProperty>^git.build.version</includeOnlyProperty>
+						<includeOnlyProperty>^git.build.time</includeOnlyProperty>
+						<includeOnlyProperty>^git.commit.id.abbrev$</includeOnlyProperty>
+						<includeOnlyProperty>^git.commit.message.short</includeOnlyProperty>
+						<includeOnlyProperty>^git.commit.time</includeOnlyProperty>
+						<includeOnlyProperty>^git.commit.user.name</includeOnlyProperty>
+						<includeOnlyProperty>^git.total.commit.count</includeOnlyProperty>
+					</includeOnlyProperties>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 

README.md

@@ -1,4 +1,4 @@
-FROM maven:3.8.8-eclipse-temurin-21 as build
+FROM maven:3.8.8-eclipse-temurin-21 AS build
 WORKDIR /app
 COPY ../../.. ./
 RUN mvn clean package --file pom.xml

app.json

@@ -1,4 +1,4 @@
-FROM ghcr.io/graalvm/native-image-community:21 as build
+FROM ghcr.io/graalvm/native-image-community:21 AS build
 WORKDIR /app
 COPY ../../.. ./
 RUN ./mvnw -Pnative clean package -DskipNativeImage=false --file pom.xml

pom.xml

@@ -2,7 +2,6 @@
 
 import com.github.rawsanj.model.ChatMessage;
 import com.github.rawsanj.model.Message;
-import com.github.rawsanj.model.Platform;
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.context.annotation.ImportRuntimeHints;
@@ -18,8 +17,7 @@ static class SerdeRuntimeHints implements RuntimeHintsRegistrar {
 		public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
 			hints.serialization()
 				.registerType(ChatMessage.class)
-				.registerType(Message.class)
-				.registerType(Platform.class);
+				.registerType(Message.class);
 		}
 	}
 }

src/main/docker/Dockerfile.jvm

@@ -2,11 +2,9 @@
 
 import com.github.rawsanj.messaging.RedisChatMessagePublisher;
 import com.github.rawsanj.model.Message;
-import com.github.rawsanj.model.Platform;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
 import org.springframework.core.io.Resource;
 import org.springframework.http.MediaType;
 import org.springframework.web.reactive.function.server.RouterFunction;
@@ -21,14 +19,11 @@ public class WebHttpHandler {
 
 	@Bean
 	public RouterFunction<ServerResponse> htmlRouter(@Value("classpath:/static/index.html") Resource html,
-													 RedisChatMessagePublisher redisChatMessagePublisher, Environment environment) {
+													 RedisChatMessagePublisher redisChatMessagePublisher) {
 		return route(GET("/"), request -> ServerResponse.ok().contentType(MediaType.TEXT_HTML).bodyValue(html))
 			.andRoute(POST("/message"), request -> request.bodyToMono(Message.class)
 				.flatMap(message -> redisChatMessagePublisher.publishChatMessage(message.getMessage()))
 				.flatMap(aLong -> ServerResponse.ok().bodyValue(new Message("Message Sent Successfully!.")))
-			)
-			.andRoute(
-				GET("/platform"), request -> ServerResponse.ok().bodyValue(new Platform(environment.getProperty("RUNTIME_PLATFORM", "JVM")))
 			);
 	}
 

src/main/docker/Dockerfile.native

@@ -5,8 +5,46 @@ spring:
         port: 6379
     application:
         name: spring-redis-reactive-websocket
+
 management:
+    endpoints:
+        web:
+            base-path: /management
+            exposure:
+                include:
+                    - configprops
+                    - env
+                    - health
+                    - info
+                    - logfile
+                    - loggers
+                    - threaddump
     endpoint:
         health:
-            access: read_only
             show-details: always
+            group:
+                liveness:
+                    include: livenessState
+                readiness:
+                    include: readinessState
+    info:
+        git:
+            mode: full
+        env:
+            enabled: true
+    health:
+        redis:
+            enabled: true
+    metrics:
+        enable:
+            http: true
+            jvm: true
+            logback: true
+            process: true
+            system: true
+        distribution:
+            percentiles-histogram:
+                all: true
+            percentiles:
+                all: 0, 0.5, 0.75, 0.95, 0.99, 1.0
+

src/main/java/com/github/rawsanj/config/RuntimeHintsConfig.java

@@ -177,13 +177,13 @@ $(document).ready(function () {
 
 	function initPlatform() {
 		$.ajax({
-			url: "/platform",
+			url: "/management/info",
 			type: "GET",
 			dataType: "json",
 			contentType: "application/json",
 			success: function (response) {
 				console.log(response);
-				$("#platform").text(response.name);
+				$("#platform").text(response.platform);
 			},
 			error: function (err) {
 				console.log(err);

src/main/java/com/github/rawsanj/handler/WebHttpHandler.java

@@ -2,7 +2,6 @@
 
 import com.github.rawsanj.model.ChatMessage;
 import com.github.rawsanj.model.Message;
-import com.github.rawsanj.model.Platform;
 import org.junit.jupiter.api.Test;
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
@@ -16,7 +15,6 @@ void registerHintsTest() {
 		RuntimeHints hints = new RuntimeHints();
 		new RuntimeHintsConfig.SerdeRuntimeHints().registerHints(hints, getClass().getClassLoader());
 		assertThat(RuntimeHintsPredicates.serialization().onType(ChatMessage.class)).accepts(hints);
-		assertThat(RuntimeHintsPredicates.serialization().onType(Message.class)).accepts(hints);
-		assertThat(RuntimeHintsPredicates.serialization().onType(Platform.class)).accepts(hints);
+		assertThat(RuntimeHintsPredicates.serialization().onType(Message.class)).accepts(hints);;
 	}
 }