From f8a21c1d7913e25de7ccd47f937ab58f61983297 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 3 Feb 2021 01:30:28 -0500
Subject: [PATCH 1/2] RUBY-2484 update event storage format

---
 spec/runners/unified/test.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/spec/runners/unified/test.rb b/spec/runners/unified/test.rb
index 228b923ebc..55defe3449 100644
--- a/spec/runners/unified/test.rb
+++ b/spec/runners/unified/test.rb
@@ -89,10 +89,12 @@ def create_entities
 
           if store_events = spec.use('storeEventsAsEntities')
             store_event_names = {}
-            store_events.each do |event_name, entity_name|
+            store_events.each do |entity_name, event_names|
               #event_name = event_name.gsub(/Event$/, '').gsub(/[A-Z]/) { |m| "_#{m}" }.upcase
               #event_name = event_name.gsub(/Event$/, '').sub(/./) { |m| m.upcase }
-              store_event_names[event_name] = entity_name
+              event_names.each do |event_name|
+                store_event_names[event_name] = entity_name
+              end
             end
             store_event_names.values.uniq.each do |entity_name|
               entities.set(:event_list, entity_name, [])

From 3b20fe89d1be4054f516fcc2f773b94cc9b88677 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 3 Feb 2021 01:37:59 -0500
Subject: [PATCH 2/2] switch to observedAt

---
 spec/runners/unified/event_subscriber.rb   | 2 +-
 spec/runners/unified/support_operations.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/runners/unified/event_subscriber.rb b/spec/runners/unified/event_subscriber.rb
index 0201261a00..c0f686f9bb 100644
--- a/spec/runners/unified/event_subscriber.rb
+++ b/spec/runners/unified/event_subscriber.rb
@@ -74,7 +74,7 @@ def failed(event)
     def published(event)
       payload = {
         'name' => event.class.name.sub(/.*::/, '') + 'Event',
-        'time' => Time.now.to_f,
+        'observedAt' => Time.now.to_f,
         'address' => event.address.seed,
       }.tap do |entry|
         if event.respond_to?(:connection_id)
diff --git a/spec/runners/unified/support_operations.rb b/spec/runners/unified/support_operations.rb
index 293f992948..f18b4993cc 100644
--- a/spec/runners/unified/support_operations.rb
+++ b/spec/runners/unified/support_operations.rb
@@ -198,7 +198,7 @@ def _loop(op)
               STDERR.puts "Error: #{e.class}: #{e}"
               entities.get(:error_list, store_errors) << {
                 error: "#{e.class}: #{e}",
-                time: Time.now.to_f,
+                observedAt: Time.now.to_f,
               }
             else
               raise