Merge pull request #322 from splitio/sdk-events-metadata

chillaq · web-flow · commit d9a78437e18b · 2026-01-23T12:25:52.000-08:00
updated metadata with Sdk event type
diff --git a/src/Splitio/Constants/Constants.cs b/src/Splitio/Constants/Constants.cs
@@ -61,11 +61,4 @@ public static class ApiVersions
         public static string Spec1_1 => "1.1";
         public static string LatestFlagsSpec => "1.3";
     }
-
-    public static class EventMetadataKeys
-    {
-        public static string Flags => "flags";
-        public static string Segments => "segments";
-        public static string RuleBasedSegments => "ruleBasedSegments";
-    }
 }
diff --git a/src/Splitio/Domain/EventMetadata.cs b/src/Splitio/Domain/EventMetadata.cs
@@ -6,44 +6,17 @@ namespace Splitio.Domain
 {
     public class EventMetadata
     {
-        private readonly Dictionary<string, object> _data;
+        private List<string> _names;
+        private SdkEventType _type;
 
-        public EventMetadata(Dictionary<string, object> data) 
+        public EventMetadata(SdkEventType type, List<string> names) 
         {
-            _data = Santize(data);
+            _type = type;
+            _names = names;
         }
 
-        public Dictionary<string, object> GetData() { return _data; }
-
-        public List<string> GetKeys() { return _data.Keys.ToList(); }
-
-        public List<object> GetValues() { return _data.Values.ToList(); }
-
-        public bool ContainKey(string key)
-        {
-            return _data.ContainsKey(key);
-        }
-
-        private static Dictionary<string, object> Santize(Dictionary<string, object> data)
-        {
-            Dictionary<string, object> santizedData = new Dictionary<string, object>();
-            foreach (var item in data.Where(x => ValueIsValid(x.Value))) 
-            {
-                santizedData.Add(item.Key, item.Value);
-            }
-
-            return santizedData;
-        }
-
-        private static bool ValueIsValid(object value)
-        {
-            if (!(value is null) && (PropertiesValidator.IsNumeric(value) || (value is bool) || (value is string) || (value is List<string>)))
-            {
-                return true;
-            }
-
-            return false;
-        }
+        public List<string> GetNames() { return _names; }
 
+        public SdkEventType GetEventType() { return _type; }
     }
 }
diff --git a/src/Splitio/Domain/SdkEventType.cs b/src/Splitio/Domain/SdkEventType.cs
@@ -0,0 +1,9 @@
+﻿
+namespace Splitio.Domain
+{
+    public enum SdkEventType
+    {
+        SegmentsUpdate,
+        FlagsUpdate
+    }
+}
diff --git a/src/Splitio/Services/Cache/Classes/InMemoryReadinessGatesCache.cs b/src/Splitio/Services/Cache/Classes/InMemoryReadinessGatesCache.cs
@@ -1,7 +1,6 @@
 ﻿using Splitio.Domain;
 using Splitio.Services.Cache.Interfaces;
 using Splitio.Services.Common;
-using System.Collections.Generic;
 using System.Threading;
 
 namespace Splitio.Services.Client.Classes
@@ -30,8 +29,7 @@ public bool WaitUntilReady(int milliseconds)
         public void SetReady()
         {
             _sdkReady.Signal();
-            _eventsManager.NotifyInternalEvent(SdkInternalEvent.SdkReady,
-                new EventMetadata(new Dictionary<string, object>()));
+            _eventsManager.NotifyInternalEvent(SdkInternalEvent.SdkReady, null);
         }
 
         public void SetDestroy()
diff --git a/src/Splitio/Services/Cache/Classes/InMemoryRuleBasedSegmentCache.cs b/src/Splitio/Services/Cache/Classes/InMemoryRuleBasedSegmentCache.cs
@@ -1,5 +1,4 @@
-﻿using Splitio.Constants;
-using Splitio.Domain;
+﻿using Splitio.Domain;
 using Splitio.Services.Cache.Interfaces;
 using Splitio.Services.Common;
 using System.Collections.Concurrent;
