backporting 2.1.8 changes

getsentry · Nov 21, 2020 · a98a7c9 · a98a7c9
1 parent 27267e6
commit a98a7c9
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## vNext
+
+* Add SentryScopeProcessor #603
+
 ## 3.0.0-alpha.5
 
 * Replaced `BaseScope` with `IScope`. (#590) @Tyrrrz

diff --git a/samples/Sentry.Samples.Console.Customized/Program.cs b/samples/Sentry.Samples.Console.Customized/Program.cs
@@ -273,7 +273,7 @@ private class MyCustomerScopeStateProcessor : ISentryScopeStateProcessor
     {
         private readonly ISentryScopeStateProcessor _fallback = new DefaultSentryScopeStateProcessor();
 
-        public void Apply(BaseScope scope, object state)
+        public void Apply(IScope scope, object state)
         {
             if (state is SpecialContextObject specialState)
             {

diff --git a/src/Sentry.Protocol/ISentryScopeProcessor.cs b/src/Sentry.Protocol/ISentryScopeProcessor.cs
diff --git a/...y.Protocol/DefaultSentryScopeProcessor.cs → ...tocol/DefaultSentryScopeStateProcessor.cs b/...y.Protocol/DefaultSentryScopeProcessor.cs → ...tocol/DefaultSentryScopeStateProcessor.cs
@@ -4,9 +4,15 @@
 
 namespace Sentry.Protocol
 {
-    public class DefaultSentryScopeProcessor : ISentryScopeProcessor
+    /// <summary>
+    /// Defines the logic for applying state onto a scope.
+    /// </summary>
+    public class DefaultSentryScopeStateProcessor : ISentryScopeStateProcessor
     {
-        public void Apply(BaseScope scope, object state)
+        /// <summary>
+        /// Applies state onto a scope.
+        /// </summary>
+        public void Apply(IScope scope, object state)
         {
             switch (state)
             {
@@ -23,7 +29,7 @@ public void Apply(BaseScope scope, object state)
                     scope.SetTags(keyValStringObject
                         .Select(k => new KeyValuePair<string, string>(
                             k.Key,
-                            k.Value?.ToString()))
+                            k.Value?.ToString()!))
                         .Where(kv => !string.IsNullOrEmpty(kv.Value)));
 
                     break;

diff --git a/src/Sentry/Protocol/ISentryScopeStateProcessor.cs b/src/Sentry/Protocol/ISentryScopeStateProcessor.cs
@@ -0,0 +1,13 @@
+namespace Sentry.Protocol
+{
+    /// <summary>
+    /// Defines the logic for applying state onto a scope.
+    /// </summary>
+    public interface ISentryScopeStateProcessor
+    {
+        /// <summary>
+        /// Applies state onto a scope.
+        /// </summary>
+        void Apply(IScope scope, object state);
+    }
+}
diff --git a/src/Sentry/ScopeExtensions.cs b/src/Sentry/ScopeExtensions.cs
@@ -2,8 +2,8 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
 using Sentry.Extensibility;
+using System.Linq;
 using Sentry.Internal;
 using Sentry.Protocol;
 using Constants = Sentry.Protocol.Constants;
@@ -354,7 +354,7 @@ public static void Apply(this IScope from, IScope to)
         /// <param name="state">The state object to apply.</param>
         public static void Apply(this IScope scope, object state)
         {
-            var processor = scope.ScopeOptions.SentryScopeProcessor ?? new DefaultSentryScopeProcessor();
+            var processor = scope.ScopeOptions?.SentryScopeStateProcessor ?? new DefaultSentryScopeStateProcessor();
             processor.Apply(scope, state);
         }