Feature: Add IDs to requests

project/src/main/kotlin/org/ionproject/core/CoreApplication.kt

@@ -8,6 +8,7 @@ import org.ionproject.core.calendar.icalendar.Calendar
 import org.ionproject.core.calendar.representations.CalendarSerializer
 import org.ionproject.core.common.Media
 import org.ionproject.core.common.UriTemplateSerializer
+import org.ionproject.core.common.filters.RequestIDFilter
 import org.ionproject.core.common.interceptors.ControlAccessInterceptor
 import org.ionproject.core.common.interceptors.LoggerInterceptor
 import org.ionproject.core.common.interceptors.PageLimitQueryParamInterceptor
@@ -16,6 +17,8 @@ import org.ionproject.core.common.messageConverters.ProblemJsonMessageConverter
 import org.ionproject.core.common.messageConverters.SirenMessageConverter
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
+import org.springframework.boot.web.servlet.FilterRegistrationBean
+import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.http.converter.HttpMessageConverter
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter
@@ -77,6 +80,13 @@ class CoreSerializationConfig : WebMvcConfigurer {
             .addPathPatterns("/v?/programmes*")
             .addPathPatterns("/v?/search*")
     }
+
+    @Bean
+    fun registerRequestIDFilter() : FilterRegistrationBean<RequestIDFilter> =
+        FilterRegistrationBean<RequestIDFilter>().apply {
+            filter = RequestIDFilter()
+            order = 1
+        }
 }
 
 fun main(args: Array<String>) {

project/src/main/kotlin/org/ionproject/core/common/filters/RequestIDFilter.kt

@@ -0,0 +1,30 @@
+package org.ionproject.core.common.filters
+
+import org.slf4j.MDC // if we use logback switch the import. The method name is the same so everything should work accordingly
+import org.springframework.web.filter.OncePerRequestFilter
+import java.util.*
+import javax.servlet.FilterChain
+import javax.servlet.http.HttpServletRequest
+import javax.servlet.http.HttpServletResponse
+
+private const val REQUEST_ID_HEADER = "Request-Id"
+const val REQUEST_ID = "req-id"
+
+class RequestIDFilter : OncePerRequestFilter() {
+    override fun doFilterInternal(
+        request: HttpServletRequest,
+        response: HttpServletResponse,
+        filterChain: FilterChain
+    ) {
+        val requestId = UUID.randomUUID().toString()
+
+        MDC.put(REQUEST_ID, requestId)
+
+        response.addHeader(
+            REQUEST_ID_HEADER,
+            requestId
+        )
+
+        filterChain.doFilter(request, response)
+    }
+}

project/src/main/kotlin/org/ionproject/core/common/interceptors/LoggerInterceptor.kt

@@ -1,6 +1,8 @@
 package org.ionproject.core.common.interceptors
 
+import org.ionproject.core.common.filters.REQUEST_ID
 import org.slf4j.LoggerFactory
+import org.slf4j.MDC
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter
 import javax.servlet.http.HttpServletRequest
 import javax.servlet.http.HttpServletResponse
@@ -12,7 +14,8 @@ class LoggerInterceptor : HandlerInterceptorAdapter() {
     override fun preHandle(request: HttpServletRequest, response: HttpServletResponse, handler: Any): Boolean {
         val startTime = System.currentTimeMillis()
         logger.info(
-            "IP:${request.remoteAddr} | Method:${request.method} | Endpoint:${request.requestURI} | Timestamp:${startTime}"
+            "IP:${request.remoteAddr} | Method:${request.method} | Endpoint:${request.requestURI} | Request-Id:${MDC.get(
+                REQUEST_ID)} | Timestamp:${startTime}"
         )
         request.setAttribute("startTime", startTime)
         return true
@@ -28,7 +31,7 @@ class LoggerInterceptor : HandlerInterceptorAdapter() {
         val endTime: Long = System.currentTimeMillis()
         logger.info(
             """
-                    Total time taken to proccess request in milliseconds: ${endTime - startTime} ms
+                    Request-Id:${MDC.get(REQUEST_ID)} | Total time taken to proccess request in milliseconds: ${endTime - startTime} ms
                 """.trimIndent()
         )
     }