Skip to content

Commit 629bf40

Browse files
committed
Merge branch 'feat/ignore404-options' into feat/ignore404-filter
2 parents c88d883 + 74bc19a commit 629bf40

9 files changed

Lines changed: 39 additions & 12 deletions

File tree

‎sentry-spring-7/src/main/java/io/sentry/spring7/tracing/SentryTracingFilter.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,10 @@ private void doFilterWithTransaction(
140140
final @Nullable ITransaction transaction =
141141
getOrStartTransaction(httpRequest, transactionContext);
142142

143+
boolean filterChainCompleted = false;
143144
try {
144145
filterChain.doFilter(httpRequest, httpResponse);
146+
filterChainCompleted = true;
145147
} catch (Throwable e) {
146148
if (transaction != null) {
147149
// exceptions that are not handled by Spring
@@ -165,7 +167,10 @@ private void doFilterWithTransaction(
165167
if (transactionName != null) {
166168
transaction.setName(transactionName, transactionNameSource);
167169
transaction.setOperation(TRANSACTION_OP);
168-
transaction.setData(SpanDataConvention.HTTP_STATUS_CODE_KEY, httpResponse.getStatus());
170+
// An escaping exception may be mapped to an HTTP status later by the container.
171+
if (filterChainCompleted) {
172+
transaction.setData(SpanDataConvention.HTTP_STATUS_CODE_KEY, httpResponse.getStatus());
173+
}
169174
// if exception has been thrown, transaction status is already set to INTERNAL_ERROR, and
170175
// httpResponse.getStatus() returns 200.
171176
if (transaction.getStatus() == null) {

‎sentry-spring-7/src/test/kotlin/io/sentry/spring7/tracing/SentryTracingFilterTest.kt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,11 @@ class SentryTracingFilterTest {
276276
} catch (_: Exception) {}
277277
verify(fixture.scopes)
278278
.captureTransaction(
279-
check { assertThat(it.status).isEqualTo(SpanStatus.INTERNAL_ERROR) },
279+
check {
280+
assertThat(it.status).isEqualTo(SpanStatus.INTERNAL_ERROR)
281+
assertThat(it.contexts.trace!!.data)
282+
.doesNotContainKey(SpanDataConvention.HTTP_STATUS_CODE_KEY)
283+
},
280284
anyOrNull<TraceContext>(),
281285
anyOrNull(),
282286
anyOrNull(),

‎sentry-spring-boot-4/src/integrationTest/kotlin/io/sentry/spring/boot4/integrationtest/PersonIntegrationTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ class PersonIntegrationTest : IntegrationTest() {
4848
.transaction()!!
4949
assertThat(transaction.contexts.trace!!.data[SpanDataConvention.SENTRY_KIND_KEY])
5050
.isEqualTo("server")
51-
assertThat(transaction.contexts.trace!!.data[SpanDataConvention.HTTP_STATUS_CODE_KEY])
52-
.isEqualTo(200)
51+
assertThat(transaction.contexts.trace!!.data)
52+
.doesNotContainKey(SpanDataConvention.HTTP_STATUS_CODE_KEY)
5353
assertThat(
5454
transaction.hasOp(
5555
"http.server",

‎sentry-spring-boot-jakarta/src/integrationTest/kotlin/io/sentry/spring/boot/jakarta/integrationtest/PersonIntegrationTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ class PersonIntegrationTest : IntegrationTest() {
4848
.transaction()!!
4949
assertThat(transaction.contexts.trace!!.data[SpanDataConvention.SENTRY_KIND_KEY])
5050
.isEqualTo("server")
51-
assertThat(transaction.contexts.trace!!.data[SpanDataConvention.HTTP_STATUS_CODE_KEY])
52-
.isEqualTo(200)
51+
assertThat(transaction.contexts.trace!!.data)
52+
.doesNotContainKey(SpanDataConvention.HTTP_STATUS_CODE_KEY)
5353
assertThat(
5454
transaction.hasOp(
5555
"http.server",

‎sentry-spring-boot/src/integrationTest/kotlin/io/sentry/spring/boot/integrationtest/PersonIntegrationTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ class PersonIntegrationTest : IntegrationTest() {
4848
.transaction()!!
4949
assertThat(transaction.contexts.trace!!.data[SpanDataConvention.SENTRY_KIND_KEY])
5050
.isEqualTo("server")
51-
assertThat(transaction.contexts.trace!!.data[SpanDataConvention.HTTP_STATUS_CODE_KEY])
52-
.isEqualTo(200)
51+
assertThat(transaction.contexts.trace!!.data)
52+
.doesNotContainKey(SpanDataConvention.HTTP_STATUS_CODE_KEY)
5353
assertThat(
5454
transaction.hasOp(
5555
"http.server",

‎sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/tracing/SentryTracingFilter.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,10 @@ private void doFilterWithTransaction(
140140
final @Nullable ITransaction transaction =
141141
getOrStartTransaction(httpRequest, transactionContext);
142142

143+
boolean filterChainCompleted = false;
143144
try {
144145
filterChain.doFilter(httpRequest, httpResponse);
146+
filterChainCompleted = true;
145147
} catch (Throwable e) {
146148
if (transaction != null) {
147149
// exceptions that are not handled by Spring
@@ -165,7 +167,10 @@ private void doFilterWithTransaction(
165167
if (transactionName != null) {
166168
transaction.setName(transactionName, transactionNameSource);
167169
transaction.setOperation(TRANSACTION_OP);
168-
transaction.setData(SpanDataConvention.HTTP_STATUS_CODE_KEY, httpResponse.getStatus());
170+
// An escaping exception may be mapped to an HTTP status later by the container.
171+
if (filterChainCompleted) {
172+
transaction.setData(SpanDataConvention.HTTP_STATUS_CODE_KEY, httpResponse.getStatus());
173+
}
169174
// if exception has been thrown, transaction status is already set to INTERNAL_ERROR, and
170175
// httpResponse.getStatus() returns 200.
171176
if (transaction.getStatus() == null) {

‎sentry-spring-jakarta/src/test/kotlin/io/sentry/spring/jakarta/tracing/SentryTracingFilterTest.kt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,11 @@ class SentryTracingFilterTest {
276276
} catch (_: Exception) {}
277277
verify(fixture.scopes)
278278
.captureTransaction(
279-
check { assertThat(it.status).isEqualTo(SpanStatus.INTERNAL_ERROR) },
279+
check {
280+
assertThat(it.status).isEqualTo(SpanStatus.INTERNAL_ERROR)
281+
assertThat(it.contexts.trace!!.data)
282+
.doesNotContainKey(SpanDataConvention.HTTP_STATUS_CODE_KEY)
283+
},
280284
anyOrNull<TraceContext>(),
281285
anyOrNull(),
282286
anyOrNull(),

‎sentry-spring/src/main/java/io/sentry/spring/tracing/SentryTracingFilter.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,10 @@ private void doFilterWithTransaction(
139139
final @Nullable ITransaction transaction =
140140
getOrStartTransaction(httpRequest, transactionContext);
141141

142+
boolean filterChainCompleted = false;
142143
try {
143144
filterChain.doFilter(httpRequest, httpResponse);
145+
filterChainCompleted = true;
144146
} catch (Throwable e) {
145147
if (transaction != null) {
146148
// exceptions that are not handled by Spring
@@ -164,7 +166,10 @@ private void doFilterWithTransaction(
164166
if (transactionName != null) {
165167
transaction.setName(transactionName, transactionNameSource);
166168
transaction.setOperation(TRANSACTION_OP);
167-
transaction.setData(SpanDataConvention.HTTP_STATUS_CODE_KEY, httpResponse.getStatus());
169+
// An escaping exception may be mapped to an HTTP status later by the container.
170+
if (filterChainCompleted) {
171+
transaction.setData(SpanDataConvention.HTTP_STATUS_CODE_KEY, httpResponse.getStatus());
172+
}
168173
// if exception has been thrown, transaction status is already set to INTERNAL_ERROR, and
169174
// httpResponse.getStatus() returns 200.
170175
if (transaction.getStatus() == null) {

‎sentry-spring/src/test/kotlin/io/sentry/spring/tracing/SentryTracingFilterTest.kt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,11 @@ class SentryTracingFilterTest {
276276
} catch (_: Exception) {}
277277
verify(fixture.scopes)
278278
.captureTransaction(
279-
check { assertThat(it.status).isEqualTo(SpanStatus.INTERNAL_ERROR) },
279+
check {
280+
assertThat(it.status).isEqualTo(SpanStatus.INTERNAL_ERROR)
281+
assertThat(it.contexts.trace!!.data)
282+
.doesNotContainKey(SpanDataConvention.HTTP_STATUS_CODE_KEY)
283+
},
280284
anyOrNull<TraceContext>(),
281285
anyOrNull(),
282286
anyOrNull(),

0 commit comments

Comments
 (0)