ruby_event_store 2.18.0 → 2.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82556ae88f8391f125384c68ab2dc9ab304d7faae665432f93df0c0283925043
-  data.tar.gz: 3bb3ae6455b09c231b72a7ff4da9594832785cb5fa6c3aca73701eda12fca7dc
+  metadata.gz: 7f21bbf176c36c5948ac817d5e6cf13972d608c25eeb11d691831ba3a51f09bd
+  data.tar.gz: f9cd6d162d9927454ccd9bba582d53644a83a635c775c515283ea32654209652
 SHA512:
-  metadata.gz: dadeb6e20f83eccce924639e146cbbd9a2660ae5c4dfa714b060e0a0617a7d33ee6249de2b5e0e27282388daeaddeb1f161a0ef205434544654e49b67cc305a8
-  data.tar.gz: f2e2d102651a8a21a1ca76d8b34366186cc8768fcc3af9a023b9c085db0ad941830219a959ee42b686df5cf2b4a4a040bfad715159389f97b6e1bf0e6bb8bf99
+  metadata.gz: 5cbe530dace472f1e46a7bfe52cdfb11adb0b4f4b38e59fb448fb68d679fdd5a8cd76be0dc6fdcc29ecb6d4e316845d6022eafd4499cc303e66601c64336556a
+  data.tar.gz: b1288e6f0a95d0eb90550f089a791b6e23583f4939426bdc655e63d94814837187b95cd81860c07de666be07063667dcf1823103bbae3cbede2d6d075077ef0a

data/lib/ruby_event_store/client.rb

@@ -18,7 +18,7 @@ module RubyEventStore
       @mapper = batch_mapper?(mapper) ? mapper : Mappers::BatchMapper.new(mapper)
       @broker =
         message_broker ||
-          Broker.new(subscriptions: subscriptions || Subscriptions.new, dispatcher: dispatcher || Dispatcher.new)
+          Broker.new(subscriptions: subscriptions || Subscriptions.new, dispatcher: dispatcher || SyncScheduler.new)
       @clock = clock
       @metadata = Concurrent::ThreadLocalVar.new
       @correlation_id_generator = correlation_id_generator
@@ -33,7 +33,7 @@ module RubyEventStore
           event_store = RubyEventStore::Client.new(
             message_broker: RubyEventStore::Broker.new(
               subscriptions: RubyEventStore::Subscriptions.new,
-              dispatcher: RubyEventStore::Dispatcher.new
+              dispatcher: RubyEventStore::SyncScheduler.new
             )
           )
         EOW
@@ -54,7 +54,7 @@ module RubyEventStore
     #
     # @param events [Array<Event>, Event] event(s)
     # @param stream_name [String] name of the stream for persisting events.
-    # @param expected_version [:any, :auto, :none, Integer] controls optimistic locking strategy. {http://railseventstore.org/docs/expected_version/ Read more}
+    # @param expected_version [:any, :auto, :none, Integer] controls optimistic locking strategy. {https://railseventstore.org/docs/core-concepts/expected-version Read more}
     # @return [self]
     def publish(events, topic: nil, stream_name: GLOBAL_STREAM, expected_version: :any)
       enriched_events = enrich_events_metadata(events)
@@ -98,6 +98,11 @@ module RubyEventStore
     # @param expected_version (see #publish)
     # @return [self]
     def link(event_ids, stream_name:, expected_version: :any)
+      if event_ids.nil? || Array(event_ids).any?(&:nil?)
+        warn <<~EOW
+          Passing `nil` to link is deprecated and will raise ArgumentError in RubyEventStore 3.0.
+        EOW
+      end
       @repository.link_to_stream(Array(event_ids), Stream.new(stream_name), ExpectedVersion.new(expected_version))
       self
     end
@@ -114,7 +119,7 @@ module RubyEventStore
     end
 
     # Starts building a query specification for reading events.
