From dbc556e188fca938ae2862b0d4e1f57a875833f0 Mon Sep 17 00:00:00 2001 From: Tobias Stadler Date: Mon, 21 Feb 2022 09:56:58 +0100 Subject: [PATCH] Added assertions for span counts to compression tests --- .../AbstractCompressionStrategyTest.java | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/AbstractCompressionStrategyTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/AbstractCompressionStrategyTest.java index e81b956d7c..736087eeee 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/AbstractCompressionStrategyTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/AbstractCompressionStrategyTest.java @@ -108,6 +108,10 @@ void testCompositeSpanIsCreated() { assertCompositeSpan(reportedSpans.get(0), 4); assertThat(reportedSpans.get(0).getComposite().getSum()).isEqualTo(1234 + (3456 - 2345) + (4567 - 3456) + (4556 - 3467)); assertThat(reportedSpans.get(0).getDuration()).isEqualTo(4567); + + SpanCount spanCount = reporter.getFirstTransaction().getSpanCount(); + assertThat(spanCount.getReported().get()).isEqualTo(1); + assertThat(spanCount.getDropped().get()).isEqualTo(3); } @Test @@ -121,6 +125,10 @@ void testUnknownOutcomeStopsRegularCompression() { assertThat(reportedSpans).hasSize(2); assertThat(reportedSpans.get(0).isComposite()).isFalse(); assertThat(reportedSpans.get(1).isComposite()).isFalse(); + + SpanCount spanCount = reporter.getFirstTransaction().getSpanCount(); + assertThat(spanCount.getReported().get()).isEqualTo(2); + assertThat(spanCount.getDropped().get()).isEqualTo(0); } @Test @@ -135,6 +143,10 @@ void testUnknownOutcomeStopsCompositeCompression() { assertThat(reportedSpans).hasSize(2); assertCompositeSpan(reportedSpans.get(0), 2); assertThat(reportedSpans.get(1).isComposite()).isFalse(); + + SpanCount spanCount = reporter.getFirstTransaction().getSpanCount(); + assertThat(spanCount.getReported().get()).isEqualTo(2); + assertThat(spanCount.getDropped().get()).isEqualTo(1); } @Test @@ -148,6 +160,10 @@ void testFailedOutcomeStopsRegularCompression() { assertThat(reportedSpans).hasSize(2); assertThat(reportedSpans.get(0).isComposite()).isFalse(); assertThat(reportedSpans.get(1).isComposite()).isFalse(); + + SpanCount spanCount = reporter.getFirstTransaction().getSpanCount(); + assertThat(spanCount.getReported().get()).isEqualTo(2); + assertThat(spanCount.getDropped().get()).isEqualTo(0); } @Test @@ -162,6 +178,10 @@ void testFailedOutcomeStopsCompositeCompression() { assertThat(reportedSpans).hasSize(2); assertCompositeSpan(reportedSpans.get(0), 2); assertThat(reportedSpans.get(1).isComposite()).isFalse(); + + SpanCount spanCount = reporter.getFirstTransaction().getSpanCount(); + assertThat(spanCount.getReported().get()).isEqualTo(2); + assertThat(spanCount.getDropped().get()).isEqualTo(1); } @Test @@ -179,6 +199,10 @@ void testContextPropagationStopsRegularCompression() { assertThat(reportedSpans).hasSize(2); assertThat(reportedSpans.get(0).isComposite()).isFalse(); assertThat(reportedSpans.get(1).isComposite()).isFalse(); + + SpanCount spanCount = reporter.getFirstTransaction().getSpanCount(); + assertThat(spanCount.getReported().get()).isEqualTo(2); + assertThat(spanCount.getDropped().get()).isEqualTo(0); } @Test @@ -197,6 +221,10 @@ void testContextPropagationStopsCompositeCompression() { assertThat(reportedSpans).hasSize(2); assertCompositeSpan(reportedSpans.get(0), 2); assertThat(reportedSpans.get(1).isComposite()).isFalse(); + + SpanCount spanCount = reporter.getFirstTransaction().getSpanCount(); + assertThat(spanCount.getReported().get()).isEqualTo(2); + assertThat(spanCount.getDropped().get()).isEqualTo(1); } @Test @@ -210,6 +238,10 @@ void testNonExitSpanStopsRegularCompression() { assertThat(reportedSpans).hasSize(2); assertThat(reportedSpans.get(0).isComposite()).isFalse(); assertThat(reportedSpans.get(1).isComposite()).isFalse(); + + SpanCount spanCount = reporter.getFirstTransaction().getSpanCount(); + assertThat(spanCount.getReported().get()).isEqualTo(2); + assertThat(spanCount.getDropped().get()).isEqualTo(0); } @Test @@ -224,6 +256,10 @@ void testNonExitSpanStopsCompositeCompression() { assertThat(reportedSpans).hasSize(2); assertCompositeSpan(reportedSpans.get(0), 2); assertThat(reportedSpans.get(1).isComposite()).isFalse(); + + SpanCount spanCount = reporter.getFirstTransaction().getSpanCount(); + assertThat(spanCount.getReported().get()).isEqualTo(2); + assertThat(spanCount.getDropped().get()).isEqualTo(1); } @Test @@ -237,6 +273,10 @@ void testDifferentTypeStopsRegularCompression() { assertThat(reportedSpans).hasSize(2); assertThat(reportedSpans.get(0).isComposite()).isFalse(); assertThat(reportedSpans.get(1).isComposite()).isFalse(); + + SpanCount spanCount = reporter.getFirstTransaction().getSpanCount(); + assertThat(spanCount.getReported().get()).isEqualTo(2); + assertThat(spanCount.getDropped().get()).isEqualTo(0); } @Test @@ -251,6 +291,10 @@ void testDifferentTypeStopsCompositeCompression() { assertThat(reportedSpans).hasSize(2); assertCompositeSpan(reportedSpans.get(0), 2); assertThat(reportedSpans.get(1).isComposite()).isFalse(); + + SpanCount spanCount = reporter.getFirstTransaction().getSpanCount(); + assertThat(spanCount.getReported().get()).isEqualTo(2); + assertThat(spanCount.getDropped().get()).isEqualTo(1); } @Test @@ -264,6 +308,10 @@ void testDifferentSubtypeStopsRegularCompression() { assertThat(reportedSpans).hasSize(2); assertThat(reportedSpans.get(0).isComposite()).isFalse(); assertThat(reportedSpans.get(1).isComposite()).isFalse(); + + SpanCount spanCount = reporter.getFirstTransaction().getSpanCount(); + assertThat(spanCount.getReported().get()).isEqualTo(2); + assertThat(spanCount.getDropped().get()).isEqualTo(0); } @Test @@ -278,6 +326,10 @@ void testDifferentSubtypeStopsCompositeCompression() { assertThat(reportedSpans).hasSize(2); assertCompositeSpan(reportedSpans.get(0), 2); assertThat(reportedSpans.get(1).isComposite()).isFalse(); + + SpanCount spanCount = reporter.getFirstTransaction().getSpanCount(); + assertThat(spanCount.getReported().get()).isEqualTo(2); + assertThat(spanCount.getDropped().get()).isEqualTo(1); } @Test @@ -297,6 +349,10 @@ void testSpanExceedingMaxDurationStopsRegularCompression() { assertThat(reportedSpans).hasSize(2); assertThat(reportedSpans.get(0).isComposite()).isFalse(); assertThat(reportedSpans.get(1).isComposite()).isFalse(); + + SpanCount spanCount = reporter.getFirstTransaction().getSpanCount(); + assertThat(spanCount.getReported().get()).isEqualTo(2); + assertThat(spanCount.getDropped().get()).isEqualTo(0); } @Test @@ -317,6 +373,10 @@ void testSpanExceedingMaxDurationStopsCompositeCompression() { assertThat(reportedSpans).hasSize(2); assertCompositeSpan(reportedSpans.get(0), 2); assertThat(reportedSpans.get(1).isComposite()).isFalse(); + + SpanCount spanCount = reporter.getFirstTransaction().getSpanCount(); + assertThat(spanCount.getReported().get()).isEqualTo(2); + assertThat(spanCount.getDropped().get()).isEqualTo(1); } @Test @@ -332,6 +392,10 @@ void testDifferentDestinationServiceResourceStopsRegularCompression() { assertThat(reportedSpans).hasSize(2); assertThat(reportedSpans.get(0).isComposite()).isFalse(); assertThat(reportedSpans.get(1).isComposite()).isFalse(); + + SpanCount spanCount = reporter.getFirstTransaction().getSpanCount(); + assertThat(spanCount.getReported().get()).isEqualTo(2); + assertThat(spanCount.getDropped().get()).isEqualTo(0); } @Test @@ -348,6 +412,10 @@ void testDifferentDestinationServiceResourceStopsCompositeCompression() { assertThat(reportedSpans).hasSize(2); assertCompositeSpan(reportedSpans.get(0), 2); assertThat(reportedSpans.get(1).isComposite()).isFalse(); + + SpanCount spanCount = reporter.getFirstTransaction().getSpanCount(); + assertThat(spanCount.getReported().get()).isEqualTo(2); + assertThat(spanCount.getDropped().get()).isEqualTo(1); } protected static void runInTransactionScope(Consumer> r) {