Support transaction finishing automatically with 'idle timeout'

src/Sentry/TransactionTracer.cs

@@ -215,10 +215,16 @@ public TransactionTracer(IHub hub, string name, string operation, TransactionNam
     /// <summary>
     /// Initializes an instance of <see cref="TransactionTracer"/>.
     /// </summary>
-    public TransactionTracer(IHub hub, ITransactionContext context)
+    public TransactionTracer(IHub hub, ITransactionContext context) : this(hub, context, null)
+    {
+    }
+
+    /// <summary>
+    /// Initializes an instance of <see cref="TransactionTracer"/>.
+    /// </summary>
+    internal TransactionTracer(IHub hub, ITransactionContext context, TimeSpan? idleTimeoutOverride)
     {
         _hub = hub;
-        var idleTimeout = hub.GetSentryOptions()?.IdleTimeout;
         Name = context.Name;
         NameSource = context is IHasTransactionNameSource c ? c.NameSource : TransactionNameSource.Custom;
         Operation = context.Operation;
@@ -234,6 +240,8 @@ public TransactionTracer(IHub hub, ITransactionContext context)
             _instrumenter = transactionContext.Instrumenter;
         }
 
+        var idleTimeout = idleTimeoutOverride ?? hub.GetSentryOptions()?.IdleTimeout;
+
         if (idleTimeout != null)
         {
             _idleTimer = new Timer(state =>
@@ -244,7 +252,7 @@ public TransactionTracer(IHub hub, ITransactionContext context)
                 }
 
                 transactionTracer.Finish(Status ?? SpanStatus.Ok);
-            }, this, TimeSpan.Zero, idleTimeout.Value);
+            }, this, idleTimeout.Value, Timeout.InfiniteTimeSpan);
         }
     }
 

test/Sentry.OpenTelemetry.Tests/SentrySpanProcessorTests.cs

@@ -318,6 +318,6 @@ public void OnEnd_does_not_finish_transaction_marked_as_IsSentryRequest()
             return;
         }
 
-        transaction.Contexts.ContainsKey("otel").Should().BeFalse();
+        transaction.IsSentryRequest.Should().BeTrue();
     }
 }

test/Sentry.Tests/HubTests.cs

@@ -1376,32 +1376,4 @@ public async Task WithScopeAsyncT_Works()
     }
 
     private static Scope GetCurrentScope(Hub hub) => hub.ScopeManager.GetCurrent().Key;
-
-    [Fact]
-    public async Task IdleTimeout_auto_finishes_transaction()
-    {
-        // Arrange
-        _fixture.Options.IdleTimeout = TimeSpan.FromMilliseconds(2);
-        var hub = _fixture.GetSut();
-        var context = new TransactionContext(
-            SpanId.Create(),
-            SpanId.Create(),
-            SentryId.Create(),
-            "name",
-            "operation",
-            "description",
-            SpanStatus.Ok,
-            null,
-            true,
-            TransactionNameSource.Component
-        );
-
-        // Act
-        var transaction = hub.StartTransaction(context);
-
-        await Task.Delay(TimeSpan.FromMilliseconds(5));
-
-        // Assert
-        transaction.IsFinished.Should().BeTrue();
-    }
 }

test/Sentry.Tests/Protocol/TransactionTests.cs

@@ -595,4 +595,37 @@ public async Task Idle_transaction_should_finish_with_idle_timeout_specified()
         // Assert
         transaction.IsFinished.Should().BeTrue();
     }
+
+    [Fact]
+    public async Task IdleTimeoutOverride_should_override_SentryOptions_IdleTimeout()
+    {
+        // Arrange
+        var client = Substitute.For<ISentryClient>();
+        var options = new SentryOptions
+        {
+            Dsn = ValidDsn,
+            IdleTimeout = TimeSpan.FromMilliseconds(2)
+        };
+        var hub = new Hub(options, client);
+        var context = new TransactionContext(
+            SpanId.Create(),
+            SpanId.Create(),
+            SentryId.Create(),
+            "my name",
+            "my operation",
+            "description",
+            SpanStatus.Ok,
+            null,
+            true,
+            TransactionNameSource.Component
+        );
+
+        var transaction = new TransactionTracer(hub, context, TimeSpan.FromMilliseconds(30));
+
+        // Act
+        await Task.Delay(5);
+
+        // Assert
+        transaction.IsFinished.Should().BeFalse();
+    }
 }