PI-1597

libs/commons/build.gradle.kts

@@ -1,11 +1,11 @@
 import uk.gov.justice.digital.hmpps.extensions.ClassPathExtension
 
 dependencies {
+    api(libs.bundles.telemetry)
     compileOnly("org.springframework.boot:spring-boot-starter-data-ldap")
     implementation("org.springframework.boot:spring-boot-starter-security")
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
-    implementation(libs.bundles.telemetry)
     implementation(libs.flipt)
 
     testImplementation("org.springframework.boot:spring-boot-starter-data-ldap")

libs/messaging/build.gradle.kts

@@ -4,7 +4,6 @@ dependencies {
     implementation(project(":libs:commons"))
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
-    implementation(libs.bundles.telemetry)
     compileOnly(libs.openfeign)
     compileOnly("org.springframework.boot:spring-boot-starter-data-jpa")
 

libs/oauth-server/src/main/kotlin/uk/gov/justice/digital/hmpps/config/telemetry/ClientTrackingInterceptor.kt

@@ -0,0 +1,29 @@
+package uk.gov.justice.digital.hmpps.config.telemetry
+
+import com.nimbusds.jwt.SignedJWT
+import io.opentelemetry.api.trace.Span
+import jakarta.servlet.http.HttpServletRequest
+import jakarta.servlet.http.HttpServletResponse
+import org.springframework.context.annotation.Configuration
+import org.springframework.http.HttpHeaders
+import org.springframework.web.servlet.HandlerInterceptor
+
+@Configuration
+class ClientTrackingInterceptor : HandlerInterceptor {
+    override fun preHandle(request: HttpServletRequest, response: HttpServletResponse, handler: Any): Boolean {
+        val token = request.getHeader(HttpHeaders.AUTHORIZATION)
+        if (token.startsWith(BEARER)) {
+            try {
+                val jwtBody = SignedJWT.parse(token.replace(BEARER, "")).jwtClaimsSet
+                Span.current().setAttribute("clientId", jwtBody.getClaim("client_id").toString())
+            } catch (ignored: Exception) {
+                // Do nothing - don't create client id span
+            }
+        }
+        return true
+    }
+
+    companion object {
+        private const val BEARER = "Bearer "
+    }
+}

projects/domain-events-and-delius/build.gradle.kts

@@ -16,7 +16,6 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
-    implementation(libs.bundles.telemetry)
 
     dev(project(":libs:dev-tools"))
     dev("com.h2database:h2")