@@ -50,22 +49,19 @@ public long GetChangeNumber()
         // Producer
         public void Update(List<RuleBasedSegment> toAdd, List<string> toRemove, long till)
         {
-            List<string> toNotify = new List<string>();
             foreach (var rbSegment in toAdd)
             {
                 _cache.AddOrUpdate(rbSegment.Name, rbSegment, (key, oldValue) => rbSegment);
-                toNotify.Add(rbSegment.Name);
             }
 
             foreach (var name in toRemove)
             {
                 _cache.TryRemove(name, out var _);
-                toNotify.Add(name);
             }
 
             SetChangeNumber(till);
             _eventsManager.NotifyInternalEvent(SdkInternalEvent.RuleBasedSegmentsUpdated,
-                new EventMetadata(new Dictionary<string, object> { { EventMetadataKeys.RuleBasedSegments, toNotify } }));
+                new EventMetadata(SdkEventType.SegmentsUpdate, new List<string>()));
         }
 
         public void SetChangeNumber(long changeNumber)
diff --git a/src/Splitio/Services/Cache/Classes/InMemorySegmentCache.cs b/src/Splitio/Services/Cache/Classes/InMemorySegmentCache.cs
@@ -1,5 +1,4 @@
-﻿using Splitio.Constants;
-using Splitio.Domain;
+﻿using Splitio.Domain;
 using Splitio.Services.Cache.Interfaces;
 using Splitio.Services.Common;
 using Splitio.Services.Logger;
@@ -36,7 +35,7 @@ public void AddToSegment(string segmentName, List<string> segmentKeys)
 
             segment.AddKeys(segmentKeys);
             _eventsManager.NotifyInternalEvent(SdkInternalEvent.SegmentsUpdated,
-                new EventMetadata(new Dictionary<string, object> { { EventMetadataKeys.Segments, segmentName } }));
+                new EventMetadata(SdkEventType.SegmentsUpdate, new List<string>()));
         }
 
         public void RemoveFromSegment(string segmentName, List<string> segmentKeys)
@@ -45,7 +44,7 @@ public void RemoveFromSegment(string segmentName, List<string> segmentKeys)
             {
                 segment.RemoveKeys(segmentKeys);
                 _eventsManager.NotifyInternalEvent(SdkInternalEvent.SegmentsUpdated,
-                    new EventMetadata(new Dictionary<string, object> { { EventMetadataKeys.Segments, segmentName } }));
+                    new EventMetadata(SdkEventType.SegmentsUpdate, new List<string>()));
             }
         }
 
diff --git a/src/Splitio/Services/Cache/Classes/InMemorySplitCache.cs b/src/Splitio/Services/Cache/Classes/InMemorySplitCache.cs
@@ -8,7 +8,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Splitio.Services.Common;
-using Splitio.Constants;
 
 namespace Splitio.Services.Cache.Classes
 {
@@ -80,7 +79,7 @@ public void Update(List<ParsedSplit> toAdd, List<string> toRemove, long till)
 
             SetChangeNumber(till);
             _eventsManager.NotifyInternalEvent(SdkInternalEvent.FlagsUpdated, 
-                new EventMetadata(new Dictionary<string, object> { { EventMetadataKeys.Flags, eventsFlags } }));
+                new EventMetadata(SdkEventType.FlagsUpdate, eventsFlags));
         }
 
         public void SetChangeNumber(long changeNumber)
@@ -153,7 +152,7 @@ public void Kill(long changeNumber, string splitName, string defaultTreatment)
 
             _featureFlags.AddOrUpdate(featureFlag.name, featureFlag, (key, oldValue) => featureFlag);
             _eventsManager.NotifyInternalEvent(SdkInternalEvent.FlagKilledNotification,
-                new EventMetadata(new Dictionary<string, object> { { EventMetadataKeys.Flags, new List<string> { { featureFlag.name } } } }));
+                new EventMetadata(SdkEventType.FlagsUpdate,  new List<string> { { featureFlag.name } }));
 
         }
 
