Async flow working

trask · trask · commit fad55ad41ded · 2024-09-23T16:09:02.000-07:00
diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/keytransaction/KeyTransactionConfigSupplier.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/keytransaction/KeyTransactionConfigSupplier.java
@@ -1,22 +1,25 @@
 package com.microsoft.applicationinsights.agent.internal.keytransaction;
 
+import static java.util.stream.Collectors.toList;
+
 import com.azure.json.JsonProviders;
 import java.io.IOException;
 import java.util.List;
 import java.util.function.Supplier;
 
-import static java.util.stream.Collectors.toList;
-
 public class KeyTransactionConfigSupplier implements Supplier<List<KeyTransactionConfig>> {
 
   public static final boolean KEY_TRANSACTIONS_ENABLED = true;
+  public static final boolean USE_HARDCODED_CONFIG = false;
 
   // TODO remove reliance on global
   private static final KeyTransactionConfigSupplier instance = new KeyTransactionConfigSupplier();
 
-//  static {
-//    instance.set(hardcodedDemo());
-//  }
+  static {
+    if (USE_HARDCODED_CONFIG) {
+      instance.set(hardcodedDemo());
+    }
+  }
 
   public static KeyTransactionConfigSupplier getInstance() {
     return instance;
@@ -33,53 +36,57 @@ public void set(List<KeyTransactionConfig> configs) {
     this.configs = configs;
   }
 
-  @SuppressWarnings("unused")
   private static List<KeyTransactionConfig> hardcodedDemo() {
     List<KeyTransactionConfig> configs;
     try {
       configs = NewResponse.fromJson(JsonProviders.createReader(
-          "{\n"
-              + "  \"itemsReceived\": 13,\n"
-              + "  \"itemsAccepted\": 13,\n"
-              + "  \"appId\": null,\n"
-              + "  \"errors\": [],\n"
-              + "  \"sdkConfiguration\": [\n"
-              + "    {\n"
-              + "      \"Key\": \"Transaction\",\n"
-              + "      \"Value\": {\n"
-              + "        \"Name\": \"EarthOrbit\",\n"
-              + "        \"StartCriteria\": [\n"
-              + "          {\n"
-              + "            \"Field\": \"url.path\",\n"
-              + "            \"Operator\": \"==\",\n"
-              + "            \"Value\": \"/earth\"\n"
-              + "          }\n"
-              + "        ],\n"
-              + "        \"EndCriteria\": []\n"
-              + "      }\n"
-              + "    },\n"
-              + "    {\n"
-              + "      \"Key\": \"Transaction\",\n"
-              + "      \"Value\": {\n"
-              + "        \"Name\": \"MarsMission\",\n"
-              + "        \"StartCriteria\": [\n"
-              + "          {\n"
-              + "            \"Field\": \"url.path\",\n"
-              + "            \"Operator\": \"==\",\n"
-              + "            \"Value\": \"/mars\"\n"
-              + "          }\n"
-              + "        ],\n"
-              + "        \"EndCriteria\": [\n"
-              + "          {\n"
-              + "            \"Field\": \"messaging.todo\",\n"
-              + "            \"Operator\": \"==\",\n"
-              + "            \"Value\": \"todo\"\n"
-              + "          }\n"
-              + "        ]\n"
-              + "      }\n"
-              + "    }\n"
-              + "  ]\n"
-              + "}\n"
+              "{\n"
+                  + "  \"itemsReceived\": 13,\n"
+                  + "  \"itemsAccepted\": 13,\n"
+                  + "  \"appId\": null,\n"
+                  + "  \"errors\": [],\n"
+                  + "  \"sdkConfiguration\": [\n"
+                  + "    {\n"
+                  + "      \"Key\": \"Transaction\",\n"
+                  + "      \"Value\": {\n"
+                  + "        \"Name\": \"EarthOrbit\",\n"
+                  + "        \"StartCriteria\": [\n"
+                  + "          {\n"
+                  + "            \"Field\": \"url.path\",\n"
+                  + "            \"Operator\": \"==\",\n"
+                  + "            \"Value\": \"/earth\"\n"
+                  + "          }\n"
+                  + "        ],\n"
+                  + "        \"EndCriteria\": []\n"
+                  + "      }\n"
+                  + "    },\n"
+                  + "    {\n"
+                  + "      \"Key\": \"Transaction\",\n"
+                  + "      \"Value\": {\n"
+                  + "        \"Name\": \"MarsMission\",\n"
+                  + "        \"StartCriteria\": [\n"
+                  + "          {\n"
+                  + "            \"Field\": \"url.path\",\n"
+                  + "            \"Operator\": \"==\",\n"
+                  + "            \"Value\": \"/mars\"\n"
+                  + "          }\n"
+                  + "        ],\n"
+                  + "        \"EndCriteria\": [\n"
+                  + "          {\n"
+                  + "            \"Field\": \"messaging.operation\",\n"
+                  + "            \"Operator\": \"==\",\n"
+                  + "            \"Value\": \"process\"\n"
+                  + "          },\n"
+                  + "          {\n"
+                  + "            \"Field\": \"messaging.destination.name\",\n"
+                  + "            \"Operator\": \"==\",\n"
+                  + "            \"Value\": \"space\"\n"
+                  + "          }\n"
+                  + "        ]\n"
+                  + "      }\n"
+                  + "    }\n"
+                  + "  ]\n"
+                  + "}\n"
           ))
           .getSdkConfigurations()
           .stream()
diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/keytransaction/KeyTransactionTelemetryPipelineListener.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/keytransaction/KeyTransactionTelemetryPipelineListener.java
@@ -44,7 +44,7 @@ public void onResponse(TelemetryPipelineRequest request, TelemetryPipelineRespon
       return;
     }
 
-    if (parsedResponse.getSdkConfigurations() != null) {
+    if (parsedResponse.getSdkConfigurations() != null && !KeyTransactionConfigSupplier.USE_HARDCODED_CONFIG) {
       KeyTransactionConfigSupplier.getInstance().set(
           parsedResponse.getSdkConfigurations()
               .stream()
diff --git a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/keytransaction/KeyTransactionConfigTest.java b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/keytransaction/KeyTransactionConfigTest.java
@@ -44,11 +44,18 @@ void test() throws Exception {
     assertThat(marsMissionStartCriteria.getOperator()).isEqualTo(EQUALS);
     assertThat(marsMissionStartCriteria.getValue()).isEqualTo("mars");
 
-    assertThat(marsMissionKeyTransactionConfig.getEndCriteria()).hasSize(1);
-    KeyTransactionConfig.Criterion marsMissionEndCriteria =
+    assertThat(marsMissionKeyTransactionConfig.getEndCriteria()).hasSize(2);
+
+    KeyTransactionConfig.Criterion marsMissionEndCriteria1 =
+        marsMissionKeyTransactionConfig.getEndCriteria().get(0);
+    assertThat(marsMissionEndCriteria1.getField().getKey()).isEqualTo("messaging.operation");
+    assertThat(marsMissionEndCriteria1.getOperator()).isEqualTo(EQUALS);
+    assertThat(marsMissionEndCriteria1.getValue()).isEqualTo("process");
+
+    KeyTransactionConfig.Criterion marsMissionEndCriteria2 =
         marsMissionKeyTransactionConfig.getEndCriteria().get(0);
-    assertThat(marsMissionEndCriteria.getField().getKey()).isEqualTo("messaging.todo");
-    assertThat(marsMissionEndCriteria.getOperator()).isEqualTo(EQUALS);
-    assertThat(marsMissionEndCriteria.getValue()).isEqualTo("todo");
+    assertThat(marsMissionEndCriteria2.getField().getKey()).isEqualTo("messaging.destination.name");
+    assertThat(marsMissionEndCriteria2.getOperator()).isEqualTo(EQUALS);
+    assertThat(marsMissionEndCriteria2.getValue()).isEqualTo("space");
   }
 }
diff --git a/agent/agent-tooling/src/test/resources/com/microsoft/applicationinsights/agent/internal/keytransaction/demo.json b/agent/agent-tooling/src/test/resources/com/microsoft/applicationinsights/agent/internal/keytransaction/demo.json
@@ -31,9 +31,14 @@
         ],
         "EndCriteria": [
           {
-            "Field": "messaging.todo",
+            "Field": "messaging.operation",
             "Operator": "==",
-            "Value": "todo"
+            "Value": "process"
+          },
+          {
+            "Field": "messaging.destination.name",
+            "Operator": "==",
+            "Value": "space"
           }
         ]
       }

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public void onResponse(TelemetryPipelineRequest request, TelemetryPipelineRespon`
`44`	`44`	`return;`
`45`	`45`	`}`
`46`	`46`
`47`		`- if (parsedResponse.getSdkConfigurations() != null) {`
	`47`	`+ if (parsedResponse.getSdkConfigurations() != null && !KeyTransactionConfigSupplier.USE_HARDCODED_CONFIG) {`
`48`	`48`	`KeyTransactionConfigSupplier.getInstance().set(`
`49`	`49`	`parsedResponse.getSdkConfigurations()`
`50`	`50`	`.stream()`
Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,14 @@`
`31`	`31`	`],`
`32`	`32`	`"EndCriteria": [`
`33`	`33`	`{`
`34`		`- "Field": "messaging.todo",`
	`34`	`+ "Field": "messaging.operation",`
`35`	`35`	`"Operator": "==",`
`36`		`- "Value": "todo"`
	`36`	`+ "Value": "process"`
	`37`	`+ },`
	`38`	`+ {`
	`39`	`+ "Field": "messaging.destination.name",`
	`40`	`+ "Operator": "==",`
	`41`	`+ "Value": "space"`
`37`	`42`	`}`
`38`	`43`	`]`
`39`	`44`	`}`