Skip to content

feat(apollo): [Data Collection 8] Apply outgoing request body policy #5804

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

Draft
adinauer wants to merge 2 commits into
base: feat/data-collection-incoming-response-body
Choose a base branch
from
Draft

feat(apollo): [Data Collection 8] Apply outgoing request body policy #5804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34dcac9
feat(apollo): Apply outgoing request body policy
adinauer Jul 17, 2026
04f91e1
merge: Update Data Collection stack
adinauer Jul 21, 2026
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
22 changes: 12 additions & 10 deletions sentry-apollo-3/src/main/java/io/sentry/apollo3/SentryApollo3HttpInterceptor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,16 +365,18 @@ constructor(
request.body?.let {
bodySize = it.contentLength

val buffer = Buffer()

try {
it.writeTo(buffer)
data = GraphqlUtils.filterRequestBody(buffer.readUtf8(), scopes.options)
} catch (e: Throwable) {
scopes.options.logger.log(SentryLevel.ERROR, "Error reading the request body.", e)
// continue because the response body alone can already give some insights
} finally {
buffer.close()
if (scopes.options.dataCollectionResolver.isOutgoingRequestBody) {
val buffer = Buffer()

try {
it.writeTo(buffer)
data = GraphqlUtils.filterRequestBody(buffer.readUtf8(), scopes.options)
} catch (e: Throwable) {
scopes.options.logger.log(SentryLevel.ERROR, "Error reading the request body.", e)
// continue because the response body alone can already give some insights
} finally {
buffer.close()
}
}
}
}
Expand Down
19 changes: 19 additions & 0 deletions sentry-apollo-3/src/test/java/io/sentry/apollo3/SentryApollo3InterceptorClientErrors.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import com.apollographql.apollo3.api.http.HttpRequest
import com.apollographql.apollo3.api.http.HttpResponse
import com.apollographql.apollo3.exception.ApolloException
import io.sentry.Hint
import io.sentry.HttpBodyType
import io.sentry.IScopes
import io.sentry.SentryIntegrationPackageStorage
import io.sentry.SentryOptions
Expand Down Expand Up @@ -268,6 +269,24 @@ class SentryApollo3InterceptorClientErrors {
)
}

@Test
fun `data collection can disable outgoing request body`() {
val sut =
fixture.getSut(responseBody = fixture.responseBodyNotOk) {
dataCollection.httpBodies = setOf(HttpBodyType.INCOMING_RESPONSE)
}
executeQuery(sut)

verify(fixture.scopes)
.captureEvent(
check {
assertEquals(193L, it.request!!.bodySize)
assertNull(it.request!!.data)
},
any<Hint>(),
)
}

@Test
fun `data collection can disable the GraphQL document independently`() {
val sut =
Expand Down
22 changes: 12 additions & 10 deletions sentry-apollo-4/src/main/java/io/sentry/apollo4/SentryApollo4HttpInterceptor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,16 +364,18 @@ constructor(
request.body?.let {
bodySize = it.contentLength

val buffer = Buffer()

try {
it.writeTo(buffer)
data = GraphqlUtils.filterRequestBody(buffer.readUtf8(), scopes.options)
} catch (e: Throwable) {
scopes.options.logger.log(SentryLevel.ERROR, "Error reading the request body.", e)
// continue because the response body alone can already give some insights
} finally {
buffer.close()
if (scopes.options.dataCollectionResolver.isOutgoingRequestBody) {
val buffer = Buffer()

try {
it.writeTo(buffer)
data = GraphqlUtils.filterRequestBody(buffer.readUtf8(), scopes.options)
} catch (e: Throwable) {
scopes.options.logger.log(SentryLevel.ERROR, "Error reading the request body.", e)
// continue because the response body alone can already give some insights
} finally {
buffer.close()
}
}
}
}
Expand Down
19 changes: 19 additions & 0 deletions ...pollo-4/src/test/java/io/sentry/apollo4/SentryApollo4BuilderExtensionsClientErrorsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import com.apollographql.apollo.api.http.HttpRequest
import com.apollographql.apollo.api.http.HttpResponse
import com.apollographql.apollo.exception.ApolloException
import io.sentry.Hint
import io.sentry.HttpBodyType
import io.sentry.IScopes
import io.sentry.SentryIntegrationPackageStorage
import io.sentry.SentryOptions
Expand Down Expand Up @@ -282,6 +283,24 @@ abstract class SentryApollo4BuilderExtensionsClientErrorsTest(
)
}

@Test
fun `data collection can disable outgoing request body`() {
val sut =
fixture.getSut(responseBody = fixture.responseBodyNotOk) {
dataCollection.httpBodies = setOf(HttpBodyType.INCOMING_RESPONSE)
}
executeQuery(sut)

verify(fixture.scopes)
.captureEvent(
check {
assertEquals(193L, it.request!!.bodySize)
assertNull(it.request!!.data)
},
any<Hint>(),
)
}

@Test
fun `data collection can disable the GraphQL document independently`() {
val sut =
Expand Down
Loading