Skip to content

refactor/(bankconnectors): Extract correlationId from CallContext bef… #2686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simonredfern merged 2 commits into from
Feb 10, 2026
Merged

refactor/(bankconnectors): Extract correlationId from CallContext bef… #2686

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97e6405
refactor/(bankconnectors): Extract correlationId from CallContext bef…
hongwei1 Feb 10, 2026
bfe9933
Merge remote-tracking branch 'Simon/develop' into develop
hongwei1 Feb 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions obp-api/src/main/scala/code/bankconnectors/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,13 @@ package object bankconnectors extends MdcLoggable {
// Consider refactoring invokeMethod to accept a pre-resolved connectorName to avoid the duplicate lookup.
val (_, connectorName) = getConnectorNameAndMethodRouting(methodName, argNameToValue)

// Extract correlationId from CallContext before entering any Future callback,
// because Lift's S.containerSession is unavailable in async contexts.
val correlationId: String = args.collectFirst {
case Some(cc: CallContext) => cc.correlationId
case Full(cc: CallContext) => cc.correlationId
}.getOrElse(getCorrelationId()) // fallback to Lift session if no CallContext in args

// Record outbound (before call)
ConnectorCountsRedis.incrementOutbound(connectorName, methodName)
val t0 = System.currentTimeMillis()
Expand All @@ -88,11 +95,6 @@ package object bankconnectors extends MdcLoggable {
// Record detailed metric to DB
if (getPropsAsBoolValue("write_connector_metrics", false)) {
val params = extractKeyParams(args)
// TODO: The correlation_id should be passed down from the REST API layer
// so that one REST call with a correlation_id results in multiple connector
// metric records each sharing the same correlation_id. Currently getCorrelationId()
// relies on Lift's S.containerSession which is unavailable inside this Future.
val correlationId = getCorrelationId()
Future {
ConnectorMetricsProvider.metrics.vend.saveConnectorMetric(
connectorName, methodName, correlationId, now, duration, params, isSuccess)
Expand All @@ -108,8 +110,6 @@ package object bankconnectors extends MdcLoggable {

if (getPropsAsBoolValue("write_connector_metrics", false)) {
val params = extractKeyParams(args)
// TODO: Same as above — correlation_id should come from the REST API layer.
val correlationId = getCorrelationId()
Future {
ConnectorMetricsProvider.metrics.vend.saveConnectorMetric(
connectorName, methodName, correlationId, now, duration, params, isSuccess)
Expand Down
Loading