From bba5586037353337cbbe575bf1ca6586ab56efcd Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Tue, 14 Jun 2022 08:25:49 +0200 Subject: [PATCH 01/22] added tssb-bt sqs --- .../custom-service-java.yaml | 27 ++++++++++++++++--- .../custom-service-java/template-1-1.json | 2 +- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/BMW-Dynatrace-config/CD_VDLM_tssb-bt/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_tssb-bt/custom-service-java/custom-service-java.yaml index 25f8a028..cc7f76f7 100644 --- a/BMW-Dynatrace-config/CD_VDLM_tssb-bt/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_tssb-bt/custom-service-java/custom-service-java.yaml @@ -1,9 +1,28 @@ config: - customService1: template-1-1.json +- customService2: template-1-1.json +- customService3: template-1-1.json customService1: -- name: myJOYNRService -- className: com.bmw.cc.conn.this.is.just.an.exampleClasss -- methodName: exampleJoynrMethod +- name: "ifs-015 (SQS) AppointmentInformation - IN" +- className: com.bmw.tssb.tickets.client.appointmentinformation.AppointmentInformationMF +- methodName: processMessage +- methodArgs: com.bmw.cd.logging.CdllLoggingContext,software.amazon.awssdk.services.sqs.model.Message - returnType: void -- skipDeployment: "true" \ No newline at end of file +- skipDeployment: "false" + +customService2: +- name: "ifs-013 (SQS) ServiceNotificationDealer - IN" +- className: com.bmw.tssb.tickets.client.servicenotification.DealerServiceNotificationMF +- methodName: processMessage +- methodArgs: com.bmw.cd.logging.CdllLoggingContext,software.amazon.awssdk.services.sqs.model.Message +- returnType: void +- skipDeployment: "false" + +customService3: +- name: "ifs-014 (SQS) ServiceNotificationThirdParty - IN" +- className: com.bmw.tssb.tickets.client.servicenotification.ThirdPartyServiceNotificationMF +- methodName: processMessage +- methodArgs: com.bmw.cd.logging.CdllLoggingContext,software.amazon.awssdk.services.sqs.model.Message +- returnType: void +- skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_tssb-bt/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_VDLM_tssb-bt/custom-service-java/template-1-1.json index b3003515..ebe95097 100644 --- a/BMW-Dynatrace-config/CD_VDLM_tssb-bt/custom-service-java/template-1-1.json +++ b/BMW-Dynatrace-config/CD_VDLM_tssb-bt/custom-service-java/template-1-1.json @@ -13,7 +13,7 @@ "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [], + "argumentTypes": ["{{.methodArgs}}"], "methodName": "{{.methodName}}", "returnType": "{{.returnType}}" } From 797dd91681c9886ece1a0fd50300af61823d6167 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Tue, 14 Jun 2022 08:38:26 +0200 Subject: [PATCH 02/22] ts-base-ffs --- .../custom-service-java.yaml | 18 ++++++++++++++---- .../custom-service-java/template-1-1.json | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-base-ffs/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_ts-base-ffs/custom-service-java/custom-service-java.yaml index 25f8a028..c5775191 100644 --- a/BMW-Dynatrace-config/CD_VDLM_ts-base-ffs/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_ts-base-ffs/custom-service-java/custom-service-java.yaml @@ -1,9 +1,19 @@ config: - customService1: template-1-1.json +- customService2: template-1-1.json customService1: -- name: myJOYNRService -- className: com.bmw.cc.conn.this.is.just.an.exampleClasss -- methodName: exampleJoynrMethod +- name: "ifs-001 (SQS) ServiceNotificationBaseFfs - IN" +- className: com.bmw.cc.tsbaseffs.api.seam.boundary.SeamNotificationSqsListenerMF +- methodName: onNotification +- methodArgs: java.lang.String,java.util.Map - returnType: void -- skipDeployment: "true" \ No newline at end of file +- skipDeployment: "false" + +customService2: +- name: "(SQS) ServiceNotificationFeedback - OUT" +- className: com.bmw.cc.tsbaseffs.integration.seam.boundary.SeamESI +- methodName: sendSqsMessage +- methodArgs: com.bmw.cc.tsbaseffs.integration.seam.entity.ServiceNotificationFeedbackPayload +- returnType: void +- skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-base-ffs/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_VDLM_ts-base-ffs/custom-service-java/template-1-1.json index b3003515..ebe95097 100644 --- a/BMW-Dynatrace-config/CD_VDLM_ts-base-ffs/custom-service-java/template-1-1.json +++ b/BMW-Dynatrace-config/CD_VDLM_ts-base-ffs/custom-service-java/template-1-1.json @@ -13,7 +13,7 @@ "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [], + "argumentTypes": ["{{.methodArgs}}"], "methodName": "{{.methodName}}", "returnType": "{{.returnType}}" } From 8b68d592ab4cf08a243d8f1a043f21efaf9ba5fc Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Tue, 14 Jun 2022 08:45:04 +0200 Subject: [PATCH 03/22] added sqs ts-pffs --- .../custom-service-java.yaml | 18 ++++++++++++++---- .../custom-service-java/template-1-1.json | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-pffs/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_ts-pffs/custom-service-java/custom-service-java.yaml index 25f8a028..d64aeed9 100644 --- a/BMW-Dynatrace-config/CD_VDLM_ts-pffs/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_ts-pffs/custom-service-java/custom-service-java.yaml @@ -1,9 +1,19 @@ config: - customService1: template-1-1.json +- customService2: template-1-1.json customService1: -- name: myJOYNRService -- className: com.bmw.cc.conn.this.is.just.an.exampleClasss -- methodName: exampleJoynrMethod +- name: "ifs-003 (SQS) ServiceNotificationTSPFFS - IN" +- className: com.bmw.cc.tspffs.api.seam.boundary.SeamNotificationSqsListenerMF +- methodName: onNotification +- methodArgs: java.lang.String,java.util.Map - returnType: void -- skipDeployment: "true" \ No newline at end of file +- skipDeployment: "false" + +customService2: +- name: "(SQS) ServiceNotificationFeedback - OUT" +- className: com.bmw.cc.tspffs.integration.seam.boundary.SeamESI +- methodName: sendSqsMessage +- methodArgs: com.bmw.cc.tspffs.integration.seam.entity.ServiceNotificationFeedbackPayload +- returnType: void +- skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-pffs/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_VDLM_ts-pffs/custom-service-java/template-1-1.json index b3003515..ebe95097 100644 --- a/BMW-Dynatrace-config/CD_VDLM_ts-pffs/custom-service-java/template-1-1.json +++ b/BMW-Dynatrace-config/CD_VDLM_ts-pffs/custom-service-java/template-1-1.json @@ -13,7 +13,7 @@ "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [], + "argumentTypes": ["{{.methodArgs}}"], "methodName": "{{.methodName}}", "returnType": "{{.returnType}}" } From 026c9597c0db61a339280ab5c0d4bdba2670cc41 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Tue, 14 Jun 2022 08:50:38 +0200 Subject: [PATCH 04/22] added SQS patchcampaign --- .../custom-service-java/custom-service-java.yaml | 9 +++++---- .../custom-service-java/template-1-1.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/BMW-Dynatrace-config/CD_VDLM_patchcampaign/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_patchcampaign/custom-service-java/custom-service-java.yaml index 25f8a028..71eca54e 100644 --- a/BMW-Dynatrace-config/CD_VDLM_patchcampaign/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_patchcampaign/custom-service-java/custom-service-java.yaml @@ -2,8 +2,9 @@ config: - customService1: template-1-1.json customService1: -- name: myJOYNRService -- className: com.bmw.cc.conn.this.is.just.an.exampleClasss -- methodName: exampleJoynrMethod +- name: "ifs-003 (SQS) odfUpdateStatus - IN" +- className: com.bmw.cc.patchcampaign.integration.wlmanager.sqs.boundary.WhitelistUpdateSqsListenerMF +- methodName: onWhitelistUpdateNotification +- methodArgs: java.lang.String,java.lang.String,java.lang.String - returnType: void -- skipDeployment: "true" \ No newline at end of file +- skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_patchcampaign/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_VDLM_patchcampaign/custom-service-java/template-1-1.json index b3003515..ebe95097 100644 --- a/BMW-Dynatrace-config/CD_VDLM_patchcampaign/custom-service-java/template-1-1.json +++ b/BMW-Dynatrace-config/CD_VDLM_patchcampaign/custom-service-java/template-1-1.json @@ -13,7 +13,7 @@ "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [], + "argumentTypes": ["{{.methodArgs}}"], "methodName": "{{.methodName}}", "returnType": "{{.returnType}}" } From 03f1a89289d6d82518fc110cd4cbc72387ab4698 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Tue, 14 Jun 2022 09:47:47 +0200 Subject: [PATCH 05/22] added SQS rsurservice --- .../custom-service-java.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/BMW-Dynatrace-config/CD_VDLM_rsurservice/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_rsurservice/custom-service-java/custom-service-java.yaml index bf5af195..633d2678 100644 --- a/BMW-Dynatrace-config/CD_VDLM_rsurservice/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_rsurservice/custom-service-java/custom-service-java.yaml @@ -1,5 +1,7 @@ config: - customService1: template-1-1.json +- customService2: template-1-1.json +- customService3: template-1-1.json customService1: - name: "ifs-002 (JOYNR) notifyRSUStatus - IN" @@ -7,4 +9,20 @@ customService1: - methodName: notifyRSUStatus - methodArgs: joynr.de.bmw.infotainment.telematic.common.CommonTypes.RequestId,java.lang.Long,java.lang.String,joynr.de.bmw.infotainment.telematic.teleservice.TeleserviceTypes.RsuTriggerType,joynr.de.bmw.infotainment.telematic.teleservice.TeleserviceTypes.ExtPosition,java.lang.String,joynr.de.bmw.infotainment.telematic.common.CommonTypes.ResultCode - returnType: void +- skipDeployment: "false" + +customService2: +- name: "ifs-004 (SQS) QuitDiagnosisMessage - IN" +- className: com.bmw.cc.ts.rsurservice.api.consumer.external.diagservice.QuitDiagnosisSqsListener +- methodName: processMessage +- methodArgs: com.bmw.cd.logging.CdllLoggingContext,software.amazon.awssdk.services.sqs.model.Message +- returnType: void +- skipDeployment: "false" + +customService3: +- name: "(SQS) CallTopic - OUT" +- className: com.bmw.cc.ts.rsurservice.api.consumer.external.callstorage.CallStorageSnsPublisher +- methodName: createTicket +- methodArgs: com.bmw.cc.ts.rsurservice.api.consumer.entity.CallStorageModel +- returnType: void - skipDeployment: "false" \ No newline at end of file From 726b50a038e9622071481307bae01090d13d76ba Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Tue, 14 Jun 2022 09:57:27 +0200 Subject: [PATCH 06/22] added SQS rtcservice, corrected template-*.json --- .../custom-service-java.yaml | 20 +++++++- .../custom-service-java/template-1-1.json | 51 +++++++------------ .../custom-service-java/template-2-1.json | 36 +++++++++++++ 3 files changed, 74 insertions(+), 33 deletions(-) create mode 100644 BMW-Dynatrace-config/CD_VDLM_rtcservice/custom-service-java/template-2-1.json diff --git a/BMW-Dynatrace-config/CD_VDLM_rtcservice/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_rtcservice/custom-service-java/custom-service-java.yaml index 13cc9f3b..61b0cdf0 100644 --- a/BMW-Dynatrace-config/CD_VDLM_rtcservice/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_rtcservice/custom-service-java/custom-service-java.yaml @@ -1,5 +1,7 @@ config: -- customService1: template-1-1.json +- customService1: template-2-1.json +- customService2: template-1-1.json +- customService3: template-1-1.json customService1: - name: "ifs-002 (JOYNR) request/notifyKeyData - IN/OUT" @@ -11,4 +13,20 @@ customService1: - methodName2: notifyKeyData - methodArgs2: joynr.de.bmw.infotainment.telematic.common.CommonTypes.RequestId,joynr.de.bmw.infotainment.telematic.teleservice.TeleserviceTypes.TeleserviceInfo,java.lang.String,joynr.de.bmw.infotainment.telematic.common.CommonTypes.ResultCode - returnType2: void +- skipDeployment: "false" + +customService2: +- name: "ifs-004 (SQS) QuitDiagnosisMessage - IN" +- className: com.bmw.cc.ts.rtcservice.api.consumer.external.diagservice.QuitDiagnosisSqsListener +- methodName: processMessage +- methodArgs: com.bmw.cd.logging.CdllLoggingContext,software.amazon.awssdk.services.sqs.model.Message +- returnType: void +- skipDeployment: "false" + +customService3: +- name: "(SQS) CallTopic - OUT" +- className: com.bmw.cc.ts.rtcservice.api.consumer.external.callstorage.CallStorageSnsPublisher +- methodName: createTicket +- methodArgs: com.bmw.cc.ts.rtcservice.api.consumer.entity.CallStorageModel +- returnType: void - skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_rtcservice/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_VDLM_rtcservice/custom-service-java/template-1-1.json index f0077b0c..ebe95097 100644 --- a/BMW-Dynatrace-config/CD_VDLM_rtcservice/custom-service-java/template-1-1.json +++ b/BMW-Dynatrace-config/CD_VDLM_rtcservice/custom-service-java/template-1-1.json @@ -1,36 +1,23 @@ { - "enabled": true, - "name": "{{.name}}", - "processGroups": [], - "queueEntryPoint": false, - "queueEntryPointType": null, - "rules": [ + "enabled": true, + "name": "{{.name}}", + "processGroups": [], + "queueEntryPoint": false, + "queueEntryPointType": null, + "rules": [ + { + "annotations": [], + "className": "{{.className}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ { - "annotations": [], - "className": "{{.className1}}", - "enabled": true, - "fileName": "", - "matcher": "EQUALS", - "methodRules": [ - { - "argumentTypes": ["{{.methodArgs1}}"], - "methodName": "{{.methodName1}}", - "returnType": "{{.returnType1}}" - }] - }, - { - "annotations": [], - "className": "{{.className2}}", - "enabled": true, - "fileName": "", - "matcher": "EQUALS", - "methodRules": [ - { - "argumentTypes": ["{{.methodArgs2}}"], - "methodName": "{{.methodName2}}", - "returnType": "{{.returnType2}}" - } - ] + "argumentTypes": ["{{.methodArgs}}"], + "methodName": "{{.methodName}}", + "returnType": "{{.returnType}}" } - ] + ] + } + ] } \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_rtcservice/custom-service-java/template-2-1.json b/BMW-Dynatrace-config/CD_VDLM_rtcservice/custom-service-java/template-2-1.json new file mode 100644 index 00000000..f0077b0c --- /dev/null +++ b/BMW-Dynatrace-config/CD_VDLM_rtcservice/custom-service-java/template-2-1.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": ["{{.methodArgs1}}"], + "methodName": "{{.methodName1}}", + "returnType": "{{.returnType1}}" + }] + }, + { + "annotations": [], + "className": "{{.className2}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": ["{{.methodArgs2}}"], + "methodName": "{{.methodName2}}", + "returnType": "{{.returnType2}}" + } + ] + } + ] +} \ No newline at end of file From 50160873247aea78a474ffb3b6b58d3860ad522f Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Tue, 14 Jun 2022 10:07:17 +0200 Subject: [PATCH 07/22] added SQS tsrd --- .../custom-service-java/custom-service-java.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml index 8027a3d8..2b8addd9 100644 --- a/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml @@ -3,6 +3,8 @@ config: - customService2: template-1-1.json - customService3: template-1-1.json - customService4: template-2-1.json +- customService5: template-1-1.json +- customService6: template-1-1.json customService1: - name: "ifs-006 (JOYNR) enable/disableFullDiagnosticsMode - OUT" @@ -42,3 +44,17 @@ customService3: - methodArgs2: javax.ejb.Timer - returnType2: void - skipDeployment: "false" + +customService5: +- name: "ifs-009 (SQS) QuitDiagnosisMessage - IN" +- className1: com.bmw.cc.ts.tsrd.bm.remotediagnosis.boundary.DiagServiceSqsListener +- methodName1: processMessage +- methodArgs1: com.bmw.cd.logging.CdllLoggingContext,software.amazon.awssdk.services.sqs.model.Message +- returnType1: void + +customService6: +- name: "(SQS) CallTopic - OUT" +- className1: com.bmw.cc.ts.tsrd.integration.aws.calltopic.CallTopicNotificationESI +- methodName1: publishNotification +- methodArgs1: com.bmw.cc.ts.tsrd.integration.aws.calltopic.CallStorageCallDO +- returnType1: void From 008a30c231b9aca79c47ccb81e0348cc47abb7d9 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Tue, 14 Jun 2022 10:19:47 +0200 Subject: [PATCH 08/22] added SQS tyrewf --- .../custom-service-java.yaml | 27 ++++++++++++++++--- .../custom-service-java/template-1-1.json | 2 +- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-tyrewf/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_ts-tyrewf/custom-service-java/custom-service-java.yaml index 25f8a028..17588b08 100644 --- a/BMW-Dynatrace-config/CD_VDLM_ts-tyrewf/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_ts-tyrewf/custom-service-java/custom-service-java.yaml @@ -1,9 +1,28 @@ config: - customService1: template-1-1.json +- customService2: template-1-1.json +- customService3: template-1-1.json customService1: -- name: myJOYNRService -- className: com.bmw.cc.conn.this.is.just.an.exampleClasss -- methodName: exampleJoynrMethod +- name: "ifs-001 (SQS) TyrewfStatisticsIn - IN" +- className: com.bmw.cc.tstyrewf.api.statistic.v1.boundary.StatisticQueueListenerMDB +- methodName: listen +- methodArgs: java.lang.String,java.util.Map,org.springframework.cloud.aws.messaging.listener.Acknowledgment - returnType: void -- skipDeployment: "true" \ No newline at end of file +- skipDeployment: "false" + +customService2: +- name: "ifs-002 (SQS) TyrewfTimberIn - IN" +- className: com.bmw.cc.tstyrewf.api.timber.v1.boundary.TimberQueueListenerMDB +- methodName: listen +- methodArgs: java.lang.String,java.util.Map,org.springframework.cloud.aws.messaging.listener.Acknowledgment +- returnType: void +- skipDeployment: "false" + +customService3: +- name: "ifs (SQS) ServiceDemand - OUT" +- className: com.bmw.cc.tstyrewf.integration.seam.boundary.SeamESI +- methodName: sendMessage +- methodArgs: com.bmw.cc.tstyrewf.integration.seam.entity.ServiceDemandEventPayload +- returnType: void +- skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-tyrewf/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_VDLM_ts-tyrewf/custom-service-java/template-1-1.json index b3003515..ebe95097 100644 --- a/BMW-Dynatrace-config/CD_VDLM_ts-tyrewf/custom-service-java/template-1-1.json +++ b/BMW-Dynatrace-config/CD_VDLM_ts-tyrewf/custom-service-java/template-1-1.json @@ -13,7 +13,7 @@ "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [], + "argumentTypes": ["{{.methodArgs}}"], "methodName": "{{.methodName}}", "returnType": "{{.returnType}}" } From 5417ff280a25ae1dd0f3ec0087ee5d3750dc5e52 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Tue, 14 Jun 2022 10:38:31 +0200 Subject: [PATCH 09/22] added in tyredi (not out kinesis+lambda) --- .../custom-service-java.yaml | 18 ++++++++++++++---- .../custom-service-java/template-1-1.json | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-tyredi/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_ts-tyredi/custom-service-java/custom-service-java.yaml index 25f8a028..ffb4fc62 100644 --- a/BMW-Dynatrace-config/CD_VDLM_ts-tyredi/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_ts-tyredi/custom-service-java/custom-service-java.yaml @@ -1,9 +1,19 @@ config: - customService1: template-1-1.json +- customService2: template-1-1.json customService1: -- name: myJOYNRService -- className: com.bmw.cc.conn.this.is.just.an.exampleClasss -- methodName: exampleJoynrMethod +- name: "ifs-003 (SQS) TyrediLambdaIn - IN" +- className: com.bmw.cc.tstyredi.api.lambda.v1.boundary.LambdaQueueListenerMDB +- methodName: listen +- methodArgs: java.lang.String,java.util.Map,org.springframework.cloud.aws.messaging.listener.Acknowledgment - returnType: void -- skipDeployment: "true" \ No newline at end of file +- skipDeployment: "false" + +customService2: +- name: "ifs-001 (Kinesis) TyreDiIncoming - IN" +- className: com.bmw.cc.tstyredi.api.vehicleshadow.v1.boundary.VehicleShadowRecordProcessorBF +- methodName: processRecords +- methodArgs: software.amazon.kinesis.lifecycle.events.ProcessRecordsInput +- returnType: void +- skipDeployment: "false" diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-tyredi/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_VDLM_ts-tyredi/custom-service-java/template-1-1.json index b3003515..ebe95097 100644 --- a/BMW-Dynatrace-config/CD_VDLM_ts-tyredi/custom-service-java/template-1-1.json +++ b/BMW-Dynatrace-config/CD_VDLM_ts-tyredi/custom-service-java/template-1-1.json @@ -13,7 +13,7 @@ "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [], + "argumentTypes": ["{{.methodArgs}}"], "methodName": "{{.methodName}}", "returnType": "{{.returnType}}" } From 83c32035cefc2d5e465f8c89ccaaf421a752e879 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Tue, 14 Jun 2022 11:40:04 +0200 Subject: [PATCH 10/22] added tyrewt / SQS IN / KINESIS IN / Test for invoke Lambda --- .../custom-service-java.yaml | 31 +++++++++++++--- .../custom-service-java/template-1-1.json | 2 +- .../custom-service-java/template-2-1.json | 36 +++++++++++++++++++ 3 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 BMW-Dynatrace-config/CD_VDLM_ts-tyrewt/custom-service-java/template-2-1.json diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-tyrewt/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_ts-tyrewt/custom-service-java/custom-service-java.yaml index 25f8a028..07207d8a 100644 --- a/BMW-Dynatrace-config/CD_VDLM_ts-tyrewt/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_ts-tyrewt/custom-service-java/custom-service-java.yaml @@ -1,9 +1,32 @@ config: - customService1: template-1-1.json +- customService2: template-1-1.json +- customService3: template-2-1.json customService1: -- name: myJOYNRService -- className: com.bmw.cc.conn.this.is.just.an.exampleClasss -- methodName: exampleJoynrMethod +- name: "ts-tyrewt: ifs-001 (Kinesis) TyreWtIncoming - IN" +- className: com.bmw.cc.tstyrewt.api.vehicleshadow.v1.boundary.VehicleShadowRecordProcessorBF +- methodName: processRecords +- methodArgs: software.amazon.kinesis.lifecycle.events.ProcessRecordsInput - returnType: void -- skipDeployment: "true" \ No newline at end of file +- skipDeployment: "false" + +customService2: +- name: "ifs-003 (SQS) TyrewtLambdaIn - IN" +- className: com.bmw.cc.tstyrewt.api.lambda.v1.boundary.LambdaQueueListenerMDB +- methodName: listen +- methodArgs: java.lang.String,java.util.Map,org.springframework.cloud.aws.messaging.listener.Acknowledgment +- returnType: void +- skipDeployment: "false" + +customService3: +- name: "ifs-002 (SQS) TyrewtMessageBuffer - IN/OUT" +- className1: com.bmw.cc.tstyrewt.api.buffer.v1.boundary.MessageBufferQueueListenerMDB +- methodName1: listen +- methodArgs1: java.lang.String,java.util.Map,org.springframework.cloud.aws.messaging.listener.Acknowledgment +- returnType1: void +- className2: com.bmw.cc.tstyrewt.integration.buffer.boundary.MessageBufferQueueESI +- methodName2: sendMessageToBufferQueue +- methodArgs2: java.lang.String,com.bmw.cc.tstyrewt.integration.buffer.entity.MessageType +- returnType2: void +- skipDeployment: "false" diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-tyrewt/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_VDLM_ts-tyrewt/custom-service-java/template-1-1.json index b3003515..ebe95097 100644 --- a/BMW-Dynatrace-config/CD_VDLM_ts-tyrewt/custom-service-java/template-1-1.json +++ b/BMW-Dynatrace-config/CD_VDLM_ts-tyrewt/custom-service-java/template-1-1.json @@ -13,7 +13,7 @@ "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [], + "argumentTypes": ["{{.methodArgs}}"], "methodName": "{{.methodName}}", "returnType": "{{.returnType}}" } diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-tyrewt/custom-service-java/template-2-1.json b/BMW-Dynatrace-config/CD_VDLM_ts-tyrewt/custom-service-java/template-2-1.json new file mode 100644 index 00000000..f0077b0c --- /dev/null +++ b/BMW-Dynatrace-config/CD_VDLM_ts-tyrewt/custom-service-java/template-2-1.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": ["{{.methodArgs1}}"], + "methodName": "{{.methodName1}}", + "returnType": "{{.returnType1}}" + }] + }, + { + "annotations": [], + "className": "{{.className2}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": ["{{.methodArgs2}}"], + "methodName": "{{.methodName2}}", + "returnType": "{{.returnType2}}" + } + ] + } + ] +} \ No newline at end of file From 82ad483f2fb5b46ee45ab39b4ced1225e2494c5e Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Tue, 14 Jun 2022 11:40:42 +0200 Subject: [PATCH 11/22] tyrewt: invoke lambda --- .../custom-service-java/custom-service-java.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-tyrewt/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_ts-tyrewt/custom-service-java/custom-service-java.yaml index 07207d8a..28e124c3 100644 --- a/BMW-Dynatrace-config/CD_VDLM_ts-tyrewt/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_ts-tyrewt/custom-service-java/custom-service-java.yaml @@ -2,6 +2,7 @@ config: - customService1: template-1-1.json - customService2: template-1-1.json - customService3: template-2-1.json +- customService4: template-1-1.json customService1: - name: "ts-tyrewt: ifs-001 (Kinesis) TyreWtIncoming - IN" @@ -30,3 +31,11 @@ customService3: - methodArgs2: java.lang.String,com.bmw.cc.tstyrewt.integration.buffer.entity.MessageType - returnType2: void - skipDeployment: "false" + +customService4: +- name: "ts-tyrewt-lambda: ifs-001 (Lambda) TimberData - OUT" +- className: com.bmw.cc.tstyrewt.integration.ef.lambda.boundary.LambdaESI +- methodName: invokeLambdaFunction +- methodArgs: com.bmw.cc.tstyrewt.integration.ef.lambda.entity.LambdaPayload +- returnType: void +- skipDeployment: "false" From 0e2142f9ce6493de147b319a183ef11c5ed92b85 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Tue, 14 Jun 2022 11:50:22 +0200 Subject: [PATCH 12/22] added tscs --- .../custom-service-java/custom-service-java.yaml | 9 +++++---- .../CD_VDLM_tscs/custom-service-java/template-1-1.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/BMW-Dynatrace-config/CD_VDLM_tscs/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_tscs/custom-service-java/custom-service-java.yaml index 25f8a028..22c99f67 100644 --- a/BMW-Dynatrace-config/CD_VDLM_tscs/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_tscs/custom-service-java/custom-service-java.yaml @@ -2,8 +2,9 @@ config: - customService1: template-1-1.json customService1: -- name: myJOYNRService -- className: com.bmw.cc.conn.this.is.just.an.exampleClasss -- methodName: exampleJoynrMethod +- name: "ifs-005 (SQS) TscsCallTopic - IN" +- className: com.bmw.cc.tscs.integration.aws.CallTopicSqsListener +- methodName: processMessage - returnType: void -- skipDeployment: "true" \ No newline at end of file +- methodArgs: com.bmw.cd.logging.CdllLoggingContext,software.amazon.awssdk.services.sqs.model.Message +- skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_tscs/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_VDLM_tscs/custom-service-java/template-1-1.json index b3003515..ebe95097 100644 --- a/BMW-Dynatrace-config/CD_VDLM_tscs/custom-service-java/template-1-1.json +++ b/BMW-Dynatrace-config/CD_VDLM_tscs/custom-service-java/template-1-1.json @@ -13,7 +13,7 @@ "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [], + "argumentTypes": ["{{.methodArgs}}"], "methodName": "{{.methodName}}", "returnType": "{{.returnType}}" } From 9fd749a3025f86a84943e46a0e35c6b5389aea33 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Tue, 14 Jun 2022 11:50:54 +0200 Subject: [PATCH 13/22] fix tsrd --- .../CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml index 2b8addd9..c65de3f8 100644 --- a/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml @@ -32,7 +32,6 @@ customService3: - methodArgs1: software.amazon.awssdk.services.sqs.model.Message - returnType1: void - - customService4: - name: "(Timer) deletion/timeout" - className1: com.bmw.cc.ts.tsrd.bm.timer.DatabaseCleanerTimerService From b6a4c6435627bf4b1eba43802c6651b382106b1f Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Tue, 14 Jun 2022 11:51:48 +0200 Subject: [PATCH 14/22] fix name --- .../custom-service-java/custom-service-java.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-bcallhandler/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_ts-bcallhandler/custom-service-java/custom-service-java.yaml index 1677d38f..08439e73 100644 --- a/BMW-Dynatrace-config/CD_VDLM_ts-bcallhandler/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_ts-bcallhandler/custom-service-java/custom-service-java.yaml @@ -16,7 +16,7 @@ customService1: - skipDeployment: "false" customService2: -- name: ifs-005 (MQS) BCallHandlerIstaIn/Out - IN/OUT +- name: "ifs-005 (MQS) BCallHandlerIstaIn/Out - IN/OUT" - className1: com.bmw.cc.tsbcallhandler.integration.jms.boundary.IstaTsNextJmsESI - methodName1: onMessage - returnType1: void @@ -28,7 +28,7 @@ customService2: - skipDeployment: "false" customService3: -- name: (MQS) CallTopic - OUT +- name: "(MQS) CallTopic - OUT" - className: com.bmw.cc.tsbcallhandler.integration.jms.boundary.CallTopicJmsESI - methodName: send - returnType: void From 491f0556b48084b81b5ca0af29c3928d7c191b38 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Tue, 14 Jun 2022 12:07:46 +0200 Subject: [PATCH 15/22] added tsdd --- .../custom-service-java.yaml | 35 ++++++++++++++++--- .../custom-service-java/template-1-1.json | 2 +- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/BMW-Dynatrace-config/CD_VDLM_tsdd/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_tsdd/custom-service-java/custom-service-java.yaml index 25f8a028..194ddb38 100644 --- a/BMW-Dynatrace-config/CD_VDLM_tsdd/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_tsdd/custom-service-java/custom-service-java.yaml @@ -1,9 +1,34 @@ config: - customService1: template-1-1.json +- customService2: template-1-1.json +- customService3: template-1-1.json +- customService4: template-1-1.json customService1: -- name: myJOYNRService -- className: com.bmw.cc.conn.this.is.just.an.exampleClasss -- methodName: exampleJoynrMethod -- returnType: void -- skipDeployment: "true" \ No newline at end of file +- name: "ifs-006 (SQS) TsddCallTopic - IN" +- className1: com.bmw.cc.ts.datadispatch.integration.aws.CallTopicSqsListener +- methodName1: processMessage +- methodArgs1: com.bmw.cd.logging.CdllLoggingContext,software.amazon.awssdk.services.sqs.model.Message +- returnType1: void + +customService2: +- name: "ifs-005 (SQS) EVNS2EventQueue - OUT" +- className1: com.bmw.cc.ts.datadispatch.integration.evns2.boundary.Evns2ESI +- methodName1: send +- methodArgs1: java.lang.String +- returnType1: void + +customService3: +- name: "ifs-003 (SQS) FbmQueue - OUT" +- className1: com.bmw.cc.ts.datadispatch.integration.fbm.boundary.FbmESI +- methodName1: send +- methodArgs1: com.bmw.fbm.SendKeyDataFBM +- returnType1: void + +customService4: +- name: "ifs (Kinesis) vhs_ts_diagnostic_kinesis_stream - OUT" +- className1: com.bmw.cc.ts.datadispatch.integration.vhs.boundary.VhsClientESI +- methodName1: dispatch +- methodArgs1: com.bmw.cc.ts.datadispatch.bm.data.VhsPushData +- returnType1: void + diff --git a/BMW-Dynatrace-config/CD_VDLM_tsdd/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_VDLM_tsdd/custom-service-java/template-1-1.json index b3003515..ebe95097 100644 --- a/BMW-Dynatrace-config/CD_VDLM_tsdd/custom-service-java/template-1-1.json +++ b/BMW-Dynatrace-config/CD_VDLM_tsdd/custom-service-java/template-1-1.json @@ -13,7 +13,7 @@ "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [], + "argumentTypes": ["{{.methodArgs}}"], "methodName": "{{.methodName}}", "returnType": "{{.returnType}}" } From 49957e2a8c9aa27b13c1dd5d30c4eaf26cafedd1 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Tue, 14 Jun 2022 16:11:28 +0200 Subject: [PATCH 16/22] fix --- .../CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml index 510c321c..2f0ee7b4 100644 --- a/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml @@ -50,6 +50,7 @@ customService5: - methodName: processMessage - methodArgs: com.bmw.cd.logging.CdllLoggingContext,software.amazon.awssdk.services.sqs.model.Message - returnType: void +- skipDeployment: "false" customService6: - name: "(SQS) CallTopic - OUT" @@ -57,3 +58,4 @@ customService6: - methodName: publishNotification - methodArgs: com.bmw.cc.ts.tsrd.integration.aws.calltopic.CallStorageCallDO - returnType: void +- skipDeployment: "false" \ No newline at end of file From 501d2e86b9e6b467e08ea12795990406b6be8ee0 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Wed, 15 Jun 2022 10:27:23 +0200 Subject: [PATCH 17/22] added ccm-di --- .../custom-service-java.yaml | 36 ++++++++++++++++--- .../custom-service-java/template-1-1.json | 2 +- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-ccm-di/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_ts-ccm-di/custom-service-java/custom-service-java.yaml index 25f8a028..b0490cdb 100644 --- a/BMW-Dynatrace-config/CD_VDLM_ts-ccm-di/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_ts-ccm-di/custom-service-java/custom-service-java.yaml @@ -1,9 +1,37 @@ config: - customService1: template-1-1.json +- customService2: template-1-1.json +- customService3: template-1-1.json +- customService4: template-1-1.json customService1: -- name: myJOYNRService -- className: com.bmw.cc.conn.this.is.just.an.exampleClasss -- methodName: exampleJoynrMethod +- name: "ifs-006 (SQS) TsCcmCallTopic - IN" +- className: com.bmw.cc.tsccmdi.api.identifier.sqs.CallTopicConsumer +- methodName: receiveMessage - returnType: void -- skipDeployment: "true" \ No newline at end of file +- methodArgs: java.util.Map,java.lang.String,org.springframework.cloud.aws.messaging.listener.Acknowledgment +- skipDeployment: "false" + +customService2: +- name: "ifs-005 (SQS) DocumentNotification - IN" +- className: com.bmw.cc.tsccmdi.api.identifier.sqs.FdlGateKeyConsumer +- methodName: receiveMessage +- returnType: void +- methodArgs: java.util.Map,java.lang.String +- skipDeployment: "false" + +customService3: +- name: "ifs-003 (SQS) PaCCSqsQueue - IN" +- className: com.bmw.cc.tsccmdi.api.publisher.CcmLeadConsumer +- methodName: receive +- returnType: void +- methodArgs: java.util.Map,com.bmw.cc.tsccmdi.domain.model.CcmLead +- skipDeployment: "false" + +customService4: +- name: "ifs-001 (Kinesis) CCM" +- className: com.bmw.cc.tsccmdi.api.identifier.kinesis.VehicleShadowCcmEventConsumer +- methodName: processRecords +- returnType: void +- methodArgs: java.util.List,com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer +- skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-ccm-di/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_VDLM_ts-ccm-di/custom-service-java/template-1-1.json index b3003515..ebe95097 100644 --- a/BMW-Dynatrace-config/CD_VDLM_ts-ccm-di/custom-service-java/template-1-1.json +++ b/BMW-Dynatrace-config/CD_VDLM_ts-ccm-di/custom-service-java/template-1-1.json @@ -13,7 +13,7 @@ "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [], + "argumentTypes": ["{{.methodArgs}}"], "methodName": "{{.methodName}}", "returnType": "{{.returnType}}" } From 6796b195246665d48205b01ea47990effd14e834 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Wed, 15 Jun 2022 10:46:52 +0200 Subject: [PATCH 18/22] added SQS/MQS rtcad --- .../custom-service-java.yaml | 22 +++++++++--- .../custom-service-java/template-1-1.json | 2 +- .../custom-service-java/template-2-1.json | 36 +++++++++++++++++++ 3 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 BMW-Dynatrace-config/CD_VDLM_rtcad/custom-service-java/template-2-1.json diff --git a/BMW-Dynatrace-config/CD_VDLM_rtcad/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_rtcad/custom-service-java/custom-service-java.yaml index 25f8a028..9de4edb0 100644 --- a/BMW-Dynatrace-config/CD_VDLM_rtcad/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_rtcad/custom-service-java/custom-service-java.yaml @@ -1,9 +1,23 @@ config: - customService1: template-1-1.json +- customService1: template-2-1.json customService1: -- name: myJOYNRService -- className: com.bmw.cc.conn.this.is.just.an.exampleClasss -- methodName: exampleJoynrMethod +- name: "ifs-010 (SQS) RtcadCallTopic - IN" +- className: com.bmw.cc.ts.rtcad.integration.aws.CallTopicSqsListener +- methodName: processMessage +- methodArgs: com.bmw.cd.logging.CdllLoggingContext,software.amazon.awssdk.services.sqs.model.Message - returnType: void -- skipDeployment: "true" \ No newline at end of file +- skipDeployment: "false" + +customService2: +- name: "ifs-006 (MQS) RTCTransformationRequest/Response - IN/OUT" +- className1: com.bmw.cc.ts.rtcad.bm.boundary.IstaPdmTransformationMF +- methodName1: onMessage +- returnType1: void +- methodArgs1: javax.jms.Message +- className2: package com.bmw.cc.ts.rtcad.bm.control.RTCPDMServiceBA +- methodName2: pdmResultProcessed +- returnType2: void +- methodArgs2: java.lang.String,java.lang.String,com.bmw.cc.ts.rtcad.bm.dto.RTCKeyData,java.lang.String,java.lang.String +- skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_rtcad/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_VDLM_rtcad/custom-service-java/template-1-1.json index b3003515..ebe95097 100644 --- a/BMW-Dynatrace-config/CD_VDLM_rtcad/custom-service-java/template-1-1.json +++ b/BMW-Dynatrace-config/CD_VDLM_rtcad/custom-service-java/template-1-1.json @@ -13,7 +13,7 @@ "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [], + "argumentTypes": ["{{.methodArgs}}"], "methodName": "{{.methodName}}", "returnType": "{{.returnType}}" } diff --git a/BMW-Dynatrace-config/CD_VDLM_rtcad/custom-service-java/template-2-1.json b/BMW-Dynatrace-config/CD_VDLM_rtcad/custom-service-java/template-2-1.json new file mode 100644 index 00000000..f0077b0c --- /dev/null +++ b/BMW-Dynatrace-config/CD_VDLM_rtcad/custom-service-java/template-2-1.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": ["{{.methodArgs1}}"], + "methodName": "{{.methodName1}}", + "returnType": "{{.returnType1}}" + }] + }, + { + "annotations": [], + "className": "{{.className2}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": ["{{.methodArgs2}}"], + "methodName": "{{.methodName2}}", + "returnType": "{{.returnType2}}" + } + ] + } + ] +} \ No newline at end of file From a98baa0b736c096b6e5117f6b233ba3b65842e59 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Wed, 15 Jun 2022 10:58:37 +0200 Subject: [PATCH 19/22] added MQS eshad --- .../custom-service-java.yaml | 21 ++++++---- .../custom-service-java/template-2-2-1.json | 42 +++++++++++++++++++ 2 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 BMW-Dynatrace-config/CD_VDLM_eshad/custom-service-java/template-2-2-1.json diff --git a/BMW-Dynatrace-config/CD_VDLM_eshad/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_eshad/custom-service-java/custom-service-java.yaml index a58fde35..2ef30c45 100644 --- a/BMW-Dynatrace-config/CD_VDLM_eshad/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_eshad/custom-service-java/custom-service-java.yaml @@ -1,10 +1,17 @@ config: -- customService1: template-1-1.json +- customService1: template-2-2-1.json customService1: -- name: myJOYNRService -- className: com.bmw.cc.conn.this.is.just.an.exampleClasss -- methodName: exampleJoynrMethod -- methodArgs: java.lang.Byte[],java.lang.String -- returnType: void -- skipDeployment: "true" \ No newline at end of file +- name: "ifs-003 (MQS) TssbShIn/Out - IN/OUT" +- className1: com.bmw.cc.ts.esh.integration.jms.sh.v1.boundary.ShResponseSenderESI +- methodName11: sendServiceHistoryState +- returnType11: void +- methodArgs11: com.bmw.cc.ts.esh.bm.model.ShRequestVO,com.bmw.cc.ts.esh.bm.enums.ShNotificationCode +- methodName12: sendServiceHistoryStateDirectly +- returnType12: void +- methodArgs12: com.bmw.cc.ts.esh.bm.model.SendMaintenanceHistoryLP2VO,com.bmw.cc.ts.esh.bm.enums.ShNotificationCode,java.lang.String +- className2: com.bmw.cc.ts.esh.api.jms.ShMF +- methodName2: onMessage +- returnType2: void +- methodArgs2: javax.jms.Message +- skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_eshad/custom-service-java/template-2-2-1.json b/BMW-Dynatrace-config/CD_VDLM_eshad/custom-service-java/template-2-2-1.json new file mode 100644 index 00000000..5764cc8f --- /dev/null +++ b/BMW-Dynatrace-config/CD_VDLM_eshad/custom-service-java/template-2-2-1.json @@ -0,0 +1,42 @@ +{ + "enabled": true, + "name": "{{.name}}", + "processGroups": [], + "queueEntryPoint": false, + "queueEntryPointType": null, + "rules": [ + { + "annotations": [], + "className": "{{.className1}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": ["{{.methodArgs11}}"], + "methodName": "{{.methodName11}}", + "returnType": "{{.returnType11}}" + }, + { + "argumentTypes": ["{{.methodArgs12}}"], + "methodName": "{{.methodName12}}", + "returnType": "{{.returnType12}}" + } + ] + }, + { + "annotations": [], + "className": "{{.className2}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": ["{{.methodArgs2}}"], + "methodName": "{{.methodName2}}", + "returnType": "{{.returnType2}}" + } + ] + } + ] +} \ No newline at end of file From 40efa5621423a5e55cefb1c9e5711883768fe610 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Wed, 15 Jun 2022 10:59:39 +0200 Subject: [PATCH 20/22] update seam --- .../custom-service-java.yaml | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) 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 5bd25434..45019590 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 @@ -14,36 +14,36 @@ customService1: - skipDeployment: "false" customService2: - - 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" +- 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: "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" +- 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: "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" +- 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: "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" +- 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" From 1b0ee21b255ae61d8eb9e33c1166534ed740006b Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Wed, 15 Jun 2022 14:31:27 +0200 Subject: [PATCH 21/22] added SNS/MQS diagservice --- .../custom-service-java.yaml | 57 +++++++++++++++++++ .../custom-service-java/template-1-1.json | 23 ++++++++ 2 files changed, 80 insertions(+) create mode 100644 BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/template-1-1.json diff --git a/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/custom-service-java.yaml index a4714387..d33464df 100644 --- a/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/custom-service-java.yaml @@ -1,6 +1,11 @@ config: - customService1: template-2-1.json - customService2: template-2-1.json +- customService3: template-2-1.json +- customService4: template-2-1.json +- customService5: template-2-1.json +- customService6: template-1-1.json +- customService7: template-1-1.json customService1: - name: "ifs-007 (JOYNR) requestDiagResult/notifyDiagResult - IN/OUT" @@ -24,4 +29,56 @@ customService2: - methodName2: notifyPdmResultStatus - methodArgs2: joynr.de.bmw.infotainment.telematic.common.CommonTypes.RequestId,joynr.de.bmw.infotainment.telematic.teleservice.TeleserviceTypes.AppInfo,joynr.de.bmw.infotainment.telematic.teleservice.TeleserviceTypes.TeleserviceInfo,java.lang.String,java.lang.String,java.lang.String,joynr.de.bmw.infotainment.telematic.common.CommonTypes.ResultCode - returnType2: void +- skipDeployment: "false" + +customService3: +- name: "ifs-003 (MQS) MguItsnIn/Out (ClassificationRequest/Response) - IN/OUT" +- className1: com.bmw.cc.ts.diagservice.api.consumer.external.istatsnext.ISTAClassificationRequestJmsPublisher +- methodName1: requestClassification +- methodArgs1: com.bmw.cc.ts.diagservice.api.consumer.entity.generated.istats.request.ClassificationRequest +- returnType1: void +- className2: com.bmw.cc.ts.diagservice.bm.diagnosis.boundary.callback.ClassificationResponseBF +- methodName2: onMessage +- methodArgs2: com.bmw.cc.ts.diagservice.api.consumer.entity.generated.istats.response.ClassificationResponse +- returnType2: void +- skipDeployment: "false" + +customService4: +- name: "ifs-003 (MQS) MguItsnIn/Out (DiagnosisRequest/Response) - IN/OUT" +- className1: com.bmw.cc.ts.diagservice.bm.diagnosis.boundary.callback.DiagnosisIstaTsRequestBrokerBF +- methodName1: onMessage +- methodArgs1: com.bmw.cc.ts.diagservice.api.consumer.entity.generated.istats.diagnosisrequest.DiagnosisRequest +- returnType1: void +- className2: com.bmw.cc.ts.diagservice.api.consumer.external.istatsnext.ISTADiagnosisResponseJmsPublisher +- methodName2: diagnosisResponse +- methodArgs2: com.bmw.cc.ts.diagservice.api.consumer.entity.generated.istats.diagnosisresponse.DiagnosisResponse +- returnType2: void +- skipDeployment: "false" + +customService5: +- name: "ifs-003 (MQS) MguItsnIn/Out (TerminateDiagSession) - IN/OUT" +- className1: com.bmw.cc.ts.diagservice.api.consumer.external.istatsnext.ISTATerminateDiagSessionJmsPublisher +- methodName1: terminateDiagSessionRequest +- methodArgs1: com.bmw.cc.ts.diagservice.api.consumer.entity.generated.istats.terminatediagsession.TerminateDiagSession +- returnType1: void +- className2: com.bmw.cc.ts.diagservice.bm.diagnosis.boundary.callback.ISTATerminateSessionBF +- methodName2: onMessage +- methodArgs2: com.bmw.cc.ts.diagservice.api.consumer.entity.generated.istats.terminatediagsession.TerminateDiagSession +- returnType2: void +- skipDeployment: "false" + +customService6: +- name: "ifs-003 (MQS) MguItsnIn/Out (Generic InMessages) - IN" +- className: com.bmw.cc.ts.diagservice.api.consumer.external.istatsnext.ISTAQueueMessageListener +- methodName: onMessage +- methodArgs: javax.jms.Message +- returnType: void +- skipDeployment: "false" + +customService7: +- name: "(SNS) QuitDiagnosis - OUT" +- className: com.bmw.cc.ts.diagservice.bm.diagnosis.integration.sqs.boundary.DiagnosisEventNotificationESI +- methodName: quitDiagnosis +- methodArgs: com.bmw.cc.ts.diagservice.api.consumer.entity.QuitDiagnosisMessage,com.bmw.cc.ts.diagservice.bm.diagnosis.integration.sqs.boundary.model.DiagSnsMessageAttributes +- returnType: void - skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/template-1-1.json new file mode 100644 index 00000000..ebe95097 --- /dev/null +++ b/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/template-1-1.json @@ -0,0 +1,23 @@ +{ + "enabled": true, + "name": "{{.name}}", + "processGroups": [], + "queueEntryPoint": false, + "queueEntryPointType": null, + "rules": [ + { + "annotations": [], + "className": "{{.className}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": ["{{.methodArgs}}"], + "methodName": "{{.methodName}}", + "returnType": "{{.returnType}}" + } + ] + } + ] +} \ No newline at end of file From 98e90a3009583b2b909d587a1cff1c8f03f21064 Mon Sep 17 00:00:00 2001 From: "SLW\\ARNAUA" Date: Wed, 15 Jun 2022 16:38:12 +0200 Subject: [PATCH 22/22] Fixed. --- .../custom-service-java.yaml | 4 +- .../custom-service-java/template-2-1.json | 5 ++- .../custom-service-java/template-1-1.json | 40 +++++++++---------- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/BMW-Dynatrace-config/CD_VDLM_rtcad/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_rtcad/custom-service-java/custom-service-java.yaml index 9de4edb0..dd12cd11 100644 --- a/BMW-Dynatrace-config/CD_VDLM_rtcad/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_rtcad/custom-service-java/custom-service-java.yaml @@ -1,6 +1,6 @@ config: - customService1: template-1-1.json -- customService1: template-2-1.json +- customService2: template-2-1.json customService1: - name: "ifs-010 (SQS) RtcadCallTopic - IN" @@ -16,7 +16,7 @@ customService2: - methodName1: onMessage - returnType1: void - methodArgs1: javax.jms.Message -- className2: package com.bmw.cc.ts.rtcad.bm.control.RTCPDMServiceBA +- className2: com.bmw.cc.ts.rtcad.bm.control.RTCPDMServiceBA - methodName2: pdmResultProcessed - returnType2: void - methodArgs2: java.lang.String,java.lang.String,com.bmw.cc.ts.rtcad.bm.dto.RTCKeyData,java.lang.String,java.lang.String diff --git a/BMW-Dynatrace-config/CD_VDLM_rtcad/custom-service-java/template-2-1.json b/BMW-Dynatrace-config/CD_VDLM_rtcad/custom-service-java/template-2-1.json index f0077b0c..1ad547a9 100644 --- a/BMW-Dynatrace-config/CD_VDLM_rtcad/custom-service-java/template-2-1.json +++ b/BMW-Dynatrace-config/CD_VDLM_rtcad/custom-service-java/template-2-1.json @@ -16,7 +16,8 @@ "argumentTypes": ["{{.methodArgs1}}"], "methodName": "{{.methodName1}}", "returnType": "{{.returnType1}}" - }] + } + ] }, { "annotations": [], @@ -33,4 +34,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/BMW-Dynatrace-config/CD_VDLM_tsdd/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_VDLM_tsdd/custom-service-java/template-1-1.json index ebe95097..8823cd24 100644 --- a/BMW-Dynatrace-config/CD_VDLM_tsdd/custom-service-java/template-1-1.json +++ b/BMW-Dynatrace-config/CD_VDLM_tsdd/custom-service-java/template-1-1.json @@ -1,23 +1,23 @@ { - "enabled": true, - "name": "{{.name}}", - "processGroups": [], - "queueEntryPoint": false, - "queueEntryPointType": null, - "rules": [ - { - "annotations": [], - "className": "{{.className}}", - "enabled": true, - "fileName": "", - "matcher": "EQUALS", - "methodRules": [ + "enabled": true, + "name": "{{.name}}", + "processGroups": [], + "queueEntryPoint": false, + "queueEntryPointType": null, + "rules": [ { - "argumentTypes": ["{{.methodArgs}}"], - "methodName": "{{.methodName}}", - "returnType": "{{.returnType}}" + "annotations": [], + "className": "{{.className1}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": ["{{.methodArgs1}}"], + "methodName": "{{.methodName1}}", + "returnType": "{{.returnType1}}" + } + ] } - ] - } - ] -} \ No newline at end of file + ] +}