Skip to content

Fix: ODP Event manager not consistent in triggering events. #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Feb 13, 2023
Merged

Fix: ODP Event manager not consistent in triggering events. #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b9ed189
Removing thread.sleep as it seems unnecessary
mnoman09 Feb 8, 2023
5b6bb53
Test
mnoman09 Feb 8, 2023
de1fc0c
Fixed the odpEventManager flush trigger.
NomanShoaib Feb 9, 2023
8f0879c
Fixed the test as when there are no remaining items in queue then odp…
NomanShoaib Feb 9, 2023
64cdf80
Removing mutex lock from notification registry instead using concurre…
NomanShoaib Feb 10, 2023
331826b
Revert "Removing mutex lock from notification registry instead using …
NomanShoaib Feb 10, 2023
80b3c33
Added Thread.sleep which somehow enabling thread to shutdown gracefully.
NomanShoaib Feb 10, 2023
9c8e5df
nit fix
NomanShoaib Feb 10, 2023
31101f6
nit fix
NomanShoaib Feb 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions OptimizelySDK.Tests/OdpTests/OdpEventManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ public void ShouldAddAdditionalInformationToEachEvent()
}

[Test]
public void ShouldAttemptToFlushAnEmptyQueueAtFlushInterval()
public void ShouldNotAttemptToFlushAnEmptyQueueAtFlushInterval()
{
var eventManager = new OdpEventManager.Builder().
WithOdpEventApiManager(_mockApiManager.Object).
Expand All @@ -327,7 +327,7 @@ public void ShouldAttemptToFlushAnEmptyQueueAtFlushInterval()
eventManager.Stop();

_mockLogger.Verify(l => l.Log(LogLevel.DEBUG, "Flushing queue."),
Times.AtLeast(3));
Times.Never);
}

[Test]
Expand Down
32 changes: 21 additions & 11 deletions OptimizelySDK/Odp/OdpEventManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,35 +146,45 @@ protected virtual void Run()
{
while (true)
{
if (DateTime.Now.MillisecondsSince1970() > _flushingIntervalDeadline)
object item;
// If batch has events, set the timeout to remaining time for flush interval,
// otherwise wait for the new event indefinitely
if (_currentBatch.Count > 0)
{
_logger.Log(LogLevel.DEBUG, $"Flushing queue.");
FlushQueue();
_eventQueue.TryTake(out item, (int)(_flushingIntervalDeadline - DateTime.Now.MillisecondsSince1970()));
}
else
{
item = _eventQueue.Take();
Thread.Sleep(1); // TODO: need to figure out why this is allowing item to read shutdown signal.
}

if (!_eventQueue.TryTake(out object item, 50))
if (item == null)
{
Thread.Sleep(50);
// null means no new events received and flush interval is over, dispatch whatever is in the batch.
if (_currentBatch.Count != 0)
{
_logger.Log(LogLevel.DEBUG, $"Flushing queue.");
FlushQueue();
}
continue;
}

if (item == _shutdownSignal)
else if (item == _shutdownSignal)
{
_logger.Log(LogLevel.INFO, "Received shutdown signal.");
break;
}

if (item == _flushSignal)
else if (item == _flushSignal)
{
_logger.Log(LogLevel.DEBUG, "Received flush signal.");
FlushQueue();
continue;
}

if (item is OdpEvent odpEvent)
else if (item is OdpEvent odpEvent)
{
AddToBatch(odpEvent);
}

}
}
catch (InvalidOperationException ioe)
Expand Down