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

Support spans that are split into multiple batches #3539

Merged
merged 3 commits into from
Jul 2, 2024
Merged

Support spans that are split into multiple batches #3539

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
57c1b97
Support spans across batches
adinauer Jul 2, 2024
2a3d0eb
changelog
adinauer Jul 2, 2024
740d01b
Merge branch '8.x.x' into fix/support-spans-across-batches
adinauer Jul 2, 2024
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

### Fixes

- Support spans that are split into multiple batches ([#3539](https://github.com/getsentry/sentry-java/pull/3539))
- When spans belonging to a single transaction were split into multiple batches for SpanExporter, we did not add all spans because the isSpanTooOld check wasn't inverted.
- Parse and use `send-default-pii` and `max-request-body-size` from `sentry.properties` ([#3534](https://github.com/getsentry/sentry-java/pull/3534))

## 8.0.0-alpha.2
Expand Down
3 changes: 2 additions & 1 deletion ...y/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ public CompletableResultCode export(Collection<SpanData> spans) {
final @NotNull SentryInstantDate now = new SentryInstantDate();

final @NotNull List<SpanData> nonExpired =
remaining.stream().filter((span) -> isSpanTooOld(span, now)).collect(Collectors.toList());
remaining.stream().filter((span) -> !isSpanTooOld(span, now)).collect(Collectors.toList());

this.finishedSpans.addAll(nonExpired);

// TODO
Expand Down
Loading