Use now() instead of os:timestamp() for compatibility. now() uses a per-node lock, which is not great, but this is only invoked on lifecycle events, plus every few seconds per queue / channel / connection when the stats level is > none.

1 files changed, 2 insertions, 1 deletions

diff --git a/src/rabbit_event.erl b/src/rabbit_event.erl
index 07027cd5c6..e654b34a6e 100644
--- a/src/rabbit_event.erl
+++ b/src/rabbit_event.erl
@@ -120,9 +120,10 @@ stats_level(#state{level = Level}) ->
 
 notify(Type, Props) ->
     try
+        %% TODO: when we no longer support 12B3, switch to os:timestamp()
         gen_event:notify(rabbit_event, #event{type = Type,
                                               props = Props,
-                                              timestamp = os:timestamp()})
+                                              timestamp = now()})
     catch error:badarg ->
             %% badarg means rabbit_event is no longer registered. We never
             %% unregister it so the great likelihood is that we're shutting