Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Capture failed HTTP requests by default #2794

Merged
merged 3 commits into from
Jul 7, 2023
Merged

Capture failed HTTP requests by default #2794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ecf34f2
Capture failed requests by default
markushi Jun 22, 2023
87aaef1
Merge branch 'feat/7.0.0' into feat/default-capture-failed-requests
markushi Jul 7, 2023
5a214bd
Update Changelog
markushi Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Features

- Add debouncing mechanism and before-capture callbacks for screenshots and view hierarchies ([#2773](https://github.com/getsentry/sentry-java/pull/2773))
- Capture failed HTTP requests by default ([#2794](https://github.com/getsentry/sentry-java/pull/2794))

### Fixes

Expand Down
2 changes: 1 addition & 1 deletion sentry-android-okhttp/src/main/java/io/sentry/android/okhttp/SentryOkHttpInterceptor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import java.io.IOException
class SentryOkHttpInterceptor(
private val hub: IHub = HubAdapter.getInstance(),
private val beforeSpan: BeforeSpanCallback? = null,
private val captureFailedRequests: Boolean = false,
private val captureFailedRequests: Boolean = true,
private val failedRequestStatusCodes: List<HttpStatusCodeRange> = listOf(
HttpStatusCodeRange(HttpStatusCodeRange.DEFAULT_MIN, HttpStatusCodeRange.DEFAULT_MAX)
),
Expand Down
36 changes: 28 additions & 8 deletions sentry-android-okhttp/src/test/java/io/sentry/android/okhttp/SentryOkHttpInterceptorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class SentryOkHttpInterceptorTest {
beforeSpan: SentryOkHttpInterceptor.BeforeSpanCallback? = null,
includeMockServerInTracePropagationTargets: Boolean = true,
keepDefaultTracePropagationTargets: Boolean = false,
captureFailedRequests: Boolean = false,
captureFailedRequests: Boolean? = false,
failedRequestTargets: List<String> = listOf(".*"),
failedRequestStatusCodes: List<HttpStatusCodeRange> = listOf(
HttpStatusCodeRange(
Expand Down Expand Up @@ -91,13 +91,22 @@ class SentryOkHttpInterceptorTest {
.setResponseCode(httpStatusCode)
)

val interceptor = SentryOkHttpInterceptor(
hub,
beforeSpan,
captureFailedRequests = captureFailedRequests,
failedRequestTargets = failedRequestTargets,
failedRequestStatusCodes = failedRequestStatusCodes
)
val interceptor = when (captureFailedRequests) {
null -> SentryOkHttpInterceptor(
hub,
beforeSpan,
failedRequestTargets = failedRequestTargets,
failedRequestStatusCodes = failedRequestStatusCodes
)

else -> SentryOkHttpInterceptor(
hub,
beforeSpan,
captureFailedRequests = captureFailedRequests,
failedRequestTargets = failedRequestTargets,
failedRequestStatusCodes = failedRequestStatusCodes
)
}
return OkHttpClient.Builder().addInterceptor(interceptor).build()
}
}
Expand Down Expand Up @@ -349,6 +358,17 @@ class SentryOkHttpInterceptorTest {
}
}

@Test
fun `captures failed requests by default`() {
val sut = fixture.getSut(
httpStatusCode = 500,
captureFailedRequests = null
)
sut.newCall(getRequest()).execute()

verify(fixture.hub).captureEvent(any(), any<Hint>())
}

@Test
fun `captures an event if captureFailedRequests is enabled and within the range`() {
val sut = fixture.getSut(
Expand Down