diff --git a/src/Splitio/Services/Client/Classes/SplitClient.cs b/src/Splitio/Services/Client/Classes/SplitClient.cs
@@ -73,7 +73,7 @@ public event EventHandler<EventMetadata> SdkReady
                 SdkReadyEvent = (EventHandler<EventMetadata>)Delegate.Combine(SdkReadyEvent, value);
                 if (_eventsManager.EventAlreadyTriggered(SdkEvent.SdkReady))
                 {
-                    SdkReadyEvent.Invoke(this, new EventMetadata(new Dictionary<string, object>()));
+                    SdkReadyEvent.Invoke(this, null);
                 }
             }
 
diff --git a/src/Splitio/Services/Shared/Classes/SelfRefreshingBlockUntilReadyService.cs b/src/Splitio/Services/Shared/Classes/SelfRefreshingBlockUntilReadyService.cs
@@ -36,8 +36,7 @@ public void BlockUntilReady(int blockMilisecondsUntilReady)
                 
             if (!_statusManager.WaitUntilReady(blockMilisecondsUntilReady))
             {
-                _eventsManager.NotifyInternalEvent(SdkInternalEvent.SdkTimedOut,
-                    new EventMetadata(new Dictionary<string, object>()));
+                _eventsManager.NotifyInternalEvent(SdkInternalEvent.SdkTimedOut, null);
                 _telemetryInitProducer.RecordBURTimeout();
                 throw new TimeoutException($"SDK was not ready in {blockMilisecondsUntilReady} milliseconds");
             }
diff --git a/tests/Splitio-tests/Unit Tests/Cache/InMemory/RuleBasedSegmentCacheTests.cs b/tests/Splitio-tests/Unit Tests/Cache/InMemory/RuleBasedSegmentCacheTests.cs
@@ -162,19 +162,15 @@ public void Update_ShouldNotifyEvent()
             SdkUpdate += sdkUpdate_callback;
             _eventsManager.Register(SdkEvent.SdkUpdate, TriggerSdkUpdate);
             _eventsManager.Register(SdkEvent.SdkReady, TriggerSdkReady);
-            _eventsManager.NotifyInternalEvent(SdkInternalEvent.SdkReady, new EventMetadata(new Dictionary<string, object>()));
+            _eventsManager.NotifyInternalEvent(SdkInternalEvent.SdkReady, null);
 
             // Act
             SdkUpdateFlag = false;
             _segmentCache.Update(new List<RuleBasedSegment> { segmentToAdd, segmentToRemove }, new List<string> { segmentToRemove.Name }, till);
 
             // Assert
             Assert.IsTrue(SdkUpdateFlag);
-            Assert.IsTrue(eMetadata.ContainKey(Splitio.Constants.EventMetadataKeys.RuleBasedSegments));
-            List<string> rbsegments = (List<string>)eMetadata.GetData()[Splitio.Constants.EventMetadataKeys.RuleBasedSegments];
-            Assert.IsTrue(rbsegments.Count == 3);
-            Assert.IsTrue(rbsegments.Contains("segment-to-add"));
-            Assert.IsTrue(rbsegments.Contains("segment-to-remove"));
+            Assert.AreEqual(SdkEventType.SegmentsUpdate, eMetadata.GetEventType());
         }
 
         private void sdkUpdate_callback(object sender, EventMetadata metadata)
diff --git a/tests/Splitio-tests/Unit Tests/Cache/InMemory/SegmentCacheAsyncTests.cs b/tests/Splitio-tests/Unit Tests/Cache/InMemory/SegmentCacheAsyncTests.cs
@@ -64,17 +64,15 @@ public async Task NotifyEventsTest()
             SdkUpdate += sdkUpdate_callback;
             _eventsManager.Register(SdkEvent.SdkUpdate, TriggerSdkUpdate);
             _eventsManager.Register(SdkEvent.SdkReady, TriggerSdkReady);
