add job name in datasource config

crss-admin/crss-admin.yml

@@ -11,7 +11,7 @@ spring:
       gzipped: true
 
   datasource:
-    url: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=admin
+    url: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=admin&ApplicationName=adminApp
     username: crss_admin
     password: YReYA7fI
 

crss-audit/crss-audit.yml

@@ -2,7 +2,7 @@ spring:
   profiles.include: client-sec
   crss-audit:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=audit
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=audit&ApplicationName=auditApp
       username: crss_audit
       password: S0CuFyj6
       driverClassName: com.edb.Driver

crss-dataflow-app/crss-dataflow-app.yml

@@ -7,7 +7,7 @@ spring:
       maximumPoolSize: 10
       test-on-borrow: true
       validation-query: SELECT 1
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=dataflow&ApplicationName=dataflowApp
       username: crss_dataflow
       password: lgcCpwy0
   jpa:

crss-metering/crss-metering.yml

@@ -2,7 +2,7 @@ spring:
   profiles:
     include: client-sec,pg-query
   datasource:
-    url: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=metering
+    url: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=metering&ApplicationName=meteringApp
     username: crss_metering
     password: Fh7UcXpW
     hikari:

crss-meterprocess-app/crss-meterprocess-app.yml

@@ -2,7 +2,7 @@ spring:
   profiles.include: client-sec
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess&ApplicationName=meterprocessApp
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
@@ -12,7 +12,7 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=registration&ApplicationName=meterprocessApp
       username: crss_registration
       password: 51UF3JA9
       driverClassName: com.edb.Driver
@@ -22,7 +22,7 @@ spring:
       validation-query: SELECT 1
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=nmms
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=nmms&ApplicationName=meterprocessApp
       username: crss_nmms
       password: lbgg1i2Y
       driverClassName: com.edb.Driver

crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp.yml

@@ -1,7 +1,7 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=settlement&ApplicationName=calcAddtlComp
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=settlement&ApplicationName=calcAcJob
       username: crss_settlement
       password: i17SMOPm
       driverClassName: com.edb.Driver
@@ -11,7 +11,7 @@ spring:
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess&ApplicationName=calcAddtlComp
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess&ApplicationName=calcAcJob
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
@@ -21,7 +21,7 @@ spring:
       validation-query: SELECT 1
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=metering&ApplicationName=calcAddtlComp
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=metering&ApplicationName=calcAcJob
       username: crss_metering
       password: Fh7UcXpW
       driverClassName: com.edb.Driver
@@ -31,7 +31,7 @@ spring:
       validation-query: SELECT 1
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=nmms&ApplicationName=calcAddtlComp
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=nmms&ApplicationName=calcAcJob
       username: crss_nmms
       password: lbgg1i2Y
       driverClassName: com.edb.Driver
@@ -41,7 +41,7 @@ spring:
       validation-query: SELECT 1
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=dataflow&ApplicationName=calcAddtlComp
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=dataflow&ApplicationName=calcAcJob
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: com.edb.Driver

crss-settlement-task-calculation/crss-settlement-task-calculation.yml

@@ -1,7 +1,7 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=settlement&ApplicationName=stlCalc
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=settlement&ApplicationName=stlCalcJob
       username: crss_settlement
       password: i17SMOPm
       driverClassName: com.edb.Driver
@@ -11,7 +11,7 @@ spring:
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess&ApplicationName=stlCalc
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess&ApplicationName=stlCalcJob
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
@@ -21,7 +21,7 @@ spring:
       validation-query: SELECT 1
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=metering&ApplicationName=stlCalc
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=metering&ApplicationName=stlCalcJob
       username: crss_metering
       password: Fh7UcXpW
       driverClassName: com.edb.Driver
@@ -31,7 +31,7 @@ spring:
       validation-query: SELECT 1
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=nmms&ApplicationName=stlCalc
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=nmms&ApplicationName=stlCalcJob
       username: crss_nmms
       password: lbgg1i2Y
       driverClassName: com.edb.Driver
@@ -41,7 +41,7 @@ spring:
       validation-query: SELECT 1
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=dataflow&ApplicationName=stlCalc
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=dataflow&ApplicationName=stlCalcJob
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: com.edb.Driver
@@ -51,7 +51,7 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=registration&ApplicationName=stlCalcJob
       username: crss_registration
       password: 51UF3JA9
       driverClassName: com.edb.Driver

crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp.yml

@@ -1,7 +1,7 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=settlement&ApplicationName=fileGenAddtlComp
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=settlement&ApplicationName=fileAcJob
       username: crss_settlement
       password: i17SMOPm
       driverClassName: com.edb.Driver
@@ -11,7 +11,7 @@ spring:
       validation-query: SELECT 1
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=dataflow&ApplicationName=fileGenAddtlComp
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=dataflow&ApplicationName=fileAcJob
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: com.edb.Driver
@@ -21,7 +21,7 @@ spring:
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess&ApplicationName=fileGenAddtlComp
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess&ApplicationName=fileAcJob
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
@@ -31,7 +31,7 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=registration&ApplicationName=fileAcJob
       username: crss_registration
       password: 51UF3JA9
       driverClassName: com.edb.Driver

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation.yml

@@ -1,7 +1,7 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=settlement&ApplicationName=invoiceGen
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=settlement&ApplicationName=stlInvJob
       username: crss_settlement
       password: i17SMOPm
       driverClassName: com.edb.Driver
@@ -11,7 +11,7 @@ spring:
       validation-query: SELECT 1
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=dataflow&ApplicationName=invoiceGen
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=dataflow&ApplicationName=stlInvJob
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: com.edb.Driver
@@ -21,7 +21,7 @@ spring:
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess&ApplicationName=invoiceGen
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess&ApplicationName=stlInvJob
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
@@ -31,7 +31,7 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=registration&ApplicationName=stlInvJob
       username: crss_registration
       password: 51UF3JA9
       driverClassName: com.edb.Driver

crss-settlement-task-validation/crss-settlement-task-validation.yml

@@ -1,7 +1,7 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=settlement&ApplicationName=stlValidation
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=settlement&ApplicationName=stlValidationJob
       username: crss_settlement
       password: i17SMOPm
       driverClassName: com.edb.Driver
@@ -11,7 +11,7 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=registration&ApplicationName=stlValidation
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=registration&ApplicationName=stlValidationJob
       username: crss_registration
       password: 51UF3JA9
       driverClassName: com.edb.Driver
@@ -21,7 +21,7 @@ spring:
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess&ApplicationName=stlValidation
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess&ApplicationName=stlValidationJob
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
@@ -31,7 +31,7 @@ spring:
       validation-query: SELECT 1
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=metering&ApplicationName=stlValidation
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=metering&ApplicationName=stlValidationJob
       username: crss_metering
       password: Fh7UcXpW
       driverClassName: com.edb.Driver
@@ -41,7 +41,7 @@ spring:
       validation-query: SELECT 1
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=nmms&ApplicationName=stlValidation
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=nmms&ApplicationName=stlValidationJob
       username: crss_nmms
       password: lbgg1i2Y
       driverClassName: com.edb.Driver
@@ -51,7 +51,7 @@ spring:
       validation-query: SELECT 1
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=dataflow&ApplicationName=stlValidation
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=dataflow&ApplicationName=stlValidationJob
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: com.edb.Driver

crss-uaa/crss-uaa.yml

@@ -2,7 +2,7 @@ spring:
   profiles:
     include: ldap
   datasource:
-    url: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=admin
+    url: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=admin&ApplicationName=authApp
     username: crss_admin
     password: YReYA7fI
   redis:

crss-worklist-app/crss-worklist-app.yml

@@ -2,7 +2,7 @@ spring:
   profiles.include: client-sec
   crss-worklist:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=worklist
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=worklist&ApplicationName=worklistApp
       username: crss_worklist
       password: c3XL8Lcb
       driverClassName: com.edb.Driver
@@ -10,7 +10,7 @@ spring:
       maximumPoolSize: 5
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=settlement
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=settlement&ApplicationName=worklistApp
       username: crss_settlement
       password: i17SMOPm
       driverClassName: com.edb.Driver
@@ -18,7 +18,7 @@ spring:
       maximumPoolSize: 5
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess&ApplicationName=worklistApp
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
@@ -28,7 +28,7 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=registration&ApplicationName=worklistApp
       username: crss_registration
       password: 51UF3JA9
       driverClassName: com.edb.Driver