Merged IHasTransactionNameSource into ITransactionContext (#2654)

Author: jamescrosswell

CHANGELOG.md

@@ -16,6 +16,7 @@ without native/platform specific bindings and SDKs. See [this ticket for more de
 
 API Changes:
 
+- Removed IHasTransactionNameSource. Use ITransactionContext instead. ([#2654](https://github.com/getsentry/sentry-dotnet/pull/2654))
 - Adding `Distribution` to `IEventLike` ([#2660](https://github.com/getsentry/sentry-dotnet/pull/2660))
 
 ### Features

src/Sentry/IHasTransactionNameSource.cs

@@ -14,4 +14,9 @@ public interface ITransactionContext : ISpanContext
     /// Whether the parent transaction of this transaction has been sampled.
     /// </summary>
     bool? IsParentSampled { get; }
+
+    /// <summary>
+    /// The source of the transaction name.
+    /// </summary>
+    TransactionNameSource NameSource { get; }
 }

src/Sentry/ITransactionContext.cs

@@ -25,6 +25,8 @@ public bool? IsParentSampled
         set { }
     }
 
+    public TransactionNameSource NameSource => TransactionNameSource.Custom;
+
     public string? Distribution
     {
         get => string.Empty;

src/Sentry/Internal/NoOpTransaction.cs

@@ -9,7 +9,7 @@ namespace Sentry;
 /// <summary>
 /// Sentry performance transaction.
 /// </summary>
-public class Transaction : ITransactionData, IJsonSerializable, IHasTransactionNameSource, IHasMeasurements
+public class Transaction : ITransactionData, IJsonSerializable, IHasMeasurements
 {
     /// <summary>
     /// Transaction's event ID.
@@ -233,7 +233,7 @@ public Transaction(string name, string operation, TransactionNameSource nameSour
     /// Initializes an instance of <see cref="Transaction"/>.
     /// </summary>
     public Transaction(ITransaction tracer)
-        : this(tracer.Name, tracer is IHasTransactionNameSource t ? t.NameSource : TransactionNameSource.Custom)
+        : this(tracer.Name, tracer.NameSource)
     {
         // Contexts have to be set first because other fields use that
         Contexts = tracer.Contexts;

src/Sentry/Transaction.cs

@@ -3,7 +3,7 @@ namespace Sentry;
 /// <summary>
 /// Transaction metadata used for sampling.
 /// </summary>
-public class TransactionContext : SpanContext, ITransactionContext, IHasTransactionNameSource
+public class TransactionContext : SpanContext, ITransactionContext
 {
     /// <inheritdoc />
     public string Name { get; set; }

src/Sentry/TransactionContext.cs

@@ -7,7 +7,7 @@ namespace Sentry;
 /// <summary>
 /// Transaction tracer.
 /// </summary>
-public class TransactionTracer : ITransaction, IHasTransactionNameSource, IHasMeasurements
+public class TransactionTracer : ITransaction, IHasMeasurements
 {
     private readonly IHub _hub;
     private readonly SentryOptions? _options;
@@ -43,7 +43,7 @@ public SentryId TraceId
     /// <inheritdoc cref="ITransaction.Name" />
     public string Name { get; set; }
 
-    /// <inheritdoc cref="IHasTransactionNameSource.NameSource" />
+    /// <inheritdoc cref="ITransactionContext.NameSource" />
     public TransactionNameSource NameSource { get; set; }
 
     /// <inheritdoc cref="ITransaction.IsParentSampled" />
@@ -229,7 +229,7 @@ internal TransactionTracer(IHub hub, ITransactionContext context, TimeSpan? idle
         _hub = hub;
         _options = _hub.GetSentryOptions();
         Name = context.Name;
-        NameSource = context is IHasTransactionNameSource c ? c.NameSource : TransactionNameSource.Custom;
+        NameSource = context.NameSource;
         Operation = context.Operation;
         SpanId = context.SpanId;
         ParentSpanId = context.ParentSpanId;

src/Sentry/TransactionTracer.cs

@@ -16,7 +16,7 @@ public void StartSentryTransaction_CreatesValidTransaction()
         // Assert
         transaction.Name.Should().Be("GET /the/path");
         transaction.Operation.Should().Be("http.server");
-        ((IHasTransactionNameSource)transaction).NameSource.Should().Be(TransactionNameSource.Url);
+        transaction.NameSource.Should().Be(TransactionNameSource.Url);
     }
 
     [Fact]

test/Sentry.AspNet.Tests/HttpContextExtensionsTests.cs

@@ -101,7 +101,7 @@ public async Task Transaction_is_bound_on_the_scope_automatically()
         // Assert
         transaction.Should().NotBeNull();
         transaction.Name.Should().Be("GET /person/{id}");
-        ((IHasTransactionNameSource)transaction).NameSource.Should().Be(TransactionNameSource.Route);
+        transaction.NameSource.Should().Be(TransactionNameSource.Route);
     }
 
     [Fact]