prepare 4.1.1 release (#77)

launchdarkly · Mar 23, 2018 · f94680d · f94680d
1 parent 8ed370a
commit f94680d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to the LaunchDarkly .NET SDK will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org).
 
+## [4.1.1] - 2018-03-23
+### Fixed
+- Fixed a [bug](https://github.com/launchdarkly/.net-client/issues/75) in the event sampling feature that was introduced in 4.1.0: sampling might not work correctly if events were generated from multiple threads.
+
 ## [4.1.0] - 2018-03-05
 ### Added
 - `Configuration` now has an `EventSamplingInterval` property. If greater than zero, this causes a fraction of analytics events to be sent to LaunchDarkly: one per that number of events (pseudo-randomly). For instance, setting it to 5 would cause 20% of events to be sent on average.

diff --git a/src/LaunchDarkly.Client/EventProcessor.cs b/src/LaunchDarkly.Client/EventProcessor.cs
@@ -41,7 +41,7 @@ private void SubmitEvents(object StateInfo)
 
         void IStoreEvents.Add(Event eventToLog)
         {
-            if (_config.EventSamplingInterval > 1 && _random.Next(_config.EventSamplingInterval) != 0)
+            if (_config.EventSamplingInterval > 1 && !ShouldAddEventWithSamplingInterval(_config.EventSamplingInterval))
             {
                 return;
             }
@@ -77,6 +77,14 @@ void IStoreEvents.Flush()
             }
         }
 
+        private bool ShouldAddEventWithSamplingInterval(int interval)
+        {
+            lock (_random)
+            {
+                return _random.Next(interval) == 0;
+            }
+        }
+
         private async Task BulkSubmitAsync(IList<Event> events)
         {
             var cts = new CancellationTokenSource(_config.HttpClientTimeout);

diff --git a/src/LaunchDarkly.Client/LaunchDarkly.Client.csproj b/src/LaunchDarkly.Client/LaunchDarkly.Client.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <VersionPrefix>4.1.0</VersionPrefix>
+    <VersionPrefix>4.1.1</VersionPrefix>
     <TargetFrameworks>netstandard1.4;netstandard1.6;netstandard2.0;net45</TargetFrameworks>
     <PackageLicenseUrl>https://raw.githubusercontent.com/launchdarkly/.net-client/master/LICENSE</PackageLicenseUrl>
     <DebugType>portable</DebugType>
@@ -30,7 +30,7 @@
     <AssemblyOriginatorKeyFile>../../LaunchDarkly.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
-    <Version>4.1.0</Version>
+    <Version>4.1.1</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard1.4|AnyCPU'">