From d9b952b1718491f3633c0f39621f065258f23aeb Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Mon, 13 Jun 2022 11:28:51 +0200 Subject: [PATCH] seam update to new templates --- .../custom-service-java.yaml | 50 +++++++++++-------- ...n => template-1-1-without-methodargs.json} | 5 +- .../custom-service-java/template-1-1.json | 8 +-- .../custom-service-java/template-1-1a.json | 27 ---------- .../custom-service-java/template-1-1c.json | 27 ---------- .../custom-service-java/template-1-1d.json | 26 ---------- .../custom-service-java/template-1-2.json | 37 ++++++++++++++ .../{template-1-2e.json => template-2-1.json} | 13 ++--- .../template-2-2-without-methodargs.json | 36 +++++++++++++ 9 files changed, 110 insertions(+), 119 deletions(-) rename BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/{template-1-1b.json => template-1-1-without-methodargs.json} (81%) delete mode 100644 BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-1a.json delete mode 100644 BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-1c.json delete mode 100644 BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-1d.json create mode 100644 BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-2.json rename BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/{template-1-2e.json => template-2-1.json} (71%) create mode 100644 BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-2-2-without-methodargs.json diff --git a/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/custom-service-java.yaml index 91a21533..5bd25434 100644 --- a/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/custom-service-java.yaml @@ -1,43 +1,49 @@ config: -- customService1: template-1-1a.json -- customService2: template-1-1b.json -- customService3: template-1-1c.json -- customService4: template-1-1d.json -- customService5: template-1-2e.json +- customService1: template-1-1.json +- customService2: template-1-1.json +- customService3: template-1-1.json +- customService4: template-1-1.json +- customService5: template-1-2.json customService1: -- name: "VDLM_seam - ifs-004 (SQS) ServiceDemand - IN" -- className: com.bmw.cc.seam.api.servicedemandevent.v1.boundary.ServiceDemandEventMDB -- methodName: listen -- returnType: void +- name: "ifs-004 (SQS) ServiceDemand - IN" +- className1: com.bmw.cc.seam.api.servicedemandevent.v1.boundary.ServiceDemandEventMDB +- methodName1: listen +- methodArgs1: java.lang.String,java.util.Map,org.springframework.cloud.aws.messaging.listener.Acknowledgment +- returnType1: void - skipDeployment: "false" customService2: - - name: "VDLM_seam - ifs-005 (SQS) ServiceAppointment - IN" - - className: com.bmw.cc.seam.api.appointment.v1.boundary.AppointmentListenerMDB - - methodName: listen - - returnType: void + - name: "ifs-005 (SQS) ServiceAppointment - IN" + - className1: com.bmw.cc.seam.api.appointment.v1.boundary.AppointmentListenerMDB + - methodName1: listen + - methodArgs1: java.lang.String,java.util.Map + - returnType1: void - skipDeployment: "false" customService3: - - name: "VDLM_seam - ifs-003 (SQS) ServiceNotificationFeedback - IN" - - className: com.bmw.cc.seam.api.notificationfeedback.v1.boundary.ServiceNotificationFeedbackListenerMDB - - methodName: listen - - returnType: void + - name: "ifs-003 (SQS) ServiceNotificationFeedback - IN" + - className1: com.bmw.cc.seam.api.notificationfeedback.v1.boundary.ServiceNotificationFeedbackListenerMDB + - methodName1: listen + - methodArgs1: java.lang.String,java.util.Map,org.springframework.cloud.aws.messaging.listener.Acknowledgment + - returnType1: void - skipDeployment: "false" customService4: - - name: "VDLM_seam - ifs (SQS) ServiceNotification - OUT" - - className: com.bmw.cc.seam.integration.notificationservice.boundary.ServiceNotificationESI - - methodName: send - - returnType: void + - name: "ifs (SQS) ServiceNotification - OUT" + - className1: com.bmw.cc.seam.integration.notificationservice.boundary.ServiceNotificationESI + - methodName1: send + - methodArgs1: com.bmw.cc.seam.integration.notificationservice.entity.ServiceNotification,java.lang.String + - returnType1: void - skipDeployment: "false" customService5: - - name: "VDLM_seam - cdh: ifs-001 (Kinesis) Reporting - OUT" + - name: "cdh: ifs-001 (Kinesis) Reporting - OUT" - className: com.bmw.cc.seam.integration.datalake.boundary.DataLakeESI - methodName1: sendAsync + - methodArgs1: java.lang.String,java.lang.String - returnType1: void - methodName2: sendSync + - methodArgs2: java.lang.String - returnType2: void - skipDeployment: "false" diff --git a/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-1b.json b/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-1-without-methodargs.json similarity index 81% rename from BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-1b.json rename to BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-1-without-methodargs.json index a8434d5d..b3003515 100644 --- a/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-1b.json +++ b/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-1-without-methodargs.json @@ -13,10 +13,7 @@ "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [ - "java.lang.String", - "java.util.Map" - ], + "argumentTypes": [], "methodName": "{{.methodName}}", "returnType": "{{.returnType}}" } diff --git a/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-1.json index b3003515..d972cec5 100644 --- a/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-1.json +++ b/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-1.json @@ -7,15 +7,15 @@ "rules": [ { "annotations": [], - "className": "{{.className}}", + "className": "{{.className1}}", "enabled": true, "fileName": "", "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [], - "methodName": "{{.methodName}}", - "returnType": "{{.returnType}}" + "argumentTypes": ["{{.methodArgs1}}"], + "methodName": "{{.methodName1}}", + "returnType": "{{.returnType1}}" } ] } diff --git a/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-1a.json b/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-1a.json deleted file mode 100644 index 61022ee8..00000000 --- a/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-1a.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "enabled": true, - "name": "{{.name}}", - "processGroups": [], - "queueEntryPoint": false, - "queueEntryPointType": null, - "rules": [ - { - "annotations": [], - "className": "{{.className}}", - "enabled": true, - "fileName": "", - "matcher": "EQUALS", - "methodRules": [ - { - "argumentTypes": [ - "java.lang.String", - "java.util.Map", - "org.springframework.cloud.aws.messaging.listener.Acknowledgment" - ], - "methodName": "{{.methodName}}", - "returnType": "{{.returnType}}" - } - ] - } - ] -} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-1c.json b/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-1c.json deleted file mode 100644 index 61022ee8..00000000 --- a/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-1c.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "enabled": true, - "name": "{{.name}}", - "processGroups": [], - "queueEntryPoint": false, - "queueEntryPointType": null, - "rules": [ - { - "annotations": [], - "className": "{{.className}}", - "enabled": true, - "fileName": "", - "matcher": "EQUALS", - "methodRules": [ - { - "argumentTypes": [ - "java.lang.String", - "java.util.Map", - "org.springframework.cloud.aws.messaging.listener.Acknowledgment" - ], - "methodName": "{{.methodName}}", - "returnType": "{{.returnType}}" - } - ] - } - ] -} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-1d.json b/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-1d.json deleted file mode 100644 index 6f3d0988..00000000 --- a/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-1d.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "enabled": true, - "name": "{{.name}}", - "processGroups": [], - "queueEntryPoint": false, - "queueEntryPointType": null, - "rules": [ - { - "annotations": [], - "className": "{{.className}}", - "enabled": true, - "fileName": "", - "matcher": "EQUALS", - "methodRules": [ - { - "argumentTypes": [ - "com.bmw.cc.seam.integration.notificationservice.entity.ServiceNotification", - "java.lang.String" - ], - "methodName": "{{.methodName}}", - "returnType": "{{.returnType}}" - } - ] - } - ] -} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-2.json b/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-2.json new file mode 100644 index 00000000..956c6803 --- /dev/null +++ b/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-2.json @@ -0,0 +1,37 @@ +{ + "enabled": true, + "name": "{{.name}}", + "processGroups": [], + "queueEntryPoint": false, + "queueEntryPointType": null, + "rules": [ + { + "annotations": [], + "className": "{{.className}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": ["{{.methodArgs1}}"], + "methodName": "{{.methodName1}}", + "returnType": "{{.returnType1}}" + } + ] + }, + { + "annotations": [], + "className": "{{.className}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": ["{{.methodArgs2}}"], + "methodName": "{{.methodName2}}", + "returnType": "{{.returnType2}}" + } + ] + } + ] +} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-2e.json b/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-2-1.json similarity index 71% rename from BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-2e.json rename to BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-2-1.json index 5d450258..f0077b0c 100644 --- a/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-1-2e.json +++ b/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-2-1.json @@ -7,31 +7,26 @@ "rules": [ { "annotations": [], - "className": "{{.className}}", + "className": "{{.className1}}", "enabled": true, "fileName": "", "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [ - "java.lang.String", - "java.lang.String" - ], + "argumentTypes": ["{{.methodArgs1}}"], "methodName": "{{.methodName1}}", "returnType": "{{.returnType1}}" }] }, { "annotations": [], - "className": "{{.className}}", + "className": "{{.className2}}", "enabled": true, "fileName": "", "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [ - "java.lang.String" - ], + "argumentTypes": ["{{.methodArgs2}}"], "methodName": "{{.methodName2}}", "returnType": "{{.returnType2}}" } diff --git a/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-2-2-without-methodargs.json b/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-2-2-without-methodargs.json new file mode 100644 index 00000000..7ed95c38 --- /dev/null +++ b/BMW-Dynatrace-config/CD_VDLM_seam/custom-service-java/template-2-2-without-methodargs.json @@ -0,0 +1,36 @@ +{ + "enabled": true, + "name": "{{.name}}", + "processGroups": [], + "queueEntryPoint": false, + "queueEntryPointType": null, + "rules": [ + { + "annotations": [], + "className": "{{.className1}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": [], + "methodName": "{{.methodName1}}", + "returnType": "{{.returnType1}}" + }] + }, + { + "annotations": [], + "className": "{{.className2}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": [], + "methodName": "{{.methodName2}}", + "returnType": "{{.returnType2}}" + } + ] + } + ] +} \ No newline at end of file