-    # {http://railseventstore.org/docs/read/ More info.}
+    # {https://railseventstore.org/docs/core-concepts/read More info.}
     #
     # @return [Specification]
     def read
@@ -222,7 +227,7 @@ module RubyEventStore
       # will be called for all published events.
       # The subscription is active only during the invocation
       # of the block of code provided to {Client#within}.
-      # {http://railseventstore.org/docs/subscribe/#temporary-subscriptions Read more.}
+      # {https://railseventstore.org/docs/core-concepts/subscribe#temporary-subscriptions Read more.}
       #
       # @param handlers [Object, Class] handlers passed as objects or classes
       # @param handler2 [Proc] handler passed as proc
@@ -237,7 +242,7 @@ module RubyEventStore
       # will be called for published events of provided type.
       # The subscription is active only during the invocation
       # of the block of code provided to {Client#within}.
-      # {http://railseventstore.org/docs/subscribe/#temporary-subscriptions Read more.}
+      # {https://railseventstore.org/docs/core-concepts/subscribe#temporary-subscriptions Read more.}
       #
       # @overload subscribe(handler, to:)
       #   @param handler [Object, Class] handler passed as objects or classes
@@ -255,7 +260,7 @@ module RubyEventStore
 
       # Invokes the block of code provided to {Client#within}
       # and then unsubscribes temporary handlers.
-      # {http://railseventstore.org/docs/subscribe/#temporary-subscriptions Read more.}
+      # {https://railseventstore.org/docs/core-concepts/subscribe#temporary-subscriptions Read more.}
       #
       # @return [Object] value returned by the invoked block of code
       def call
@@ -280,7 +285,7 @@ module RubyEventStore
     end
 
     # Use for starting temporary subscriptions.
-    # {http://railseventstore.org/docs/subscribe/#temporary-subscriptions Read more}
+    # {https://railseventstore.org/docs/core-concepts/subscribe#temporary-subscriptions Read more}
     #
     # @param block [Proc] block of code during which the temporary subscriptions will be active
     # @return [Within] builder object which collects temporary subscriptions
@@ -290,7 +295,7 @@ module RubyEventStore
     end
 
     # Set additional metadata for all events published within the provided block
-    # {http://railseventstore.org/docs/request_metadata#passing-your-own-metadata-using-with_metadata-method Read more}
+    # {https://railseventstore.org/docs/core-concepts/request-metadata#passing-your-own-metadata-using-with_metadata Read more}
     #
     # @param metadata [Hash] metadata to set for events
     # @param block [Proc] block of code during which the metadata will be added
@@ -304,7 +309,7 @@ module RubyEventStore
     end
 
     # Deserialize event which was serialized for async event handlers
-    # {http://railseventstore.org/docs/subscribe/#async-handlers Read more}
+    # {https://railseventstore.org/docs/core-concepts/subscribe#async-handlers Read more}
     #
     # @return [Event] deserialized event
     def deserialize(serializer:, event_type:, event_id:, data:, metadata:, timestamp: nil, valid_at: nil)
@@ -325,7 +330,7 @@ module RubyEventStore
     end
 
     # Read additional metadata which will be added for published events
-    # {http://railseventstore.org/docs/request_metadata#passing-your-own-metadata-using-with_metadata-method Read more}
+    # {https://railseventstore.org/docs/core-concepts/request-metadata#passing-your-own-metadata-using-with_metadata Read more}
     #
     # @return [Hash]
     def metadata
@@ -337,7 +342,7 @@ module RubyEventStore
     # Does not notify any subscribed handlers.
     # Does not enrich with additional current metadata.
     # Does not allow changing which streams these events are in.
-    # {http://railseventstore.org/docs/migrating_messages Read more}
+    # {https://railseventstore.org/docs/advanced-topics/migrating-existing-events Read more}
     #
     # @example Add data and metadata to existing events
     #
@@ -380,6 +385,11 @@ module RubyEventStore
     end
 
     def enrich_events_metadata(events)
