Pull request #242: CD VDLM multiple custom services

Merge in OPAPM/cd_e2e_monitoring_config from CD_VDLM_multiple_custom_services to master * commit 'e89b825a99b6a820cb6bcddaa3b730bb0bde243f': added lambda OUT SQS->SNS fix template-1-1.json tsbgservice and added Kinesis fix bcallhandler IN JMS ISTA fix SQS->SNS fix SQS->SNS + rtchandler callstorage added scallservice (SQS) CallTopic - OUT added ts-asc (SQS) CallTopic - OUT fix template-1-1.json
2022-06-17 14:42:55 +02:00 · 2022-06-17 14:42:55 +02:00 · aa012c4300
parent 1877957ae5 e89b825a99
commit aa012c4300
13 changed files with 153 additions and 77 deletions
--- 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
@ -20,7 +20,7 @@ customService2:
 - skipDeployment: "false"

 customService3:
- name: "(SQS) CallTopic - OUT"
+- name: "(SNS) 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
--- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/custom-service-java.yaml
@ -4,6 +4,7 @@ config:
 - customService3: template-1-1.json
 - customService4: template-1-1-without-methodargs.json
 - customService5: template-1-1-without-methodargs.json
+- customService6: template-1-1.json

 customService1:
 - name: "ifs-010 (SQS) RtcTeleXIn/Out - IN/OUT"
@ -50,3 +51,11 @@ customService5:
 - methodName: cleanUp
 - returnType: void
 - skipDeployment: "false"
+
+customService6:
+- name: "(SNS) CallTopic - OUT"
+- className: com.bmw.cc.ts.rtchandler.integration.callstorage.CallStorageNotificationESI
+- methodName: publishNotification
+- returnType: void
+- methodArgs: java.lang.String,java.util.Map
+- skipDeployment: "false"
--- 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
@ -24,7 +24,7 @@ customService2:
 - skipDeployment: "false"

 customService3:
- name: "(SQS) CallTopic - OUT"
+- name: "(SNS) 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
--- a/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml
@ -1,6 +1,7 @@
 config:
 - customService1: template-1-2.json
 - customService2: template-1-1.json
+- customService3: template-1-1.json

 customService1:
 - name: "ifs-002 (JOYNR) requestMaintenanceStatus/confirmMaintenanceStatus - OUT"
@ -22,3 +23,10 @@ customService2:
 - returnType: void
 - skipDeployment: "false"

+customService3:
+- name: "(SNS) CallTopic - OUT"
+- className: com.bmw.cc.ts.scallservice.api.consumer.external.callstorage.CallStorageSnsPublisher
+- methodName: createTicket
+- returnType: void
+- methodArgs: com.bmw.cc.ts.scallservice.api.consumer.entity.CallStorageModel
+- skipDeployment: "false"
--- a/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/custom-service-java.yaml
@ -2,9 +2,10 @@ config:
 - customService1: template-2-2-without-methodargs.json
 - customService2: template-2-1.json
 - customService3: template-1-1.json
+- customService4: template-1-1.json

 customService1:
- name: (Timer) deletion/timeout
+- name: "(Timer) deletion/timeout"
 - className1: com.bmw.cc.asc.bm.boundary.TimerBF
 - methodName1: executeDeletionJob
 - returnType1: void
@ -14,7 +15,7 @@ customService1:
 - skipDeployment: "false"

 customService2:
- name: ifs-001 (SQS) AscIn/Out - IN/OUT
+- name: "ifs-001 (SQS) AscIn/Out - IN/OUT"
 - className1: com.bmw.cc.asc.integration.sqs.boundary.TeleXSqsListener
 - methodName1:  onSqsMessage
 - returnType1: void
@ -26,9 +27,17 @@ customService2:
 - skipDeployment: "false"

 customService3:
- name: (MQS) CallTopic - OUT
+- name: "(MQS) CallTopic - OUT"
 - className: com.bmw.cc.asc.integration.jms.boundry.CallTopicJmsESI
 - methodName: send
 - returnType: void
 - methodArgs: java.lang.String,com.bmw.cc.tscs.enums.CallState,com.bmw.cc.asc.bm.entity.Call
 - skipDeployment: "false"
+
+customService4:
+- name: "(SNS) CallTopic - OUT"
+- className: com.bmw.cc.asc.integration.sns.CallTopicSnsESI
+- methodName: send
+- returnType: void
+- methodArgs: java.lang.String,com.bmw.cc.tscs.enums.CallState,com.bmw.cc.asc.bm.entity.Call
+- skipDeployment: "false"
--- 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
@ -17,7 +17,7 @@ customService1:

 customService2:
 - name: "ifs-005 (MQS) BCallHandlerIstaIn/Out - IN/OUT"
- className1: com.bmw.cc.tsbcallhandler.integration.jms.boundary.IstaTsNextJmsESI
+- className1: com.bmw.cc.tsbcallhandler.integration.jms.boundary.IstaTsNextJmsListenerMF
 - methodName1: onMessage
 - returnType1: void
 - methodArgs1: java.lang.String
