added option to disable trace ID generation

Author: bitsandfoxes

sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java

@@ -159,10 +159,7 @@ private void stopPreviousTransactions() {
   private void startTracing(final @NotNull Activity activity) {
     WeakReference<Activity> weakActivity = new WeakReference<>(activity);
     if (scopes != null && !isRunningTransactionOrTrace(activity)) {
-      if (!performanceEnabled) {
-        activitiesWithOngoingTransactions.put(activity, NoOpTransaction.getInstance());
-        TracingUtils.startNewTrace(scopes);
-      } else {
+      if (performanceEnabled) {
         // as we allow a single transaction running on the bound Scope, we finish the previous ones
         stopPreviousTransactions();
 
@@ -301,6 +298,9 @@ private void startTracing(final @NotNull Activity activity) {
             });
 
         activitiesWithOngoingTransactions.put(activity, transaction);
+      } else if (options.isEnableAutoTraceIdGeneration()) {
+        activitiesWithOngoingTransactions.put(activity, NoOpTransaction.getInstance());
+        TracingUtils.startNewTrace(scopes);
       }
     }
   }

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

@@ -107,6 +107,8 @@ final class ManifestMetadataReader {
 
   static final String IGNORED_ERRORS = "io.sentry.ignored-errors";
 
+  static final String ENABLE_AUTO_TRACE_ID_GENERATION = "io.sentry.enable-trace-update";
+
   /** ManifestMetadataReader ctor */
   private ManifestMetadataReader() {}
 
@@ -380,6 +382,9 @@ static void applyMetadata(
             readBool(
                 metadata, logger, ENABLE_SCOPE_PERSISTENCE, options.isEnableScopePersistence()));
 
+        options.setEnableAutoTraceIdGeneration(
+          readBool(metadata, logger, ENABLE_AUTO_TRACE_ID_GENERATION, options.isAttachScreenshot()));
+
         if (options.getSessionReplay().getSessionSampleRate() == null) {
           final Double sessionSampleRate =
               readDouble(metadata, logger, REPLAYS_SESSION_SAMPLE_RATE);

sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroidOptions.java

@@ -166,6 +166,11 @@ public final class SentryAndroidOptions extends SentryOptions {
    */
   private boolean enableScopeSync = true;
 
+  /** Whether to enable automatic trace ID generation. This is mainly used by the Hybrid SDKs to
+   * control the trace ID generation from the outside.
+   */
+  private boolean enableAutoTraceIdGeneration = true;
+
   public interface BeforeCaptureCallback {
 
     /**
@@ -594,4 +599,13 @@ public void setFrameMetricsCollector(
       final @Nullable SentryFrameMetricsCollector frameMetricsCollector) {
     this.frameMetricsCollector = frameMetricsCollector;
   }
+
+
+  public boolean isEnableAutoTraceIdGeneration() {
+    return enableAutoTraceIdGeneration;
+  }
+
+  public void setEnableAutoTraceIdGeneration(final boolean enableAutoTraceIdGeneration) {
+    this.enableAutoTraceIdGeneration = enableAutoTraceIdGeneration;
+  }
 }

sentry-android-core/src/main/java/io/sentry/android/core/internal/gestures/SentryGestureListener.java

@@ -201,7 +201,7 @@ private void startTracing(final @NotNull UiElement target, final @NotNull Gestur
     final boolean isNewInteraction = isClickGesture || !isNewGestureSameAsActive;
 
     if (!(options.isTracingEnabled() && options.isEnableUserInteractionTracing())) {
-      if (isNewInteraction) {
+      if (options.isEnableAutoTraceIdGeneration() && isNewInteraction) {
         TracingUtils.startNewTrace(scopes);
         activeUiElement = target;
         activeEventType = eventType;