+      if events.nil? || Array(events).any?(&:nil?)
+        warn <<~EOW
+          Passing `nil` to publish/append is deprecated and will raise ArgumentError in RubyEventStore 3.0.
+        EOW
+      end
       events = Array(events)
       events.each { |event| enrich_event_metadata(event) }
     end

data/lib/ruby_event_store/dispatcher.rb

@@ -1,20 +1,12 @@
 # frozen_string_literal: true
 
 module RubyEventStore
-  class Dispatcher
-    def call(subscriber, event, _)
-      subscriber = subscriber.new if Class === subscriber
-      subscriber.call(event)
-    end
-
-    def verify(subscriber)
-      begin
-        subscriber_instance = Class === subscriber ? subscriber.new : subscriber
-      rescue ArgumentError
-        false
-      else
-        subscriber_instance.respond_to?(:call)
-      end
+  class Dispatcher < SyncScheduler
+    def initialize
+      warn <<~EOW
+        DEPRECATION WARNING: `RubyEventStore::Dispatcher` is deprecated and will be removed in the next major release.
+        Use `RubyEventStore::SyncScheduler` instead.
+      EOW
     end
   end
 end

data/lib/ruby_event_store/event.rb

@@ -78,7 +78,7 @@ module RubyEventStore
     end
 
     # Reads correlation_id from metadata.
-    # {http://railseventstore.org/docs/correlation_causation/ Find out more}
+    # {https://railseventstore.org/docs/core-concepts/correlation-causation Find out more}
     #
     # @return [String, nil]
     def correlation_id
@@ -86,7 +86,7 @@ module RubyEventStore
     end
 
     # Sets correlation_id in metadata.
-    # {http://railseventstore.org/docs/correlation_causation/ Find out more}
+    # {https://railseventstore.org/docs/core-concepts/correlation-causation Find out more}
     #
     # @param val [String]
     # @return [String]
@@ -95,7 +95,7 @@ module RubyEventStore
     end
 
     # Reads causation_id from metadata.
-    # {http://railseventstore.org/docs/correlation_causation/ Find out more}
+    # {https://railseventstore.org/docs/core-concepts/correlation-causation Find out more}
     #
     # @return [String, nil]
     def causation_id
@@ -103,7 +103,7 @@ module RubyEventStore
     end
 
     # Sets causation_id= in metadata.
-    # {http://railseventstore.org/docs/correlation_causation/ Find out more}
+    # {https://railseventstore.org/docs/core-concepts/correlation-causation Find out more}
     #
     # @param val [String]
     # @return [String]
@@ -113,7 +113,7 @@ module RubyEventStore
 
     # Sets correlation_id and causation_id in metadata based
     # on correlation_id and message_id of the provided message.
-    # {http://railseventstore.org/docs/correlation_causation/ Find out more}
+    # {https://railseventstore.org/docs/core-concepts/correlation-causation Find out more}
     #
     # @param other_message [Event, command] message to correlate with. Most likely an event or a command. Must respond to correlation_id and message_id.
     # @return [String] set causation_id

data/lib/ruby_event_store/immediate_async_dispatcher.rb

@@ -1,17 +1,13 @@
 # frozen_string_literal: true
 
 module RubyEventStore
-  class ImmediateAsyncDispatcher
+  class ImmediateAsyncDispatcher < ImmediateDispatcher
     def initialize(scheduler:)
-      @scheduler = scheduler
-    end
-
-    def call(subscriber, _, record)
-      @scheduler.call(subscriber, record)
-    end
-
-    def verify(subscriber)
-      @scheduler.verify(subscriber)
+      warn <<~EOW
+        DEPRECATION WARNING: `RubyEventStore::ImmediateAsyncDispatcher` is deprecated and will be removed in the next major release.
+        Use `RubyEventStore::ImmediateDispatcher` instead.
+      EOW
+      super
     end
   end
 end

