Merge f65d752 into 955c6ee

getsentry · Oct 8, 2024 · b2915e9 · b2915e9
2 parents 955c6ee + f65d752
commit b2915e9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
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
@@ -56,7 +56,7 @@ final class ManifestMetadataReader {
   static final String UNCAUGHT_EXCEPTION_HANDLER_ENABLE =
       "io.sentry.uncaught-exception-handler.enable";
 
-  static final String TRACING_ENABLE = "io.sentry.traces.enable";
+  @Deprecated static final String TRACING_ENABLE = "io.sentry.traces.enable";
   static final String TRACES_SAMPLE_RATE = "io.sentry.traces.sample-rate";
   static final String TRACES_ACTIVITY_ENABLE = "io.sentry.traces.activity.enable";
   static final String TRACES_ACTIVITY_AUTO_FINISH_ENABLE =

diff --git a/sentry/src/main/java/io/sentry/SentryOptions.java b/sentry/src/main/java/io/sentry/SentryOptions.java
@@ -910,14 +910,21 @@ public void setSampleRate(Double sampleRate) {
    * <p>NOTE: There is also {@link SentryOptions#isTracingEnabled()} which checks other options as
    * well.
    *
+   * @deprecated We're removing enableTracing in 8.0
    * @return true if enabled, false if disabled, null can mean enabled if {@link
    *     SentryOptions#getTracesSampleRate()} or {@link SentryOptions#getTracesSampler()} are set.
    */
+  @Deprecated
   public @Nullable Boolean getEnableTracing() {
     return enableTracing;
   }
 
-  /** Enables generation of transactions and propagation of trace data. */
+  /**
+   * Enables generation of transactions and propagation of trace data.
+   *
+   * @deprecated We're removing enableTracing in 8.0
+   */
+  @Deprecated
   public void setEnableTracing(@Nullable Boolean enableTracing) {
     this.enableTracing = enableTracing;
   }

diff --git a/sentry/src/main/java/io/sentry/TracesSampler.java b/sentry/src/main/java/io/sentry/TracesSampler.java
@@ -22,6 +22,7 @@ public TracesSampler(final @NotNull SentryOptions options) {
     this.random = random;
   }
 
+  @SuppressWarnings("deprecation")
   @NotNull
   TracesSamplingDecision sample(final @NotNull SamplingContext samplingContext) {
     final TracesSamplingDecision samplingContextSamplingDecision =