Merge branch 'version-5.0.0' into substring-or-pattern-matcher

Author: jamescrosswell

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## Version Five
+
+### API Changes
+
+- You should no longer pass `AndroidContext` as an argument to `SentrySdk.Init` ([#3562](https://github.com/getsentry/sentry-dotnet/pull/3562))
+- The `SentryUser.Segment` property has been deprecated. Consider sending this as a tag or additional data instead ([#3563](https://github.com/getsentry/sentry-dotnet/pull/3563))
+- The ITraceContext now includes an [Origin](https://develop.sentry.dev/sdk/telemetry/traces/trace-origin/), which is set automatically and is primarily used internally by the Sentry server ([#3564](https://github.com/getsentry/sentry-dotnet/pull/3564))
+
 ## 4.10.2
 
 ### Various fixes & improvements

src/Sentry.NLog/SentryTarget.cs

@@ -453,9 +453,6 @@ private void InnerWrite(LogEventInfo logEvent)
             Username = User.Username?.Render(logEvent),
             Email = User.Email?.Render(logEvent),
             IpAddress = User.IpAddress?.Render(logEvent),
-#pragma warning disable CS0618 // Type or member is obsolete
-            Segment = User.Segment?.Render(logEvent)
-#pragma warning restore CS0618 // Type or member is obsolete
         };
 
         if (User.Other?.Count > 0)

src/Sentry/DynamicSamplingContext.cs

@@ -26,7 +26,6 @@ private DynamicSamplingContext(
         double? sampleRate = null,
         string? release = null,
         string? environment = null,
-        string? userSegment = null,
         string? transactionName = null)
     {
         // Validate and set required values
@@ -72,11 +71,6 @@ private DynamicSamplingContext(
             items.Add("environment", environment);
         }
 
-        if (!string.IsNullOrWhiteSpace(userSegment))
-        {
-            items.Add("user_segment", userSegment);
-        }
-
         if (!string.IsNullOrWhiteSpace(transactionName))
         {
             items.Add("transaction", transactionName);
@@ -127,9 +121,6 @@ public static DynamicSamplingContext CreateFromTransaction(TransactionTracer tra
         var traceId = transaction.TraceId;
         var sampled = transaction.IsSampled;
         var sampleRate = transaction.SampleRate!.Value;
-#pragma warning disable CS0618 // Type or member is obsolete
-        var userSegment = transaction.User.Segment;
-#pragma warning restore CS0618 // Type or member is obsolete
         var transactionName = transaction.NameSource.IsHighQuality() ? transaction.Name : null;
 
         // These two may not have been set yet on the transaction, but we can get them directly.
@@ -143,7 +134,6 @@ public static DynamicSamplingContext CreateFromTransaction(TransactionTracer tra
             sampleRate,
             release,
             environment,
-            userSegment,
             transactionName);
     }
 

src/Sentry/IBaseTracer.cs

@@ -1,6 +1,6 @@
 namespace Sentry;
 
-internal interface IBaseTracer : ITraceContextInternal
+internal interface IBaseTracer
 {
     internal bool IsOtelInstrumenter { get; }
 }

src/Sentry/ITraceContextInternal.cs

@@ -5,7 +5,7 @@ namespace Sentry.Internal;
 /// <summary>
 /// Span class to use when we can't return null but a request to create a span couldn't be completed.
 /// </summary>
-internal class NoOpSpan : ISpan, ITraceContextInternal
+internal class NoOpSpan : ISpan
 {
     public static ISpan Instance { get; } = new NoOpSpan();
 

src/Sentry/Internal/NoOpSpan.cs

@@ -12,9 +12,6 @@ public static SentryUser ToUser(this JavaSdk.Protocol.User user) =>
             Id = user.Id,
             IpAddress = user.IpAddress,
             Username = user.Username,
-#pragma warning disable CS0618 // Type or member is obsolete
-            Segment = user.Segment,
-#pragma warning restore CS0618 // Type or member is obsolete
             Other = user.Data ?? EmptyDictionary
         };
 
@@ -25,9 +22,6 @@ public static JavaSdk.Protocol.User ToJavaUser(this SentryUser user) =>
             Id = user.Id,
             IpAddress = user.IpAddress,
             Username = user.Username,
-#pragma warning disable CS0618 // Type or member is obsolete
-            Segment = user.Segment,
-#pragma warning restore CS0618 // Type or member is obsolete
             Data = user.Other.Count == 0 ? null : user.Other
         };
 }

src/Sentry/Platforms/Android/Extensions/UserExtensions.cs

@@ -25,6 +25,8 @@ internal TransactionContextFacade(JavaSdk.TransactionContext context)
 
     public string Operation => _context.Operation;
 
+    public string? Origin => _context.Origin;
+
     public string? Description => _context.Description;
 
     public SpanStatus? Status => _context.Status?.ToSpanStatus();

src/Sentry/Platforms/Android/Facades/TransactionContextFacade.cs

@@ -20,34 +20,6 @@ public static partial class SentrySdk
 {
     private static AndroidContext AppContext { get; set; } = Application.Context;
 
-    /// <summary>
-    /// Initializes the SDK for Android, with an optional configuration options callback.
-    /// </summary>
-    /// <param name="context">The Android application context.</param>
-    /// <param name="configureOptions">The configuration options callback.</param>
-    /// <returns>An object that should be disposed when the application terminates.</returns>
-    [Obsolete("It is no longer required to provide the application context when calling Init. " +
-              "This method may be removed in a future major release.")]
-    public static IDisposable Init(AndroidContext context, Action<SentryOptions>? configureOptions)
-    {
-        AppContext = context;
-        return Init(configureOptions);
-    }
-
-    /// <summary>
-    /// Initializes the SDK for Android, using a configuration options instance.
-    /// </summary>
-    /// <param name="context">The Android application context.</param>
-    /// <param name="options">The configuration options instance.</param>
-    /// <returns>An object that should be disposed when the application terminates.</returns>
-    [Obsolete("It is no longer required to provide the application context when calling Init. " +
-              "This method may be removed in a future major release.")]
-    public static IDisposable Init(AndroidContext context, SentryOptions options)
-    {
-        AppContext = context;
-        return Init(options);
-    }
-
     private static void InitSentryAndroidSdk(SentryOptions options)
     {
         // Set default release and distribution

src/Sentry/Platforms/Android/SentrySdk.cs

@@ -11,9 +11,6 @@ public static SentryUser ToUser(this CocoaSdk.SentryUser user, IDiagnosticLogger
             Id = user.UserId,
             IpAddress = user.IpAddress,
             Username = user.Username,
-#pragma warning disable CS0618 // Type or member is obsolete
-            Segment = user.Segment,
-#pragma warning restore CS0618 // Type or member is obsolete
             Other = user.Data.ToStringDictionary(logger)
         };
 
@@ -25,9 +22,6 @@ public static CocoaSdk.SentryUser ToCocoaUser(this SentryUser user)
             UserId = user.Id,
             IpAddress = user.IpAddress,
             Username = user.Username,
-#pragma warning disable CS0618 // Type or member is obsolete
-            Segment = user.Segment ?? "",
-#pragma warning restore CS0618 // Type or member is obsolete
             Data = user.Other.ToNullableNSDictionary()
         };