--- 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,6 +1,7 @@
 config:
 - customService1: template-1-1.json
 - customService2: template-1-1.json
+- customService3: template-1-1.json

 customService1:
 - name: "ifs-003 (SQS) TyrediLambdaIn - IN"
@ -17,3 +18,11 @@ customService2:
 - methodArgs: software.amazon.kinesis.lifecycle.events.ProcessRecordsInput
 - returnType: void
 - skipDeployment: "false"
+
+customService3:
+- name: "(Lambda) TyreData - OUT"
+- className:  com.bmw.cc.tstyredi.integration.lambda.control.lambda.LambdaESI
+- methodName: invokeLambdaFunction
+- methodArgs: java.lang.String,java.lang.String,java.lang.String
+- returnType: void
+- skipDeployment: "false"
--- a/BMW-Dynatrace-config/CD_VDLM_tsbgservice/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_tsbgservice/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-005 (JOYNR) notify/confirmBatteryStatus - IN/OUT"
@ -12,3 +14,19 @@ customService1:
 - methodArgs2: joynr.de.bmw.infotainment.telematic.common.CommonTypes.RequestId,joynr.de.bmw.infotainment.telematic.common.CommonTypes.ResultCode,long,java.lang.String
 - returnType2: void
 - skipDeployment: "false"
+
+customService2:
+- name: "ifs-007 (Kinesis) TsbgKinesisStream - IN"
+- className:  com.bmw.cc.ts.tsbgservice.api.vehicleshadow.v1.boundary.VehicleShadowRecordProcessorBF
+- methodName: processRecords
+- methodArgs: software.amazon.kinesis.lifecycle.events.ProcessRecordsInput
+- returnType: void
+- skipDeployment: "false"
+
+customService3:
+- name: "ifs (Kinesis) BatteryKinesisStream - OUT"
+- className:  com.bmw.cc.ts.tsbgservice.integration.vehicleshadow.boundary.VehicleShadowKinesisESI
+- methodName: sendUpdateToVehicleShadow
+- methodArgs: com.bmw.cc.ts.tsbgservice.integration.vehicleshadow.entity.vhs.VehicleShadowUpdateMessage
+- returnType: void
+- skipDeployment: "false"
--- a/BMW-Dynatrace-config/CD_VDLM_tsbgservice/custom-service-java/template-1-1.json
+++ b/BMW-Dynatrace-config/CD_VDLM_tsbgservice/custom-service-java/template-1-1.json
@ -7,28 +7,15 @@
 "rules": [
  {
   "annotations": [],
-      "className": "{{.className1}}",
+   "className": "{{.className}}",
   "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}}"
    }
   ]
  }
--- a/BMW-Dynatrace-config/CD_VDLM_tsbgservice/custom-service-java/template-2-1.json
+++ b/BMW-Dynatrace-config/CD_VDLM_tsbgservice/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}}"
+        }
+      ]
+    }
+  ]
+}
--- 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
@ -6,29 +6,29 @@ config:

 customService1:
 - 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
+- className: com.bmw.cc.ts.datadispatch.integration.aws.CallTopicSqsListener
+- methodName: processMessage
+- methodArgs: com.bmw.cd.logging.CdllLoggingContext,software.amazon.awssdk.services.sqs.model.Message
+- returnType: 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
+- className: com.bmw.cc.ts.datadispatch.integration.evns2.boundary.Evns2ESI
+- methodName: send
+- methodArgs: java.lang.String
+- returnType: 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
+- className: com.bmw.cc.ts.datadispatch.integration.fbm.boundary.FbmESI
+- methodName: send
+- methodArgs: com.bmw.fbm.SendKeyDataFBM
+- returnType: 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
+- className: com.bmw.cc.ts.datadispatch.integration.vhs.boundary.VhsClientESI
+- methodName: dispatch
+- methodArgs: com.bmw.cc.ts.datadispatch.bm.data.VhsPushData
+- returnType: void

--- 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
@ -7,15 +7,15 @@
 "rules": [
  {
   "annotations": [],
-      "className": "{{.className1}}",
+   "className": "{{.className}}",
   "enabled": true,
   "fileName": "",
   "matcher": "EQUALS",
   "methodRules": [
    {
-          "argumentTypes": ["{{.methodArgs1}}"],
-          "methodName": "{{.methodName1}}",
-          "returnType": "{{.returnType1}}"
+     "argumentTypes": ["{{.methodArgs}}"],
+     "methodName": "{{.methodName}}",
+     "returnType": "{{.returnType}}"
    }
   ]
  }
--- 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
@ -53,7 +53,7 @@ customService5:
 - skipDeployment: "false"

 customService6:
- name: "(SQS) CallTopic - OUT"
+- name: "(SNS) CallTopic - OUT"
 - className: com.bmw.cc.ts.tsrd.integration.aws.calltopic.CallTopicNotificationESI
 - methodName: publishNotification
 - methodArgs: com.bmw.cc.ts.tsrd.integration.aws.calltopic.CallStorageCallDO