data/lib/ruby_event_store/immediate_dispatcher.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module RubyEventStore
+  class ImmediateDispatcher
+    def initialize(scheduler:)
+      @scheduler = scheduler
+    end
+
+    def call(subscriber, _, record)
+      @scheduler.call(subscriber, record)
+    end
+
+    def verify(subscriber)
+      @scheduler.verify(subscriber)
+    end
+  end
+end

data/lib/ruby_event_store/in_memory_repository.rb

@@ -8,7 +8,7 @@ module RubyEventStore
         Mixing expected version :any and specific position (or :auto) is unsupported.
 
         Read more about expected versions here:
-        https://railseventstore.org/docs/v2/expected_version/
+        https://railseventstore.org/docs/core-concepts/expected-version
         EOS
       end
     end
@@ -100,7 +100,7 @@ module RubyEventStore
     end
 
     def count(spec)
-      read_scope(spec).count
+      read_scope(spec).size # mutant:disable
     end
 
     def update_messages(records)
@@ -234,12 +234,18 @@ module RubyEventStore
     end
 
     def ensure_supported_any_usage(resolved_version, stream)
-      if @ensure_supported_any_usage
-        stream_positions = streams.fetch(stream.name, Array.new).map(&:position)
-        if resolved_version.nil?
-          raise UnsupportedVersionAnyUsage if !stream_positions.compact.empty?
+      stream_positions = streams.fetch(stream.name, Array.new).map(&:position)
+      violation =
+        (resolved_version.nil? && !stream_positions.compact.empty?) ||
+        (!resolved_version.nil? && stream_positions.include?(nil))
+
+      if violation
+        if @ensure_supported_any_usage
+          raise UnsupportedVersionAnyUsage
         else
-          raise UnsupportedVersionAnyUsage if stream_positions.include?(nil)
+          warn <<~EOW
+            Mixing expected version :any and specific position (or :auto) is deprecated and will raise UnsupportedVersionAnyUsage in RubyEventStore 3.0.
+          EOW
         end
       end
     end

data/lib/ruby_event_store/instrumented_broker.rb

@@ -2,55 +2,75 @@
 
 module RubyEventStore
   class InstrumentedBroker
+    DEPRECATION_MESSAGE = <<~EOW
+      Instrumentation event names *.rails_event_store are deprecated and will be removed in the next major release.
+      Use *.ruby_event_store instead.
+    EOW
+    private_constant :DEPRECATION_MESSAGE
+
     def initialize(broker, instrumentation)
       @broker = broker
       @instrumentation = instrumentation
     end
 
     def call(topic, event, record)
-      instrumentation.instrument("call.broker.rails_event_store", topic: topic, event: event, record: record) do
-        if broker.public_method(:call).arity == 3
-          broker.call(topic, event, record)
-        else
-          warn <<~EOW
-            Message broker shall support topics.
-            Topic WILL BE IGNORED in the current broker.
-            Modify the broker implementation to pass topic as an argument to broker.call method.
-          EOW
-          broker.call(event, record)
+      instrumentation.instrument("call.broker.ruby_event_store", topic: topic, event: event, record: record) do
+        deprecated_instrument("call.broker.rails_event_store", topic: topic, event: event, record: record) do
+          if broker.public_method(:call).arity == 3
+            broker.call(topic, event, record)
+          else
+            warn <<~EOW
+              Message broker shall support topics.
+              Topic WILL BE IGNORED in the current broker.
+              Modify the broker implementation to pass topic as an argument to broker.call method.
+            EOW
+            broker.call(event, record)
+          end
         end
       end
     end
 
     def add_subscription(subscriber, topics)
-      instrumentation.instrument("add_subscription.broker.rails_event_store", subscriber: subscriber, topics: topics) do
-        broker.add_subscription(subscriber, topics)
+      instrumentation.instrument("add_subscription.broker.ruby_event_store", subscriber: subscriber, topics: topics) do
+        deprecated_instrument("add_subscription.broker.rails_event_store", subscriber: subscriber, topics: topics) do
+          broker.add_subscription(subscriber, topics)
+        end
       end
     end
 
     def add_global_subscription(subscriber)
