From f2395e99ed956f8d7ba0e99db3435fb5d613927b Mon Sep 17 00:00:00 2001 From: hongwei Date: Tue, 14 Feb 2023 16:29:24 +0100 Subject: [PATCH] refactor/tweak the params and implement `correlation_id` --- .../src/main/scala/code/api/v5_1_0/APIMethods510.scala | 8 +++----- obp-api/src/main/scala/code/metrics/MappedMetrics.scala | 4 +++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala b/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala index 16fb9e044..2edb5d91c 100644 --- a/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala +++ b/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala @@ -401,13 +401,11 @@ trait APIMethods510 { | |11 correlation_id (if null ignore) | - |12 duration (if null ignore) non digit chars will be silently omitted + |12 include_app_names (if null ignore).eg: &include_app_names=API-EXPLORER,API-Manager,SOFI,null | - |13 include_app_names (if null ignore).eg: &include_app_names=API-EXPLORER,API-Manager,SOFI,null + |13 include_url_patterns (if null ignore).you can design you own SQL LIKE pattern. eg: &include_url_patterns=%management/metrics%,%management/aggregate-metrics% | - |14 include_url_patterns (if null ignore).you can design you own SQL LIKE pattern. eg: &include_url_patterns=%management/metrics%,%management/aggregate-metrics% - | - |15 include_implemented_by_partial_functions (if null ignore).eg: &include_implemented_by_partial_functions=getMetrics,getConnectorMetrics,getAggregateMetrics + |14 include_implemented_by_partial_functions (if null ignore).eg: &include_implemented_by_partial_functions=getMetrics,getConnectorMetrics,getAggregateMetrics | |${authenticationRequiredMessage(true)} | diff --git a/obp-api/src/main/scala/code/metrics/MappedMetrics.scala b/obp-api/src/main/scala/code/metrics/MappedMetrics.scala index ff2f4599e..5441cbf3f 100644 --- a/obp-api/src/main/scala/code/metrics/MappedMetrics.scala +++ b/obp-api/src/main/scala/code/metrics/MappedMetrics.scala @@ -316,6 +316,7 @@ object MappedMetrics extends APIMetrics with MdcLoggable{ AND (${trueOrFalse(verb.isEmpty)} or verb = ${verb.getOrElse("")}) AND (${falseOrTrue(anon.isDefined && anon.equals(Some(true)))} or userid = 'null') AND (${falseOrTrue(anon.isDefined && anon.equals(Some(false)))} or userid != 'null') + AND (${trueOrFalse(correlationId.isEmpty)} or correlationId = ${correlationId.getOrElse("")}) AND (${trueOrFalse(includeUrlPatterns.isEmpty) } or (url LIKE ($includeUrlPatternsQueriesSql))) AND (${trueOrFalse(includeAppNames.isEmpty) } or (appname in ($includeAppNamesList))) AND (${trueOrFalse(includeImplementedByPartialFunctions.isEmpty) } or implementedbypartialfunction in ($includeImplementedByPartialFunctionsList)) @@ -333,7 +334,8 @@ object MappedMetrics extends APIMetrics with MdcLoggable{ AND (${trueOrFalse(appName.isEmpty)} or appname = ${appName.getOrElse("")}) AND (${trueOrFalse(verb.isEmpty)} or verb = ${verb.getOrElse("")}) AND (${falseOrTrue(anon.isDefined && anon.equals(Some(true)))} or userid = 'null') - AND (${falseOrTrue(anon.isDefined && anon.equals(Some(false)))} or userid != 'null') + AND (${falseOrTrue(anon.isDefined && anon.equals(Some(false)))} or userid != 'null') + AND (${trueOrFalse(correlationId.isEmpty)} or correlationId = ${correlationId.getOrElse("")}) AND (${trueOrFalse(excludeUrlPatterns.isEmpty) } or (url NOT LIKE ($excludeUrlPatternsQueries))) AND (${trueOrFalse(excludeAppNames.isEmpty) } or appname not in ($excludeAppNamesList)) AND (${trueOrFalse(excludeImplementedByPartialFunctions.isEmpty) } or implementedbypartialfunction not in ($excludeImplementedByPartialFunctionsList))