Skip to content

Commit f4b6f75

Browse files
giortzisggiortzisg
authored
Merge ebe8c4c into 9770665 
2 parents 9770665 + ebe8c4c commit f4b6f75

27 files changed

Lines changed: 566 additions & 15 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Changelog
22

3+
## Unreleased
4+
5+
### Features
6+
7+
- Prevent cross-organization trace continuation ([#5136](https://github.com/getsentry/sentry-java/pull/5136))
8+
- By default, the SDK now extracts the organization ID from the DSN (e.g. `o123.ingest.sentry.io`) and compares it with the `sentry-org_id` value in incoming baggage headers. When the two differ, the SDK starts a fresh trace instead of continuing the foreign one. This guards against accidentally linking traces across organizations.
9+
- New option `enableStrictTraceContinuation` (default `false`): when enabled, both the SDK's org ID **and** the incoming baggage org ID must be present and match for a trace to be continued. Traces with a missing org ID on either side are rejected. Configurable via code (`setStrictTraceContinuation(true)`), `sentry.properties` (`enable-strict-trace-continuation=true`), Android manifest (`io.sentry.strict-trace-continuation`), or Spring Boot (`sentry.strict-trace-continuation=true`).
10+
- New option `orgId`: allows explicitly setting the organization ID for self-hosted and Relay setups where it cannot be extracted from the DSN. Configurable via code (`setOrgId("123")`), `sentry.properties` (`org-id=123`), Android manifest (`io.sentry.org-id`), or Spring Boot (`sentry.org-id=123`).
11+
312
## 8.34.1
413

514
### Fixes

‎sentry-android-core/src/main/java/io/sentry/android/core/ManifestMetadataReader.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,9 @@ final class ManifestMetadataReader {
167167

168168
static final String FEEDBACK_SHOW_BRANDING = "io.sentry.feedback.show-branding";
169169

170+
static final String STRICT_TRACE_CONTINUATION = "io.sentry.strict-trace-continuation";
171+
static final String ORG_ID = "io.sentry.org-id";
172+
170173
static final String SPOTLIGHT_ENABLE = "io.sentry.spotlight.enable";
171174

172175
static final String SPOTLIGHT_CONNECTION_URL = "io.sentry.spotlight.url";
@@ -662,6 +665,15 @@ static void applyMetadata(
662665
feedbackOptions.setShowBranding(
663666
readBool(metadata, logger, FEEDBACK_SHOW_BRANDING, feedbackOptions.isShowBranding()));
664667

668+
options.setStrictTraceContinuation(
669+
readBool(
670+
metadata, logger, STRICT_TRACE_CONTINUATION, options.isStrictTraceContinuation()));
671+
672+
final @Nullable String orgId = readString(metadata, logger, ORG_ID, null);
673+
if (orgId != null) {
674+
options.setOrgId(orgId);
675+
}
676+
665677
options.setEnableSpotlight(
666678
readBool(metadata, logger, SPOTLIGHT_ENABLE, options.isEnableSpotlight()));
667679

‎sentry-android-core/src/test/java/io/sentry/android/core/ManifestMetadataReaderTest.kt‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2436,4 +2436,54 @@ class ManifestMetadataReaderTest {
24362436
// maskAllImages should also add WebView
24372437
assertTrue(fixture.options.screenshot.maskViewClasses.contains("android.webkit.WebView"))
24382438
}
2439+
2440+
@Test
2441+
fun `applyMetadata reads strictTraceContinuation and keeps default value if not found`() {
2442+
// Arrange
2443+
val context = fixture.getContext()
2444+
2445+
// Act
2446+
ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
2447+
2448+
// Assert
2449+
assertFalse(fixture.options.isStrictTraceContinuation)
2450+
}
2451+
2452+
@Test
2453+
fun `applyMetadata reads strictTraceContinuation to options`() {
2454+
// Arrange
2455+
val bundle = bundleOf(ManifestMetadataReader.STRICT_TRACE_CONTINUATION to true)
2456+
val context = fixture.getContext(metaData = bundle)
2457+
2458+
// Act
2459+
ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
2460+
2461+
// Assert
2462+
assertTrue(fixture.options.isStrictTraceContinuation)
2463+
}
2464+
2465+
@Test
2466+
fun `applyMetadata reads orgId and keeps null if not found`() {
2467+
// Arrange
2468+
val context = fixture.getContext()
2469+
2470+
// Act
2471+
ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
2472+
2473+
// Assert
2474+
assertNull(fixture.options.orgId)
2475+
}
2476+
2477+
@Test
2478+
fun `applyMetadata reads orgId to options`() {
2479+
// Arrange
2480+
val bundle = bundleOf(ManifestMetadataReader.ORG_ID to "12345")
2481+
val context = fixture.getContext(metaData = bundle)
2482+
2483+
// Act
2484+
ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
2485+
2486+
// Assert
2487+
assertEquals("12345", fixture.options.orgId)
2488+
}
24392489
}

‎sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/OtelSentrySpanProcessor.java‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import io.sentry.SentryEvent;
2323
import io.sentry.SentryLevel;
2424
import io.sentry.SentryLongDate;
25+
import io.sentry.SentryOptions;
2526
import io.sentry.SentryTraceHeader;
2627
import io.sentry.SpanId;
2728
import io.sentry.TracesSamplingDecision;
@@ -94,9 +95,16 @@ public void onStart(final @NotNull Context parentContext, final @NotNull ReadWri
9495
}
9596
}
9697

97-
final @NotNull PropagationContext propagationContext =
98-
new PropagationContext(
99-
new SentryId(traceId), sentrySpanId, sentryParentSpanId, baggage, sampled);
98+
final @NotNull SentryOptions sentryOptions = scopes.getOptions();
99+
final @NotNull PropagationContext propagationContext;
100+
if (sentryTraceHeader != null) {
101+
propagationContext =
102+
PropagationContext.fromHeaders(sentryTraceHeader, baggage, sentrySpanId, sentryOptions);
103+
} else {
104+
propagationContext =
105+
new PropagationContext(
106+
new SentryId(traceId), sentrySpanId, sentryParentSpanId, baggage, sampled);
107+
}
100108

101109
baggage = propagationContext.getBaggage();
102110
baggage.setValuesFromSamplingDecision(samplingDecision);

‎sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySampler.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ public SamplingResult shouldSample(
9191
final @NotNull PropagationContext propagationContext =
9292
sentryTraceHeader == null
9393
? new PropagationContext(new SentryId(traceId), randomSpanId, null, baggage, null)
94-
: PropagationContext.fromHeaders(sentryTraceHeader, baggage, randomSpanId);
94+
: PropagationContext.fromHeaders(
95+
sentryTraceHeader, baggage, randomSpanId, scopes.getOptions());
9596

9697
final @NotNull TransactionContext transactionContext =
9798
TransactionContext.fromPropagationContext(propagationContext);

‎sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanProcessor.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,10 @@ public void onStart(final @NotNull Context parentContext, final @NotNull ReadWri
127127
new SentryId(traceData.getTraceId()), spanId, null, null, null)
128128
: TransactionContext.fromPropagationContext(
129129
PropagationContext.fromHeaders(
130-
traceData.getSentryTraceHeader(), traceData.getBaggage(), spanId));
130+
traceData.getSentryTraceHeader(),
131+
traceData.getBaggage(),
132+
spanId,
133+
scopes.getOptions()));
131134
;
132135
transactionContext.setName(transactionName);
133136
transactionContext.setTransactionNameSource(transactionNameSource);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ class SentryTracingFilterTest {
9696
logger,
9797
it.arguments[0] as String?,
9898
it.arguments[1] as List<String>?,
99+
null,
99100
)
100101
)
101102
}

