Repository navigation
Commit a8aeb7e
committed
fix(compose): Honor ignored origins in SentryTraced spans
Fix a bug where we set span origins for SentryTraced after their creation via the span context, resulting in our ignore-span-origins logic not being able to see them and spans being produced when they should have been ignored / suppressed.
What was happening?
SentryTracer checks `ignoredSpanOrigins` during span creation, before the returned span can be mutated:
```java
if (SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOrigins(), spanOptions.getOrigin())) {
return NoOpSpan.getInstance();
}
```
That check reads SpanOptions.origin, not the SpanContext.origin we were setting after creation.
So if a host app did this...
```kotlin
options.setIgnoredSpanOrigins(listOf("auto.ui.jetpack_compose"))
```
...it would no-op and the Compose spans were created nonetheless.
The issue affected both levels of the SentryTraced span hierarchy (ie, both parent spans and child spans).1 parent c0b7806 commit a8aeb7e
3 files changed
Lines changed: 46 additions & 12 deletions
File tree
- sentry-compose/src
- androidMain/kotlin/io/sentry/compose
- androidUnitTest/kotlin/io/sentry/compose
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
| 8 | + | |
8 | 9 | | |
9 | 10 | | |
10 | 11 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
117 | 117 | | |
118 | 118 | | |
119 | 119 | | |
120 | | - | |
121 | | - | |
122 | | - | |
123 | | - | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
124 | 129 | | |
125 | 130 | | |
126 | 131 | | |
| |||
131 | 136 | | |
132 | 137 | | |
133 | 138 | | |
134 | | - | |
135 | | - | |
136 | | - | |
137 | | - | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
138 | 148 | | |
139 | 149 | | |
140 | 150 | | |
| |||
220 | 230 | | |
221 | 231 | | |
222 | 232 | | |
| 233 | + | |
223 | 234 | | |
224 | 235 | | |
225 | 236 | | |
| |||
229 | 240 | | |
230 | 241 | | |
231 | 242 | | |
232 | | - | |
233 | | - | |
234 | 243 | | |
235 | 244 | | |
236 | 245 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
128 | 128 | | |
129 | 129 | | |
130 | 130 | | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
131 | 151 | | |
132 | 152 | | |
133 | 153 | | |
| |||
381 | 401 | | |
382 | 402 | | |
383 | 403 | | |
384 | | - | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
385 | 408 | | |
386 | 409 | | |
387 | 410 | | |
388 | 411 | | |
389 | 412 | | |
390 | 413 | | |
| 414 | + | |
391 | 415 | | |
392 | 416 | | |
393 | 417 | | |
| |||
0 commit comments