Merge pull request #117 from leanix/feature/CID-3856/Frequent-Websocket-connection-loss

CID-3856: Reduce Websocket connection losses

Author: mohamedlajmileanix

src/main/kotlin/net/leanix/githubagent/config/WebSocketClientConfig.kt

@@ -5,6 +5,7 @@ import io.github.resilience4j.retry.annotation.Retry
 import net.leanix.githubagent.handler.BrokerStompSessionHandler
 import net.leanix.githubagent.services.LeanIXAuthService
 import net.leanix.githubagent.shared.GitHubAgentProperties.GITHUB_AGENT_VERSION
+import org.springframework.beans.factory.annotation.Value
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.messaging.converter.MappingJackson2MessageConverter
@@ -23,7 +24,8 @@ class WebSocketClientConfig(
     private val objectMapper: ObjectMapper,
     private val leanIXAuthService: LeanIXAuthService,
     private val leanIXProperties: LeanIXProperties,
-    private val gitHubEnterpriseProperties: GitHubEnterpriseProperties
+    private val gitHubEnterpriseProperties: GitHubEnterpriseProperties,
+    @Value("\${websocket.heartbeat-interval}") private val heartbeatInterval: Long
 ) {
     @Retry(name = "ws_init_session")
     fun initSession(): StompSession {
@@ -50,7 +52,7 @@ class WebSocketClientConfig(
         val sockJsClient = SockJsClient(transports)
         val stompClient = WebSocketStompClient(sockJsClient)
         stompClient.messageConverter = jsonConverter
-        stompClient.defaultHeartbeat = longArrayOf(10000, 10000)
+        stompClient.defaultHeartbeat = longArrayOf(heartbeatInterval, 0)
         val scheduler = ThreadPoolTaskScheduler()
         scheduler.initialize()
         stompClient.taskScheduler = scheduler

src/main/resources/application.yaml

@@ -12,6 +12,8 @@ leanix:
     technical-user-token: ${LEANIX_TECHNICAL_USER_TOKEN}
 webhookEventService:
   waitingTime: 10000
+websocket:
+  heartbeat-interval: 30000
 
 resilience4j.retry:
   configs:

src/test/kotlin/net/leanix/githubagent/config/WebSocketClientConfigTests.kt

@@ -34,12 +34,15 @@ class WebSocketClientConfigTests {
         stompSession = mockk()
         authService = mockk()
         leanIXAuthService = mockk()
+        val heartbeatInterval = 10000L
+
         webSocketClientConfig = WebSocketClientConfig(
             brokerStompSessionHandler,
             objectMapper,
             leanIXAuthService,
             leanIXProperties,
-            gitHubEnterpriseProperties
+            gitHubEnterpriseProperties,
+            heartbeatInterval
         )
 
         GitHubAgentProperties.GITHUB_AGENT_VERSION = "test-version"

src/test/resources/application.yaml

@@ -12,3 +12,5 @@ leanix:
         technical-user-token: ${LEANIX_TECHNICAL_USER_TOKEN:dummy}
 webhookEventService:
   waitingTime: 100
+websocket:
+  heartbeat-interval: 30000