From 0b5395bc2cd24fc7e1bbdbe6fc1aeae2f50f6012 Mon Sep 17 00:00:00 2001 From: "Holomek Christopher; BMW Group" Date: Thu, 8 Dec 2022 13:30:21 +0100 Subject: [PATCH 1/4] custom service for joynr triggers and their callbacks. --- .../custom-service-java.yaml | 37 ++++++++++++++---- .../{template-1-1.json => joynrTrigger.json} | 11 ++++-- .../joynrTriggerCallback.json | 38 +++++++++++++++++++ 3 files changed, 75 insertions(+), 11 deletions(-) rename BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/{template-1-1.json => joynrTrigger.json} (54%) create mode 100644 BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/joynrTriggerCallback.json diff --git a/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/custom-service-java.yaml index a58fde35..33b548ea 100644 --- a/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/custom-service-java.yaml @@ -1,10 +1,31 @@ config: -- customService1: template-1-1.json +- joynrTrigger: joynrTrigger.json +- joynrTriggerCallback: joynrTriggerCallback.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 +joynrTrigger: +- name: AndroidJoynrTriggers +- className: com.bmw.cc.apinext.processingsvc.service.VehicleStateControlEsi +- methodName1: requestStateUpdate +- argType1: java.lang.String +- returnType1: void +- methodName2: desiredStateUpdated +- argType2: java.lang.String,java.lang.String +- returnType2: void +- skipDeployment: "false" + +joynrTriggerCallback: +- name: AndroidJoynrTriggerCallbacks +- className: com.bmw.cc.apinext.processingsvc.integration.joynr.stateless.callback.VehicleStateControlStatelessCallback +- methodName1: requestStateUpdateSuccess +- argType1: io.joynr.proxy.ReplyContext +- returnType1: void +- methodName2: requestStateUpdateFailed +- argType2: io.joynr.exceptions.JoynrRuntimeException,io.joynr.proxy.ReplyContext +- returnType2: void +- methodName3: desiredStateUpdatedSuccess +- argType3: io.joynr.proxy.ReplyContext +- returnType3: void +- methodName4: desiredStateUpdatedFailed +- argType4: io.joynr.exceptions.JoynrRuntimeException,io.joynr.proxy.ReplyContext +- returnType4: void +- skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/joynrTrigger.json similarity index 54% rename from BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/template-1-1.json rename to BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/joynrTrigger.json index ebe95097..3391b9f2 100644 --- a/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/template-1-1.json +++ b/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/joynrTrigger.json @@ -13,9 +13,14 @@ "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": ["{{.methodArgs}}"], - "methodName": "{{.methodName}}", - "returnType": "{{.returnType}}" + "argumentTypes": ["{{.argType1}}"], + "methodName": "{{.methodName1}}", + "returnType": "{{.returnType1}}" + }, + { + "argumentTypes": ["{{.argType2}}"], + "methodName": "{{.methodName2}}", + "returnType": "{{.returnType2}}" } ] } diff --git a/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/joynrTriggerCallback.json b/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/joynrTriggerCallback.json new file mode 100644 index 00000000..852c5fab --- /dev/null +++ b/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/joynrTriggerCallback.json @@ -0,0 +1,38 @@ +{ + "enabled": true, + "name": "{{.name}}", + "processGroups": [], + "queueEntryPoint": false, + "queueEntryPointType": null, + "rules": [ + { + "annotations": [], + "className": "{{.className}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": ["{{.argType1}}"], + "methodName": "{{.methodName1}}", + "returnType": "{{.returnType1}}" + }, + { + "argumentTypes": ["{{.argType2}}"], + "methodName": "{{.methodName2}}", + "returnType": "{{.returnType2}}" + }, + { + "argumentTypes": ["{{.argType3}}"], + "methodName": "{{.methodName3}}", + "returnType": "{{.returnType3}}" + }, + { + "argumentTypes": ["{{.argType4}}"], + "methodName": "{{.methodName4}}", + "returnType": "{{.returnType4}}" + } + ] + } + ] +} \ No newline at end of file From 6374506f775782d2af53ac8ae5041e449f5eb0ec Mon Sep 17 00:00:00 2001 From: "Holomek Christopher; BMW Group" Date: Fri, 9 Dec 2022 08:04:38 +0100 Subject: [PATCH 2/4] add vs-cmdb callbacks so that we can directly see if something is wrong here. --- .../custom-service-java.yaml | 12 ++++++++ .../custom-service-java/vs-cmdb.json | 28 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/vs-cmdb.json diff --git a/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/custom-service-java.yaml index 33b548ea..62986ba9 100644 --- a/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/custom-service-java.yaml @@ -1,6 +1,7 @@ config: - joynrTrigger: joynrTrigger.json - joynrTriggerCallback: joynrTriggerCallback.json +- vsCmdbCallback: vs-cmdb.json joynrTrigger: - name: AndroidJoynrTriggers @@ -28,4 +29,15 @@ joynrTriggerCallback: - methodName4: desiredStateUpdatedFailed - argType4: io.joynr.exceptions.JoynrRuntimeException,io.joynr.proxy.ReplyContext - returnType4: void +- skipDeployment: "false" + +vsCmdbCallback: +- name: AndroidVsCmdbCallbacks +- className: com.bmw.cc.apinext.processingsvc.integration.vscmdb.VsCmdbCallback +- methodName1: onSuccess +- argType1: org.springframework.kafka.support.SendResult +- returnType1: void +- methodName2: onFailure +- argType2: java.lang.Throwable +- returnType2: void - skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/vs-cmdb.json b/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/vs-cmdb.json new file mode 100644 index 00000000..05b56d8f --- /dev/null +++ b/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/vs-cmdb.json @@ -0,0 +1,28 @@ +{ + "enabled": true, + "name": "{{.name}}", + "processGroups": [], + "queueEntryPoint": false, + "queueEntryPointType": null, + "rules": [ + { + "annotations": [], + "className": "{{.className}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": ["{{.argType1}}"], + "methodName": "{{.methodName1}}", + "returnType": "{{.returnType1}}" + }, + { + "argumentTypes": ["{{.argType2}}"], + "methodName": "{{.methodName2}}", + "returnType": "{{.returnType2}}" + } + ] + } + ] +} \ No newline at end of file From e0ec446864e65e47f2a1bce34fa93530b5212902 Mon Sep 17 00:00:00 2001 From: "Holomek Christopher; BMW Group" Date: Fri, 9 Dec 2022 09:03:29 +0100 Subject: [PATCH 3/4] add vs-cmdb auth as well. --- .../custom-service-java.yaml | 11 +++++++- .../{vs-cmdb.json => vsCmdb.json} | 0 .../custom-service-java/vsCmdbAuth.json | 28 +++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) rename BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/{vs-cmdb.json => vsCmdb.json} (100%) create mode 100644 BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/vsCmdbAuth.json diff --git a/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/custom-service-java.yaml index 62986ba9..67e6ebe4 100644 --- a/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/custom-service-java.yaml @@ -1,7 +1,8 @@ config: - joynrTrigger: joynrTrigger.json - joynrTriggerCallback: joynrTriggerCallback.json -- vsCmdbCallback: vs-cmdb.json +- vsCmdbCallback: vsCmdb.json +- vsCmdbAuth: vsCmdbAuth.json joynrTrigger: - name: AndroidJoynrTriggers @@ -40,4 +41,12 @@ vsCmdbCallback: - methodName2: onFailure - argType2: java.lang.Throwable - returnType2: void +- skipDeployment: "false" + +vsCmdbAuth: +- name: AndroidVsCmdbAuth +- className: com.bmw.cc.apinext.processingsvc.integration.vscmdb.kafka.AwsWebIdentityClientCallbackHandler +- methodName1: onFailure +- argType1: java.lang.Exception +- returnType1: void - skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/vs-cmdb.json b/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/vsCmdb.json similarity index 100% rename from BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/vs-cmdb.json rename to BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/vsCmdb.json diff --git a/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/vsCmdbAuth.json b/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/vsCmdbAuth.json new file mode 100644 index 00000000..05b56d8f --- /dev/null +++ b/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/vsCmdbAuth.json @@ -0,0 +1,28 @@ +{ + "enabled": true, + "name": "{{.name}}", + "processGroups": [], + "queueEntryPoint": false, + "queueEntryPointType": null, + "rules": [ + { + "annotations": [], + "className": "{{.className}}", + "enabled": true, + "fileName": "", + "matcher": "EQUALS", + "methodRules": [ + { + "argumentTypes": ["{{.argType1}}"], + "methodName": "{{.methodName1}}", + "returnType": "{{.returnType1}}" + }, + { + "argumentTypes": ["{{.argType2}}"], + "methodName": "{{.methodName2}}", + "returnType": "{{.returnType2}}" + } + ] + } + ] +} \ No newline at end of file From efae617416a33075e7507ff10e059c1cd4182b46 Mon Sep 17 00:00:00 2001 From: "Holomek Christopher; BMW Group" Date: Wed, 21 Dec 2022 10:01:09 +0100 Subject: [PATCH 4/4] remove not used method rule. --- .../CD_AppD_Android/custom-service-java/vsCmdbAuth.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/vsCmdbAuth.json b/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/vsCmdbAuth.json index 05b56d8f..f6572e52 100644 --- a/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/vsCmdbAuth.json +++ b/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/vsCmdbAuth.json @@ -16,11 +16,6 @@ "argumentTypes": ["{{.argType1}}"], "methodName": "{{.methodName1}}", "returnType": "{{.returnType1}}" - }, - { - "argumentTypes": ["{{.argType2}}"], - "methodName": "{{.methodName2}}", - "returnType": "{{.returnType2}}" } ] }