Merge branch 'feat/4.0.0' into feat/4.0.0-remove-hasbreadcrumbs

Author: jamescrosswell

CHANGELOG.md

@@ -17,6 +17,8 @@ without native/platform specific bindings and SDKs. See [this ticket for more de
 API Changes:
 
 - IHasBreadcrumbs was removed. Use IEventLike instead. ([#2670](https://github.com/getsentry/sentry-dotnet/pull/2670))
+- ISpanContext was removed. Use ITraceContext instead. ([#2668](https://github.com/getsentry/sentry-dotnet/pull/2668))
+- 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

@@ -1,9 +1,11 @@
+using Sentry.Protocol;
+
 namespace Sentry;
 
 /// <summary>
 /// Immutable data belonging to a span.
 /// </summary>
-public interface ISpanData : ISpanContext, IHasTags, IHasExtra
+public interface ISpanData : ITraceContext, IHasTags, IHasExtra
 {
     /// <summary>
     /// Start timestamp.

src/Sentry/ISpanContext.cs

@@ -1,9 +1,11 @@
+using Sentry.Protocol;
+
 namespace Sentry;
 
 /// <summary>
 /// Transaction metadata.
 /// </summary>
-public interface ITransactionContext : ISpanContext
+public interface ITransactionContext : ITraceContext
 {
     /// <summary>
     /// Transaction name.
@@ -14,4 +16,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/ISpanData.cs

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

src/Sentry/ITransactionContext.cs

@@ -1,9 +1,11 @@
+using Sentry.Protocol;
+
 namespace Sentry;
 
 /// <summary>
 /// Span metadata used for sampling.
 /// </summary>
-public class SpanContext : ISpanContext
+public class SpanContext : ITraceContext
 {
     /// <inheritdoc />
     public SpanId SpanId { get; }

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/SpanContext.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/Transaction.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;