‎sentry-spring-7/src/test/kotlin/io/sentry/spring7/webflux/SentryWebFluxTracingFilterTest.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ class SentryWebFluxTracingFilterTest {
9898
logger,
9999
it.arguments[0] as String?,
100100
it.arguments[1] as List<String>?,
101+
null,
101102
)
102103
)
103104
}

‎sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot4/SentryAutoConfigurationTest.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,8 @@ class SentryAutoConfigurationTest {
242242
"sentry.cron.default-failure-issue-threshold=40",
243243
"sentry.cron.default-recovery-threshold=50",
244244
"sentry.logs.enabled=true",
245+
"sentry.strict-trace-continuation=true",
246+
"sentry.org-id=12345",
245247
)
246248
.run {
247249
val options = it.getBean(SentryProperties::class.java)
@@ -296,6 +298,8 @@ class SentryAutoConfigurationTest {
296298
assertThat(options.cron!!.defaultFailureIssueThreshold).isEqualTo(40L)
297299
assertThat(options.cron!!.defaultRecoveryThreshold).isEqualTo(50L)
298300
assertThat(options.logs.isEnabled).isEqualTo(true)
301+
assertThat(options.isStrictTraceContinuation).isEqualTo(true)
302+
assertThat(options.orgId).isEqualTo("12345")
299303
}
300304
}
301305

‎sentry-spring-boot-jakarta/src/test/kotlin/io/sentry/spring/boot/jakarta/SentryAutoConfigurationTest.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,8 @@ class SentryAutoConfigurationTest {
249249
"sentry.profile-session-sample-rate=1.0",
250250
"sentry.profiling-traces-dir-path=tmp/sentry/profiling-traces",
251251
"sentry.profile-lifecycle=TRACE",
252+
"sentry.strict-trace-continuation=true",
253+
"sentry.org-id=12345",
252254
)
253255
.run {
254256
val options = it.getBean(SentryProperties::class.java)
@@ -307,6 +309,8 @@ class SentryAutoConfigurationTest {
307309
assertThat(options.profilingTracesDirPath)
308310
.startsWith(File("tmp/sentry/profiling-traces").absolutePath)
309311
assertThat(options.profileLifecycle).isEqualTo(ProfileLifecycle.TRACE)
312+
assertThat(options.isStrictTraceContinuation).isEqualTo(true)
313+
assertThat(options.orgId).isEqualTo("12345")
310314
}
311315
}
312316

0 commit comments

Comments
 (0)