Merge pull request #124 from SolaceProducts/pwang/DATAGO-62205

add EMA version to heartbeat message
SolaceProducts · Oct 13, 2023 · fd986a2 · fd986a2
2 parents 4e9349f + 48290c2
commit fd986a2
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 6 deletions.
diff --git a/service/application/pom.xml b/service/application/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.solace.maas</groupId>
@@ -341,6 +342,17 @@
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build-info</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <profiles>

diff --git a/service/application/src/main/java/com/solace/maas/ep/common/messages/HeartbeatMessage.java b/service/application/src/main/java/com/solace/maas/ep/common/messages/HeartbeatMessage.java
@@ -12,19 +12,21 @@ public class HeartbeatMessage extends MOPMessage {
     private String orgId;
     private String runtimeAgentId;
     private String timestamp;
+    private String runtimeAgentVersion;
 
     public HeartbeatMessage() {
         super();
     }
 
-    public HeartbeatMessage(String runtimeAgentId, String timestamp) {
+    public HeartbeatMessage(String runtimeAgentId, String timestamp,  String runtimeAgentVersion) {
         super();
         withMessageType(MOPMessageType.generic)
                 .withProtocol(MOPProtocol.EMAHeartbeat)
                 .withVersion("1")
                 .withUhFlag(MOPUHFlag.ignore);
         this.runtimeAgentId = runtimeAgentId;
         this.timestamp = timestamp;
+        this.runtimeAgentVersion = runtimeAgentVersion;
     }
 
     @Override

diff --git a/...src/main/java/com/solace/maas/ep/event/management/agent/publisher/HeartbeatGenerator.java b/...src/main/java/com/solace/maas/ep/event/management/agent/publisher/HeartbeatGenerator.java
@@ -6,6 +6,7 @@
 import com.solace.maas.ep.event.management.agent.plugin.jacoco.ExcludeFromJacocoGeneratedReport;
 import com.solace.maas.ep.event.management.agent.plugin.publisher.SolacePublisher;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.boot.info.BuildProperties;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -19,20 +20,28 @@ public class HeartbeatGenerator {
     private final SolacePublisher solacePublisher;
     private final String runtimeAgentId;
     private final String topic;
+    private final String runtimeAgentVersion;
 
     public HeartbeatGenerator(SolaceConfiguration solaceConfiguration,
                               EventPortalProperties eventPortalProperties,
-                              SolacePublisher solacePublisher) {
+                              SolacePublisher solacePublisher,
+                              BuildProperties buildProperties) {
         this.solacePublisher = solacePublisher;
         this.runtimeAgentId = eventPortalProperties.getRuntimeAgentId();
         topic = solaceConfiguration.getTopicPrefix() + "heartbeat/v1";
-
+        this.runtimeAgentVersion = getFormattedVersion(buildProperties.getVersion());
     }
 
     @Scheduled(fixedRate = 5000)
     public void sendHeartbeat() {
-        HeartbeatMessage message = new HeartbeatMessage(runtimeAgentId, Instant.now().toString());
+        HeartbeatMessage message = new HeartbeatMessage(runtimeAgentId, Instant.now().toString(), runtimeAgentVersion);
         solacePublisher.publish(message, topic);
     }
 
+    private String getFormattedVersion(String version) {
+        if (version.endsWith("-SNAPSHOT")) {
+            return version.replace("-SNAPSHOT", "");
+        }
+        return version;
+    }
 }
diff --git a/...ice/application/src/test/java/com/solace/maas/ep/event/management/agent/mop/MopTests.java b/...ice/application/src/test/java/com/solace/maas/ep/event/management/agent/mop/MopTests.java
@@ -52,7 +52,7 @@ public void ack() {
 
     @Test
     public void testHeartbeatAgentMOPProtocol() {
-        HeartbeatMessage message = new HeartbeatMessage("runtimeId", "timestamp");
+        HeartbeatMessage message = new HeartbeatMessage("runtimeId", "timestamp", "1.1.2");
         assertEquals(message.getMopProtocol(), MOPProtocol.EMAHeartbeat);
     }
 }