Branch to rethink persistent store changes

newrelic · Feb 1, 2024 · 35876e3 · 35876e3
1 parent 6fdb24c
commit 35876e3
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 5 deletions.
diff --git a/Agent/Analytics/NRMAEventManager.m b/Agent/Analytics/NRMAEventManager.m
@@ -47,7 +47,7 @@ + (PersistentEventStore*) persistentEventStore
 - (nonnull instancetype)init {
     self = [super init];
     if (self) {
-        events = [NRMAEventManager getLastSessionEventsArray];
+        events = [[NSMutableArray<NRMAAnalyticEventProtocol> alloc] init];
         maxBufferSize = [NRMAAgentConfiguration getMaxEventBufferSize];
         maxBufferTimeSeconds = [NRMAAgentConfiguration getMaxEventBufferTime];
         totalAttemptedInserts = 0;

diff --git a/Agent/Analytics/PersistentEventStore.m b/Agent/Analytics/PersistentEventStore.m
@@ -31,7 +31,7 @@ - (nonnull instancetype)initWithFilename:(NSString *)filename
         _lastSave = [NSDate new];
         _dirty = NO;
         _workQueue = [[NSOperationQueue alloc] init];
-        [_workQueue setMaxConcurrentOperationCount:1];
+       // [_workQueue setMaxConcurrentOperationCount:1];
     }
     return self;
 }

diff --git a/Tests/Unit-Tests/NewRelicAgentTests/Analytics-Tests/NRMARequestEvents.mm b/Tests/Unit-Tests/NewRelicAgentTests/Analytics-Tests/NRMARequestEvents.mm
@@ -30,7 +30,6 @@ - (void)setUp {
     });
     [NRMAFlags setFeatureFlags:0];
 
-    [NRMAAnalytics clearDuplicationStores];
 }
 
 - (void)tearDown {

diff --git a/Tests/Unit-Tests/NewRelicAgentTests/Analytics-Tests/TestIntegratedEventManager.m b/Tests/Unit-Tests/NewRelicAgentTests/Analytics-Tests/TestIntegratedEventManager.m
@@ -46,7 +46,6 @@ - (void)setUp {
 - (void)tearDown {
     // Put teardown code here. This method is called after the invocation of each test method in the class.
     [NRMAFlags disableFeatures:NRFeatureFlag_NewEventSystem];
-    [NRMAEventManager clearDuplicationStores];
 }
 
 - (void)testRetrieveEventJSON {

diff --git a/Tests/Unit-Tests/NewRelicAgentTests/NSURLSession-Tests/NRMAURLSessionHeaderTrackingTests.m b/Tests/Unit-Tests/NewRelicAgentTests/NSURLSession-Tests/NRMAURLSessionHeaderTrackingTests.m
@@ -35,7 +35,6 @@ @implementation NRMAURLSessionHeaderTrackingTests
 - (void)setUp {
     [super setUp];
     [NRMAFlags enableFeatures: NRFeatureFlag_NetworkRequestEvents | NRFeatureFlag_NewEventSystem];
-    [NRMAAnalytics clearDuplicationStores];
 
     [NRMAURLSessionOverride beginInstrumentation];
     self.mockNewRelicInternals = [OCMockObject mockForClass:[NewRelicAgentInternal class]];
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,6 @@ - (void)setUp { @@
         });
         [NRMAFlags setFeatureFlags:0];
-        [NRMAAnalytics clearDuplicationStores];
     }
     - (void)tearDown {
@@ Expand Down @@