Skip to content

Commit f0da475

Browse files
marandanetomarandaneto
authored
Merge 636ed7e into 418a49e 
2 parents 418a49e + 636ed7e commit f0da475

45 files changed

Lines changed: 1104 additions & 246 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
- Profile envelopes are sent directly from profiler ([#2298](https://github.com/getsentry/sentry-java/pull/2298))
1616
- Add support for using Encoder with logback.SentryAppender ([#2246](https://github.com/getsentry/sentry-java/pull/2246))
1717
- Report Startup Crashes ([#2277](https://github.com/getsentry/sentry-java/pull/2277))
18+
- HTTP Client errors for OkHttp ([#2287](https://github.com/getsentry/sentry-java/pull/2287))
1819

1920
### Dependencies
2021

‎sentry-android-core/src/main/java/io/sentry/android/core/ManifestMetadataReader.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ final class ManifestMetadataReader {
7878
static final String CLIENT_REPORTS_ENABLE = "io.sentry.send-client-reports";
7979
static final String COLLECT_ADDITIONAL_CONTEXT = "io.sentry.additional-context";
8080

81+
static final String SEND_DEFAULT_PII = "io.sentry.send-default-pii";
82+
8183
/** ManifestMetadataReader ctor */
8284
private ManifestMetadataReader() {}
8385

@@ -297,6 +299,9 @@ static void applyMetadata(
297299
sdkInfo.setName(readStringNotNull(metadata, logger, SDK_NAME, sdkInfo.getName()));
298300
sdkInfo.setVersion(readStringNotNull(metadata, logger, SDK_VERSION, sdkInfo.getVersion()));
299301
options.setSdkVersion(sdkInfo);
302+
303+
options.setSendDefaultPii(
304+
readBool(metadata, logger, SEND_DEFAULT_PII, options.isSendDefaultPii()));
300305
}
301306

302307
options

‎sentry-android-core/src/test/java/io/sentry/android/core/ManifestMetadataReaderTest.kt‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,4 +1061,29 @@ class ManifestMetadataReaderTest {
10611061
// Assert
10621062
assertTrue(fixture.options.isCollectAdditionalContext)
10631063
}
1064+
1065+
@Test
1066+
fun `applyMetadata reads send default pii and keep default value if not found`() {
1067+
// Arrange
1068+
val context = fixture.getContext()
1069+
1070+
// Act
1071+
ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
1072+
1073+
// Assert
1074+
assertFalse(fixture.options.isSendDefaultPii)
1075+
}
1076+
1077+
@Test
1078+
fun `applyMetadata reads send default pii to options`() {
1079+
// Arrange
1080+
val bundle = bundleOf(ManifestMetadataReader.SEND_DEFAULT_PII to true)
1081+
val context = fixture.getContext(metaData = bundle)
1082+
1083+
// Act
1084+
ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
1085+
1086+
// Assert
1087+
assertTrue(fixture.options.isSendDefaultPii)
1088+
}
10641089
}

‎sentry-android-okhttp/api/sentry-android-okhttp.api‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ public final class io/sentry/android/okhttp/BuildConfig {
99
public final class io/sentry/android/okhttp/SentryOkHttpInterceptor : okhttp3/Interceptor {
1010
public fun <init> ()V
1111
public fun <init> (Lio/sentry/IHub;)V
12-
public fun <init> (Lio/sentry/IHub;Lio/sentry/android/okhttp/SentryOkHttpInterceptor$BeforeSpanCallback;)V
13-
public synthetic fun <init> (Lio/sentry/IHub;Lio/sentry/android/okhttp/SentryOkHttpInterceptor$BeforeSpanCallback;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
12+
public fun <init> (Lio/sentry/IHub;Lio/sentry/android/okhttp/SentryOkHttpInterceptor$BeforeSpanCallback;ZLjava/util/List;Ljava/util/List;)V
13+
public synthetic fun <init> (Lio/sentry/IHub;Lio/sentry/android/okhttp/SentryOkHttpInterceptor$BeforeSpanCallback;ZLjava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
1414
public fun <init> (Lio/sentry/android/okhttp/SentryOkHttpInterceptor$BeforeSpanCallback;)V
1515
public fun intercept (Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
1616
}

‎sentry-android-okhttp/src/main/java/io/sentry/android/okhttp/SentryOkHttpInterceptor.kt‎

Lines changed: 137 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,50 @@ package io.sentry.android.okhttp
33
import io.sentry.BaggageHeader
44
import io.sentry.Breadcrumb
55
import io.sentry.Hint
6+
import io.sentry.HttpStatusCodeRange
67
import io.sentry.HubAdapter
78
import io.sentry.IHub
89
import io.sentry.ISpan
10+
import io.sentry.SentryEvent
911
import io.sentry.SpanStatus
10-
import io.sentry.TracePropagationTargets
1112
import io.sentry.TypeCheckHint.OKHTTP_REQUEST
1213
import io.sentry.TypeCheckHint.OKHTTP_RESPONSE
14+
import io.sentry.exception.ExceptionMechanismException
15+
import io.sentry.exception.SentryHttpClientException
16+
import io.sentry.protocol.Mechanism
17+
import io.sentry.util.HttpUtils
18+
import io.sentry.util.PropagationTargetsUtils
19+
import okhttp3.Headers
1320
import okhttp3.Interceptor
1421
import okhttp3.Request
1522
import okhttp3.Response
1623
import java.io.IOException
1724

25+
/**
26+
* The Sentry's [SentryOkHttpInterceptor], it will automatically add a breadcrumb and start a span
27+
* out of the active span bound to the scope for each HTTP Request.
28+
* If [captureFailedRequests] is enabled, the SDK will capture HTTP Client errors as well.
29+
*
30+
* @param hub The [IHub], internal and only used for testing.
31+
* @param beforeSpan The [ISpan] can be customized or dropped with the [BeforeSpanCallback].
32+
* @param captureFailedRequests The SDK will only capture HTTP Client errors if it is enabled,
33+
* Defaults to false.
34+
* @param failedRequestStatusCodes The SDK will only capture HTTP Client errors if the HTTP Response
35+
* status code is within the defined ranges.
36+
* @param failedRequestTargets The SDK will only capture HTTP Client errors if the HTTP Request URL
37+
* is a match for any of the defined targets.
38+
*/
1839
class SentryOkHttpInterceptor(
1940
private val hub: IHub = HubAdapter.getInstance(),
20-
private val beforeSpan: BeforeSpanCallback? = null
41+
private val beforeSpan: BeforeSpanCallback? = null,
42+
private val captureFailedRequests: Boolean = false,
43+
private val failedRequestStatusCodes: List<HttpStatusCodeRange> = listOf(
44+
HttpStatusCodeRange(HttpStatusCodeRange.DEFAULT_MIN, HttpStatusCodeRange.DEFAULT_MAX)
45+
),
46+
private val failedRequestTargets: List<String> = listOf(".*")
2147
) : Interceptor {
2248

49+
constructor() : this(HubAdapter.getInstance())
2350
constructor(hub: IHub) : this(hub, null)
2451
constructor(beforeSpan: BeforeSpanCallback) : this(HubAdapter.getInstance(), beforeSpan)
2552

@@ -38,7 +65,7 @@ class SentryOkHttpInterceptor(
3865
try {
3966
val requestBuilder = request.newBuilder()
4067
if (span != null &&
41-
TracePropagationTargets.contain(hub.options.tracePropagationTargets, request.url.toString())
68+
PropagationTargetsUtils.contain(hub.options.tracePropagationTargets, request.url.toString())
4269
) {
4370
span.toSentryTrace().let {
4471
requestBuilder.addHeader(it.name, it.value)
@@ -53,6 +80,12 @@ class SentryOkHttpInterceptor(
5380
response = chain.proceed(request)
5481
code = response.code
5582
span?.status = SpanStatus.fromHttpStatusCode(code)
83+
84+
// OkHttp errors (4xx, 5xx) don't throw, so it's safe to call within this block.
85+
// breadcrumbs are added on the finally block because we'd like to know if the device
86+
// had an unstable connection or something similar
87+
captureEvent(request, response)
88+
5689
return response
5790
} catch (e: IOException) {
5891
span?.apply {
@@ -104,6 +137,107 @@ class SentryOkHttpInterceptor(
104137
}
105138
}
106139

140+
private fun captureEvent(request: Request, response: Response) {
141+
// not possible to get a parameterized url, but we remove at least the
142+
// query string and the fragment.
143+
// url example: https://api.github.com/users/getsentry/repos/#fragment?query=query
144+
// url will be: https://api.github.com/users/getsentry/repos/
145+
// ideally we'd like a parameterized url: https://api.github.com/users/{user}/repos/
146+
// but that's not possible
147+
var requestUrl = request.url.toString()
148+
149+
val query = request.url.query
150+
if (!query.isNullOrEmpty()) {
151+
requestUrl = requestUrl.replace("?$query", "")
152+
}
153+
154+
val urlFragment = request.url.fragment
155+
if (!urlFragment.isNullOrEmpty()) {
156+
requestUrl = requestUrl.replace("#$urlFragment", "")
157+
}
158+
159+
if (!captureFailedRequests ||
160+
!containsStatusCode(response.code) ||
161+
!PropagationTargetsUtils.contain(failedRequestTargets, requestUrl)
162+
) {
163+
return
164+
}
165+
166+
val mechanism = Mechanism().apply {
167+
type = "SentryOkHttpInterceptor"
168+
}
169+
val exception = SentryHttpClientException(
170+
"HTTP Client Error with status code: ${response.code}"
171+
)
172+
val mechanismException = ExceptionMechanismException(mechanism, exception, Thread.currentThread(), true)
173+
val event = SentryEvent(mechanismException)
174+
175+
val hint = Hint()
176+
hint.set(OKHTTP_REQUEST, request)
177+
hint.set(OKHTTP_RESPONSE, response)
178+
179+
val sentryRequest = io.sentry.protocol.Request().apply {
180+
url = requestUrl
181+
// Cookie is only sent if isSendDefaultPii is enabled
182+
cookies = if (hub.options.isSendDefaultPii) request.headers["Cookie"] else null
183+
method = request.method
184+
queryString = query
185+
headers = getHeaders(request.headers)
186+
fragment = urlFragment
187+
188+
request.body?.contentLength().ifHasValidLength {
189+
bodySize = it
190+
}
191+
}
192+
193+
val sentryResponse = io.sentry.protocol.Response().apply {
194+
// Cookie is only sent if isSendDefaultPii is enabled due to PII
195+
cookies = if (hub.options.isSendDefaultPii) response.headers["Cookie"] else null
196+
headers = getHeaders(response.headers)
197+
statusCode = response.code
198+
199+
response.body?.contentLength().ifHasValidLength {
200+
bodySize = it
201+
}
202+
}
203+
204+
event.request = sentryRequest
205+
event.contexts.setResponse(sentryResponse)
206+
207+
hub.captureEvent(event, hint)
208+
}
209+
210+
private fun containsStatusCode(statusCode: Int): Boolean {
211+
for (item in failedRequestStatusCodes) {
212+
if (item.isInRange(statusCode)) {
213+
return true
214+
}
215+
}
216+
return false
217+
}
218+
219+
private fun getHeaders(requestHeaders: Headers): MutableMap<String, String>? {
220+
// Headers are only sent if isSendDefaultPii is enabled due to PII
221+
if (!hub.options.isSendDefaultPii) {
222+
return null
223+
}
224+
225+
val headers = mutableMapOf<String, String>()
226+
227+
for (i in 0 until requestHeaders.size) {
228+
val name = requestHeaders.name(i)
229+
230+
// header is only sent if isn't sensitive
231+
if (HttpUtils.containsSensitiveHeader(name)) {
232+
continue
233+
}
234+
235+
val value = requestHeaders.value(i)
236+
headers[name] = value
237+
}
238+
return headers
239+
}
240+
107241
/**
108242
* The BeforeSpan callback
109243
*/

0 commit comments

Comments
 (0)