-      instrumentation.instrument("add_global_subscription.broker.rails_event_store", subscriber: subscriber) do
-        broker.add_global_subscription(subscriber)
+      instrumentation.instrument("add_global_subscription.broker.ruby_event_store", subscriber: subscriber) do
+        deprecated_instrument("add_global_subscription.broker.rails_event_store", subscriber: subscriber) do
+          broker.add_global_subscription(subscriber)
+        end
       end
     end
 
     def add_thread_subscription(subscriber, topics)
       instrumentation.instrument(
-        "add_thread_subscription.broker.rails_event_store",
+        "add_thread_subscription.broker.ruby_event_store",
         subscriber: subscriber,
         topics: topics,
-      ) { broker.add_thread_subscription(subscriber, topics) }
+      ) do
+        deprecated_instrument("add_thread_subscription.broker.rails_event_store", subscriber: subscriber, topics: topics) do
+          broker.add_thread_subscription(subscriber, topics)
+        end
+      end
     end
 
     def add_thread_global_subscription(subscriber)
-      instrumentation.instrument("add_thread_global_subscription.broker.rails_event_store", subscriber: subscriber) do
-        broker.add_thread_global_subscription(subscriber)
+      instrumentation.instrument("add_thread_global_subscription.broker.ruby_event_store", subscriber: subscriber) do
+        deprecated_instrument("add_thread_global_subscription.broker.rails_event_store", subscriber: subscriber) do
+          broker.add_thread_global_subscription(subscriber)
+        end
       end
     end
 
     def all_subscriptions_for(topic)
-      instrumentation.instrument("all_subscriptions_for.broker.rails_event_store", topic: topic) do
-        broker.all_subscriptions_for(topic)
+      instrumentation.instrument("all_subscriptions_for.broker.ruby_event_store", topic: topic) do
+        deprecated_instrument("all_subscriptions_for.broker.rails_event_store", topic: topic) do
+          broker.all_subscriptions_for(topic)
+        end
       end
     end
 
@@ -69,5 +89,17 @@ module RubyEventStore
     private
 
     attr_reader :instrumentation, :broker
+
+    def deprecated_instrument(name, payload, &block)
+      canonical_name = name.sub("rails_event_store", "ruby_event_store")
+      old_listeners = instrumentation.notifier.all_listeners_for(name)
+      new_listeners = instrumentation.notifier.all_listeners_for(canonical_name)
+      if (old_listeners - new_listeners).any?
+        warn DEPRECATION_MESSAGE
+        instrumentation.instrument(name, payload, &block)
+      else
+        yield
+      end
+    end
   end
 end

data/lib/ruby_event_store/instrumented_dispatcher.rb

@@ -2,14 +2,22 @@
 
 module RubyEventStore
   class InstrumentedDispatcher
+    DEPRECATION_MESSAGE = <<~EOW
+      Instrumentation event names *.rails_event_store are deprecated and will be removed in the next major release.
+      Use *.ruby_event_store instead.
+    EOW
+    private_constant :DEPRECATION_MESSAGE
+
     def initialize(dispatcher, instrumentation)
       @dispatcher = dispatcher
       @instrumentation = instrumentation
     end
 
     def call(subscriber, event, record)
-      instrumentation.instrument("call.dispatcher.rails_event_store", event: event, subscriber: subscriber) do
-        dispatcher.call(subscriber, event, record)
+      instrumentation.instrument("call.dispatcher.ruby_event_store", event: event, subscriber: subscriber) do
+        deprecated_instrument("call.dispatcher.rails_event_store", event: event, subscriber: subscriber) do
+          dispatcher.call(subscriber, event, record)
+        end
       end
     end
 
