Merge pull request #1855 from microsoft/smoke-test-cleanup

Smoke test cleanup

Author: trask

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiOperationNameSpanProcessor.java

@@ -25,6 +25,7 @@
 import com.microsoft.applicationinsights.agent.internal.exporter.Exporter;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Context;
+import io.opentelemetry.instrumentation.api.tracer.ConsumerSpan;
 import io.opentelemetry.instrumentation.api.tracer.ServerSpan;
 import io.opentelemetry.sdk.trace.ReadWriteSpan;
 import io.opentelemetry.sdk.trace.ReadableSpan;
@@ -35,10 +36,13 @@ public class AiOperationNameSpanProcessor implements SpanProcessor {
 
   @Override
   public void onStart(Context parentContext, ReadWriteSpan span) {
-    Span serverSpan = ServerSpan.fromContextOrNull(parentContext);
-    if (serverSpan instanceof ReadableSpan) {
+    Span localRootSpan = ServerSpan.fromContextOrNull(parentContext);
+    if (localRootSpan == null) {
+      localRootSpan = ConsumerSpan.fromContextOrNull(parentContext);
+    }
+    if (localRootSpan instanceof ReadableSpan) {
       span.setAttribute(
-          Exporter.AI_OPERATION_NAME_KEY, getOperationName((ReadableSpan) serverSpan));
+          Exporter.AI_OPERATION_NAME_KEY, getOperationName((ReadableSpan) localRootSpan));
     }
   }
 

test/fakeIngestion/standalone/src/main/java/com/microsoft/applicationinsights/test/fakeingestion/MockedAppInsightsIngestionServer.java

@@ -159,14 +159,25 @@ public List<Envelope> waitForItems(String type, int numItems)
   // operationId
   public List<Envelope> waitForItems(String type, int numItems, String operationId)
       throws InterruptedException, ExecutionException, TimeoutException {
+    return waitForItems(type, numItems, operationId, envelope -> true);
+  }
+
+  public List<Envelope> waitForItems(
+      String type, int numItems, String operationId, Predicate<Envelope> condition)
+      throws InterruptedException, ExecutionException, TimeoutException {
     List<Envelope> items =
         waitForItems(
             new Predicate<Envelope>() {
               @Override
               public boolean test(Envelope input) {
-                return input.getData().getBaseType().equals(type)
-                    && (operationId == null
-                        || operationId.equals(input.getTags().get("ai.operation.id")));
+                if (!input.getData().getBaseType().equals(type)) {
+                  return false;
+                }
+                if (operationId != null
+                    && !operationId.equals(input.getTags().get("ai.operation.id"))) {
+                  return false;
+                }
+                return condition.test(input);
               }
             },
             numItems,
@@ -206,6 +217,12 @@ public List<Envelope> waitForItemsInOperation(String type, int numItems, String
     return waitForItems(type, numItems, operationId);
   }
 
+  public List<Envelope> waitForItemsInOperation(
+      String type, int numItems, String operationId, Predicate<Envelope> condition)
+      throws ExecutionException, InterruptedException, TimeoutException {
+    return waitForItems(type, numItems, operationId, condition);
+  }
+
   // this is used to filter out some sporadic messages that are captured via java.util.logging
   // instrumentation
   public List<Envelope> waitForMessageItemsInRequest(int numItems)

test/smoke/framework/testCore/src/main/java/com/microsoft/applicationinsights/smoketest/AiSmokeTest.java

@@ -23,6 +23,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import com.google.common.base.CaseFormat;
@@ -41,6 +42,7 @@
 import com.microsoft.applicationinsights.smoketest.schemav2.Data;
 import com.microsoft.applicationinsights.smoketest.schemav2.Domain;
 import com.microsoft.applicationinsights.smoketest.schemav2.Envelope;
+import com.microsoft.applicationinsights.smoketest.schemav2.RemoteDependencyData;
 import com.microsoft.applicationinsights.smoketest.schemav2.RequestData;
 import com.microsoft.applicationinsights.test.fakeingestion.MockedAppInsightsIngestionServer;
 import com.microsoft.applicationinsights.test.fakeingestion.MockedAppInsightsIngestionServlet;
@@ -839,4 +841,114 @@ protected <T extends Domain> T getTelemetryDataForType(int index, String type) {
     return mockedIngestion.getBaseDataForType(index, type);
   }
   // endregion
+
+  protected static Telemetry getTelemetry(int rddCount) throws Exception {
+    return getTelemetry(rddCount, rdd -> true);
+  }
+
+  protected static Telemetry getTelemetry(int rddCount, Predicate<RemoteDependencyData> condition)
+      throws Exception {
+
+    if (rddCount > 3) {
+      throw new IllegalArgumentException("this method currently only supports rddCount up to 3");
+    }
+
+    Telemetry telemetry = new Telemetry();
+
+    List<Envelope> rdList = mockedIngestion.waitForItems("RequestData", 1);
+    telemetry.rdEnvelope = rdList.get(0);
+    telemetry.rd = (RequestData) ((Data<?>) telemetry.rdEnvelope.getData()).getBaseData();
+
+    assertEquals(0, mockedIngestion.getCountForType("EventData"));
+
+    if (rddCount == 0) {
+      return telemetry;
+    }
+
+    String operationId = telemetry.rdEnvelope.getTags().get("ai.operation.id");
+
+    List<Envelope> rddList =
+        mockedIngestion.waitForItemsInOperation(
+            "RemoteDependencyData",
+            rddCount,
+            operationId,
+            envelope -> {
+              RemoteDependencyData rdd =
+                  (RemoteDependencyData) ((Data<?>) envelope.getData()).getBaseData();
+              return condition.test(rdd);
+            });
+
+    telemetry.rddEnvelope1 = rddList.get(0);
+    telemetry.rdd1 =
+        (RemoteDependencyData) ((Data<?>) telemetry.rddEnvelope1.getData()).getBaseData();
+
+    if (rddCount == 1) {
+      return telemetry;
+    }
+
+    telemetry.rddEnvelope2 = rddList.get(1);
+    telemetry.rdd2 =
+        (RemoteDependencyData) ((Data<?>) telemetry.rddEnvelope2.getData()).getBaseData();
+
+    if (rddCount == 2) {
+      return telemetry;
+    }
+
+    telemetry.rddEnvelope3 = rddList.get(2);
+    telemetry.rdd3 =
+        (RemoteDependencyData) ((Data<?>) telemetry.rddEnvelope3.getData()).getBaseData();
+
+    return telemetry;
+  }
+
+  public static class Telemetry {
+    public Envelope rdEnvelope;
+    public Envelope rddEnvelope1;
+    public Envelope rddEnvelope2;
+    public Envelope rddEnvelope3;
+
+    public RequestData rd;
+    public RemoteDependencyData rdd1;
+    public RemoteDependencyData rdd2;
+    public RemoteDependencyData rdd3;
+  }
+
+  public static void assertParentChild(
+      RequestData rd, Envelope parentEnvelope, Envelope childEnvelope, String operationName) {
+    assertParentChild(
+        rd.getId(), parentEnvelope, childEnvelope, operationName, operationName, true);
+  }
+
+  public static void assertParentChild(
+      RemoteDependencyData rdd,
+      Envelope parentEnvelope,
+      Envelope childEnvelope,
+      String operationName) {
+    assertParentChild(
+        rdd.getId(), parentEnvelope, childEnvelope, operationName, operationName, false);
+  }
+
+  public static void assertParentChild(
+      String parentId,
+      Envelope parentEnvelope,
+      Envelope childEnvelope,
+      String parentOperationName,
+      String childOperationName,
+      boolean topLevelParent) {
+    String operationId = parentEnvelope.getTags().get("ai.operation.id");
+    assertNotNull(operationId);
+    assertEquals(operationId, childEnvelope.getTags().get("ai.operation.id"));
+
+    String operationParentId = parentEnvelope.getTags().get("ai.operation.parentId");
+    if (topLevelParent) {
+      assertNull(operationParentId);
+    } else {
+      assertNotNull(operationParentId);
+    }
+
+    assertEquals(parentId, childEnvelope.getTags().get("ai.operation.parentId"));
+
+    assertEquals(parentOperationName, parentEnvelope.getTags().get("ai.operation.name"));
+    assertEquals(childOperationName, childEnvelope.getTags().get("ai.operation.name"));
+  }
 }

test/smoke/testApps/AzureSdk/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/AzureSdkDisabledTest.java

@@ -22,14 +22,8 @@
 package com.microsoft.applicationinsights.smoketest;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import com.microsoft.applicationinsights.smoketest.schemav2.Data;
-import com.microsoft.applicationinsights.smoketest.schemav2.Envelope;
-import com.microsoft.applicationinsights.smoketest.schemav2.RemoteDependencyData;
-import com.microsoft.applicationinsights.smoketest.schemav2.RequestData;
-import java.util.List;
 import org.junit.Test;
 
 @UseAgent
@@ -38,41 +32,17 @@ public class AzureSdkDisabledTest extends AiSmokeTest {
   @Test
   @TargetUri("/test")
   public void test() throws Exception {
-    List<Envelope> rdList = mockedIngestion.waitForItems("RequestData", 1);
+    Telemetry telemetry = getTelemetry(1);
 
-    Envelope rdEnvelope = rdList.get(0);
-    String operationId = rdEnvelope.getTags().get("ai.operation.id");
-    List<Envelope> rddList =
-        mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 1, operationId);
-    assertEquals(0, mockedIngestion.getCountForType("EventData"));
+    assertEquals("GET /AzureSdk/test", telemetry.rd.getName());
+    assertTrue(telemetry.rd.getProperties().isEmpty());
+    assertTrue(telemetry.rd.getSuccess());
 
-    Envelope rddEnvelope = rddList.get(0);
+    assertEquals("TestController.test", telemetry.rdd1.getName());
+    assertTrue(telemetry.rdd1.getProperties().isEmpty());
+    assertTrue(telemetry.rdd1.getSuccess());
 
-    RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();
-    RemoteDependencyData rdd =
-        (RemoteDependencyData) ((Data<?>) rddEnvelope.getData()).getBaseData();
-
-    assertTrue(rd.getProperties().isEmpty());
-    assertTrue(rd.getSuccess());
-
-    assertEquals("GET /AzureSdk/test", rd.getName());
-    assertTrue(rd.getProperties().isEmpty());
-    assertTrue(rd.getSuccess());
-
-    assertEquals("TestController.test", rdd.getName());
-    assertTrue(rdd.getProperties().isEmpty());
-    assertTrue(rdd.getSuccess());
-
-    assertParentChild(rd.getId(), rdEnvelope, rddEnvelope);
-  }
-
-  private static void assertParentChild(
-      String parentId, Envelope parentEnvelope, Envelope childEnvelope) {
-    String operationId = parentEnvelope.getTags().get("ai.operation.id");
-
-    assertNotNull(operationId);
-
-    assertEquals(operationId, childEnvelope.getTags().get("ai.operation.id"));
-    assertEquals(parentId, childEnvelope.getTags().get("ai.operation.parentId"));
+    assertParentChild(
+        telemetry.rd, telemetry.rdEnvelope, telemetry.rddEnvelope1, "GET /AzureSdk/test");
   }
 }

test/smoke/testApps/AzureSdk/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/AzureSdkTest.java

@@ -22,14 +22,10 @@
 package com.microsoft.applicationinsights.smoketest;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import com.microsoft.applicationinsights.smoketest.schemav2.Data;
 import com.microsoft.applicationinsights.smoketest.schemav2.Envelope;
 import com.microsoft.applicationinsights.smoketest.schemav2.RemoteDependencyData;
-import com.microsoft.applicationinsights.smoketest.schemav2.RequestData;
-import java.util.List;
 import org.junit.Test;
 
 @UseAgent("azuresdk")
@@ -38,56 +34,33 @@ public class AzureSdkTest extends AiSmokeTest {
   @Test
   @TargetUri("/test")
   public void test() throws Exception {
-    List<Envelope> rdList = mockedIngestion.waitForItems("RequestData", 1);
+    Telemetry telemetry = getTelemetry(2);
 
-    Envelope rdEnvelope = rdList.get(0);
-    String operationId = rdEnvelope.getTags().get("ai.operation.id");
-    List<Envelope> rddList =
-        mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 2, operationId);
-    assertEquals(0, mockedIngestion.getCountForType("EventData"));
+    if (!telemetry.rdd1.getName().equals("TestController.test")) {
+      RemoteDependencyData rddTemp = telemetry.rdd1;
+      telemetry.rdd1 = telemetry.rdd2;
+      telemetry.rdd2 = rddTemp;
 
-    Envelope rddEnvelope1 = rddList.get(0);
-    Envelope rddEnvelope2 = rddList.get(1);
-
-    RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();
-    RemoteDependencyData rdd1 =
-        (RemoteDependencyData) ((Data<?>) rddEnvelope1.getData()).getBaseData();
-    RemoteDependencyData rdd2 =
-        (RemoteDependencyData) ((Data<?>) rddEnvelope2.getData()).getBaseData();
-
-    if (!rdd1.getName().equals("TestController.test")) {
-      RemoteDependencyData rddTemp = rdd1;
-      rdd1 = rdd2;
-      rdd2 = rddTemp;
-
-      Envelope rddEnvelopeTemp = rddEnvelope1;
-      rddEnvelope1 = rddEnvelope2;
-      rddEnvelope2 = rddEnvelopeTemp;
+      Envelope rddEnvelopeTemp = telemetry.rddEnvelope1;
+      telemetry.rddEnvelope1 = telemetry.rddEnvelope2;
+      telemetry.rddEnvelope2 = rddEnvelopeTemp;
     }
 
-    assertEquals("GET /AzureSdk/test", rd.getName());
-    assertTrue(rd.getProperties().isEmpty());
-    assertTrue(rd.getSuccess());
-
-    assertEquals("TestController.test", rdd1.getName());
-    assertTrue(rdd1.getProperties().isEmpty());
-    assertTrue(rdd1.getSuccess());
-
-    assertEquals("hello", rdd2.getName());
-    assertTrue(rdd2.getProperties().isEmpty());
-    assertTrue(rdd2.getSuccess());
-
-    assertParentChild(rd.getId(), rdEnvelope, rddEnvelope1);
-    assertParentChild(rdd1.getId(), rddEnvelope1, rddEnvelope2);
-  }
+    assertEquals("GET /AzureSdk/test", telemetry.rd.getName());
+    assertTrue(telemetry.rd.getProperties().isEmpty());
+    assertTrue(telemetry.rd.getSuccess());
 
-  private static void assertParentChild(
-      String parentId, Envelope parentEnvelope, Envelope childEnvelope) {
-    String operationId = parentEnvelope.getTags().get("ai.operation.id");
+    assertEquals("TestController.test", telemetry.rdd1.getName());
+    assertTrue(telemetry.rdd1.getProperties().isEmpty());
+    assertTrue(telemetry.rdd1.getSuccess());
 
-    assertNotNull(operationId);
+    assertEquals("hello", telemetry.rdd2.getName());
+    assertTrue(telemetry.rdd2.getProperties().isEmpty());
+    assertTrue(telemetry.rdd2.getSuccess());
 
-    assertEquals(operationId, childEnvelope.getTags().get("ai.operation.id"));
-    assertEquals(parentId, childEnvelope.getTags().get("ai.operation.parentId"));
+    assertParentChild(
+        telemetry.rd, telemetry.rdEnvelope, telemetry.rddEnvelope1, "GET /AzureSdk/test");
+    assertParentChild(
+        telemetry.rdd1, telemetry.rddEnvelope1, telemetry.rddEnvelope2, "GET /AzureSdk/test");
   }
 }

test/smoke/testApps/Cassandra/src/smokeTest/java/com/microsoft/applicationinsights/smoketestapp/CassandraDisabledTest.java

@@ -29,10 +29,6 @@
 import com.microsoft.applicationinsights.smoketest.TargetUri;
 import com.microsoft.applicationinsights.smoketest.UseAgent;
 import com.microsoft.applicationinsights.smoketest.WithDependencyContainers;
-import com.microsoft.applicationinsights.smoketest.schemav2.Data;
-import com.microsoft.applicationinsights.smoketest.schemav2.Envelope;
-import com.microsoft.applicationinsights.smoketest.schemav2.RequestData;
-import java.util.List;
 import org.junit.Test;
 
 @UseAgent("disabled_cassandra")
@@ -46,14 +42,12 @@ public class CassandraDisabledTest extends AiSmokeTest {
   @Test
   @TargetUri("/cassandra")
   public void cassandra() throws Exception {
-    List<Envelope> rdList = mockedIngestion.waitForItems("RequestData", 1);
-    Envelope rdEnvelope = rdList.get(0);
-    RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();
+    Telemetry telemetry = getTelemetry(0);
 
-    assertEquals("GET /Cassandra/*", rd.getName());
-    assertEquals("200", rd.getResponseCode());
-    assertTrue(rd.getProperties().isEmpty());
-    assertTrue(rd.getSuccess());
+    assertEquals("GET /Cassandra/*", telemetry.rd.getName());
+    assertEquals("200", telemetry.rd.getResponseCode());
+    assertTrue(telemetry.rd.getProperties().isEmpty());
+    assertTrue(telemetry.rd.getSuccess());
 
     // sleep a bit and make sure no cassandra dependencies are reported
     Thread.sleep(5000);