Skip to content

Commit

Permalink
Fix all the smoke tests
Browse files Browse the repository at this point in the history
  • Loading branch information
trask committed Mar 6, 2024
1 parent 624def0 commit 4a417bc
Show file tree
Hide file tree
Showing 30 changed files with 164 additions and 164 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ void test() throws Exception {
Envelope mdEnvelope2 = mdList.get(1);
Envelope mdEnvelope3 = mdList.get(2);

assertThat(rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(mdEnvelope1.getSampleRate()).isEqualTo(100.0f);
assertThat(mdEnvelope2.getSampleRate()).isEqualTo(100.0f);
assertThat(mdEnvelope3.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope.getSampleRate()).isNull();
assertThat(mdEnvelope1.getSampleRate()).isNull();
assertThat(mdEnvelope2.getSampleRate()).isNull();
assertThat(mdEnvelope3.getSampleRate()).isNull();

RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();

Expand Down Expand Up @@ -109,8 +109,8 @@ void testWithException() throws Exception {

Envelope edEnvelope = edList.get(0);

assertThat(rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(edEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope.getSampleRate()).isNull();
assertThat(edEnvelope.getSampleRate()).isNull();

RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();
ExceptionData ed = (ExceptionData) ((Data<?>) edEnvelope.getData()).getBaseData();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ void test() throws Exception {
Envelope mdEnvelope2 = mdList.get(1);
Envelope mdEnvelope3 = mdList.get(2);

assertThat(rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(mdEnvelope1.getSampleRate()).isEqualTo(100.0f);
assertThat(mdEnvelope2.getSampleRate()).isEqualTo(100.0f);
assertThat(mdEnvelope3.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope.getSampleRate()).isNull();
assertThat(mdEnvelope1.getSampleRate()).isNull();
assertThat(mdEnvelope2.getSampleRate()).isNull();
assertThat(mdEnvelope3.getSampleRate()).isNull();

RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();

Expand Down Expand Up @@ -101,8 +101,8 @@ void testWithException() throws Exception {

Envelope edEnvelope = edList.get(0);

assertThat(rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(edEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope.getSampleRate()).isNull();
assertThat(edEnvelope.getSampleRate()).isNull();

RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();
ExceptionData ed = (ExceptionData) ((Data<?>) edEnvelope.getData()).getBaseData();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ void test() throws Exception {
Envelope mdEnvelope1 = mdList.get(0);
Envelope mdEnvelope2 = mdList.get(1);

assertThat(rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(mdEnvelope1.getSampleRate()).isEqualTo(100.0f);
assertThat(mdEnvelope2.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope.getSampleRate()).isNull();
assertThat(mdEnvelope1.getSampleRate()).isNull();
assertThat(mdEnvelope2.getSampleRate()).isNull();

RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();

Expand Down Expand Up @@ -88,8 +88,8 @@ void testWithException() throws Exception {

Envelope edEnvelope = edList.get(0);

assertThat(rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(edEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope.getSampleRate()).isNull();
assertThat(edEnvelope.getSampleRate()).isNull();

RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();
ExceptionData ed = (ExceptionData) ((Data<?>) edEnvelope.getData()).getBaseData();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ void testTrackEvent() throws Exception {
Envelope edEnvelope1 = edList.get(0);
Envelope edEnvelope2 = edList.get(1);

assertThat(rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(edEnvelope1.getSampleRate()).isEqualTo(100.0f);
assertThat(edEnvelope2.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope.getSampleRate()).isNull();
assertThat(edEnvelope1.getSampleRate()).isNull();
assertThat(edEnvelope2.getSampleRate()).isNull();

RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();

Expand Down Expand Up @@ -110,10 +110,10 @@ void testTrackException() throws Exception {
Envelope edEnvelope2 = edList.get(1);
Envelope edEnvelope3 = edList.get(2);

assertThat(rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(edEnvelope1.getSampleRate()).isEqualTo(100.0f);
assertThat(edEnvelope2.getSampleRate()).isEqualTo(100.0f);
assertThat(edEnvelope3.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope.getSampleRate()).isNull();
assertThat(edEnvelope1.getSampleRate()).isNull();
assertThat(edEnvelope2.getSampleRate()).isNull();
assertThat(edEnvelope3.getSampleRate()).isNull();

RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();

Expand Down Expand Up @@ -208,7 +208,7 @@ void trackMetric() throws Exception {
Envelope rdEnvelope = rdList.get(0);
Envelope mdEnvelope = mdList.get(0);

assertThat(rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope.getSampleRate()).isNull();
assertThat(mdEnvelope.getSampleRate()).isNull(); // metrics are never sent with sample rate

RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();
Expand Down Expand Up @@ -245,10 +245,10 @@ void testTrackTrace() throws Exception {
Envelope mdEnvelope2 = mdList.get(1);
Envelope mdEnvelope3 = mdList.get(2);

assertThat(rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(mdEnvelope1.getSampleRate()).isEqualTo(100.0f);
assertThat(mdEnvelope2.getSampleRate()).isEqualTo(100.0f);
assertThat(mdEnvelope3.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope.getSampleRate()).isNull();
assertThat(mdEnvelope1.getSampleRate()).isNull();
assertThat(mdEnvelope2.getSampleRate()).isNull();
assertThat(mdEnvelope3.getSampleRate()).isNull();

RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();

Expand Down Expand Up @@ -308,10 +308,10 @@ void testTrackPageView() throws Exception {
}
}

assertThat(rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(pvdEnvelope1.getSampleRate()).isEqualTo(100.0f);
assertThat(pvdEnvelope2.getSampleRate()).isEqualTo(100.0f);
assertThat(pvdEnvelope3.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope.getSampleRate()).isNull();
assertThat(pvdEnvelope1.getSampleRate()).isNull();
assertThat(pvdEnvelope2.getSampleRate()).isNull();
assertThat(pvdEnvelope3.getSampleRate()).isNull();

PageViewData pv1 = (PageViewData) ((Data<?>) pvdEnvelope1.getData()).getBaseData();
PageViewData pv2 = (PageViewData) ((Data<?>) pvdEnvelope2.getData()).getBaseData();
Expand Down Expand Up @@ -399,8 +399,8 @@ void testTrackPageViewJsp() throws Exception {

Envelope pvdEnvelope = pvdList.get(0);

assertThat(rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(pvdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope.getSampleRate()).isNull();
assertThat(pvdEnvelope.getSampleRate()).isNull();

RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();

Expand All @@ -419,7 +419,7 @@ void testAutoFailedRequestWithResultCode() throws Exception {

Envelope rdEnvelope = rdList.get(0);

assertThat(rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope.getSampleRate()).isNull();

RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();

Expand Down Expand Up @@ -451,8 +451,8 @@ void testAutoExceptionWithFailedRequest() throws Exception {
assertThat(edList.size()).isEqualTo(1);
Envelope edEnvelope = edList.get(0);

assertThat(rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(edEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope.getSampleRate()).isNull();
assertThat(edEnvelope.getSampleRate()).isNull();

RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();
ExceptionData ed = (ExceptionData) ((Data<?>) edEnvelope.getData()).getBaseData();
Expand Down Expand Up @@ -480,7 +480,7 @@ private void validateSlowTest(int expectedDurationSeconds, String operationName)

Envelope rdEnvelope = rdList.get(0);

assertThat(rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope.getSampleRate()).isNull();

RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ void testTrackEvent() throws Exception {
Envelope edEnvelope1 = edList.get(0);
Envelope edEnvelope2 = edList.get(1);

assertThat(rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(edEnvelope1.getSampleRate()).isEqualTo(100.0f);
assertThat(edEnvelope2.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope.getSampleRate()).isNull();
assertThat(edEnvelope1.getSampleRate()).isNull();
assertThat(edEnvelope2.getSampleRate()).isNull();

RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();

Expand Down Expand Up @@ -113,10 +113,10 @@ void testTrackException() throws Exception {
Envelope edEnvelope2 = edList.get(1);
Envelope edEnvelope3 = edList.get(2);

assertThat(rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(edEnvelope1.getSampleRate()).isEqualTo(100.0f);
assertThat(edEnvelope2.getSampleRate()).isEqualTo(100.0f);
assertThat(edEnvelope3.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope.getSampleRate()).isNull();
assertThat(edEnvelope1.getSampleRate()).isNull();
assertThat(edEnvelope2.getSampleRate()).isNull();
assertThat(edEnvelope3.getSampleRate()).isNull();

RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();

Expand Down Expand Up @@ -211,7 +211,7 @@ void trackMetric() throws Exception {
Envelope rdEnvelope = rdList.get(0);
Envelope mdEnvelope = mdList.get(0);

assertThat(rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope.getSampleRate()).isNull();
assertThat(mdEnvelope.getSampleRate()).isNull(); // metrics are never sent with sample rate

RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();
Expand Down Expand Up @@ -248,10 +248,10 @@ void testTrackTrace() throws Exception {
Envelope mdEnvelope2 = mdList.get(1);
Envelope mdEnvelope3 = mdList.get(2);

assertThat(rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(mdEnvelope1.getSampleRate()).isEqualTo(100.0f);
assertThat(mdEnvelope2.getSampleRate()).isEqualTo(100.0f);
assertThat(mdEnvelope3.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope.getSampleRate()).isNull();
assertThat(mdEnvelope1.getSampleRate()).isNull();
assertThat(mdEnvelope2.getSampleRate()).isNull();
assertThat(mdEnvelope3.getSampleRate()).isNull();

RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();

Expand Down Expand Up @@ -311,10 +311,10 @@ void testTrackPageView() throws Exception {
}
}

assertThat(rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(pvdEnvelope1.getSampleRate()).isEqualTo(100.0f);
assertThat(pvdEnvelope2.getSampleRate()).isEqualTo(100.0f);
assertThat(pvdEnvelope3.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope.getSampleRate()).isNull();
assertThat(pvdEnvelope1.getSampleRate()).isNull();
assertThat(pvdEnvelope2.getSampleRate()).isNull();
assertThat(pvdEnvelope3.getSampleRate()).isNull();

PageViewData pv1 = (PageViewData) ((Data<?>) pvdEnvelope1.getData()).getBaseData();
PageViewData pv2 = (PageViewData) ((Data<?>) pvdEnvelope2.getData()).getBaseData();
Expand Down Expand Up @@ -402,8 +402,8 @@ void testTrackPageViewJsp() throws Exception {

Envelope pvdEnvelope = pvdList.get(0);

assertThat(rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(pvdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope.getSampleRate()).isNull();
assertThat(pvdEnvelope.getSampleRate()).isNull();

RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();

Expand All @@ -427,7 +427,7 @@ void trackAvailability() throws Exception {

Envelope adEnvelope = adList.get(0);

assertThat(rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope.getSampleRate()).isNull();
assertThat(adEnvelope.getSampleRate()).isNull(); // availability is never sent with sample rate

RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();
Expand All @@ -451,7 +451,7 @@ void testAutoFailedRequestWithResultCode() throws Exception {

Envelope rdEnvelope = rdList.get(0);

assertThat(rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope.getSampleRate()).isNull();

RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();

Expand Down Expand Up @@ -484,8 +484,8 @@ void testAutoExceptionWithFailedRequest() throws Exception {

Envelope edEnvelope = edList.get(0);

assertThat(rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(edEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope.getSampleRate()).isNull();
assertThat(edEnvelope.getSampleRate()).isNull();

RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();
ExceptionData ed = (ExceptionData) ((Data<?>) edEnvelope.getData()).getBaseData();
Expand Down Expand Up @@ -513,7 +513,7 @@ private void validateSlowTest(int expectedDurationSeconds, String operationName)

Envelope rdEnvelope = rdList.get(0);

assertThat(rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope.getSampleRate()).isNull();

RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ void internalSpan() throws Exception {

Envelope mdEnvelope = mdList.get(0);

assertThat(telemetry.rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(telemetry.rddEnvelope1.getSampleRate()).isEqualTo(100.0f);
assertThat(mdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(telemetry.rdEnvelope.getSampleRate()).isNull();
assertThat(telemetry.rddEnvelope1.getSampleRate()).isNull();
assertThat(mdEnvelope.getSampleRate()).isNull();

MessageData md = (MessageData) ((Data<?>) mdEnvelope.getData()).getBaseData();

Expand Down Expand Up @@ -82,9 +82,9 @@ void serverSpan() throws Exception {

Envelope mdEnvelope = mdList.get(0);

assertThat(rdEnvelope1.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope2.getSampleRate()).isEqualTo(100.0f);
assertThat(mdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(rdEnvelope1.getSampleRate()).isNull();
assertThat(rdEnvelope2.getSampleRate()).isNull();
assertThat(mdEnvelope.getSampleRate()).isNull();

RequestData rd1 = (RequestData) ((Data<?>) rdEnvelope1.getData()).getBaseData();
RequestData rd2 = (RequestData) ((Data<?>) rdEnvelope2.getData()).getBaseData();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ private static void verify(String successUrlWithQueryString) throws Exception {
.containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
assertThat(telemetry.rd.getSuccess()).isTrue();
// TODO (trask) add this check in all smoke tests?
assertThat(telemetry.rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(telemetry.rdEnvelope.getSampleRate()).isNull();

assertThat(telemetry.rdd1.getName()).isEqualTo("GET /200");
assertThat(telemetry.rdd1.getData()).isEqualTo(successUrlWithQueryString);
Expand All @@ -93,7 +93,7 @@ private static void verify(String successUrlWithQueryString) throws Exception {
assertThat(telemetry.rdd1.getProperties())
.containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
assertThat(telemetry.rdd1.getSuccess()).isTrue();
assertThat(telemetry.rddEnvelope1.getSampleRate()).isEqualTo(100.0f);
assertThat(telemetry.rddEnvelope1.getSampleRate()).isNull();

assertThat(telemetry.rdd2.getName()).isEqualTo("GET /404");
assertThat(telemetry.rdd2.getData()).isEqualTo("https://mock.codes/404");
Expand All @@ -103,7 +103,7 @@ private static void verify(String successUrlWithQueryString) throws Exception {
assertThat(telemetry.rdd2.getProperties())
.containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
assertThat(telemetry.rdd2.getSuccess()).isFalse();
assertThat(telemetry.rddEnvelope2.getSampleRate()).isEqualTo(100.0f);
assertThat(telemetry.rddEnvelope2.getSampleRate()).isNull();

assertThat(telemetry.rdd3.getName()).isEqualTo("GET /500");
assertThat(telemetry.rdd3.getData()).isEqualTo("https://mock.codes/500");
Expand All @@ -113,7 +113,7 @@ private static void verify(String successUrlWithQueryString) throws Exception {
assertThat(telemetry.rdd3.getProperties())
.containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
assertThat(telemetry.rdd3.getSuccess()).isFalse();
assertThat(telemetry.rddEnvelope3.getSampleRate()).isEqualTo(100.0f);
assertThat(telemetry.rddEnvelope3.getSampleRate()).isNull();

SmokeTestExtension.assertParentChild(
telemetry.rd, telemetry.rdEnvelope, telemetry.rddEnvelope1, "GET /HttpClients/*");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ private static void verifyHttpclientRequestsAndDependencies(String successUrlWit
.containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
assertThat(telemetry.rdd1.getData()).isEqualTo(successUrlWithQueryString);
assertThat(telemetry.rd.getSuccess()).isTrue();
assertThat(telemetry.rdEnvelope.getSampleRate()).isEqualTo(100.0f);
assertThat(telemetry.rdEnvelope.getSampleRate()).isNull();
assertThat(telemetry.rdd1.getName()).isEqualTo("GET /200");
assertThat(telemetry.rdd1.getType()).isEqualTo("Http");
assertThat(telemetry.rdd1.getTarget()).isEqualTo("mock.codes");
assertThat(telemetry.rdd1.getResultCode()).isEqualTo("200");
assertThat(telemetry.rdd1.getProperties())
.containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
assertThat(telemetry.rdd1.getSuccess()).isTrue();
assertThat(telemetry.rddEnvelope1.getSampleRate()).isEqualTo(100.0f);
assertThat(telemetry.rddEnvelope1.getSampleRate()).isNull();

assertThat(telemetry.rdd2.getName()).isEqualTo("GET /404");
assertThat(telemetry.rdd2.getData()).isEqualTo("https://mock.codes/404");
Expand All @@ -80,7 +80,7 @@ private static void verifyHttpclientRequestsAndDependencies(String successUrlWit
assertThat(telemetry.rdd2.getProperties())
.containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
assertThat(telemetry.rdd2.getSuccess()).isFalse();
assertThat(telemetry.rddEnvelope2.getSampleRate()).isEqualTo(100.0f);
assertThat(telemetry.rddEnvelope2.getSampleRate()).isNull();

assertThat(telemetry.rdd3.getName()).isEqualTo("GET /500");
assertThat(telemetry.rdd3.getData()).isEqualTo("https://mock.codes/500");
Expand All @@ -90,7 +90,7 @@ private static void verifyHttpclientRequestsAndDependencies(String successUrlWit
assertThat(telemetry.rdd3.getProperties())
.containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
assertThat(telemetry.rdd3.getSuccess()).isFalse();
assertThat(telemetry.rddEnvelope3.getSampleRate()).isEqualTo(100.0f);
assertThat(telemetry.rddEnvelope3.getSampleRate()).isNull();

SmokeTestExtension.assertParentChild(
telemetry.rd,
Expand Down

0 comments on commit 4a417bc

Please sign in to comment.