-            _eventsManager.NotifyInternalEvent(SdkInternalEvent.SdkReady, new EventMetadata(new Dictionary<string, object>()));
+            _eventsManager.NotifyInternalEvent(SdkInternalEvent.SdkReady, null);
 
             //Act
             SdkUpdateFlag = false;
             _cache.AddToSegment(segmentName, new List<string> { "abcd", "zzzzf" });
 
             //Assert
             Assert.IsTrue(SdkUpdateFlag);
-            Assert.IsTrue(eMetadata.ContainKey(Splitio.Constants.EventMetadataKeys.Segments));
-            string segment = (string)eMetadata.GetData()[Splitio.Constants.EventMetadataKeys.Segments];
-            Assert.AreEqual(segmentName, segment);
+            Assert.AreEqual(SdkEventType.SegmentsUpdate, eMetadata.GetEventType());
         }
 
         private void sdkUpdate_callback(object sender, EventMetadata metadata)
diff --git a/tests/Splitio-tests/Unit Tests/Cache/InMemory/SegmentCacheTests.cs b/tests/Splitio-tests/Unit Tests/Cache/InMemory/SegmentCacheTests.cs
@@ -114,17 +114,15 @@ public void NotifyEventsTest()
             SdkUpdate += sdkUpdate_callback;
             eventsManager.Register(SdkEvent.SdkUpdate, TriggerSdkUpdate);
             eventsManager.Register(SdkEvent.SdkReady, TriggerSdkReady);
-            eventsManager.NotifyInternalEvent(SdkInternalEvent.SdkReady, new EventMetadata(new Dictionary<string, object>()));
+            eventsManager.NotifyInternalEvent(SdkInternalEvent.SdkReady, null);
 
             // Act
             SdkUpdateFlag = false;
             segmentCache.AddToSegment(segmentName, keys);
 
             //Assert
             Assert.IsTrue(SdkUpdateFlag);
-            Assert.IsTrue(eMetadata.ContainKey(Splitio.Constants.EventMetadataKeys.Segments));
-            string segment = (string) eMetadata.GetData()[Splitio.Constants.EventMetadataKeys.Segments];
-            Assert.AreEqual(segmentName, segment);
+            Assert.AreEqual(SdkEventType.SegmentsUpdate, eMetadata.GetEventType());
 
             // Act
             SdkUpdateFlag = false;
@@ -133,9 +131,7 @@ public void NotifyEventsTest()
 
             //Assert
             Assert.IsTrue(SdkUpdateFlag);
-            Assert.IsTrue(eMetadata.ContainKey(Splitio.Constants.EventMetadataKeys.Segments));
-            segment = (string)eMetadata.GetData()[Splitio.Constants.EventMetadataKeys.Segments];
-            Assert.AreEqual(segmentName, segment);
+            Assert.AreEqual(SdkEventType.SegmentsUpdate, eMetadata.GetEventType());
         }
 
         private void sdkUpdate_callback(object sender, EventMetadata metadata)
diff --git a/tests/Splitio-tests/Unit Tests/Cache/InMemory/SplitCacheAsyncTests.cs b/tests/Splitio-tests/Unit Tests/Cache/InMemory/SplitCacheAsyncTests.cs
@@ -196,7 +196,7 @@ public async Task NotifyUpdateEventTest()
             SdkUpdate += sdkUpdate_callback;
             _eventsManager.Register(SdkEvent.SdkUpdate, TriggerSdkUpdate);
             _eventsManager.Register(SdkEvent.SdkReady, TriggerSdkReady);
-            _eventsManager.NotifyInternalEvent(SdkInternalEvent.SdkReady, new EventMetadata(new Dictionary<string, object>()));
+            _eventsManager.NotifyInternalEvent(SdkInternalEvent.SdkReady, null);
            
             SdkUpdateFlag = false;
             _cache.Update(toAdd, new List<string>(), -1);
@@ -207,23 +207,21 @@ public async Task NotifyUpdateEventTest()
             // Assert.
             Assert.AreEqual(5, result.Count);
             Assert.IsTrue(SdkUpdateFlag);
