From 19eb642a5694d3b111b6bd423c8b36f79434e7d1 Mon Sep 17 00:00:00 2001
From: "Bernd Brandl (DE-722)" <Bernd.Brandl@bmw.de>
Date: Wed, 4 May 2022 14:53:38 +0200
Subject: [PATCH 1/4] [TR] fix management-zone

---
 .../CD_VDLM_ts-asc/management-zone/management-zone.yaml         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-asc/management-zone/management-zone.yaml b/BMW-Dynatrace-config/CD_VDLM_ts-asc/management-zone/management-zone.yaml
index 0c9236e0..f82d0dd8 100644
--- a/BMW-Dynatrace-config/CD_VDLM_ts-asc/management-zone/management-zone.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_ts-asc/management-zone/management-zone.yaml
@@ -3,4 +3,4 @@ config:
 
 CDnewComponentTag:
 - name: CD_VDLM_ts-asc
-- compassIDs: \"ts-asc\"
+- compassIDs: ts-asc

From 217ef7a182cb4ac597164b2b4fa7b544b4c6cc79 Mon Sep 17 00:00:00 2001
From: Bernd Brandl <bernd.brandl@bmw.de>
Date: Wed, 4 May 2022 16:15:16 +0200
Subject: [PATCH 2/4] additional custom services + conditional-naming-service

---
 .../conditional-naming-service.yaml           |  7 ++--
 .../custom-service-java.yaml                  | 33 +++++++++++++----
 .../custom-service-java/template-1-2.json     | 36 +++++++++++++++++++
 .../custom-service-java/template-2-1.json     | 36 +++++++++++++++++++
 4 files changed, 103 insertions(+), 9 deletions(-)
 create mode 100644 BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/template-1-2.json
 create mode 100644 BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/template-2-1.json

diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-asc/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_VDLM_ts-asc/conditional-naming-service/conditional-naming-service.yaml
index fb9502e8..f3d95308 100644
--- a/BMW-Dynatrace-config/CD_VDLM_ts-asc/conditional-naming-service/conditional-naming-service.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_ts-asc/conditional-naming-service/conditional-naming-service.yaml
@@ -2,6 +2,7 @@ config:
 - CDnewComponentTag: template.json
 
 CDnewComponentTag:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- skipDeployment: "true"
+  - name: MyProcessNamingRule
+  - nameFormat: "{ProcessGroup:Kubernetes:app-name} - {Service:DetectedName} - {ProcessGroup:KubernetesNamespace}"
+  - skipDeployment: "false"
+  - tag: "vdlm"
\ No newline at end of file
diff --git 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
index 86670370..e9cb0ec3 100644
--- 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
@@ -1,9 +1,30 @@
 config:
-- customService1: template-1-1.json
+- customService1: template-1-2.json
+- customService2: template-2-1.json
+- customService3: template-1-1.json
 
 customService1:
-- name: vdlm-ts-asc-ifs-001-SQSAscIn
-- className: com.bmw.cc.asc.bm.boundary.TeleXBF
-- methodName: handleTeleXMessage
-- returnType: void
-- skipDeployment: "false"
\ No newline at end of file
+- name: VDLM_ts-asc - (Timer) deletion/timeout
+- className: com.bmw.cc.asc.bm.boundary.TimerBF
+- methodName1: executeDeletionJob
+- returnType1: void
+- methodName2: executeTimeoutJob
+- returnType2: void
+- skipDeployment: "false"
+
+customService2:
+  - name: VDLM_ts-asc - ifs-001 (SQS) AscIn/AscOut - IN/OUT
+  - className1: com.bmw.cc.asc.bm.boundary.TeleXBF
+  - methodName1:  handleTeleXMessage
+  - returnType1: void
+  - className2: com.bmw.cc.asc.integration.sqs.boundary.TeleXSqsESI
+  - methodName2: send
+  - returnType2: void
+  - skipDeployment: "false"
+
+customService3:
+  - name: VDLM_ts-asc - (MQS) CallTopic - OUT
+  - className: com.bmw.cc.asc.integration.jms.boundry.CallTopicJmsESI
+  - methodName1: send
+  - returnType: void
+  - skipDeployment: "false"
diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/template-1-2.json b/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/template-1-2.json
new file mode 100644
index 00000000..b45f6b11
--- /dev/null
+++ b/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/template-1-2.json
@@ -0,0 +1,36 @@
+{
+  "enabled": true,
+  "name": "{{.name}}",
+  "processGroups": [],
+  "queueEntryPoint": false,
+  "queueEntryPointType": null,
+  "rules": [
+    {
+      "annotations": [],
+      "className": "{{.className}}",
+      "enabled": true,
+      "fileName": "",
+      "matcher": "EQUALS",
+      "methodRules": [
+        {
+          "argumentTypes": [],
+          "methodName": "{{.methodName1}}",
+          "returnType": "{{.returnType1}}"
+        }]
+    },
+    {
+      "annotations": [],
+      "className": "{{.className}}",
+      "enabled": true,
+      "fileName": "",
+      "matcher": "EQUALS",
+      "methodRules": [
+        {
+          "argumentTypes": [],
+          "methodName": "{{.methodName2}}",
+          "returnType": "{{.returnType2}}"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/template-2-1.json b/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/template-2-1.json
new file mode 100644
index 00000000..9c3c9300
--- /dev/null
+++ b/BMW-Dynatrace-config/CD_VDLM_ts-asc/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": [],
+          "methodName": "{{.methodName1}}",
+          "returnType": "{{.returnType1}}"
+        }]
+    },
+    {
+      "annotations": [],
+      "className": "{{.className2}}",
+      "enabled": true,
+      "fileName": "",
+      "matcher": "EQUALS",
+      "methodRules": [
+        {
+          "argumentTypes": [],
+          "methodName": "{{.methodName2}}",
+          "returnType": "{{.returnType2}}"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file

From bd63643261ed2dc641acc9d1847fce5436a6fca9 Mon Sep 17 00:00:00 2001
From: Bernd Brandl <bernd.brandl@bmw.de>
Date: Thu, 5 May 2022 11:07:34 +0200
Subject: [PATCH 3/4] fixed method name

---
 .../CD_VDLM_ts-asc/custom-service-java/custom-service-java.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 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
index e9cb0ec3..a733cd38 100644
--- 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
@@ -25,6 +25,6 @@ customService2:
 customService3:
   - name: VDLM_ts-asc - (MQS) CallTopic - OUT
   - className: com.bmw.cc.asc.integration.jms.boundry.CallTopicJmsESI
-  - methodName1: send
+  - methodName: send
   - returnType: void
   - skipDeployment: "false"

From 93cc059a24837aa764f1b909d8faf1984752aea5 Mon Sep 17 00:00:00 2001
From: Bernd Brandl <bernd.brandl@bmw.de>
Date: Thu, 5 May 2022 11:10:07 +0200
Subject: [PATCH 4/4] added experimental $Proxy$_$$_Weld$EnterpriseProxy$

---
 .../custom-service-java/custom-service-java.yaml              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 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
index a733cd38..e96108bc 100644
--- 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
@@ -17,14 +17,14 @@ customService2:
   - className1: com.bmw.cc.asc.bm.boundary.TeleXBF
   - methodName1:  handleTeleXMessage
   - returnType1: void
-  - className2: com.bmw.cc.asc.integration.sqs.boundary.TeleXSqsESI
+  - className2: com.bmw.cc.asc.integration.sqs.boundary.TeleXSqsESI$Proxy$_$$_Weld$EnterpriseProxy$
   - methodName2: send
   - returnType2: void
   - skipDeployment: "false"
 
 customService3:
   - name: VDLM_ts-asc - (MQS) CallTopic - OUT
-  - className: com.bmw.cc.asc.integration.jms.boundry.CallTopicJmsESI
+  - className: com.bmw.cc.asc.integration.jms.boundry.CallTopicJmsESI$Proxy$_$$_Weld$EnterpriseProxy$
   - methodName: send
   - returnType: void
   - skipDeployment: "false"