@@ -28,5 +36,17 @@ module RubyEventStore
     private
 
     attr_reader :instrumentation, :dispatcher
+
+    def deprecated_instrument(name, payload, &block)
+      canonical_name = name.sub("rails_event_store", "ruby_event_store")
+      old_listeners = instrumentation.notifier.all_listeners_for(name)
+      new_listeners = instrumentation.notifier.all_listeners_for(canonical_name)
+      if (old_listeners - new_listeners).any?
+        warn DEPRECATION_MESSAGE
+        instrumentation.instrument(name, payload, &block)
+      else
+        yield
+      end
+    end
   end
 end

data/lib/ruby_event_store/instrumented_repository.rb

@@ -2,50 +2,70 @@
 
 module RubyEventStore
   class InstrumentedRepository
+    DEPRECATION_MESSAGE = <<~EOW
+      Instrumentation event names *.rails_event_store are deprecated and will be removed in the next major release.
+      Use *.ruby_event_store instead.
+    EOW
+    private_constant :DEPRECATION_MESSAGE
+
     def initialize(repository, instrumentation)
       @repository = repository
       @instrumentation = instrumentation
     end
 
     def append_to_stream(records, stream, expected_version)
-      instrumentation.instrument("append_to_stream.repository.rails_event_store", events: records, stream: stream) do
-        repository.append_to_stream(records, stream, expected_version)
+      instrumentation.instrument("append_to_stream.repository.ruby_event_store", records: records, events: records, stream: stream) do
+        deprecated_instrument("append_to_stream.repository.rails_event_store", { records: records, events: records, stream: stream }) do
+          repository.append_to_stream(records, stream, expected_version)
+        end
       end
     end
 
     def link_to_stream(event_ids, stream, expected_version)
-      instrumentation.instrument("link_to_stream.repository.rails_event_store", event_ids: event_ids, stream: stream) do
-        repository.link_to_stream(event_ids, stream, expected_version)
+      instrumentation.instrument("link_to_stream.repository.ruby_event_store", event_ids: event_ids, stream: stream) do
+        deprecated_instrument("link_to_stream.repository.rails_event_store", event_ids: event_ids, stream: stream) do
+          repository.link_to_stream(event_ids, stream, expected_version)
+        end
       end
     end
 
     def delete_stream(stream)
-      instrumentation.instrument("delete_stream.repository.rails_event_store", stream: stream) do
-        repository.delete_stream(stream)
+      instrumentation.instrument("delete_stream.repository.ruby_event_store", stream: stream) do
+        deprecated_instrument("delete_stream.repository.rails_event_store", stream: stream) do
+          repository.delete_stream(stream)
+        end
       end
     end
 
     def read(specification)
-      instrumentation.instrument("read.repository.rails_event_store", specification: specification) do
-        repository.read(specification)
+      instrumentation.instrument("read.repository.ruby_event_store", specification: specification) do
+        deprecated_instrument("read.repository.rails_event_store", specification: specification) do
+          repository.read(specification)
+        end
       end
     end
 
     def count(specification)
-      instrumentation.instrument("count.repository.rails_event_store", specification: specification) do
-        repository.count(specification)
+      instrumentation.instrument("count.repository.ruby_event_store", specification: specification) do
+        deprecated_instrument("count.repository.rails_event_store", specification: specification) do
+          repository.count(specification)
+        end
       end
     end
 
-    def update_messages(messages)
-      instrumentation.instrument("update_messages.repository.rails_event_store", messages: messages) do
-        repository.update_messages(messages)
+    def update_messages(records)
+      instrumentation.instrument("update_messages.repository.ruby_event_store", records: records, messages: records) do
+        deprecated_instrument("update_messages.repository.rails_event_store", { records: records, messages: records }) do
+          repository.update_messages(records)
+        end
       end
     end
 
     def streams_of(event_id)