-            Assert.IsTrue(eMetadata.ContainKey(Splitio.Constants.EventMetadataKeys.Flags));
-            List<string> flags = (List<string>)eMetadata.GetData()[Splitio.Constants.EventMetadataKeys.Flags];
-            Assert.IsTrue(flags.Count == 5);
+            Assert.AreEqual(SdkEventType.FlagsUpdate, eMetadata.GetEventType());
+            Assert.IsTrue(eMetadata.GetNames().Count == 5);
             for (int i = 1; i <= 5; i++)
             {
-                Assert.IsTrue(flags.Contains($"feature-flag-{i}"));
+                Assert.IsTrue(eMetadata.GetNames().Contains($"feature-flag-{i}"));
             }
 
             SdkUpdateFlag = false;
             eMetadata = null;
             _cache.Kill(123, "feature-flag-1", "off");
 
             Assert.IsTrue(SdkUpdateFlag);
-            Assert.IsTrue(eMetadata.ContainKey(Splitio.Constants.EventMetadataKeys.Flags));
-            flags = (List<string>)eMetadata.GetData()[Splitio.Constants.EventMetadataKeys.Flags];
-            Assert.IsTrue(flags.Count == 1);
-            Assert.IsTrue(flags.Contains($"feature-flag-1"));
+            Assert.AreEqual(SdkEventType.FlagsUpdate, eMetadata.GetEventType());
+            Assert.IsTrue(eMetadata.GetNames().Count == 1);
+            Assert.IsTrue(eMetadata.GetNames().Contains($"feature-flag-1"));
         }
 
         private void sdkUpdate_callback(object sender, EventMetadata metadata)
diff --git a/tests/Splitio-tests/Unit Tests/Cache/InMemory/SplitCacheTests.cs b/tests/Splitio-tests/Unit Tests/Cache/InMemory/SplitCacheTests.cs
@@ -253,18 +253,17 @@ public void NotifyUpdateEventTest()
             SdkUpdate += sdkUpdate_callback;
             eventsManager.Register(SdkEvent.SdkUpdate, TriggerSdkUpdate);
             eventsManager.Register(SdkEvent.SdkReady, TriggerSdkReady);
-            eventsManager.NotifyInternalEvent(SdkInternalEvent.SdkReady, new EventMetadata(new Dictionary<string, object>()));
+            eventsManager.NotifyInternalEvent(SdkInternalEvent.SdkReady, null);
 
             // Act.
             SdkUpdateFlag = false;
             splitCache.Update(new List<ParsedSplit> { new ParsedSplit() { name = splitName } }, new List<string>(), -1);
 
             // Assert.
             Assert.IsTrue(SdkUpdateFlag);
-            Assert.IsTrue(eMetadata.ContainKey(Splitio.Constants.EventMetadataKeys.Flags));
-            List<string> flags = (List<string>)eMetadata.GetData()[Splitio.Constants.EventMetadataKeys.Flags];
-            Assert.IsTrue(flags.Count == 1);
-            Assert.IsTrue(flags.Contains(splitName));
+            Assert.AreEqual(SdkEventType.FlagsUpdate, eMetadata.GetEventType());
+            Assert.IsTrue(eMetadata.GetNames().Count == 1);
+            Assert.IsTrue(eMetadata.GetNames().Contains(splitName));
 
             // Act.
             SdkUpdateFlag = false;
@@ -273,10 +272,9 @@ public void NotifyUpdateEventTest()
 
             // Assert.
             Assert.IsTrue(SdkUpdateFlag);
-            Assert.IsTrue(eMetadata.ContainKey(Splitio.Constants.EventMetadataKeys.Flags));
-            flags = (List<string>)eMetadata.GetData()[Splitio.Constants.EventMetadataKeys.Flags];
-            Assert.IsTrue(flags.Count == 1);
-            Assert.IsTrue(flags.Contains(splitName));
+            Assert.AreEqual(SdkEventType.FlagsUpdate, eMetadata.GetEventType());
+            Assert.IsTrue(eMetadata.GetNames().Count == 1);
+            Assert.IsTrue(eMetadata.GetNames().Contains(splitName));
         }
 
         private void sdkUpdate_callback(object sender, EventMetadata metadata)
