From 04d59bf636ae4275bdd5c1a4a268bd6762f6b6d4 Mon Sep 17 00:00:00 2001 From: Muminovic Mersa Date: Fri, 29 Apr 2022 15:44:00 +0200 Subject: [PATCH 1/8] Changes for management zone vdlm-ts-rtchandler --- .../management-zone/default.json | 129 +++++++++++++++--- 1 file changed, 113 insertions(+), 16 deletions(-) diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/management-zone/default.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/management-zone/default.json index fc96de39..33677a8f 100644 --- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/management-zone/default.json +++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/management-zone/default.json @@ -1,23 +1,120 @@ { "dimensionalRules": [], "name": "{{.name}}", + "rules": [ + { + "type": "SERVICE", + "enabled": true, + "propagationTypes": [], + "conditions": [ + { + "key": { + "attribute": "SERVICE_TAGS", + "type": "STATIC" + }, + "comparisonInfo": { + "type": "TAG", + "operator": "EQUALS", + "value": { + "context": "CONTEXTLESS", + "key": "compass-id", + "value": "{{.compassIDs}}" + }, + "negate": false + } + }, + { + "key": { + "attribute": "SERVICE_NAME", + "type": "STATIC" + }, + "comparisonInfo": { + "type": "STRING", + "operator": "CONTAINS", + "value": "PingResource", + "negate": true, + "caseSensitive": true + } + }, + { + "key": { + "attribute": "SERVICE_NAME", + "type": "STATIC" + }, + "comparisonInfo": { + "type": "STRING", + "operator": "CONTAINS", + "value": "HealthResource", + "negate": true, + "caseSensitive": true + } + }, + { + "key": { + "attribute": "SERVICE_NAME", + "type": "STATIC" + }, + "comparisonInfo": { + "type": "STRING", + "operator": "CONTAINS", + "value": "PrometheusResource", + "negate": true, + "caseSensitive": true + } + } + ] + }, + { + "type": "PROCESS_GROUP", + "enabled": true, + "propagationTypes": [], + "conditions": [ + { + "key": { + "attribute": "PROCESS_GROUP_TAGS", + "type": "STATIC" + }, + "comparisonInfo": { + "type": "TAG", + "operator": "EQUALS", + "value": { + "context": "CONTEXTLESS", + "key": "compass-id", + "value": "{{.compassIDs}}" + }, + "negate": false + } + } + ] + }, + { + "type": "HOST", + "enabled": true, + "propagationTypes": [], + "conditions": [ + { + "key": { + "attribute": "HOST_TAGS", + "type": "STATIC" + }, + "comparisonInfo": { + "type": "TAG", + "operator": "EQUALS", + "value": { + "context": "CONTEXTLESS", + "key": "compass-id", + "value": "{{.compassIDs}}" + }, + "negate": false + } + } + ] + } + ], "entitySelectorBasedRules": [ - { - "enabled": true, - "entitySelector": "type(Service),tag({{.compassIDs}})" - }, { "enabled": true, - "entitySelector": "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag({{.compassIDs}}))" - }, - { - "enabled": true, - "entitySelector": "type(PROCESS_GROUP_INSTANCE),tag({{.compassIDs}})" - }, - { - "enabled": true, - "entitySelector": "type(HOST),tag({{.compassIDs}})" - } - ], - "rules": [] + "entitySelector": "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(compass-id:{{.compassIDs}}))" + } + ] } \ No newline at end of file From 8289c17c5bb8888001f862fcb74f74e9b5259f52 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Wed, 1 Jun 2022 15:51:21 +0200 Subject: [PATCH 2/8] [TR] service-detection-full-web-service for rtchandler --- .../default.json | 36 +++++++++++++++++++ .../service-detection-full-web-service.yaml | 26 ++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 BMW-Dynatrace-config/CD_VDLM_rtchandler/service-detection-full-web-service/default.json create mode 100644 BMW-Dynatrace-config/CD_VDLM_rtchandler/service-detection-full-web-service/service-detection-full-web-service.yaml diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/service-detection-full-web-service/default.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/service-detection-full-web-service/default.json new file mode 100644 index 00000000..b21018bc --- /dev/null +++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/service-detection-full-web-service/default.json @@ -0,0 +1,36 @@ +{ + "type": "FULL_WEB_SERVICE", + "metadata": { + "configurationVersions": [ + 0 + ], + "clusterVersion": "1.241.180.20220520-165831" + }, + "managementZones": ["{{.managementZone}}"], + "name": "{{.name}}", + "description": "{{.description}}", + "enabled": true, + "conditions": [ + { + "attributeType": "WEBSERVICE_NAME", + "compareOperations": [ + { + "type": "EQUALS", + "negate": false, + "ignoreCase": false, + "values": [ + "{{.originalName}}" + ] + } + ] + } + ], + "detectAsWebRequestService": false, + "webServiceName": { + "transformations": [], + "valueOverride": "{{.valueOverride}}" + }, + "applicationId": null, + "contextRoot": null, + "serverName": null +} diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/service-detection-full-web-service/service-detection-full-web-service.yaml b/BMW-Dynatrace-config/CD_VDLM_rtchandler/service-detection-full-web-service/service-detection-full-web-service.yaml new file mode 100644 index 00000000..0dbaae4c --- /dev/null +++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/service-detection-full-web-service/service-detection-full-web-service.yaml @@ -0,0 +1,26 @@ +config: +- webService1: default.json +- webService2: default.json +- webService3: default.json + +webService1: +- name: "DiagRequestResponseV2 rule" +- description: "Renaming Service DiagRequestResponseV2" +- managementZone: "CD_VDLM_rtchandler" +- originalName: "DiagRequestResponseV2" +- valueOverride: "ifs-007 (REST) /rtchandler/rest/diag/v2 (/trigger)" + +webService2: +- name: "DiagRequestApiV2 rule" +- description: "Renaming Service DiagRequestApiV2" +- managementZone: "CD_VDLM_rtchandler" +- originalName: "DiagRequestApiV2" +- valueOverride: "ifs-002 (REST) /rtchandler/rest/diagrequests/v2" + +webService3: +- name: "WhitelistApiV1 rule" +- description: "Renaming Service WhitelistApiV1" +- managementZone: "CD_VDLM_rtchandler" +- originalName: "WhitelistApiV1" +- valueOverride: "ifs-003 (REST) /rtchandler/rest/whitelist/v1" + From 7bbaaadaf0ef11852ef9c225d6fbcf12f50b8a33 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Thu, 2 Jun 2022 07:29:11 +0200 Subject: [PATCH 3/8] removed customService6 (REST) --- .../custom-service-java.yaml | 8 ------ .../custom-service-java/template-1-1d.json | 25 ------------------- 2 files changed, 33 deletions(-) delete mode 100644 BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1d.json diff --git 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 index 57576014..64940f5f 100644 --- 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,7 +4,6 @@ config: - customService3: template-1-1a.json - customService4: template-1-1b.json - customService5: template-1-1c.json -- customService6: template-1-1d.json customService1: - name: "VDLM_rtchandler - ifs-010 (SQS) RtcTeleXIn/Out - IN/OUT" @@ -45,11 +44,4 @@ customService5: - className: com.bmw.cc.ts.rtchandler.bm.common.control.cleanup.DbCleanUpBA - methodName: cleanUp - returnType: void -- skipDeployment: "false" - -customService6: -- name: "VDLM_rtchandler - ifs-007 (REST) /rtchandler/rest/diag/v2 (/trigger)" -- className: com.bmw.cc.ts.rtchandler.api.diag.v2.boundary.DiagRequestResponseV2 -- methodName: trigger -- returnType: void - skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1d.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1d.json deleted file mode 100644 index c817d637..00000000 --- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1d.json +++ /dev/null @@ -1,25 +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.ts.rtchandler.api.diag.v2.entity.RTCTriggerRequest" - ], - "methodName": "{{.methodName}}", - "returnType": "{{.returnType}}" - } - ] - } - ] -} \ No newline at end of file From ba88c0c54d11fe85e941aaf3ebc35471a2921a64 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Thu, 2 Jun 2022 08:43:31 +0200 Subject: [PATCH 4/8] remove custom-service 6 --- .../custom-service-java/custom-service-java.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git 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 index 64940f5f..5915766e 100644 --- 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 @@ -6,7 +6,7 @@ config: - customService5: template-1-1c.json customService1: -- name: "VDLM_rtchandler - ifs-010 (SQS) RtcTeleXIn/Out - IN/OUT" +- name: "ifs-010 (SQS) RtcTeleXIn/Out - IN/OUT" - className1: com.bmw.cc.ts.rtchandler.bm.message.MessageServiceRTCBF - methodName1: processMessage - returnType1: void @@ -16,7 +16,7 @@ customService1: - skipDeployment: "false" customService2: -- name: "VDLM_rtchandler - ifs-008 (SQS) NgtpRtcHandlerIn/Out - IN/OUT" +- name: "ifs-008 (SQS) NgtpRtcHandlerIn/Out - IN/OUT" - className1: com.bmw.cc.ts.rtchandler.api.ngtp.v1.boundary.NgtpSqsListener - methodName1: processMessage - returnType1: void @@ -26,21 +26,21 @@ customService2: - skipDeployment: "false" customService3: -- name: "VDLM_rtchandler - ifs-009 (MQS) RtcHandlerIstaOut - OUT" +- name: "ifs-009 (MQS) RtcHandlerIstaOut - OUT" - className: com.bmw.cc.ts.rtchandler.bm.common.control.classificationrequest.ClassificationRequestQueueSender - methodName: sendClassificationRequestMessage - returnType: void - skipDeployment: "false" customService4: -- name: "VDLM_rtchandler - (Timer) timeout" +- name: "(Timer) timeout" - className: com.bmw.cc.ts.rtchandler.bm.common.timer.CallTimeoutTimerService - methodName: handleTimer - returnType: void - skipDeployment: "false" customService5: -- name: "VDLM_rtchandler - (Timer) deletion" +- name: "(Timer) deletion" - className: com.bmw.cc.ts.rtchandler.bm.common.control.cleanup.DbCleanUpBA - methodName: cleanUp - returnType: void From dd7ef0c7a5e2fa786b67fa6a019ae70a387f5586 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Fri, 3 Jun 2022 14:02:53 +0200 Subject: [PATCH 5/8] [TR] new Custom Service Template with methodArgs // challenge with empty methodArgs --- .../custom-service-java.yaml | 17 ++++--- .../{template-1-1b.json => template-1-1.json} | 2 +- .../custom-service-java/template-1-1a.json | 25 ----------- .../custom-service-java/template-1-1c.json | 23 ---------- .../{template-2-1b.json => template-2-1.json} | 11 +---- .../custom-service-java/template-2-1a.json | 44 ------------------- 6 files changed, 15 insertions(+), 107 deletions(-) rename BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/{template-1-1b.json => template-1-1.json} (89%) delete mode 100644 BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1a.json delete mode 100644 BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1c.json rename BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/{template-2-1b.json => template-2-1.json} (67%) delete mode 100644 BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1a.json diff --git 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 index 5915766e..1722cda0 100644 --- 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 @@ -1,17 +1,19 @@ config: -- customService1: template-2-1a.json -- customService2: template-2-1b.json -- customService3: template-1-1a.json -- customService4: template-1-1b.json -- customService5: template-1-1c.json +- customService1: template-2-1.json +- customService2: template-2-1.json +- customService3: template-1-1.json +- customService4: template-1-1.json +- customService5: template-1-1.json customService1: - name: "ifs-010 (SQS) RtcTeleXIn/Out - IN/OUT" - className1: com.bmw.cc.ts.rtchandler.bm.message.MessageServiceRTCBF - methodName1: processMessage +- methodArgs1: java.lang.String,java.util.Map,com.bmw.cc.ts.rtchandler.bm.common.util.RequestContext - returnType1: void - className2: com.bmw.cc.ts.rtchandler.integration.tsmb.boundary.TeleXSqsESI - methodName2: sendMessage +- methodArgs2: java.lang.String,java.util.Map,com.bmw.cc.ts.rtchandler.bm.common.util.RequestContext - returnType2: void - skipDeployment: "false" @@ -19,9 +21,11 @@ customService2: - name: "ifs-008 (SQS) NgtpRtcHandlerIn/Out - IN/OUT" - className1: com.bmw.cc.ts.rtchandler.api.ngtp.v1.boundary.NgtpSqsListener - methodName1: processMessage +- methodArgs1: com.bmw.cd.logging.CdllLoggingContext, software.amazon.awssdk.services.sqs.model.Message - returnType1: void - className2: com.bmw.cc.ts.rtchandler.integration.ngtp.v1.boundary.NgtpSqsESI - methodName2: sendMessage +- methodArgs2: java.lang.String,java.lang.String,com.bmw.cc.ts.rtchandler.bm.diag.entity.RTCTriggerType - returnType2: void - skipDeployment: "false" @@ -29,6 +33,7 @@ customService3: - name: "ifs-009 (MQS) RtcHandlerIstaOut - OUT" - className: com.bmw.cc.ts.rtchandler.bm.common.control.classificationrequest.ClassificationRequestQueueSender - methodName: sendClassificationRequestMessage +- methodArgs: com.bmw.cc.ts.rtchandler.bm.common.model.classificationrequest.ClassificationRequest - returnType: void - skipDeployment: "false" @@ -36,6 +41,7 @@ customService4: - name: "(Timer) timeout" - className: com.bmw.cc.ts.rtchandler.bm.common.timer.CallTimeoutTimerService - methodName: handleTimer +- methodArgs: - returnType: void - skipDeployment: "false" @@ -43,5 +49,6 @@ customService5: - name: "(Timer) deletion" - className: com.bmw.cc.ts.rtchandler.bm.common.control.cleanup.DbCleanUpBA - methodName: cleanUp +- methodArgs: - returnType: void - skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1b.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1.json similarity index 89% rename from BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1b.json rename to BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1.json index 1fd760ba..ebe95097 100644 --- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1b.json +++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/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_rtchandler/custom-service-java/template-1-1a.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1a.json deleted file mode 100644 index fb870862..00000000 --- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1a.json +++ /dev/null @@ -1,25 +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.ts.rtchandler.bm.common.model.classificationrequest.ClassificationRequest" - ], - "methodName": "{{.methodName}}", - "returnType": "{{.returnType}}" - } - ] - } - ] -} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1c.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1c.json deleted file mode 100644 index 1fd760ba..00000000 --- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1c.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "enabled": true, - "name": "{{.name}}", - "processGroups": [], - "queueEntryPoint": false, - "queueEntryPointType": null, - "rules": [ - { - "annotations": [], - "className": "{{.className}}", - "enabled": true, - "fileName": "", - "matcher": "EQUALS", - "methodRules": [ - { - "argumentTypes": [ ], - "methodName": "{{.methodName}}", - "returnType": "{{.returnType}}" - } - ] - } - ] -} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1b.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1.json similarity index 67% rename from BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1b.json rename to BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1.json index f6873db3..f0077b0c 100644 --- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1b.json +++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1.json @@ -13,10 +13,7 @@ "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [ - "com.bmw.cd.logging.CdllLoggingContext", - "software.amazon.awssdk.services.sqs.model.Message" - ], + "argumentTypes": ["{{.methodArgs1}}"], "methodName": "{{.methodName1}}", "returnType": "{{.returnType1}}" }] @@ -29,11 +26,7 @@ "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [ - "java.lang.String", - "java.lang.String", - "com.bmw.cc.ts.rtchandler.bm.diag.entity.RTCTriggerType" - ], + "argumentTypes": ["{{.methodArgs2}}"], "methodName": "{{.methodName2}}", "returnType": "{{.returnType2}}" } diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1a.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1a.json deleted file mode 100644 index 62c8d7a4..00000000 --- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1a.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "enabled": true, - "name": "{{.name}}", - "processGroups": [], - "queueEntryPoint": false, - "queueEntryPointType": null, - "rules": [ - { - "annotations": [], - "className": "{{.className1}}", - "enabled": true, - "fileName": "", - "matcher": "EQUALS", - "methodRules": [ - { - "argumentTypes": [ - "java.lang.String", - "java.util.Map", - "com.bmw.cc.ts.rtchandler.bm.common.util.RequestContext" - ], - "methodName": "{{.methodName1}}", - "returnType": "{{.returnType1}}" - }] - }, - { - "annotations": [], - "className": "{{.className2}}", - "enabled": true, - "fileName": "", - "matcher": "EQUALS", - "methodRules": [ - { - "argumentTypes": [ - "java.lang.String", - "java.util.Map", - "com.bmw.cc.ts.rtchandler.bm.common.util.RequestContext" - ], - "methodName": "{{.methodName2}}", - "returnType": "{{.returnType2}}" - } - ] - } - ] -} \ No newline at end of file From dd9465e549d8b0c82bdeba5a229fab6ca3c28e78 Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Fri, 3 Jun 2022 15:02:46 +0200 Subject: [PATCH 6/8] added template-1-1-without-methodargs --- .../custom-service-java.yaml | 6 ++--- .../template-1-1-without-methodargs.json | 23 +++++++++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1-without-methodargs.json diff --git 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 index 1722cda0..64a64f0e 100644 --- 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 @@ -2,8 +2,8 @@ config: - customService1: template-2-1.json - customService2: template-2-1.json - customService3: template-1-1.json -- customService4: template-1-1.json -- customService5: template-1-1.json +- customService4: template-1-1-without-methodargs.json +- customService5: template-1-1-without-methodargs.json customService1: - name: "ifs-010 (SQS) RtcTeleXIn/Out - IN/OUT" @@ -41,7 +41,6 @@ customService4: - name: "(Timer) timeout" - className: com.bmw.cc.ts.rtchandler.bm.common.timer.CallTimeoutTimerService - methodName: handleTimer -- methodArgs: - returnType: void - skipDeployment: "false" @@ -49,6 +48,5 @@ customService5: - name: "(Timer) deletion" - className: com.bmw.cc.ts.rtchandler.bm.common.control.cleanup.DbCleanUpBA - methodName: cleanUp -- methodArgs: - returnType: void - skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1-without-methodargs.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1-without-methodargs.json new file mode 100644 index 00000000..b3003515 --- /dev/null +++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1-without-methodargs.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": [], + "methodName": "{{.methodName}}", + "returnType": "{{.returnType}}" + } + ] + } + ] +} \ No newline at end of file From c1f6eb528a52cf2cce15d9a8a974f4c035bfc2e1 Mon Sep 17 00:00:00 2001 From: Muminovic Mersa Date: Wed, 8 Jun 2022 10:57:01 +0200 Subject: [PATCH 7/8] Added additional template json without argumentTypes for template-2-2 --- .../template-2-2-without-methodargs.json | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-2-without-methodargs.json diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-2-without-methodargs.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-2-without-methodargs.json new file mode 100644 index 00000000..7ed95c38 --- /dev/null +++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/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 From c4cb8c395fbf07268cccc6052228ef0fcf9e7e08 Mon Sep 17 00:00:00 2001 From: "SLW\\ARNAUA" Date: Wed, 8 Jun 2022 12:03:41 +0200 Subject: [PATCH 8/8] Removed space. --- .../custom-service-java/custom-service-java.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git 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 index 64a64f0e..a04c1013 100644 --- 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 @@ -21,7 +21,7 @@ customService2: - name: "ifs-008 (SQS) NgtpRtcHandlerIn/Out - IN/OUT" - className1: com.bmw.cc.ts.rtchandler.api.ngtp.v1.boundary.NgtpSqsListener - methodName1: processMessage -- methodArgs1: com.bmw.cd.logging.CdllLoggingContext, software.amazon.awssdk.services.sqs.model.Message +- methodArgs1: com.bmw.cd.logging.CdllLoggingContext,software.amazon.awssdk.services.sqs.model.Message - returnType1: void - className2: com.bmw.cc.ts.rtchandler.integration.ngtp.v1.boundary.NgtpSqsESI - methodName2: sendMessage