Replace BaseScope with IScope (#590)

Author: Tyrrrz

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## vNext
 
+* Replaced `BaseScope` with `IScope`. (#590) @Tyrrrz
 * Removed code coverage report from the test folder. (#592) @lucas-zimerman
 * Add target framework NET5.0 on Sentry.csproj. Change the type of `Extra` where value parameter become nullable. @lucas-zimerman 
 * Implement envelope caching. (#576) @Tyrrrz

src/Sentry.AspNetCore.Grpc/ScopeExtensions.cs

@@ -35,7 +35,7 @@ public static void Populate<TRequest>(this Scope scope, ServerCallContext contex
             }
         }
 
-        private static void SetBody<TRequest>(BaseScope scope, ServerCallContext context, TRequest request,
+        private static void SetBody<TRequest>(IScope scope, ServerCallContext context, TRequest request,
             SentryAspNetCoreOptions options) where TRequest : class, IMessage
         {
             var httpContext = context.GetHttpContext();

src/Sentry.AspNetCore/ScopeExtensions.cs

@@ -147,7 +147,7 @@ private static void SetEnv(Scope scope, HttpContext context, SentryAspNetCoreOpt
             }
         }
 
-        private static void SetBody(BaseScope scope, HttpContext context, SentryAspNetCoreOptions options)
+        private static void SetBody(IScope scope, HttpContext context, SentryAspNetCoreOptions options)
         {
             var extractors = context.RequestServices.GetService<IEnumerable<IRequestPayloadExtractor>>();
             if (extractors == null)

src/Sentry/Internal/Extensions/CollectionsExtensions.cs

@@ -6,30 +6,28 @@ namespace Sentry.Internal.Extensions
 {
     internal static class CollectionsExtensions
     {
+        public static void AddRange<T>(this ICollection<T> collection, IEnumerable<T> items)
+        {
+            foreach (var i in items)
+            {
+                collection.Add(i);
+            }
+        }
+
         public static TValue GetOrCreate<TValue>(
             this ConcurrentDictionary<string, object> dictionary,
             string key)
             where TValue : class, new()
             => (TValue) dictionary.GetOrAdd(key, _ => new TValue());
 
-        public static ConcurrentQueue<T> EnqueueAll<T>(this ConcurrentQueue<T> target, IEnumerable<T> values)
-        {
-            foreach (var value in values)
-            {
-                target.Enqueue(value);
-            }
-
-            return target;
-        }
-
         public static void TryCopyTo<TKey, TValue>(this IDictionary<TKey, TValue> from, IDictionary<TKey, TValue> to)
             where TKey : notnull
         {
-            foreach (var kv in from)
+            foreach (var (key, value) in from)
             {
-                if (!to.ContainsKey(kv.Key))
+                if (!to.ContainsKey(key))
                 {
-                    to[kv.Key] = kv.Value;
+                    to[key] = value;
                 }
             }
         }

src/Sentry/Internal/Json.cs

@@ -1,14 +1,52 @@
+using System;
+using System.Collections;
 using System.IO;
+using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Serialization;
 
 namespace Sentry.Internal
 {
+    [AttributeUsage(AttributeTargets.Property)]
+    internal class DontSerializeEmptyAttribute : Attribute {}
+
     internal static class Json
     {
+        private class ContractResolver : DefaultContractResolver
+        {
+            protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
+            {
+                var jsonProperty = base.CreateProperty(member, memberSerialization);
+                var property = jsonProperty.DeclaringType.GetProperty(jsonProperty.UnderlyingName);
+
+                // DontSerializeEmpty
+                if (jsonProperty.ShouldSerialize is null &&
+                    property?.GetCustomAttribute<DontSerializeEmptyAttribute>() is {})
+                {
+                    // Collections
+                    if (property.PropertyType.GetInterfaces().Any(i => i == typeof(IEnumerable)))
+                    {
+                        jsonProperty.ShouldSerialize = o =>
+                        {
+                            if (property.GetValue(o) is IEnumerable value)
+                            {
+                                return !value.Cast<object>().Any();
+                            }
+
+                            return true;
+                        };
+                    }
+                }
+
+                return jsonProperty;
+            }
+        }
+
         private static readonly Encoding Encoding = new UTF8Encoding(false, true);
         private static readonly StringEnumConverter StringEnumConverter = new StringEnumConverter();
 
@@ -19,7 +57,8 @@ internal static class Json
             ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
             Formatting = Formatting.None,
             Converters = {StringEnumConverter},
-            DateFormatHandling = DateFormatHandling.IsoDateFormat
+            DateFormatHandling = DateFormatHandling.IsoDateFormat,
+            ContractResolver = new ContractResolver()
         };
 
         private static JsonTextWriter CreateWriter(Stream stream) => new JsonTextWriter(