diff --git a/CHANGELOG.md b/CHANGELOG.md index a3d0cec6fc1..bb0be8c065f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,9 @@ - `SentryOptions.getIgnoredErrors()`, `getIgnoredTransactions()`, `getIgnoredCheckIns()` and `getIgnoredSpanOrigins()` now return `List` instead of `List`, matching their setters ([#6489](https://github.com/getsentry/sentry-java/pull/6489)) - The SDK is now compiled for Java 11 instead of Java 8. JVM applications need Java 11 or newer ([#6459](https://github.com/getsentry/sentry-java/pull/6459)) - Default trace context status to `ok` when an active span has no explicit status ([#6418](https://github.com/getsentry/sentry-java/pull/6418)) +- Remove the deprecated `traceSampling` option (`SentryOptions.setTraceSampling`/`isTraceSampling` and the `io.sentry.traces.trace-sampling` manifest key) ([#6415](https://github.com/getsentry/sentry-java/pull/6415)) + - Use `tracePropagationTargets` to control which URL-aware outgoing requests get tracing headers. + - For Apollo v2, pass `attachTracingHeaders = false` to `SentryApolloInterceptor` to disable the headers while still creating spans. - Remove the deprecated user feedback APIs ([#6337](https://github.com/getsentry/sentry-java/pull/6337)) - `UserFeedback` and `Sentry.captureUserFeedback(...)`: use `Sentry.feedback().capture(...)` with `io.sentry.protocol.Feedback` instead - `Sentry.captureFeedback(...)`: use `Sentry.feedback().capture(...)` instead diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/ManifestMetadataReader.java b/sentry-android-core/src/main/java/io/sentry/android/core/ManifestMetadataReader.java index b50999ac1ef..4418ae95871 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/ManifestMetadataReader.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/ManifestMetadataReader.java @@ -24,7 +24,6 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -101,7 +100,6 @@ final class ManifestMetadataReader { static final String PROFILER_START_ON_APP_START = "io.sentry.traces.profiling.start-on-app-start"; - @ApiStatus.Experimental static final String TRACE_SAMPLING = "io.sentry.traces.trace-sampling"; static final String TRACE_PROPAGATION_TARGETS = "io.sentry.traces.trace-propagation-targets"; static final String ATTACH_THREADS = "io.sentry.attach-threads"; @@ -472,9 +470,6 @@ static void applyMetadata( } } - options.setTraceSampling( - readBool(metadata, logger, TRACE_SAMPLING, options.isTraceSampling())); - options.setEnableAutoActivityLifecycleTracing( readBool( metadata, diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/ManifestMetadataReaderTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/ManifestMetadataReaderTest.kt index 4a4dba19861..6ec5def5b49 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/ManifestMetadataReaderTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/ManifestMetadataReaderTest.kt @@ -1033,31 +1033,6 @@ class ManifestMetadataReaderTest { assertTrue(fixture.options.isEnableActivityLifecycleTracingAutoFinish) } - @Test - fun `applyMetadata reads traceSampling to options`() { - // Arrange - val bundle = bundleOf(ManifestMetadataReader.TRACE_SAMPLING to false) - val context = fixture.getContext(metaData = bundle) - - // Act - ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider) - - // Assert - assertFalse(fixture.options.isTraceSampling) - } - - @Test - fun `applyMetadata reads traceSampling to options and keeps default`() { - // Arrange - val context = fixture.getContext() - - // Act - ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider) - - // Assert - assertTrue(fixture.options.isTraceSampling) - } - @Test fun `applyMetadata reads profilesSampleRate from metadata`() { // Arrange diff --git a/sentry-apollo/src/main/java/io/sentry/apollo/SentryApolloInterceptor.kt b/sentry-apollo/src/main/java/io/sentry/apollo/SentryApolloInterceptor.kt index c50d85a05eb..9362d597615 100644 --- a/sentry-apollo/src/main/java/io/sentry/apollo/SentryApolloInterceptor.kt +++ b/sentry-apollo/src/main/java/io/sentry/apollo/SentryApolloInterceptor.kt @@ -144,7 +144,7 @@ class SentryApolloInterceptor( private fun addTracingHeaders(request: InterceptorRequest, span: ISpan?): RequestHeaders { val requestHeaderBuilder = request.requestHeaders.toBuilder() - if (attachTracingHeaders && scopes.options.isTraceSampling && !isIgnored()) { + if (attachTracingHeaders && !isIgnored()) { // we have no access to URI, no way to verify tracing origins TracingUtils.trace( scopes, diff --git a/sentry-openfeign/src/test/kotlin/io/sentry/openfeign/SentryFeignClientTest.kt b/sentry-openfeign/src/test/kotlin/io/sentry/openfeign/SentryFeignClientTest.kt index 3f47b4f6e17..398640989ce 100644 --- a/sentry-openfeign/src/test/kotlin/io/sentry/openfeign/SentryFeignClientTest.kt +++ b/sentry-openfeign/src/test/kotlin/io/sentry/openfeign/SentryFeignClientTest.kt @@ -99,7 +99,6 @@ class SentryFeignClientTest { @Test fun `when there is an active span, adds sentry trace header to the request`() { - fixture.sentryOptions.isTraceSampling = true fixture.sentryOptions.dsn = "https://key@sentry.io/proj" val sut = fixture.getSut() sut.getOk() @@ -111,7 +110,6 @@ class SentryFeignClientTest { @Test fun `when there is an active span, existing baggage headers are merged with sentry baggage into single header`() { - fixture.sentryOptions.isTraceSampling = true fixture.sentryOptions.dsn = "https://key@sentry.io/proj" val sut = fixture.getSut() @@ -180,7 +178,6 @@ class SentryFeignClientTest { @Test fun `when request url not in tracing origins, does not add sentry trace header to the request`() { fixture.sentryOptions.setTracePropagationTargets(listOf("http://some-other-url.sentry.io")) - fixture.sentryOptions.isTraceSampling = true fixture.sentryOptions.dsn = "https://key@sentry.io/proj" val sut = fixture.getSut() sut.getOk() @@ -424,7 +421,6 @@ class SentryFeignClientTest { @Test fun `adds W3C traceparent header when propagateTraceparent is enabled`() { - fixture.sentryOptions.isTraceSampling = true fixture.sentryOptions.isPropagateTraceparent = true fixture.sentryOptions.dsn = "https://key@sentry.io/proj" val sut = fixture.getSut() @@ -437,7 +433,6 @@ class SentryFeignClientTest { @Test fun `does not add W3C traceparent header when propagateTraceparent is disabled`() { - fixture.sentryOptions.isTraceSampling = true fixture.sentryOptions.isPropagateTraceparent = false fixture.sentryOptions.dsn = "https://key@sentry.io/proj" val sut = fixture.getSut() diff --git a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/OtelSpanWrapper.java b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/OtelSpanWrapper.java index c746c30c01b..5733d85a9cd 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/OtelSpanWrapper.java +++ b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/OtelSpanWrapper.java @@ -194,12 +194,10 @@ public OtelSpanWrapper( @Override public @Nullable TraceContext traceContext() { - if (scopes.getOptions().isTraceSampling()) { - final @Nullable Baggage baggage = context.getBaggage(); - if (baggage != null) { - updateBaggageValues(baggage); - return baggage.toTraceContext(); - } + final @Nullable Baggage baggage = context.getBaggage(); + if (baggage != null) { + updateBaggageValues(baggage); + return baggage.toTraceContext(); } return null; } @@ -232,12 +230,10 @@ private void updateBaggageValues(final @NotNull Baggage baggage) { @Override public @Nullable BaggageHeader toBaggageHeader(@Nullable List thirdPartyBaggageHeaders) { - if (scopes.getOptions().isTraceSampling()) { - final @Nullable Baggage baggage = context.getBaggage(); - if (baggage != null) { - updateBaggageValues(baggage); - return BaggageHeader.fromBaggageAndOutgoingHeader(baggage, thirdPartyBaggageHeaders); - } + final @Nullable Baggage baggage = context.getBaggage(); + if (baggage != null) { + updateBaggageValues(baggage); + return BaggageHeader.fromBaggageAndOutgoingHeader(baggage, thirdPartyBaggageHeaders); } return null; } diff --git a/sentry-opentelemetry/sentry-opentelemetry-core/src/test/kotlin/OtelSentryPropagatorTest.kt b/sentry-opentelemetry/sentry-opentelemetry-core/src/test/kotlin/OtelSentryPropagatorTest.kt index 6b9e733157d..f935d71b329 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-core/src/test/kotlin/OtelSentryPropagatorTest.kt +++ b/sentry-opentelemetry/sentry-opentelemetry-core/src/test/kotlin/OtelSentryPropagatorTest.kt @@ -261,43 +261,6 @@ class OtelSentryPropagatorTest { assertNull(carrier["baggage"]) } - @Test - fun `does not inject headers if URL in span attributes with tracePropagationTargets set to same url but trace sampling disabled`() { - Sentry.init { options -> - options.dsn = "https://key@sentry.io/proj" - options.setTracePropagationTargets(listOf("sentry.io")) - options.isTraceSampling = false - } - val propagator = OtelSentryPropagator() - val carrier = mutableMapOf() - - val otelAttributes = Attributes.of(UrlAttributes.URL_FULL, "https://sentry.io/some/path") - val sentrySpan = mock() - whenever(sentrySpan.toSentryTrace()) - .thenReturn(SentryTraceHeader("f9118105af4a2d42b4124532cd1065ff-424cffc8f94feeee-1")) - whenever(sentrySpan.toBaggageHeader(anyOrNull())) - .thenReturn( - BaggageHeader( - "sentry-environment=production,sentry-public_key=502f25099c204a2fbf4cb16edc5975d1,sentry-sample_rand=0.456789,sentry-sample_rate=0.5,sentry-sampled=true,sentry-trace_id=df71f5972f754b4c85af13ff5c07017d" - ) - ) - whenever(sentrySpan.openTelemetrySpanAttributes).thenReturn(otelAttributes) - val otelSpanContext = - SpanContext.create( - "f9118105af4a2d42b4124532cd1065ff", - "424cffc8f94feeee", - TraceFlags.getSampled(), - TraceState.getDefault(), - ) - val otelSpan = Span.wrap(otelSpanContext) - spanStorage.storeSentrySpan(otelSpanContext, sentrySpan) - - propagator.inject(Context.root().with(otelSpan), carrier, MapSetter()) - - assertNull(carrier["sentry-trace"]) - assertNull(carrier["baggage"]) - } - @Test fun `does not inject headers if sentry span missing`() { val propagator = OtelSentryPropagator() diff --git a/sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot4/SentrySpanRestClientCustomizerTest.kt b/sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot4/SentrySpanRestClientCustomizerTest.kt index 9b35c0e2abc..04e6eede7a6 100644 --- a/sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot4/SentrySpanRestClientCustomizerTest.kt +++ b/sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot4/SentrySpanRestClientCustomizerTest.kt @@ -77,7 +77,6 @@ class SentrySpanRestClientCustomizerTest { } sentryOptions.dsn = "https://key@sentry.io/proj" - sentryOptions.isTraceSampling = true mockServer.enqueue( MockResponse().setBody("OK").setSocketPolicy(socketPolicy).setResponseCode(status.value()) diff --git a/sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot4/SentrySpanRestTemplateCustomizerTest.kt b/sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot4/SentrySpanRestTemplateCustomizerTest.kt index 381a10975f6..a58968a5317 100644 --- a/sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot4/SentrySpanRestTemplateCustomizerTest.kt +++ b/sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot4/SentrySpanRestTemplateCustomizerTest.kt @@ -81,7 +81,6 @@ class SentrySpanRestTemplateCustomizerTest { } sentryOptions.dsn = "https://key@sentry.io/proj" - sentryOptions.isTraceSampling = true mockServer.enqueue( MockResponse().setBody("OK").setSocketPolicy(socketPolicy).setResponseCode(status.value()) diff --git a/sentry-spring-boot-jakarta/src/test/kotlin/io/sentry/spring/boot/jakarta/SentrySpanRestClientCustomizerTest.kt b/sentry-spring-boot-jakarta/src/test/kotlin/io/sentry/spring/boot/jakarta/SentrySpanRestClientCustomizerTest.kt index ac38f48047a..bdb6a56e55e 100644 --- a/sentry-spring-boot-jakarta/src/test/kotlin/io/sentry/spring/boot/jakarta/SentrySpanRestClientCustomizerTest.kt +++ b/sentry-spring-boot-jakarta/src/test/kotlin/io/sentry/spring/boot/jakarta/SentrySpanRestClientCustomizerTest.kt @@ -77,7 +77,6 @@ class SentrySpanRestClientCustomizerTest { } sentryOptions.dsn = "https://key@sentry.io/proj" - sentryOptions.isTraceSampling = true mockServer.enqueue( MockResponse().setBody("OK").setSocketPolicy(socketPolicy).setResponseCode(status.value()) diff --git a/sentry-spring-boot-jakarta/src/test/kotlin/io/sentry/spring/boot/jakarta/SentrySpanRestTemplateCustomizerTest.kt b/sentry-spring-boot-jakarta/src/test/kotlin/io/sentry/spring/boot/jakarta/SentrySpanRestTemplateCustomizerTest.kt index e30c2e99d72..d00849a025e 100644 --- a/sentry-spring-boot-jakarta/src/test/kotlin/io/sentry/spring/boot/jakarta/SentrySpanRestTemplateCustomizerTest.kt +++ b/sentry-spring-boot-jakarta/src/test/kotlin/io/sentry/spring/boot/jakarta/SentrySpanRestTemplateCustomizerTest.kt @@ -81,7 +81,6 @@ class SentrySpanRestTemplateCustomizerTest { } sentryOptions.dsn = "https://key@sentry.io/proj" - sentryOptions.isTraceSampling = true mockServer.enqueue( MockResponse().setBody("OK").setSocketPolicy(socketPolicy).setResponseCode(status.value()) diff --git a/sentry-spring-boot/src/test/kotlin/io/sentry/spring/boot/SentrySpanRestTemplateCustomizerTest.kt b/sentry-spring-boot/src/test/kotlin/io/sentry/spring/boot/SentrySpanRestTemplateCustomizerTest.kt index 7fcba218af4..634054d039e 100644 --- a/sentry-spring-boot/src/test/kotlin/io/sentry/spring/boot/SentrySpanRestTemplateCustomizerTest.kt +++ b/sentry-spring-boot/src/test/kotlin/io/sentry/spring/boot/SentrySpanRestTemplateCustomizerTest.kt @@ -81,7 +81,6 @@ class SentrySpanRestTemplateCustomizerTest { } sentryOptions.dsn = "https://key@sentry.io/proj" - sentryOptions.isTraceSampling = true mockServer.enqueue( MockResponse().setBody("OK").setSocketPolicy(socketPolicy).setResponseCode(status.value()) diff --git a/sentry/api/sentry.api b/sentry/api/sentry.api index b3c312169a3..bafc87a1039 100644 --- a/sentry/api/sentry.api +++ b/sentry/api/sentry.api @@ -3661,7 +3661,6 @@ public class io/sentry/SentryOptions : io/sentry/transport/RateLimiterConfig { public fun isStartProfilerOnAppStart ()Z public fun isStrictTraceContinuation ()Z public fun isTraceOptionsRequests ()Z - public fun isTraceSampling ()Z public fun isTracingEnabled ()Z public fun merge (Lio/sentry/ExternalOptions;)V public fun setAppStartExtender (Lio/sentry/IAppStartExtender;)V @@ -3787,7 +3786,6 @@ public class io/sentry/SentryOptions : io/sentry/transport/RateLimiterConfig { public fun setTimerExecutorService (Lio/sentry/ISentryExecutorService;)V public fun setTraceOptionsRequests (Z)V public fun setTracePropagationTargets (Ljava/util/List;)V - public fun setTraceSampling (Z)V public fun setTracesSampleRate (Ljava/lang/Double;)V public fun setTracesSampler (Lio/sentry/SentryOptions$TracesSamplerCallback;)V public fun setTransactionProfiler (Lio/sentry/ITransactionProfiler;)V diff --git a/sentry/src/main/java/io/sentry/ISpan.java b/sentry/src/main/java/io/sentry/ISpan.java index 0baf99d7b7b..58c89dbe4b6 100644 --- a/sentry/src/main/java/io/sentry/ISpan.java +++ b/sentry/src/main/java/io/sentry/ISpan.java @@ -84,7 +84,7 @@ default ISpan startChild( /** * Returns the trace context. * - * @return a trace context or {@code null} if {@link SentryOptions#isTraceSampling()} is disabled. + * @return a trace context or {@code null} if there is no baggage. */ @Nullable @ApiStatus.Experimental @@ -93,7 +93,7 @@ default ISpan startChild( /** * Returns the baggage that can be sent as "baggage" header. * - * @return BaggageHeader or {@code null} if {@link SentryOptions#isTraceSampling()} is disabled. + * @return BaggageHeader or {@code null} if there is no baggage. */ @Nullable @ApiStatus.Experimental diff --git a/sentry/src/main/java/io/sentry/SentryOptions.java b/sentry/src/main/java/io/sentry/SentryOptions.java index 71dd4588e33..41e23caa08a 100644 --- a/sentry/src/main/java/io/sentry/SentryOptions.java +++ b/sentry/src/main/java/io/sentry/SentryOptions.java @@ -411,12 +411,6 @@ public class SentryOptions implements RateLimiterConfig { */ private @NotNull RequestSize maxRequestBodySize = RequestSize.NONE; - /** - * Controls if the `baggage` header is attached to HTTP client integrations and if the `trace` - * header is attached to envelopes. - */ - private boolean traceSampling = true; - /** * Configures the profiles sample rate as a percentage of sampled transactions to be sent in the * range of 0.0 to 1.0. if 1.0 is set it means that 100% of sampled transactions will send a @@ -2152,33 +2146,6 @@ public void setMaxRequestBodySize(final @NotNull RequestSize maxRequestBodySize) this.maxRequestBodySize = maxRequestBodySize; } - /** - * Returns whether the `baggage` header is attached to HTTP client integrations and the `trace` - * header is attached to envelopes. - * - *

Note: this is an experimental API and will be removed without notice. - * - * @return true if enabled - */ - @ApiStatus.Experimental - public boolean isTraceSampling() { - return traceSampling; - } - - /** - * Controls if the `baggage` header is attached HTTP client integrations and if the `trace` header - * is attached to envelopes. Defaults to false. - * - *

Note: this is an experimental API and will be removed without notice. - * - * @deprecated please use {{@link SentryOptions#setTracePropagationTargets(List)}} instead - * @param traceSampling - if trace sampling should be enabled - */ - @Deprecated - public void setTraceSampling(boolean traceSampling) { - this.traceSampling = traceSampling; - } - /** * Returns the maximum trace file size for each envelope item in bytes. * diff --git a/sentry/src/main/java/io/sentry/SentryTracer.java b/sentry/src/main/java/io/sentry/SentryTracer.java index ad130ac55a9..ad9533f82c6 100644 --- a/sentry/src/main/java/io/sentry/SentryTracer.java +++ b/sentry/src/main/java/io/sentry/SentryTracer.java @@ -656,12 +656,10 @@ public void finish(@Nullable SpanStatus status, @Nullable SentryDate finishDate) @Override public @Nullable TraceContext traceContext() { - if (scopes.getOptions().isTraceSampling()) { - final @Nullable Baggage baggage = getSpanContext().getBaggage(); - if (baggage != null) { - updateBaggageValues(baggage); - return baggage.toTraceContext(); - } + final @Nullable Baggage baggage = getSpanContext().getBaggage(); + if (baggage != null) { + updateBaggageValues(baggage); + return baggage.toTraceContext(); } return null; } @@ -694,12 +692,10 @@ private void updateBaggageValues(final @NotNull Baggage baggage) { @Override public @Nullable BaggageHeader toBaggageHeader(@Nullable List thirdPartyBaggageHeaders) { - if (scopes.getOptions().isTraceSampling()) { - final @Nullable Baggage baggage = getSpanContext().getBaggage(); - if (baggage != null) { - updateBaggageValues(baggage); - return BaggageHeader.fromBaggageAndOutgoingHeader(baggage, thirdPartyBaggageHeaders); - } + final @Nullable Baggage baggage = getSpanContext().getBaggage(); + if (baggage != null) { + updateBaggageValues(baggage); + return BaggageHeader.fromBaggageAndOutgoingHeader(baggage, thirdPartyBaggageHeaders); } return null; } diff --git a/sentry/src/main/java/io/sentry/util/TracingUtils.java b/sentry/src/main/java/io/sentry/util/TracingUtils.java index 8a1aa0ac660..81b7fff213d 100644 --- a/sentry/src/main/java/io/sentry/util/TracingUtils.java +++ b/sentry/src/main/java/io/sentry/util/TracingUtils.java @@ -48,7 +48,7 @@ public static void setTrace( @Nullable List thirdPartyBaggageHeaders, final @Nullable ISpan span) { final @NotNull SentryOptions sentryOptions = scopes.getOptions(); - if (sentryOptions.isTraceSampling() && shouldAttachTracingHeaders(requestUrl, sentryOptions)) { + if (shouldAttachTracingHeaders(requestUrl, sentryOptions)) { return trace(scopes, thirdPartyBaggageHeaders, span); } diff --git a/sentry/src/test/java/io/sentry/OutboxSenderTest.kt b/sentry/src/test/java/io/sentry/OutboxSenderTest.kt index 703f0823c00..f133bbb5a61 100644 --- a/sentry/src/test/java/io/sentry/OutboxSenderTest.kt +++ b/sentry/src/test/java/io/sentry/OutboxSenderTest.kt @@ -38,6 +38,7 @@ class OutboxSenderTest { init { whenever(options.dsn).thenReturn("https://key@sentry.io/proj") + whenever(options.retrieveParsedDsn()).thenReturn(Dsn("https://key@sentry.io/proj")) whenever(options.dateProvider).thenReturn(SentryNanotimeDateProvider()) whenever(options.threadChecker).thenReturn(NoOpThreadChecker.getInstance()) whenever(options.continuousProfiler).thenReturn(NoOpContinuousProfiler.getInstance()) diff --git a/sentry/src/test/java/io/sentry/SentryClientTest.kt b/sentry/src/test/java/io/sentry/SentryClientTest.kt index 6e359e56b9f..c95e116fe1c 100644 --- a/sentry/src/test/java/io/sentry/SentryClientTest.kt +++ b/sentry/src/test/java/io/sentry/SentryClientTest.kt @@ -108,7 +108,6 @@ class SentryClientTest { logs.setLoggerBatchProcessorFactory(loggerBatchProcessorFactory) metrics.setMetricsBatchProcessorFactory(metricsBatchProcessorFactory) release = "0.0.1" - isTraceSampling = true } init { diff --git a/sentry/src/test/java/io/sentry/SentryTracerTest.kt b/sentry/src/test/java/io/sentry/SentryTracerTest.kt index 20232f56b4d..d36155fd070 100644 --- a/sentry/src/test/java/io/sentry/SentryTracerTest.kt +++ b/sentry/src/test/java/io/sentry/SentryTracerTest.kt @@ -912,7 +912,6 @@ class SentryTracerTest { fun `returns trace state`() { val transaction = fixture.getSut({ - it.isTraceSampling = true it.isSendDefaultPii = true }) fixture.scopes.setUser(User().apply { id = "user-id" }) @@ -931,7 +930,7 @@ class SentryTracerTest { @Test fun `trace state uses the scope environment when set`() { - val transaction = fixture.getSut({ it.isTraceSampling = true }) + val transaction = fixture.getSut() fixture.scopes.configureScope { it.environment = "scope-environment" } val trace = transaction.traceContext() @@ -941,7 +940,7 @@ class SentryTracerTest { @Test fun `trace state uses the global scope environment when set`() { - val transaction = fixture.getSut({ it.isTraceSampling = true }) + val transaction = fixture.getSut() fixture.scopes.configureScope(ScopeType.GLOBAL) { it.environment = "global-environment" } val trace = transaction.traceContext() @@ -951,7 +950,7 @@ class SentryTracerTest { @Test fun `returns trace state without userId if not send pii`() { - val transaction = fixture.getSut({ it.isTraceSampling = true }) + val transaction = fixture.getSut() fixture.scopes.setUser(User().apply { id = "user-id" }) val trace = transaction.traceContext() assertNotNull(trace) { @@ -966,7 +965,7 @@ class SentryTracerTest { @Test fun `trace state does not change once computed`() { - val transaction = fixture.getSut({ it.isTraceSampling = true }) + val transaction = fixture.getSut() val traceBeforeUserSet = transaction.traceContext() fixture.scopes.setUser(User().apply { id = "user-id" }) val traceAfterUserSet = transaction.traceContext() @@ -987,7 +986,6 @@ class SentryTracerTest { fun `returns baggage header`() { val transaction = fixture.getSut({ - it.isTraceSampling = true it.environment = "production" it.release = "1.0.99-rc.7" it.isSendDefaultPii = true @@ -1016,7 +1014,6 @@ class SentryTracerTest { fun `returns baggage header without userId if not send pii`() { val transaction = fixture.getSut({ - it.isTraceSampling = true it.environment = "production" it.release = "1.0.99-rc.7" }) @@ -1041,7 +1038,6 @@ class SentryTracerTest { fun `returns baggage header without userId if send pii and null user`() { val transaction = fixture.getSut({ - it.isTraceSampling = true it.environment = "production" it.release = "1.0.99-rc.7" it.isSendDefaultPii = true diff --git a/sentry/src/test/java/io/sentry/SpanTest.kt b/sentry/src/test/java/io/sentry/SpanTest.kt index 9c4491d2de1..c33923b5268 100644 --- a/sentry/src/test/java/io/sentry/SpanTest.kt +++ b/sentry/src/test/java/io/sentry/SpanTest.kt @@ -28,7 +28,6 @@ class SpanTest { .thenReturn( SentryOptions().apply { dsn = "https://key@sentry.io/proj" - isTraceSampling = true } ) } diff --git a/sentry/src/test/java/io/sentry/util/TracingUtilsTest.kt b/sentry/src/test/java/io/sentry/util/TracingUtilsTest.kt index 8fa8eb05ef3..7e67bc6e53e 100644 --- a/sentry/src/test/java/io/sentry/util/TracingUtilsTest.kt +++ b/sentry/src/test/java/io/sentry/util/TracingUtilsTest.kt @@ -230,38 +230,6 @@ class TracingUtilsTest { assertTrue(headers.baggageHeader!!.value.contains("some-baggage-key=some-baggage-value")) } - @Test - fun `does not return headers if not trace sampling without span`() { - fixture.options.isTraceSampling = false - fixture.setup() - - val headers = - TracingUtils.traceIfAllowed( - fixture.scopes, - "https://sentry.io/hello", - fixture.preExistingBaggage, - null, - ) - - assertNull(headers) - } - - @Test - fun `does not return headers if not trace sampling from span`() { - fixture.options.isTraceSampling = false - fixture.setup() - - val headers = - TracingUtils.traceIfAllowed( - fixture.scopes, - "https://sentry.io/hello", - fixture.preExistingBaggage, - fixture.span, - ) - - assertNull(headers) - } - @Test fun `does not return headers if host is disallowed without span`() { fixture.options.setTracePropagationTargets(listOf("some-host-that-does-not-exist"))