From 57c1b9702e9d50aebd6a279a7e03a953ed91b951 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Tue, 2 Jul 2024 11:45:57 +0200 Subject: [PATCH 1/2] Support spans across batches --- .../main/java/io/sentry/opentelemetry/SentrySpanExporter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanExporter.java b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanExporter.java index 5e7c610cc0f..0e86f281bcc 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanExporter.java +++ b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanExporter.java @@ -105,7 +105,8 @@ public CompletableResultCode export(Collection spans) { final @NotNull SentryInstantDate now = new SentryInstantDate(); final @NotNull List 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 From 2a3d0eb7df609b3c9b385387cb5dd9dde9099a08 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Tue, 2 Jul 2024 11:49:39 +0200 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a179e82555a..ac39c1c7a85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,11 @@ - `sentry-android-okhttp` has been removed in favor of `sentry-okhttp`, removing android dependency from the module ([#3510](https://github.com/getsentry/sentry-java/pull/3510)) +### 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. + ## 8.0.0-alpha.2 ### Behavioural Changes