-      instrumentation.instrument("streams_of.repository.rails_event_store", event_id: event_id) do
-        repository.streams_of(event_id)
+      instrumentation.instrument("streams_of.repository.ruby_event_store", event_id: event_id) do
+        deprecated_instrument("streams_of.repository.rails_event_store", event_id: event_id) do
+          repository.streams_of(event_id)
+        end
       end
     end
 
@@ -64,5 +84,17 @@ module RubyEventStore
     private
 
     attr_reader :repository, :instrumentation
+
+    def deprecated_instrument(name, payload, &block)
+      canonical_name = name.sub("rails_event_store", "ruby_event_store")
+      old_listeners = instrumentation.notifier.all_listeners_for(name)
+      new_listeners = instrumentation.notifier.all_listeners_for(canonical_name)
+      if (old_listeners - new_listeners).any?
+        warn DEPRECATION_MESSAGE
+        instrumentation.instrument(name, payload, &block)
+      else
+        yield
+      end
+    end
   end
 end

data/lib/ruby_event_store/mappers/default.rb

@@ -4,12 +4,20 @@ module RubyEventStore
   module Mappers
     class Default < PipelineMapper
       def initialize(events_class_remapping: {})
-        super(
-          Pipeline.new(
-            Transformation::EventClassRemapper.new(events_class_remapping),
-            Transformation::SymbolizeMetadataKeys.new,
-          ),
-        )
+        if events_class_remapping.any?
+          warn <<~EOW
+            DEPRECATION WARNING: `events_class_remapping` option in `RubyEventStore::Mappers::Default` is deprecated and will be removed in the next major release.
+            Use `RubyEventStore::Mappers::Transformation::Upcast` instead.
+          EOW
+          super(
+            Pipeline.new(
+              Transformation::EventClassRemapper.new(events_class_remapping),
+              Transformation::SymbolizeMetadataKeys.new,
+            ),
+          )
+        else
+          super(Pipeline.new(Transformation::SymbolizeMetadataKeys.new))
+        end
       end
     end
   end

data/lib/ruby_event_store/mappers/instrumented_batch_mapper.rb

@@ -3,26 +3,48 @@
 module RubyEventStore
   module Mappers
     class InstrumentedBatchMapper
+      DEPRECATION_MESSAGE = <<~EOW
+        Instrumentation event names *.rails_event_store are deprecated and will be removed in the next major release.
+        Use *.ruby_event_store instead.
+      EOW
+      private_constant :DEPRECATION_MESSAGE
+
       def initialize(mapper, instrumentation)
         @mapper = mapper
         @instrumentation = instrumentation
       end
 
       def events_to_records(events)
-        instrumentation.instrument("events_to_records.mapper.rails_event_store", domain_events: events) do
-          mapper.events_to_records(events)
+        instrumentation.instrument("events_to_records.mapper.ruby_event_store", domain_events: events) do
+          deprecated_instrument("events_to_records.mapper.rails_event_store", domain_events: events) do
+            mapper.events_to_records(events)
+          end
         end
       end
 
       def records_to_events(records)
-        instrumentation.instrument("records_to_events.mapper.rails_event_store", records: records) do
-          mapper.records_to_events(records)
+        instrumentation.instrument("records_to_events.mapper.ruby_event_store", records: records) do
+          deprecated_instrument("records_to_events.mapper.rails_event_store", records: records) do
+            mapper.records_to_events(records)
+          end
         end
       end
 
       private
 
       attr_reader :instrumentation, :mapper
+
+      def deprecated_instrument(name, payload, &block)
+        canonical_name = name.sub("rails_event_store", "ruby_event_store")
+        old_listeners = instrumentation.notifier.all_listeners_for(name)
+        new_listeners = instrumentation.notifier.all_listeners_for(canonical_name)
+        if (old_listeners - new_listeners).any?
+          warn DEPRECATION_MESSAGE
+          instrumentation.instrument(name, payload, &block)
+        else
+          yield
+        end
+      end
     end
   end
 end