diff --git a/tests/Splitio-tests/Unit Tests/Client/SdkReadinessGatesUnitTests.cs b/tests/Splitio-tests/Unit Tests/Client/SdkReadinessGatesUnitTests.cs
@@ -40,7 +40,7 @@ public void TestFireReadyEvent()
 
             // Assert.
             Assert.IsTrue(SdkReadyFlag);
-            Assert.AreEqual(0, eMetadata.GetData().Count);
+            Assert.AreEqual(null, eMetadata);
         }
 
         private void sdkReady_callback(object sender, EventMetadata metadata)
diff --git a/tests/Splitio-tests/Unit Tests/Common/EventDeliveryTests.cs b/tests/Splitio-tests/Unit Tests/Common/EventDeliveryTests.cs
@@ -17,23 +17,9 @@ public void TestFiringEvents()
             //Act
             EventDelivery<SdkEvent, EventMetadata> eventDelivery = new EventDelivery<SdkEvent, EventMetadata>();
 
-            Dictionary<string, object> metaData = new Dictionary<string, object>
-            {
-                { "flags", new List<string> {{ "flag1" }} }
-            };
-
-            eventDelivery.Deliver(SdkEvent.SdkReady, new EventMetadata(metaData), sdkReady_callback);
+            eventDelivery.Deliver(SdkEvent.SdkReady, null, sdkReady_callback);
 
             Assert.IsTrue(SdkReady);
-            VerifyMetadata(eMetadata);
-        }
-
-        void VerifyMetadata(EventMetadata eMetdata)
-        {
-            Assert.IsTrue(eMetadata.ContainKey("flags"));
-            List<string> flags = (List<string>)eMetadata.GetData()["flags"];
-            Assert.IsTrue(flags.Count == 1);
-            Assert.IsTrue(flags.Contains("flag1"));
         }
 
         private void sdkReady_callback(EventMetadata metadata)
diff --git a/tests/Splitio-tests/Unit Tests/Common/EventMetadataTests.cs b/tests/Splitio-tests/Unit Tests/Common/EventMetadataTests.cs
diff --git a/tests/Splitio-tests/Unit Tests/Common/EventsManagerTests.cs b/tests/Splitio-tests/Unit Tests/Common/EventsManagerTests.cs
diff --git a/tests/Splitio-tests/Unit Tests/Shared/SelfRefreshingBlockUntilReadyServiceTests.cs b/tests/Splitio-tests/Unit Tests/Shared/SelfRefreshingBlockUntilReadyServiceTests.cs

Original file line number	Diff line number	Diff line change
`@@ -61,11 +61,4 @@ public static class ApiVersions`
`61`	`61`	`public static string Spec1_1 => "1.1";`
`62`	`62`	`public static string LatestFlagsSpec => "1.3";`
`63`	`63`	`}`
`64`		`-`
`65`		`- public static class EventMetadataKeys`
`66`		`- {`
`67`		`- public static string Flags => "flags";`
`68`		`- public static string Segments => "segments";`
`69`		`- public static string RuleBasedSegments => "ruleBasedSegments";`
`70`		`- }`
`71`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-using Splitio.Constants;`
`2`		`-using Splitio.Domain;`
	`1`	`+using Splitio.Domain;`
`3`	`2`	`using Splitio.Services.Cache.Interfaces;`
`4`	`3`	`using Splitio.Services.Common;`
`5`	`4`	`using System.Collections.Concurrent;`
`@@ -50,22 +49,19 @@ public long GetChangeNumber()`
`50`	`49`	`// Producer`
`51`	`50`	`public void Update(List<RuleBasedSegment> toAdd, List<string> toRemove, long till)`
`52`	`51`	`{`
`53`		`- List<string> toNotify = new List<string>();`
`54`	`52`	`foreach (var rbSegment in toAdd)`
`55`	`53`	`{`
`56`	`54`	`_cache.AddOrUpdate(rbSegment.Name, rbSegment, (key, oldValue) => rbSegment);`
`57`		`- toNotify.Add(rbSegment.Name);`
`58`	`55`	`}`
`59`	`56`
`60`	`57`	`foreach (var name in toRemove)`
`61`	`58`	`{`
`62`	`59`	`_cache.TryRemove(name, out var _);`
`63`		`- toNotify.Add(name);`
`64`	`60`	`}`
`65`	`61`
`66`	`62`	`SetChangeNumber(till);`
`67`	`63`	`_eventsManager.NotifyInternalEvent(SdkInternalEvent.RuleBasedSegmentsUpdated,`
`68`		`- new EventMetadata(new Dictionary<string, object> { { EventMetadataKeys.RuleBasedSegments, toNotify } }));`
	`64`	`+ new EventMetadata(SdkEventType.SegmentsUpdate, new List<string>()));`
