diff --git a/LICENSE.txt b/LICENSE.txt index c022e920..7fbcdda5 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,13 +1,169 @@ -Copyright © 2024 Split Software, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + 1. Definitions. + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + END OF TERMS AND CONDITIONS + APPENDIX: How to apply the Apache License to your work. + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + Copyright 2026 harness corporation + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/Splitio.Redis/Services/Client/Classes/RedisClient.cs b/Splitio.Redis/Services/Client/Classes/RedisClient.cs index d36a6cf4..bd65ac25 100644 --- a/Splitio.Redis/Services/Client/Classes/RedisClient.cs +++ b/Splitio.Redis/Services/Client/Classes/RedisClient.cs @@ -16,6 +16,7 @@ using Splitio.Services.InputValidation.Classes; using Splitio.Services.Parsing; using Splitio.Services.Shared.Classes; +using Splitio.Services.Tasks; namespace Splitio.Redis.Services.Client.Classes { @@ -34,7 +35,9 @@ public RedisClient(ConfigurationOptions config, string apiKey) : base(apiKey) _config = new RedisConfig(); ReadConfig(config); - + + BuildRedisEventsManager(); + BuildStatusAndTaskManager(); BuildFallbackCalculator(_config.FallbackTreatments); BuildRedisCache(); BuildTreatmentLog(config.ImpressionListener); @@ -56,6 +59,12 @@ public RedisClient(ConfigurationOptions config, string apiKey) : base(apiKey) } #region Private Methods + private void BuildRedisEventsManager() + { + _eventsManager = null; + _internalEventsTask = new NoOpInternalEventsTask(); + } + private void ReadConfig(ConfigurationOptions config) { var baseConfig = _configService.ReadConfig(config, ConfigTypes.Redis); diff --git a/Splitio.Redis/Splitio.Redis.csproj b/Splitio.Redis/Splitio.Redis.csproj index ec925af2..56e7e0a3 100644 --- a/Splitio.Redis/Splitio.Redis.csproj +++ b/Splitio.Redis/Splitio.Redis.csproj @@ -7,7 +7,7 @@ false false false - 7.13.0-rc1 + 7.13.0-rc5 true SplitioRedis.snk Apache-2.0 diff --git a/src/Splitio/Services/Cache/Classes/InMemorySplitCache.cs b/src/Splitio/Services/Cache/Classes/InMemorySplitCache.cs index 6063d43e..8b637808 100644 --- a/src/Splitio/Services/Cache/Classes/InMemorySplitCache.cs +++ b/src/Splitio/Services/Cache/Classes/InMemorySplitCache.cs @@ -78,7 +78,7 @@ public void Update(List toAdd, List toRemove, long till) } SetChangeNumber(till); - if (eventsFlags.Any()) + if (eventsFlags.Count > 0) { Task task = new Task(() => { diff --git a/src/Splitio/Services/Client/Classes/JSONFileClient.cs b/src/Splitio/Services/Client/Classes/JSONFileClient.cs index 34bd7194..be7e9d42 100644 --- a/src/Splitio/Services/Client/Classes/JSONFileClient.cs +++ b/src/Splitio/Services/Client/Classes/JSONFileClient.cs @@ -52,6 +52,8 @@ public JSONFileClient(string splitsFilePath, parsedSplits.TryAdd(split.name, _splitParser.Parse(split, rbsCache)); } + BuildEventsManager(); + BuildStatusAndTaskManager(); BuildFallbackCalculator(config.FallbackTreatments); BuildFlagSetsFilter(new HashSet()); _featureFlagCache = featureFlagCacheInstance ?? new InMemorySplitCache(new ConcurrentDictionary(parsedSplits), _flagSetsFilter, _internalEventsTask); diff --git a/src/Splitio/Services/Client/Classes/LocalhostClient.cs b/src/Splitio/Services/Client/Classes/LocalhostClient.cs index 92cb305f..de98f934 100644 --- a/src/Splitio/Services/Client/Classes/LocalhostClient.cs +++ b/src/Splitio/Services/Client/Classes/LocalhostClient.cs @@ -29,6 +29,8 @@ public class LocalhostClient : SplitClient public LocalhostClient(ConfigurationOptions configurationOptions) : base("localhost") { + BuildEventsManager(); + BuildStatusAndTaskManager(); var configs = (LocalhostClientConfigurations)_configService.ReadConfig(configurationOptions, ConfigTypes.Localhost, _statusManager); _fullPath = LookupFilePath(configs.FilePath); diff --git a/src/Splitio/Services/Client/Classes/SelfRefreshingClient.cs b/src/Splitio/Services/Client/Classes/SelfRefreshingClient.cs index b90e6e74..4bb3b6b3 100644 --- a/src/Splitio/Services/Client/Classes/SelfRefreshingClient.cs +++ b/src/Splitio/Services/Client/Classes/SelfRefreshingClient.cs @@ -56,6 +56,8 @@ public SelfRefreshingClient(string apiKey, ConfigurationOptions config) : base(a { _config = (SelfRefreshingConfig)_configService.ReadConfig(config, ConfigTypes.InMemory); + BuildEventsManager(); + BuildStatusAndTaskManager(); BuildFallbackCalculator(_config.FallbackTreatments); BuildFlagSetsFilter(_config.FlagSetsFilter); BuildSplitCache(); diff --git a/src/Splitio/Services/Client/Classes/SplitClient.cs b/src/Splitio/Services/Client/Classes/SplitClient.cs index ef5867ab..17910ad0 100644 --- a/src/Splitio/Services/Client/Classes/SplitClient.cs +++ b/src/Splitio/Services/Client/Classes/SplitClient.cs @@ -88,11 +88,6 @@ public event EventHandler SdkReady protected SplitClient(string apikey) { ApiKey = apikey; - _eventsManager = new EventsManager(new EventsManagerConfig(), new EventDelivery()); - _internalEventsTask = new InternalEventsTask(_eventsManager, new SplitQueue()); - _internalEventsTask.Start(); - RegisterEvents(); - _wrapperAdapter = WrapperAdapter.Instance(); _keyValidator = new KeyValidator(); _splitNameValidator = new SplitNameValidator(); @@ -101,8 +96,6 @@ protected SplitClient(string apikey) _factoryInstantiationsService = FactoryInstantiationsService.Instance(); _flagSetsValidator = new FlagSetsValidator(); _configService = new ConfigService(_wrapperAdapter, _flagSetsValidator, new SdkMetadataValidator()); - _statusManager = new InMemoryReadinessGatesCache(_internalEventsTask); - _tasksManager = new TasksManager(_statusManager); } #region GetTreatment @@ -319,12 +312,14 @@ public virtual async Task DestroyAsync() if (_statusManager.IsDestroyed()) return; _log.Info(Messages.InitDestroy); - _internalEventsTask.Stop(); _factoryInstantiationsService.Decrease(ApiKey); _statusManager.SetDestroy(); await _syncManager.ShutdownAsync(); - UnregisterEvents(); - + if (_eventsManager != null) + { + _internalEventsTask.Stop(); + UnregisterEvents(); + } _log.Info(Messages.Destroyed); } @@ -334,12 +329,14 @@ public virtual void Destroy() _log.Info(Messages.InitDestroy); - _internalEventsTask.Stop(); _factoryInstantiationsService.Decrease(ApiKey); _statusManager.SetDestroy(); _syncManager.Shutdown(); - UnregisterEvents(); - + if (_eventsManager != null) + { + _internalEventsTask.Stop(); + UnregisterEvents(); + } _log.Info(Messages.Destroyed); } #endregion @@ -416,6 +413,12 @@ public ISplitManager GetSplitManager() #endregion #region Protected Methods + protected void BuildStatusAndTaskManager() + { + _statusManager = new InMemoryReadinessGatesCache(_internalEventsTask); + _tasksManager = new TasksManager(_statusManager); + } + protected void BuildUniqueKeysTracker(BaseConfig config) { var bloomFilter = new BloomFilter(config.BfExpectedElements, config.BfErrorRate); @@ -453,6 +456,14 @@ protected void BuildFallbackCalculator(FallbackTreatmentsConfiguration fallbackT { _fallbackTreatmentCalculator = new FallbackTreatmentCalculator(fallbackTreatmentsConfiguration); } + + protected void BuildEventsManager() + { + _eventsManager = new EventsManager(new EventsManagerConfig(), new EventDelivery()); + _internalEventsTask = new InternalEventsTask(_eventsManager, new SplitQueue()); + _internalEventsTask.Start(); + RegisterEvents(); + } #endregion #region Private Async Methods diff --git a/src/Splitio/Services/Tasks/NoOpInternalEventsTask.cs b/src/Splitio/Services/Tasks/NoOpInternalEventsTask.cs new file mode 100644 index 00000000..1410df79 --- /dev/null +++ b/src/Splitio/Services/Tasks/NoOpInternalEventsTask.cs @@ -0,0 +1,19 @@ +using Splitio.Domain; +using System.Threading.Tasks; + +namespace Splitio.Services.Tasks +{ + public class NoOpInternalEventsTask : IInternalEventsTask + { + public NoOpInternalEventsTask() {} + public async Task AddToQueue(SdkInternalEvent sdkInternalEvent, EventMetadata eventMetadata) + { await DoNothing(); } + + public void Start() { } + + public void Stop() { } + + public static Task DoNothing() + { return Task.FromResult(true); } + } +} diff --git a/src/Splitio/Splitio.csproj b/src/Splitio/Splitio.csproj index 95302642..7070ef19 100644 --- a/src/Splitio/Splitio.csproj +++ b/src/Splitio/Splitio.csproj @@ -7,7 +7,7 @@ false false false - 7.13.0-rc1 + 7.13.0-rc5 Splitio true Splitio.snk diff --git a/tests/Splitio-tests/Unit Tests/Client/SplitClientForTesting.cs b/tests/Splitio-tests/Unit Tests/Client/SplitClientForTesting.cs index fe11a14e..84d50592 100644 --- a/tests/Splitio-tests/Unit Tests/Client/SplitClientForTesting.cs +++ b/tests/Splitio-tests/Unit Tests/Client/SplitClientForTesting.cs @@ -24,6 +24,8 @@ public SplitClientForTesting(IFeatureFlagCacheConsumer featureFlagCacheConsumer, IFallbackTreatmentCalculator fallbackTreatmentCalculator) : base("SplitClientForTesting") { + BuildEventsManager(); + BuildStatusAndTaskManager(); _fallbackTreatmentCalculator = fallbackTreatmentCalculator; _eventsLog = eventsLog; _impressionsLog = impressionsLog; @@ -33,7 +35,6 @@ public SplitClientForTesting(IFeatureFlagCacheConsumer featureFlagCacheConsumer, _impressionsManager = impressionsManager; _syncManager = syncManager; _telemetryEvaluationProducer = telemetryEvaluationProducer; - BuildClientExtension(); } } diff --git a/tests/Splitio.TestSupport/SplitClientForTest.cs b/tests/Splitio.TestSupport/SplitClientForTest.cs index 9f453fc1..12db14b9 100644 --- a/tests/Splitio.TestSupport/SplitClientForTest.cs +++ b/tests/Splitio.TestSupport/SplitClientForTest.cs @@ -10,6 +10,7 @@ public class SplitClientForTest : SplitClient public SplitClientForTest(ConfigurationOptions config) : base("SplitClientForTest") { + BuildEventsManager(); BuildFallbackCalculator(config.FallbackTreatments); _tests = new Dictionary(); } diff --git a/tests/Splitio.Tests.Common/BaseAsyncClientTests.cs b/tests/Splitio.Tests.Common/BaseAsyncClientTests.cs index cf6f7ebf..47724179 100644 --- a/tests/Splitio.Tests.Common/BaseAsyncClientTests.cs +++ b/tests/Splitio.Tests.Common/BaseAsyncClientTests.cs @@ -984,7 +984,7 @@ public async Task TrackAsync_WithValidData_ReturnsTrue() new EventBackend { Key = "key_4", TrafficTypeName = "traffic_type_4", EventTypeId = "event_type_4", Value = 444, Properties = properties } }; - var apikey = "base-apikey17"; + var apikey = "base-apikey20"; var splitFactory = new SplitFactory(apikey, configurations); var client = splitFactory.Client(); @@ -1001,6 +1001,7 @@ public async Task TrackAsync_WithValidData_ReturnsTrue() } //Validate Events sent to the be. +// await Task.Delay(1000); AssertSentEvents(events); await client.DestroyAsync(); } @@ -1042,6 +1043,7 @@ public async Task TrackAsync_WithBUR_ReturnsTrue() } //Validate Events sent to the be. +// await Task.Delay(1000); AssertSentEvents(events); await client.DestroyAsync(); } @@ -1091,6 +1093,7 @@ public async Task TrackAsync_WithInvalidData_ReturnsFalse() .ToList(); //Validate Events sent to the be. +// await Task.Delay(1000); AssertSentEvents(events); await client.DestroyAsync(); } @@ -1135,7 +1138,7 @@ public async Task TrackAsync_WithLowQueue_ReturnsTrue() } //Validate Events sent to the be. - await Task.Delay(1000); +// await Task.Delay(1000); AssertSentEvents(events, eventsCount: 3, validateEvents: false); await client.DestroyAsync(); }