Added DeliveryStrategy to event delivery #2312
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| package com.bugsnag.android | ||
|
|
||
| enum class DeliveryStrategy { | ||
| STORE_ONLY, | ||
| STORE_AND_FLUSH, | ||
| STORE_AND_SEND, | ||
| SEND_IMMEDIATELY, | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,7 +34,8 @@ internal class EventInternal : FeatureFlagAware, JsonStream.Streamable, Metadata | |
| severityReason, | ||
| ThreadState(originalError, severityReason.unhandled, config).threads, | ||
| User(), | ||
| config.redactedKeys.toSet(), | ||
| config.attemptDeliveryOnCrash | ||
| ) | ||
|
|
||
| internal constructor( | ||
|
|
@@ -50,7 +51,8 @@ internal class EventInternal : FeatureFlagAware, JsonStream.Streamable, Metadata | |
| severityReason: SeverityReason = SeverityReason.newInstance(SeverityReason.REASON_HANDLED_EXCEPTION), | ||
| threads: MutableList<Thread> = mutableListOf(), | ||
| user: User = User(), | ||
| redactionKeys: Set<Pattern>? = null, | ||
| isAttemptDeliveryOnCrash: Boolean = false | ||
| ) { | ||
| this.logger = logger | ||
| this.apiKey = apiKey | ||
|
|
@@ -64,7 +66,7 @@ internal class EventInternal : FeatureFlagAware, JsonStream.Streamable, Metadata | |
| this.severityReason = severityReason | ||
| this.threads = threads | ||
| this.userImpl = user | ||
| this.isAttemptDeliveryOnCrash = isAttemptDeliveryOnCrash | ||
| redactionKeys?.let { | ||
| this.redactedKeys = it | ||
| } | ||
|
|
@@ -76,6 +78,8 @@ internal class EventInternal : FeatureFlagAware, JsonStream.Streamable, Metadata | |
| val logger: Logger | ||
| val metadata: Metadata | ||
| val featureFlags: FeatureFlags | ||
| val isAttemptDeliveryOnCrash: Boolean | ||
|
|
||
| private val discardClasses: Set<Pattern> | ||
| internal var projectPackages: Collection<String> | ||
|
|
||
|
|
@@ -123,6 +127,8 @@ internal class EventInternal : FeatureFlagAware, JsonStream.Streamable, Metadata | |
|
|
||
| var traceCorrelation: TraceCorrelation? = null | ||
|
|
||
| var deliveryStrategy: DeliveryStrategy? = null | ||
|
|
||
| fun getUnhandledOverridden(): Boolean = severityReason.unhandledOverridden | ||
|
|
||
| fun getOriginalUnhandled(): Boolean = severityReason.originalUnhandled | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,7 +42,9 @@ internal class DeliveryDelegateTest { | |
| notifier, | ||
| BackgroundTaskService() | ||
| ) | ||
| event.session = Session( | ||
| "123", Date(), User(null, null, null), false, notifier, NoopLogger, apiKey | ||
| ) | ||
| } | ||
|
|
||
| @Test | ||
|
|
@@ -63,6 +65,8 @@ internal class DeliveryDelegateTest { | |
| assertEquals(0, event.session!!.handledCount) | ||
|
|
||
| assertEquals("BUGSNAG_API_KEY", event.session!!.apiKey) | ||
|
|
||
| assertEquals(DeliveryStrategy.STORE_ONLY, event.deliveryStrategy) | ||
| } | ||
|
|
||
| @Test | ||
|
|
@@ -71,7 +75,9 @@ internal class DeliveryDelegateTest { | |
| SeverityReason.REASON_HANDLED_EXCEPTION | ||
| ) | ||
| val event = Event(RuntimeException("Whoops!"), config, state, NoopLogger) | ||
| event.session = Session( | ||
| "123", Date(), User(null, null, null), false, notifier, NoopLogger, apiKey | ||
| ) | ||
|
|
||
| var msg: StateEvent.NotifyHandled? = null | ||
| deliveryDelegate.addObserver( | ||
|
|
@@ -87,6 +93,8 @@ internal class DeliveryDelegateTest { | |
| // check session count incremented | ||
| assertEquals(0, event.session!!.unhandledCount) | ||
| assertEquals(1, event.session!!.handledCount) | ||
|
|
||
| assertEquals(DeliveryStrategy.SEND_IMMEDIATELY, event.deliveryStrategy) | ||
| } | ||
|
|
||
| @Test | ||
|
|
@@ -107,6 +115,8 @@ internal class DeliveryDelegateTest { | |
|
|
||
| // verify no payload was sent for an Event with no errors | ||
| assertNull(msg) | ||
|
|
||
| assertEquals(DeliveryStrategy.SEND_IMMEDIATELY, event.deliveryStrategy) | ||
| } | ||
|
|
||
| @Test | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| package com.bugsnag.android | ||
|
|
||
| import com.bugsnag.android.BugsnagTestUtils.generateImmutableConfig | ||
| import org.junit.Assert.assertEquals | ||
| import org.junit.Before | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
| import org.mockito.junit.MockitoJUnitRunner | ||
| import java.util.Date | ||
|
|
||
| @RunWith(MockitoJUnitRunner::class) | ||
| internal class EventDeliveryStrategyTest { | ||
YYChen01988 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| private val apiKey = "BUGSNAG_API_KEY" | ||
| private val notifier = Notifier() | ||
| private val config = generateImmutableConfig() | ||
| private var testException: RuntimeException? = null | ||
|
There was a problem hiding this comment. This could reasonably be |
||
| private val event = Event( | ||
| RuntimeException("Whoops!"), config, | ||
| SeverityReason.newInstance( | ||
| SeverityReason.REASON_UNHANDLED_EXCEPTION | ||
| ), | ||
| NoopLogger | ||
| ) | ||
|
Comment on lines
+18
to
+24
There was a problem hiding this comment. Given that this is only used in |
||
|
|
||
| @Before | ||
| fun setUp() { | ||
| testException = RuntimeException("Example message") | ||
| event.session = Session( | ||
| "123", Date(), User(null, null, null), false, notifier, NoopLogger, apiKey | ||
| ) | ||
| } | ||
|
|
||
| @Test | ||
| fun testGenerateUnhandledReport() { | ||
| assertEquals(DeliveryStrategy.STORE_ONLY, event.deliveryStrategy) | ||
| event.deliveryStrategy = DeliveryStrategy.SEND_IMMEDIATELY | ||
| assertEquals(DeliveryStrategy.SEND_IMMEDIATELY, event.deliveryStrategy) | ||
| } | ||
|
|
||
| @Test | ||
| fun testANRStoreEventAndFlush() { | ||
| val anrEvent = Event( | ||
| testException, config, | ||
| SeverityReason.newInstance(SeverityReason.REASON_ANR), | ||
| NoopLogger | ||
| ) | ||
| anrEvent.getErrors().get(0).setErrorClass("ANR") | ||
| assertEquals(DeliveryStrategy.STORE_AND_FLUSH, anrEvent.getDeliveryStrategy()) | ||
| } | ||
|
|
||
| @Test | ||
| fun testPromiseRejectionEvetStoreAndFlush() { | ||
| val promiseRejectionEvent = Event( | ||
| testException, config, | ||
| SeverityReason.newInstance(SeverityReason.REASON_PROMISE_REJECTION), | ||
| NoopLogger | ||
| ) | ||
| assertEquals(DeliveryStrategy.STORE_AND_FLUSH, promiseRejectionEvent.getDeliveryStrategy()) | ||
| } | ||
|
|
||
| @Test | ||
| fun testANRWithModifiedErrorClassStoreAndFlush() { | ||
| val modifiedAnrEvent = Event( | ||
| testException, | ||
| config, | ||
| SeverityReason.newInstance(SeverityReason.REASON_PROMISE_REJECTION), | ||
| NoopLogger | ||
| ) | ||
| modifiedAnrEvent.getErrors().get(0).setErrorClass("ANR") | ||
| assertEquals(DeliveryStrategy.STORE_AND_FLUSH, modifiedAnrEvent.getDeliveryStrategy()) | ||
| } | ||
|
|
||
| @Test | ||
| fun testGenerateHandledReport() { | ||
| val state = SeverityReason.newInstance( | ||
| SeverityReason.REASON_HANDLED_EXCEPTION | ||
| ) | ||
| val event = Event(RuntimeException("Whoops!"), config, state, NoopLogger) | ||
| event.session = Session( | ||
| "123", Date(), User(null, null, null), false, notifier, NoopLogger, apiKey | ||
| ) | ||
| assertEquals(DeliveryStrategy.SEND_IMMEDIATELY, event.deliveryStrategy) | ||
| } | ||
|
|
||
| @Test | ||
| fun testDeliveryStrategyStoreAndSend() { | ||
| val configuration = Configuration(apiKey) | ||
| val newConfig = generateImmutableConfig(configuration).apply { | ||
| configuration.setAttemptDeliveryOnCrash(true) | ||
| } | ||
| val unhandledEvent = Event( | ||
| testException, newConfig, | ||
| SeverityReason.newInstance(SeverityReason.REASON_UNHANDLED_EXCEPTION), | ||
| NoopLogger | ||
| ) | ||
| assertEquals(DeliveryStrategy.STORE_ONLY, unhandledEvent.getDeliveryStrategy()) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,6 @@ | |
| <CurrentIssues> | ||
| <ID>CyclomaticComplexMethod:CodeDescriptions.kt$@RequiresApi(Build.VERSION_CODES.R) @SuppressLint("SwitchIntDef") @Suppress("DEPRECATION") internal fun importanceDescriptionOf(exitInfo: ApplicationExitInfo)</ID> | ||
| <ID>CyclomaticComplexMethod:CodeDescriptions.kt$@RequiresApi(Build.VERSION_CODES.R) internal fun exitReasonOf(exitInfo: ApplicationExitInfo)</ID> | ||
| <ID>MagicNumber:TraceParser.kt$TraceParser$16</ID> | ||
| <ID>MagicNumber:TraceParser.kt$TraceParser$3</ID> | ||
| <ID>MaxLineLength:TraceParserInvalidStackframesTest.kt$TraceParserInvalidStackframesTest.Companion$"#01 pc 0000000000000c5c /data/app/~~sKQbJGqVJA5glcnvEjZCMg==/com.example.bugsnag.android-fVuoJh5GpAL7sRAeI3vjSw==/lib/arm64/libentrypoint.so "</ID> | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.