fix outbox sender; test; cleanup api file

Author: adinauer

sentry/api/sentry.api

@@ -30,7 +30,6 @@ public abstract interface class io/sentry/BackfillingEventProcessor : io/sentry/
 }
 
 public final class io/sentry/Baggage {
-	public static final field NOOP Lio/sentry/Baggage;
 	public fun <init> (Lio/sentry/Baggage;)V
 	public fun <init> (Lio/sentry/ILogger;)V
 	public fun <init> (Ljava/util/Map;Ljava/lang/String;ZZLio/sentry/ILogger;)V
@@ -1946,7 +1945,6 @@ public final class io/sentry/ProfilingTransactionData$JsonKeys {
 }
 
 public final class io/sentry/PropagationContext {
-	public static field NOOP Lio/sentry/PropagationContext;
 	public fun <init> ()V
 	public fun <init> (Lio/sentry/PropagationContext;)V
 	public fun <init> (Lio/sentry/protocol/SentryId;Lio/sentry/SpanId;Lio/sentry/SpanId;Lio/sentry/Baggage;Ljava/lang/Boolean;)V

sentry/src/main/java/io/sentry/OutboxSender.java

@@ -244,10 +244,10 @@ private void processEnvelope(final @NotNull SentryEnvelope envelope, final @NotN
                 "Invalid sample rate parsed from TraceContext: %s",
                 sampleRateString);
           } else {
-            final @Nullable String sampleRandString = traceContext.getSampleRate();
+            final @Nullable String sampleRandString = traceContext.getSampleRand();
             if (sampleRandString != null) {
               final Double sampleRand = Double.parseDouble(sampleRandString);
-              if (!SampleRateUtils.isValidTracesSampleRate(sampleRand, false)) {
+              if (SampleRateUtils.isValidTracesSampleRate(sampleRand, false)) {
                 return new TracesSamplingDecision(true, sampleRate, sampleRand);
               }
             }

sentry/src/test/java/io/sentry/OutboxSenderTest.kt

@@ -23,6 +23,7 @@ import java.util.Date
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
+import kotlin.test.assertNotNull
 import kotlin.test.assertTrue
 
 class OutboxSenderTest {
@@ -141,6 +142,63 @@ class OutboxSenderTest {
         whenever(fixture.scopes.options).thenReturn(fixture.options)
         whenever(fixture.options.transactionProfiler).thenReturn(NoOpTransactionProfiler.getInstance())
 
+        val transactionContext = TransactionContext("fixture-name", "http")
+        transactionContext.description = "fixture-request"
+        transactionContext.status = SpanStatus.OK
+        transactionContext.setTag("fixture-tag", "fixture-value")
+        transactionContext.samplingDecision = TracesSamplingDecision(true, 0.00000021, 0.021)
+
+        val sentryTracer = SentryTracer(transactionContext, fixture.scopes)
+        val span = sentryTracer.startChild("child")
+        span.finish(SpanStatus.OK)
+        sentryTracer.finish()
+
+        val sentryTracerSpy = spy(sentryTracer)
+        whenever(sentryTracerSpy.eventId).thenReturn(SentryId("3367f5196c494acaae85bbbd535379ac"))
+
+        val expected = SentryTransaction(sentryTracerSpy)
+        whenever(fixture.serializer.deserialize(any(), eq(SentryTransaction::class.java))).thenReturn(expected)
+
+        val sut = fixture.getSut()
+        val path = getTempEnvelope(fileName = "envelope-transaction-with-sample-rand.txt")
+        assertTrue(File(path).exists())
+
+        val hints = HintUtils.createWithTypeCheckHint(mock<Retryable>())
+        sut.processEnvelopeFile(path, hints)
+
+        verify(fixture.scopes).captureTransaction(
+            check {
+                assertEquals(expected, it)
+                assertTrue(it.isSampled)
+                assertEquals(0.00000021, it.samplingDecision?.sampleRate)
+                assertEquals(0.021, it.samplingDecision?.sampleRand)
+                assertTrue(it.samplingDecision!!.sampled)
+            },
+            check {
+                assertEquals("b156a475de54423d9c1571df97ec7eb6", it.traceId.toString())
+                assertEquals("key", it.publicKey)
+                assertEquals("0.00000021", it.sampleRate)
+                assertEquals("1.0-beta.1", it.release)
+                assertEquals("prod", it.environment)
+                assertEquals("usr1", it.userId)
+                assertEquals("tx1", it.transaction)
+            },
+            any()
+        )
+        assertFalse(File(path).exists())
+
+        // Additionally make sure we have no errors logged
+        verify(fixture.logger, never()).log(eq(SentryLevel.ERROR), any(), any<Any>())
+        verify(fixture.logger, never()).log(eq(SentryLevel.ERROR), any<String>(), any())
+    }
+
+    @Test
+    fun `backfills sampleRand`() {
+        fixture.envelopeReader = EnvelopeReader(JsonSerializer(fixture.options))
+        whenever(fixture.options.maxSpans).thenReturn(1000)
+        whenever(fixture.scopes.options).thenReturn(fixture.options)
+        whenever(fixture.options.transactionProfiler).thenReturn(NoOpTransactionProfiler.getInstance())
+
         val transactionContext = TransactionContext("fixture-name", "http")
         transactionContext.description = "fixture-request"
         transactionContext.status = SpanStatus.OK
@@ -170,6 +228,7 @@ class OutboxSenderTest {
                 assertEquals(expected, it)
                 assertTrue(it.isSampled)
                 assertEquals(0.00000021, it.samplingDecision?.sampleRate)
+                assertNotNull(it.samplingDecision?.sampleRand)
                 assertTrue(it.samplingDecision!!.sampled)
             },
             check {

sentry/src/test/resources/envelope-transaction-with-sample-rand.txt

@@ -0,0 +1,3 @@
+{"event_id":"3367f5196c494acaae85bbbd535379ac","trace":{"trace_id":"b156a475de54423d9c1571df97ec7eb6","public_key":"key","release":"1.0-beta.1","environment":"prod","user_id":"usr1","transaction":"tx1","sample_rate":"0.00000021","sample_rand":"0.021"}}
+{"type":"transaction","length":640,"content_type":"application/json"}
+{"transaction":"a-transaction","type":"transaction","start_timestamp":"2020-10-23T10:24:01.791Z","timestamp":"2020-10-23T10:24:02.791Z","event_id":"3367f5196c494acaae85bbbd535379ac","contexts":{"trace":{"trace_id":"b156a475de54423d9c1571df97ec7eb6","span_id":"0a53026963414893","op":"http","status":"ok"},"custom":{"some-key":"some-value"}},"spans":[{"start_timestamp":"2021-03-05T08:51:12.838Z","timestamp":"2021-03-05T08:51:12.949Z","trace_id":"2b099185293344a5bfdd7ad89ebf9416","span_id":"5b95c29a5ded4281","parent_span_id":"a3b2d1d58b344b07","op":"PersonService.create","description":"desc","status":"aborted","tags":{"name":"value"}}]}