`69`	`65`	`}`
`70`	`66`
`71`	`67`	`public void SetChangeNumber(long changeNumber)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`using System.Linq;`
`9`	`9`	`using System.Threading.Tasks;`
`10`	`10`	`using Splitio.Services.Common;`
`11`		`-using Splitio.Constants;`
`12`	`11`
`13`	`12`	`namespace Splitio.Services.Cache.Classes`
`14`	`13`	`{`
`@@ -80,7 +79,7 @@ public void Update(List<ParsedSplit> toAdd, List<string> toRemove, long till)`
`80`	`79`
`81`	`80`	`SetChangeNumber(till);`
`82`	`81`	`_eventsManager.NotifyInternalEvent(SdkInternalEvent.FlagsUpdated,`
`83`		`- new EventMetadata(new Dictionary<string, object> { { EventMetadataKeys.Flags, eventsFlags } }));`
	`82`	`+ new EventMetadata(SdkEventType.FlagsUpdate, eventsFlags));`
`84`	`83`	`}`
`85`	`84`
`86`	`85`	`public void SetChangeNumber(long changeNumber)`
`@@ -153,7 +152,7 @@ public void Kill(long changeNumber, string splitName, string defaultTreatment)`
`153`	`152`
`154`	`153`	`_featureFlags.AddOrUpdate(featureFlag.name, featureFlag, (key, oldValue) => featureFlag);`
`155`	`154`	`_eventsManager.NotifyInternalEvent(SdkInternalEvent.FlagKilledNotification,`
`156`		`- new EventMetadata(new Dictionary<string, object> { { EventMetadataKeys.Flags, new List<string> { { featureFlag.name } } } }));`
	`155`	`+ new EventMetadata(SdkEventType.FlagsUpdate, new List<string> { { featureFlag.name } }));`
`157`	`156`
`158`	`157`	`}`
`159`	`158`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public event EventHandler<EventMetadata> SdkReady`
`73`	`73`	`SdkReadyEvent = (EventHandler<EventMetadata>)Delegate.Combine(SdkReadyEvent, value);`
`74`	`74`	`if (_eventsManager.EventAlreadyTriggered(SdkEvent.SdkReady))`
`75`	`75`	`{`
`76`		`- SdkReadyEvent.Invoke(this, new EventMetadata(new Dictionary<string, object>()));`
	`76`	`+ SdkReadyEvent.Invoke(this, null);`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,7 @@ public void BlockUntilReady(int blockMilisecondsUntilReady)`
`36`	`36`
`37`	`37`	`if (!_statusManager.WaitUntilReady(blockMilisecondsUntilReady))`
`38`	`38`	`{`
`39`		`- _eventsManager.NotifyInternalEvent(SdkInternalEvent.SdkTimedOut,`
`40`		`- new EventMetadata(new Dictionary<string, object>()));`
	`39`	`+ _eventsManager.NotifyInternalEvent(SdkInternalEvent.SdkTimedOut, null);`
`41`	`40`	`_telemetryInitProducer.RecordBURTimeout();`
`42`	`41`	`throw new TimeoutException($"SDK was not ready in {blockMilisecondsUntilReady} milliseconds");`
`43`	`42`	`}`