feat: Add last-modified to metadata for events. (#253)

Add last-modified to metadata for events.
DevCycleHQ · Apr 29, 2024 · 73f0ce8 · 73f0ce8
1 parent a62bb31
commit 73f0ce8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/bucketing/event_queue.go b/bucketing/event_queue.go
@@ -53,7 +53,7 @@ func (u *UserEventQueue) BuildBatchRecords() []api.UserEventsBatchRecord {
 	return records
 }
 
-func (agg *AggregateEventQueue) BuildBatchRecords(platformData *api.PlatformData, clientUUID string, configEtag string, rayId string) api.UserEventsBatchRecord {
+func (agg *AggregateEventQueue) BuildBatchRecords(platformData *api.PlatformData, clientUUID, configEtag, rayId, lastModified string) api.UserEventsBatchRecord {
 	var aggregateEvents []api.Event
 	userId, err := os.Hostname()
 	if err != nil {
@@ -90,6 +90,9 @@ func (agg *AggregateEventQueue) BuildBatchRecords(platformData *api.PlatformData
 					if rayId != "" {
 						metaData["configRayId"] = rayId
 					}
+					if lastModified != "" {
+						metaData["lastModified"] = lastModified
+					}
 
 					event := api.Event{
 						Type_:       _type,
@@ -248,13 +251,13 @@ func (eq *EventQueue) QueueVariableDefaultedEvent(variableKey, defaultReason str
 	return eq.queueAggregateEventInternal(variableKey, "", "", api.EventType_AggVariableDefaulted, defaultReason)
 }
 
-func (eq *EventQueue) FlushEventQueue(clientUUID string, configEtag string, rayId string) (map[string]api.FlushPayload, error) {
+func (eq *EventQueue) FlushEventQueue(clientUUID, configEtag, rayId, lastModified string) (map[string]api.FlushPayload, error) {
 	eq.stateMutex.Lock()
 	defer eq.stateMutex.Unlock()
 
 	var records []api.UserEventsBatchRecord
 
-	records = append(records, eq.aggEventQueue.BuildBatchRecords(eq.platformData, clientUUID, configEtag, rayId))
+	records = append(records, eq.aggEventQueue.BuildBatchRecords(eq.platformData, clientUUID, configEtag, rayId, lastModified))
 	records = append(records, eq.userEventQueue.BuildBatchRecords()...)
 	eq.aggEventQueue = make(AggregateEventQueue)
 	eq.userEventQueue = make(UserEventQueue)

diff --git a/bucketing/event_queue_test.go b/bucketing/event_queue_test.go
@@ -197,7 +197,7 @@ func TestEventQueue_QueueAndFlush(t *testing.T) {
 	require.Equal(t, 2, len(eq.userEventQueue))
 	require.Equal(t, 0, len(eq.userEventQueueRaw))
 
-	payloads, err := eq.FlushEventQueue("", "", "")
+	payloads, err := eq.FlushEventQueue("", "", "", "")
 	require.NoError(t, err)
 	require.Equal(t, 2, len(payloads))
 	require.Equal(t, 0, len(eq.userEventQueue))

diff --git a/client_native_bucketing.go b/client_native_bucketing.go
@@ -55,7 +55,7 @@ func NewNativeLocalBucketing(sdkKey string, platformData *api.PlatformData, opti
 
 func (n *NativeLocalBucketing) StoreConfig(configJSON []byte, eTag, rayId, lastModified string) error {
 	oldETag := bucketing.GetEtag(n.sdkKey)
-	_, err := n.eventQueue.FlushEventQueue(n.clientUUID, oldETag, n.GetRayId())
+	_, err := n.eventQueue.FlushEventQueue(n.clientUUID, oldETag, n.GetRayId(), n.GetLastModified())
 	if err != nil {
 		return fmt.Errorf("Error flushing events for %s: %w", oldETag, err)
 	}
@@ -149,9 +149,7 @@ func (n *NativeLocalBucketing) UserQueueLength() (int, error) {
 }
 
 func (n *NativeLocalBucketing) FlushEventQueue(callback EventFlushCallback) error {
-	configEtag := bucketing.GetEtag(n.sdkKey)
-	rayId := bucketing.GetRayId(n.sdkKey)
-	payloads, err := n.eventQueue.FlushEventQueue(n.clientUUID, configEtag, rayId)
+	payloads, err := n.eventQueue.FlushEventQueue(n.clientUUID, n.GetETag(), n.GetRayId(), n.GetLastModified())
 	if err != nil {
 		return fmt.Errorf("Error flushing event queue: %w", err)
 	}

diff --git a/example/local/main.go b/example/local/main.go
@@ -32,7 +32,7 @@ func main() {
 
 	client, err := devcycle.NewClient(sdkKey, &dvcOptions)
 	time.Sleep(10 * time.Second)
-	if(err != nil) {
+	if err != nil {
 		log.Fatalf("Error initializing client: %v", err)
 	}
 	fmt.Println(client.GetRawConfig())
@@ -82,7 +82,7 @@ func main() {
 	}
 
 	err = client.FlushEvents()
-	if(err != nil) {
+	if err != nil {
 		log.Fatalf("Error flushing events: %v", err)
 	}