More smoke test cleanup (#1864)

trask · web-flow · commit 3e023393d258 · 2021-08-25T18:33:27.000-07:00
* More smoke test cleanup

* Fix

* Fix variable port assignment

* Fix
diff --git a/test/smoke/testApps/AzureSdk/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/AzureSdkDisabledTest.java b/test/smoke/testApps/AzureSdk/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/AzureSdkDisabledTest.java
@@ -35,11 +35,9 @@ public void test() throws Exception {
     Telemetry telemetry = getTelemetry(1);
 
     assertEquals("GET /AzureSdk/test", telemetry.rd.getName());
-    assertTrue(telemetry.rd.getProperties().isEmpty());
     assertTrue(telemetry.rd.getSuccess());
 
     assertEquals("TestController.test", telemetry.rdd1.getName());
-    assertTrue(telemetry.rdd1.getProperties().isEmpty());
     assertTrue(telemetry.rdd1.getSuccess());
 
     assertParentChild(
diff --git a/test/smoke/testApps/AzureSdk/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/AzureSdkTest.java b/test/smoke/testApps/AzureSdk/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/AzureSdkTest.java
@@ -22,6 +22,7 @@
 package com.microsoft.applicationinsights.smoketest;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import com.microsoft.applicationinsights.smoketest.schemav2.Envelope;
@@ -47,14 +48,21 @@ public void test() throws Exception {
     }
 
     assertEquals("GET /AzureSdk/test", telemetry.rd.getName());
-    assertTrue(telemetry.rd.getProperties().isEmpty());
+    assertTrue(telemetry.rd.getUrl().matches("http://localhost:[0-9]+/AzureSdk/test"));
+    assertEquals("200", telemetry.rd.getResponseCode());
     assertTrue(telemetry.rd.getSuccess());
+    assertNull(telemetry.rd.getSource());
+    assertTrue(telemetry.rd.getProperties().isEmpty());
+    assertTrue(telemetry.rd.getMeasurements().isEmpty());
 
     assertEquals("TestController.test", telemetry.rdd1.getName());
+    assertEquals("InProc", telemetry.rdd1.getType());
+    assertNull(telemetry.rdd1.getTarget());
     assertTrue(telemetry.rdd1.getProperties().isEmpty());
     assertTrue(telemetry.rdd1.getSuccess());
 
     assertEquals("hello", telemetry.rdd2.getName());
+    assertEquals("InProc", telemetry.rdd2.getType());
     assertTrue(telemetry.rdd2.getProperties().isEmpty());
     assertTrue(telemetry.rdd2.getSuccess());
 
diff --git a/test/smoke/testApps/Cassandra/src/smokeTest/java/com/microsoft/applicationinsights/smoketestapp/CassandraDisabledTest.java b/test/smoke/testApps/Cassandra/src/smokeTest/java/com/microsoft/applicationinsights/smoketestapp/CassandraDisabledTest.java
@@ -45,8 +45,6 @@ public void cassandra() throws Exception {
     Telemetry telemetry = getTelemetry(0);
 
     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
diff --git a/test/smoke/testApps/Cassandra/src/smokeTest/java/com/microsoft/applicationinsights/smoketestapp/CassandraTest.java b/test/smoke/testApps/Cassandra/src/smokeTest/java/com/microsoft/applicationinsights/smoketestapp/CassandraTest.java
@@ -22,6 +22,7 @@
 package com.microsoft.applicationinsights.smoketestapp;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import com.microsoft.applicationinsights.smoketest.AiSmokeTest;
@@ -45,9 +46,12 @@ public void cassandra() throws Exception {
     Telemetry telemetry = getTelemetry(1);
 
     assertEquals("GET /Cassandra/*", telemetry.rd.getName());
+    assertTrue(telemetry.rd.getUrl().matches("http://localhost:[0-9]+/Cassandra/cassandra"));
     assertEquals("200", telemetry.rd.getResponseCode());
-    assertTrue(telemetry.rd.getProperties().isEmpty());
     assertTrue(telemetry.rd.getSuccess());
+    assertNull(telemetry.rd.getSource());
+    assertTrue(telemetry.rd.getProperties().isEmpty());
+    assertTrue(telemetry.rd.getMeasurements().isEmpty());
 
     assertEquals("SELECT test.test", telemetry.rdd1.getName());
     assertEquals("cassandra", telemetry.rdd1.getType());
diff --git a/test/smoke/testApps/Jdbc/src/smokeTest/java/com/microsoft/applicationinsights/smoketestapp/JdbcDisabledTest.java b/test/smoke/testApps/Jdbc/src/smokeTest/java/com/microsoft/applicationinsights/smoketestapp/JdbcDisabledTest.java
@@ -38,8 +38,6 @@ public void hsqldbPreparedStatement() throws Exception {
     Telemetry telemetry = getTelemetry(0);
 
     assertEquals("GET /Jdbc/*", telemetry.rd.getName());
-    assertEquals("200", telemetry.rd.getResponseCode());
-    assertTrue(telemetry.rd.getProperties().isEmpty());
     assertTrue(telemetry.rd.getSuccess());
 
     // sleep a bit and make sure no jdbc dependencies are reported
diff --git a/test/smoke/testApps/Jedis/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JedisDisabledTest.java b/test/smoke/testApps/Jedis/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JedisDisabledTest.java
@@ -36,8 +36,6 @@ public void jedis() throws Exception {
     Telemetry telemetry = getTelemetry(0);
 
     assertEquals("GET /Jedis/*", telemetry.rd.getName());
-    assertEquals("200", telemetry.rd.getResponseCode());
-    assertTrue(telemetry.rd.getProperties().isEmpty());
     assertTrue(telemetry.rd.getSuccess());
 
     // sleep a bit and make sure no jedis dependencies are reported
diff --git a/test/smoke/testApps/Jedis/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JedisTest.java b/test/smoke/testApps/Jedis/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JedisTest.java
@@ -22,6 +22,7 @@
 package com.microsoft.applicationinsights.smoketest;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
@@ -36,9 +37,12 @@ public void jedis() throws Exception {
     Telemetry telemetry = getTelemetry(1);
 
     assertEquals("GET /Jedis/*", telemetry.rd.getName());
+    assertTrue(telemetry.rd.getUrl().matches("http://localhost:[0-9]+/Jedis/jedis"));
     assertEquals("200", telemetry.rd.getResponseCode());
-    assertTrue(telemetry.rd.getProperties().isEmpty());
     assertTrue(telemetry.rd.getSuccess());
+    assertNull(telemetry.rd.getSource());
+    assertTrue(telemetry.rd.getProperties().isEmpty());
+    assertTrue(telemetry.rd.getMeasurements().isEmpty());
 
     assertEquals("GET", telemetry.rdd1.getName());
     assertEquals("redis", telemetry.rdd1.getType());
diff --git a/test/smoke/testApps/JettyNativeHandler/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JettyNativeHandlerTest.java b/test/smoke/testApps/JettyNativeHandler/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JettyNativeHandlerTest.java
@@ -22,6 +22,7 @@
 package com.microsoft.applicationinsights.smoketest;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
@@ -35,8 +36,11 @@ public void doSimpleTest() throws Exception {
     Telemetry telemetry = getTelemetry(0);
 
     assertEquals("HTTP GET", telemetry.rd.getName());
+    assertTrue(telemetry.rd.getUrl().matches("http://localhost:[0-9]+/path"));
     assertEquals("200", telemetry.rd.getResponseCode());
-    assertTrue(telemetry.rd.getProperties().isEmpty());
     assertTrue(telemetry.rd.getSuccess());
+    assertNull(telemetry.rd.getSource());
+    assertTrue(telemetry.rd.getProperties().isEmpty());
+    assertTrue(telemetry.rd.getMeasurements().isEmpty());
   }
 }
diff --git a/test/smoke/testApps/Lettuce/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/LettuceDisabledTest.java b/test/smoke/testApps/Lettuce/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/LettuceDisabledTest.java
@@ -36,8 +36,6 @@ public void lettuce() throws Exception {
     Telemetry telemetry = getTelemetry(0);
 
     assertEquals("GET /Lettuce/*", telemetry.rd.getName());
-    assertEquals("200", telemetry.rd.getResponseCode());
-    assertTrue(telemetry.rd.getProperties().isEmpty());
     assertTrue(telemetry.rd.getSuccess());
 
     // sleep a bit and make sure no lettuce dependencies are reported
diff --git a/test/smoke/testApps/Lettuce/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/LettuceTest.java b/test/smoke/testApps/Lettuce/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/LettuceTest.java
@@ -22,6 +22,7 @@
 package com.microsoft.applicationinsights.smoketest;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
@@ -36,9 +37,12 @@ public void lettuce() throws Exception {
     Telemetry telemetry = getTelemetry(1);
 
     assertEquals("GET /Lettuce/*", telemetry.rd.getName());
+    assertTrue(telemetry.rd.getUrl().matches("http://localhost:[0-9]+/Lettuce/lettuce"));
     assertEquals("200", telemetry.rd.getResponseCode());
-    assertTrue(telemetry.rd.getProperties().isEmpty());
     assertTrue(telemetry.rd.getSuccess());
+    assertNull(telemetry.rd.getSource());
+    assertTrue(telemetry.rd.getProperties().isEmpty());
+    assertTrue(telemetry.rd.getMeasurements().isEmpty());
 
     assertEquals("GET", telemetry.rdd1.getName());
     assertEquals("redis", telemetry.rdd1.getType());
diff --git a/test/smoke/testApps/Micrometer/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MicrometerDisabledTest.java b/test/smoke/testApps/Micrometer/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MicrometerDisabledTest.java
@@ -35,8 +35,6 @@ public void doMostBasicTest() throws Exception {
     Telemetry telemetry = getTelemetry(0);
 
     assertEquals("GET /test", telemetry.rd.getName());
-    assertEquals("200", telemetry.rd.getResponseCode());
-    assertTrue(telemetry.rd.getProperties().isEmpty());
     assertTrue(telemetry.rd.getSuccess());
 
     // sleep a bit and make sure no micrometer metrics are reported
diff --git a/test/smoke/testApps/Micrometer/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MicrometerTest.java b/test/smoke/testApps/Micrometer/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MicrometerTest.java
@@ -43,9 +43,12 @@ public void doMostBasicTest() throws Exception {
     Telemetry telemetry = getTelemetry(0);
 
     assertEquals("GET /test", telemetry.rd.getName());
+    assertTrue(telemetry.rd.getUrl().matches("http://localhost:[0-9]+/test"));
     assertEquals("200", telemetry.rd.getResponseCode());
-    assertTrue(telemetry.rd.getProperties().isEmpty());
     assertTrue(telemetry.rd.getSuccess());
+    assertNull(telemetry.rd.getSource());
+    assertTrue(telemetry.rd.getProperties().isEmpty());
+    assertTrue(telemetry.rd.getMeasurements().isEmpty());
 
     // sleep a bit and make sure that the excluded metric is not reported
     Thread.sleep(10000);
diff --git a/test/smoke/testApps/MongoDB/src/smokeTest/java/com/microsoft/applicationinsights/smoketestapp/MongoDisabledTest.java b/test/smoke/testApps/MongoDB/src/smokeTest/java/com/microsoft/applicationinsights/smoketestapp/MongoDisabledTest.java
@@ -45,8 +45,6 @@ public void mongo() throws Exception {
     Telemetry telemetry = getTelemetry(0);
 
     assertEquals("GET /MongoDB/*", telemetry.rd.getName());
-    assertEquals("200", telemetry.rd.getResponseCode());
-    assertTrue(telemetry.rd.getProperties().isEmpty());
     assertTrue(telemetry.rd.getSuccess());
 
     // sleep a bit and make sure no mongo dependencies are reported
diff --git a/test/smoke/testApps/MongoDB/src/smokeTest/java/com/microsoft/applicationinsights/smoketestapp/MongoTest.java b/test/smoke/testApps/MongoDB/src/smokeTest/java/com/microsoft/applicationinsights/smoketestapp/MongoTest.java
@@ -22,6 +22,7 @@
 package com.microsoft.applicationinsights.smoketestapp;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import com.microsoft.applicationinsights.smoketest.AiSmokeTest;
@@ -45,9 +46,12 @@ public void mongo() throws Exception {
     Telemetry telemetry = getTelemetry(1);
 
     assertEquals("GET /MongoDB/*", telemetry.rd.getName());
+    assertTrue(telemetry.rd.getUrl().matches("http://localhost:[0-9]+/MongoDB/mongo"));
     assertEquals("200", telemetry.rd.getResponseCode());
-    assertTrue(telemetry.rd.getProperties().isEmpty());
     assertTrue(telemetry.rd.getSuccess());
+    assertNull(telemetry.rd.getSource());
+    assertTrue(telemetry.rd.getProperties().isEmpty());
+    assertTrue(telemetry.rd.getMeasurements().isEmpty());
 
     assertEquals("find testdb.test", telemetry.rdd1.getName());
     assertEquals("mongodb", telemetry.rdd1.getType());
diff --git a/test/smoke/testApps/OpenTelemetryApiSupport/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiSupportDisabledTest.java b/test/smoke/testApps/OpenTelemetryApiSupport/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiSupportDisabledTest.java
@@ -22,6 +22,7 @@
 package com.microsoft.applicationinsights.smoketest;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
@@ -35,11 +36,9 @@ public void testApi() throws Exception {
     Telemetry telemetry = getTelemetry(1);
 
     assertEquals("GET /OpenTelemetryApiSupport/test-api", telemetry.rd.getName());
-    assertTrue(telemetry.rd.getProperties().isEmpty());
     assertTrue(telemetry.rd.getSuccess());
 
     assertEquals("TestController.testApi", telemetry.rdd1.getName());
-    assertTrue(telemetry.rdd1.getProperties().isEmpty());
     assertTrue(telemetry.rdd1.getSuccess());
 
     assertParentChild(
diff --git a/test/smoke/testApps/OpenTelemetryApiSupport/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiSupportTest.java b/test/smoke/testApps/OpenTelemetryApiSupport/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiSupportTest.java
@@ -22,6 +22,7 @@
 package com.microsoft.applicationinsights.smoketest;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import com.microsoft.applicationinsights.smoketest.schemav2.Envelope;
@@ -37,8 +38,12 @@ public void testApi() throws Exception {
     Telemetry telemetry = getTelemetry(1);
 
     assertEquals("GET /OpenTelemetryApiSupport/test-api", telemetry.rd.getName());
-    assertTrue(telemetry.rd.getProperties().isEmpty());
+    assertTrue(telemetry.rd.getUrl().matches("http://localhost:[0-9]+/OpenTelemetryApiSupport/test-api"));
+    assertEquals("200", telemetry.rd.getResponseCode());
     assertTrue(telemetry.rd.getSuccess());
+    assertNull(telemetry.rd.getSource());
+    assertTrue(telemetry.rd.getProperties().isEmpty());
+    assertTrue(telemetry.rd.getMeasurements().isEmpty());
 
     assertEquals("myspanname", telemetry.rdd1.getName());
 
@@ -72,8 +77,12 @@ public void testOverridingIkeyEtc() throws Exception {
     Telemetry telemetry = getTelemetry(1);
 
     assertEquals("GET /OpenTelemetryApiSupport/test-overriding-ikey-etc", telemetry.rd.getName());
-    assertTrue(telemetry.rd.getProperties().isEmpty());
+    assertTrue(telemetry.rd.getUrl().matches("http://localhost:[0-9]+/OpenTelemetryApiSupport/test-overriding-ikey-etc"));
+    assertEquals("200", telemetry.rd.getResponseCode());
     assertTrue(telemetry.rd.getSuccess());
+    assertNull(telemetry.rd.getSource());
+    assertTrue(telemetry.rd.getProperties().isEmpty());
+    assertTrue(telemetry.rd.getMeasurements().isEmpty());
 
     // ideally want the properties below on rd, but can't get SERVER span yet, see
     // https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/1726#issuecomment-731890267
@@ -114,8 +123,12 @@ public void testAnnotations() throws Exception {
     }
 
     assertEquals("GET /OpenTelemetryApiSupport/test-annotations", telemetry.rd.getName());
-    assertTrue(telemetry.rd.getProperties().isEmpty());
+    assertTrue(telemetry.rd.getUrl().matches("http://localhost:[0-9]+/OpenTelemetryApiSupport/test-annotations"));
+    assertEquals("200", telemetry.rd.getResponseCode());
     assertTrue(telemetry.rd.getSuccess());
+    assertNull(telemetry.rd.getSource());
+    assertTrue(telemetry.rd.getProperties().isEmpty());
+    assertTrue(telemetry.rd.getMeasurements().isEmpty());
 
     assertEquals("TestController.testAnnotations", telemetry.rdd1.getName());
     assertTrue(telemetry.rdd1.getProperties().isEmpty());
diff --git a/test/smoke/testApps/SpringBootAttachInMain/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootAttachInMainTest.java b/test/smoke/testApps/SpringBootAttachInMain/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootAttachInMainTest.java
@@ -22,6 +22,7 @@
 package com.microsoft.applicationinsights.smoketest;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
@@ -34,8 +35,11 @@ public void doMostBasicTest() throws Exception {
     Telemetry telemetry = getTelemetry(0);
 
     assertEquals("GET /test", telemetry.rd.getName());
+    assertTrue(telemetry.rd.getUrl().matches("http://localhost:[0-9]+/test"));
     assertEquals("200", telemetry.rd.getResponseCode());
-    assertTrue(telemetry.rd.getProperties().isEmpty());
     assertTrue(telemetry.rd.getSuccess());
+    assertNull(telemetry.rd.getSource());
+    assertTrue(telemetry.rd.getProperties().isEmpty());
+    assertTrue(telemetry.rd.getMeasurements().isEmpty());
   }
 }
diff --git a/test/smoke/testApps/SpringBootAuto/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootAutoTest.java b/test/smoke/testApps/SpringBootAuto/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootAutoTest.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 org.junit.Test;
@@ -41,8 +42,11 @@ public void doMostBasicTest() throws Exception {
     assertNotNull(telemetry.rdEnvelope.getTags().get("ai.location.ip"));
 
     assertEquals("GET /SpringBootAuto/test", telemetry.rd.getName());
+    assertTrue(telemetry.rd.getUrl().matches("http://localhost:[0-9]+/SpringBootAuto/test"));
     assertEquals("200", telemetry.rd.getResponseCode());
-    assertTrue(telemetry.rd.getProperties().isEmpty());
     assertTrue(telemetry.rd.getSuccess());
+    assertNull(telemetry.rd.getSource());
+    assertTrue(telemetry.rd.getProperties().isEmpty());
+    assertTrue(telemetry.rd.getMeasurements().isEmpty());
   }
 }
diff --git a/test/smoke/testApps/SpringScheduling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringSchedulingDisabledTest.java b/test/smoke/testApps/SpringScheduling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringSchedulingDisabledTest.java
@@ -22,6 +22,7 @@
 package com.microsoft.applicationinsights.smoketest;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
@@ -35,8 +36,6 @@ public void fixedRateSchedulerTest() throws Exception {
     Telemetry telemetry = getTelemetry(0);
 
     assertEquals("GET /SpringScheduling/scheduler", telemetry.rd.getName());
-    assertEquals("200", telemetry.rd.getResponseCode());
-    assertTrue(telemetry.rd.getProperties().isEmpty());
     assertTrue(telemetry.rd.getSuccess());
 
     // sleep a bit and make sure no spring scheduling "requests" are reported
diff --git a/test/smoke/testApps/WebFlux/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/WebFluxTest.java b/test/smoke/testApps/WebFlux/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/WebFluxTest.java
@@ -23,6 +23,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
@@ -36,9 +37,12 @@ public void doMostBasicTest() throws Exception {
     Telemetry telemetry = getTelemetry(1);
 
     assertEquals("GET /test/**", telemetry.rd.getName());
+    assertTrue(telemetry.rd.getUrl().matches("http://localhost:[0-9]+/test"));
     assertEquals("200", telemetry.rd.getResponseCode());
-    assertTrue(telemetry.rd.getProperties().isEmpty());
     assertTrue(telemetry.rd.getSuccess());
+    assertNull(telemetry.rd.getSource());
+    assertTrue(telemetry.rd.getProperties().isEmpty());
+    assertTrue(telemetry.rd.getMeasurements().isEmpty());
 
     // TODO (trask): assert on rdd1
   }
@@ -49,9 +53,12 @@ public void testException() throws Exception {
     Telemetry telemetry = getTelemetry(1);
 
     assertEquals("GET /exception", telemetry.rd.getName());
+    assertTrue(telemetry.rd.getUrl().matches("http://localhost:[0-9]+/exception"));
     assertEquals("500", telemetry.rd.getResponseCode());
-    assertTrue(telemetry.rd.getProperties().isEmpty());
     assertFalse(telemetry.rd.getSuccess());
+    assertNull(telemetry.rd.getSource());
+    assertTrue(telemetry.rd.getProperties().isEmpty());
+    assertTrue(telemetry.rd.getMeasurements().isEmpty());
 
     // TODO (trask): assert on rdd1
   }
@@ -62,9 +69,12 @@ public void testFutureException() throws Exception {
     Telemetry telemetry = getTelemetry(1);
 
     assertEquals("GET /futureException", telemetry.rd.getName());
+    assertTrue(telemetry.rd.getUrl().matches("http://localhost:[0-9]+/futureException"));
     assertEquals("500", telemetry.rd.getResponseCode());
-    assertTrue(telemetry.rd.getProperties().isEmpty());
     assertFalse(telemetry.rd.getSuccess());
+    assertNull(telemetry.rd.getSource());
+    assertTrue(telemetry.rd.getProperties().isEmpty());
+    assertTrue(telemetry.rd.getMeasurements().isEmpty());
 
     // TODO (trask): assert on rdd1
   }
