chore: yggdrasil

src/Unleash/ClientFactory/IUnleashClientFactory.cs

@@ -1,10 +1,9 @@
-using System;
-using System.Threading.Tasks;
-using Unleash.Strategies;
+using System.Threading.Tasks;
+using Yggdrasil;
 
 namespace Unleash.ClientFactory
 {
     public interface IUnleashClientFactory
     {
         IUnleash CreateClient(UnleashSettings settings, bool synchronousInitialization = false, params IStrategy[] strategies);
         Task<IUnleash> CreateClientAsync(UnleashSettings settings, bool synchronousInitialization = false, params IStrategy[] strategies);

src/Unleash/ClientFactory/UnleashClientFactory.cs

@@ -1,6 +1,6 @@
 using System.Threading;
 using System.Threading.Tasks;
-using Unleash.Strategies;
+using Yggdrasil;
 
 namespace Unleash.ClientFactory
 {

src/Unleash/Communication/FetchTogglesResult.cs

@@ -1,11 +1,9 @@
-using Unleash.Internal;
-
-namespace Unleash.Communication
+namespace Unleash.Communication
 {
     internal class FetchTogglesResult
     {
-        public ToggleCollection ToggleCollection { get; set; }
         public bool HasChanged { get; set; }
         public string Etag { get; set; }
+        public string State { get; set; }
     }
 }

src/Unleash/Communication/IUnleashApiClient.cs

@@ -8,6 +8,7 @@ internal interface IUnleashApiClient
     {
         Task<FetchTogglesResult> FetchToggles(string etag, CancellationToken cancellationToken, bool throwOnFail = false);
         Task<bool> RegisterClient(ClientRegistration registration, CancellationToken cancellationToken);
-        Task<bool> SendMetrics(ThreadSafeMetricsBucket metrics, CancellationToken cancellationToken);
+        // TODO: Can be simplified to `using Yggdrasil;` once MetricsBucket is dropped from Unleash.Metrics
+        Task<bool> SendMetrics(Yggdrasil.MetricsBucket metrics, CancellationToken cancellationToken);
     }
 }

src/Unleash/Communication/UnleashApiClient.cs

@@ -157,14 +157,12 @@ private async Task<FetchTogglesResult> HandleSuccessResponse(HttpResponseMessage
                 {
                     HasChanged = false,
                     Etag = newEtag,
-                    ToggleCollection = null,
                 };
             }
 
-            var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
-            var toggleCollection = jsonSerializer.Deserialize<ToggleCollection>(stream);
+            var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
 
-            if (toggleCollection == null)
+            if (string.IsNullOrEmpty(content))
             {
                 return new FetchTogglesResult
                 {
@@ -177,7 +175,7 @@ private async Task<FetchTogglesResult> HandleSuccessResponse(HttpResponseMessage
             {
                 HasChanged = true,
                 Etag = newEtag,
-                ToggleCollection = toggleCollection
+                State = content
             };
         }
 
@@ -212,7 +210,7 @@ public async Task<bool> RegisterClient(ClientRegistration registration, Cancella
             }
         }
 
-        public async Task<bool> SendMetrics(ThreadSafeMetricsBucket metrics, CancellationToken cancellationToken)
+        public async Task<bool> SendMetrics(Yggdrasil.MetricsBucket metrics, CancellationToken cancellationToken)
         {
             if (metricsRequestsToSkip > metricsRequestsSkipped)
             {
@@ -226,16 +224,13 @@ public async Task<bool> SendMetrics(ThreadSafeMetricsBucket metrics, Cancellatio
 
             var memoryStream = new MemoryStream();
 
-            using (metrics.StopCollectingMetrics(out var bucket))
+            jsonSerializer.Serialize(memoryStream, new ClientMetrics
             {
-                jsonSerializer.Serialize(memoryStream, new ClientMetrics
-                {
-                    AppName = clientRequestHeaders.AppName,
-                    InstanceId = clientRequestHeaders.InstanceTag,
-                    Bucket = bucket
-                });
-                memoryStream.Position = 0;
-            }
+                AppName = clientRequestHeaders.AppName,
+                InstanceId = clientRequestHeaders.InstanceTag,
+                Bucket = metrics
+            });
+            memoryStream.Position = 0;
 
             const int bufferSize = 1024 * 4;