feat!: Drop the V2 suffixes and rename data_system_config to data_system

contract-tests/client_entity.rb

@@ -52,10 +52,10 @@ def initialize(log, config)
         data_system.fdv1_compatible_synchronizer(build_fdv1_fallback_builder(fdv1_fallback_config))
       end
 
-      opts[:data_system_config] = data_system.build
+      opts[:data_system] = data_system.build
     else
       # Without a data system configuration, the client does not connect to LaunchDarkly for data.
-      opts[:data_system_config] = LaunchDarkly::DataSystem.custom.build
+      opts[:data_system] = LaunchDarkly::DataSystem.custom.build
     end
 
     if config[:events]

lib/ldclient-rb/config.rb

@@ -37,7 +37,7 @@ class Config
     # @option opts [BigSegmentsConfig] :big_segments See {#big_segments}.
     # @option opts [Hash] :application See {#application}
     # @option opts [Boolean] :omit_anonymous_contexts See {#omit_anonymous_contexts}
-    # @option opts [DataSystemConfig] :data_system_config See {#data_system_config}
+    # @option opts [DataSystemConfig] :data_system See {#data_system}
     # @option hooks [Array<Interfaces::Hooks::Hook]
     # @option plugins [Array<Interfaces::Plugins::Plugin]
     #
@@ -66,7 +66,7 @@ def initialize(opts = {})
       @hooks = (opts[:hooks] || []).keep_if { |hook| hook.is_a? Interfaces::Hooks::Hook }
       @plugins = (opts[:plugins] || []).keep_if { |plugin| plugin.is_a? Interfaces::Plugins::Plugin }
       @omit_anonymous_contexts = opts.has_key?(:omit_anonymous_contexts) && opts[:omit_anonymous_contexts]
-      @data_system_config = opts[:data_system_config]
+      @data_system = opts[:data_system]
       @instance_id = nil
     end
 
@@ -332,7 +332,7 @@ def with_wrapper_information(wrapper_name, wrapper_version = nil)
     #
     # @return [DataSystemConfig, nil]
     #
-    attr_reader :data_system_config
+    attr_reader :data_system
 
     #
     # The default LaunchDarkly client configuration. This configuration sets

lib/ldclient-rb/impl/data_source/status_provider.rb

@@ -14,7 +14,7 @@ module DataSource
       # This class implements the {LaunchDarkly::Interfaces::DataSource::StatusProvider} interface.
       # It maintains the current status of the data source and broadcasts status changes to listeners.
       #
-      class StatusProviderV2
+      class StatusProvider
         include LaunchDarkly::Interfaces::DataSource::StatusProvider
 
         extend Forwardable

lib/ldclient-rb/impl/data_store/feature_store_client_wrapper.rb

@@ -12,14 +12,14 @@ module DataStore
       # Provides additional behavior that the client requires before or after feature store operations.
       # Currently this just means sorting the data set for init() and dealing with data store status listeners.
       #
-      class FeatureStoreClientWrapperV2
+      class FeatureStoreClientWrapper
         include LaunchDarkly::Interfaces::FeatureStore
 
         #
         # Initialize the wrapper.
         #
         # @param store [LaunchDarkly::Interfaces::FeatureStore] The underlying feature store
-        # @param store_update_sink [LaunchDarkly::Impl::DataStore::StatusProviderV2] The status provider for updates
+        # @param store_update_sink [LaunchDarkly::Impl::DataStore::StatusProvider] The status provider for updates
         # @param logger [Logger] The logger instance
         #
         def initialize(store, store_update_sink, logger)
@@ -144,7 +144,7 @@ def available?
               poller_to_stop = @poller
               @poller = nil
             elsif @poller.nil?
-              task = LaunchDarkly::Impl::RepeatingTask.new(0.5, 0, method(:check_availability), @logger, "LDClient/DataStoreWrapperV2#check-availability")
+              task = LaunchDarkly::Impl::RepeatingTask.new(0.5, 0, method(:check_availability), @logger, "LDClient/DataStoreWrapper#check-availability")
               @poller = task
               @poller.start
             end

lib/ldclient-rb/impl/data_store/in_memory_feature_store.rb

@@ -8,9 +8,9 @@ module LaunchDarkly
   module Impl
     module DataStore
       #
-      # InMemoryFeatureStoreV2 is a read-only in-memory store implementation for FDv2.
+      # InMemoryFeatureStore is a read-only in-memory store implementation for FDv2.
       #
-      class InMemoryFeatureStoreV2
+      class InMemoryFeatureStore
         include LaunchDarkly::Interfaces::DataSystem::ReadOnlyStore
         def initialize(logger)
           @logger = logger

lib/ldclient-rb/impl/data_store/status_provider.rb

@@ -8,9 +8,9 @@ module LaunchDarkly
   module Impl
     module DataStore
       #
-      # StatusProviderV2 is the FDv2-specific implementation of {LaunchDarkly::Interfaces::DataStore::StatusProvider}.
+      # StatusProvider is the FDv2-specific implementation of {LaunchDarkly::Interfaces::DataStore::StatusProvider}.
       #
-      class StatusProviderV2
+      class StatusProvider
         include LaunchDarkly::Interfaces::DataStore::StatusProvider
 
         extend Forwardable

lib/ldclient-rb/impl/data_store/store.rb

@@ -35,7 +35,7 @@ def initialize(flag_change_broadcaster, change_set_broadcaster, logger)
           @persistent_store_writable = false
 
           # Source of truth for flag evaluations once initialized
-          @memory_store = InMemoryFeatureStoreV2.new(logger)
+          @memory_store = InMemoryFeatureStore.new(logger)
 
           # Used to track dependencies between items in the store. Items are keyed by string,
           # the form in which the data model names prerequisites and segments.
@@ -63,7 +63,7 @@ def initialize(flag_change_broadcaster, change_set_broadcaster, logger)
         #
         # @param persistent_store [LaunchDarkly::Interfaces::FeatureStore] The persistent store implementation
         # @param writable [Boolean] Whether the persistent store should be written to
-        # @param status_provider [LaunchDarkly::Impl::DataStore::StatusProviderV2, nil] Optional status provider for the persistent store
+        # @param status_provider [LaunchDarkly::Impl::DataStore::StatusProvider, nil] Optional status provider for the persistent store
         # @return [Store] self for method chaining
         #
         def with_persistence(persistent_store, writable, status_provider = nil)
@@ -182,7 +182,7 @@ def initialized?
         #
         # Get the data store status provider for the persistent store, if configured.
         #
-        # @return [LaunchDarkly::Impl::DataStore::StatusProviderV2, nil] The data store status provider for the persistent store, if configured
+        # @return [LaunchDarkly::Impl::DataStore::StatusProvider, nil] The data store status provider for the persistent store, if configured
         #
         def get_data_store_status_provider
           @lock.synchronize do

lib/ldclient-rb/impl/data_system/fdv2.rb

@@ -81,19 +81,19 @@ def initialize(sdk_key, config, data_system_config)
           @store = LaunchDarkly::Impl::DataStore::Store.new(@flag_change_broadcaster, @change_set_broadcaster, @logger)
 
           # Status providers
-          @data_source_status_provider = LaunchDarkly::Impl::DataSource::StatusProviderV2.new(
+          @data_source_status_provider = LaunchDarkly::Impl::DataSource::StatusProvider.new(
             @data_source_broadcaster
           )
-          @data_store_status_provider = LaunchDarkly::Impl::DataStore::StatusProviderV2.new(nil, @data_store_broadcaster)
+          @data_store_status_provider = LaunchDarkly::Impl::DataStore::StatusProvider.new(nil, @data_store_broadcaster)
 
           # Configure persistent store if provided
           if @data_system_config.data_store
-            @data_store_status_provider = LaunchDarkly::Impl::DataStore::StatusProviderV2.new(
+            @data_store_status_provider = LaunchDarkly::Impl::DataStore::StatusProvider.new(
               @data_system_config.data_store,
               @data_store_broadcaster
             )
             writable = @data_system_config.data_store_mode == :read_write
-            wrapper = LaunchDarkly::Impl::DataStore::FeatureStoreClientWrapperV2.new(
+            wrapper = LaunchDarkly::Impl::DataStore::FeatureStoreClientWrapper.new(
               @data_system_config.data_store,
               @data_store_status_provider,
               @logger

lib/ldclient-rb/impl/data_system/polling.rb

@@ -107,7 +107,7 @@ def initialize(poll_interval, requester, logger)
           @logger = logger
           @interrupt_event = Concurrent::Event.new
           @stop = Concurrent::Event.new
-          @name = "PollingDataSourceV2"
+          @name = "PollingDataSource"
         end
 
         #
@@ -134,7 +134,7 @@ def fetch(ss)
         # @yieldparam update [LaunchDarkly::Interfaces::DataSystem::Update]
         #
         def sync(ss)
-          @logger.info { "[LDClient] Starting PollingDataSourceV2 synchronizer" }
+          @logger.info { "[LDClient] Starting PollingDataSource synchronizer" }
 
           until @stop.set?
             result = @requester.fetch(ss.selector)
@@ -229,7 +229,7 @@ def sync(ss)
         # Stops the synchronizer.
         #
         def stop
-          @logger.info { "[LDClient] Stopping PollingDataSourceV2 synchronizer" }
+          @logger.info { "[LDClient] Stopping PollingDataSource synchronizer" }
           @interrupt_event.set
           @stop.set
         end

lib/ldclient-rb/impl/data_system/streaming.rb

@@ -42,7 +42,7 @@ def initialize(sdk_key, http_config, initial_reconnect_delay, config)
           @initial_reconnect_delay = initial_reconnect_delay
           @config = config
           @logger = config.logger
-          @name = "StreamingDataSourceV2"
+          @name = "StreamingDataSource"
           @sse = nil
           @stopped = Concurrent::Event.new
           @diagnostic_accumulator = nil
@@ -68,7 +68,7 @@ def set_diagnostic_accumulator(diagnostic_accumulator)
         # @yieldparam update [LaunchDarkly::Interfaces::DataSystem::Update]
         #
         def sync(ss)
-          @logger.info { "[LDClient] Starting StreamingDataSourceV2 synchronizer" }
+          @logger.info { "[LDClient] Starting StreamingDataSource synchronizer" }
           log_connection_started
 
           change_set_builder = LaunchDarkly::Interfaces::DataSystem::ChangeSetBuilder.new
@@ -175,7 +175,7 @@ def sync(ss)
         # Stops the streaming synchronizer.
         #
         def stop
-          @logger.info { "[LDClient] Stopping StreamingDataSourceV2 synchronizer" }
+          @logger.info { "[LDClient] Stopping StreamingDataSource synchronizer" }
           @sse&.close
           @stopped.set
         end

lib/ldclient-rb/impl/integrations/file_data_source_v2.rb → lib/ldclient-rb/impl/integrations/file_data_source.rb

@@ -25,7 +25,7 @@ module Integrations
       # The files use the same format as the v1 file data source, supporting flags, flagValues,
       # and segments in JSON or YAML format.
       #
-      class FileDataSourceV2
+      class FileDataSource
         include LaunchDarkly::Interfaces::DataSystem::Initializer
         include LaunchDarkly::Interfaces::DataSystem::Synchronizer
 
@@ -64,7 +64,7 @@ def initialize(logger, paths:, poll_interval: 1)
         # @return [String]
         #
         def name
-          'FileDataV2'
+          'FileData'
         end
 
         #
@@ -82,7 +82,7 @@ def fetch(selector_store)
             begin
               @lock.synchronize do
                 if @closed
-                  next LaunchDarkly::Result.fail('FileDataV2 source has been closed')
+                  next LaunchDarkly::Result.fail('FileData source has been closed')
                 end
 
                 load_result = load_all_to_changeset
@@ -377,7 +377,7 @@ def stop
           if @@have_listen
             start_listener_with_listen_gem(resolved_paths)
           else
-            FileDataSourcePollerV2.new(resolved_paths, @poll_interval, method(:on_file_change), @logger)
+            FileDataSourcePoller.new(resolved_paths, @poll_interval, method(:on_file_change), @logger)
           end
         end
 
@@ -403,9 +403,9 @@ def stop
       end
 
       #
-      # Used internally by FileDataSourceV2 to track data file changes if the 'listen' gem is not available.
+      # Used internally by FileDataSource to track data file changes if the 'listen' gem is not available.
       #
-      class FileDataSourcePollerV2
+      class FileDataSourcePoller
         #
         # Initialize the file data poller.
         #
@@ -450,11 +450,11 @@ def initialize(resolved_paths, interval, on_change_callback, logger)
                 last_times = new_times
                 @on_change.call if changed
               rescue => e
-                Impl::Util.log_exception(@logger, "Unexpected exception in FileDataSourcePollerV2", e)
+                Impl::Util.log_exception(@logger, "Unexpected exception in FileDataSourcePoller", e)
               end
             end
           end
-          @thread.name = "LD/FileDataSourceV2"
+          @thread.name = "LD/FileDataSource"
         end
 
         def stop

lib/ldclient-rb/impl/integrations/test_data/test_data_source_v2.rb → lib/ldclient-rb/impl/integrations/test_data/test_data_source.rb

@@ -9,19 +9,19 @@ module Impl
     module Integrations
       module TestData
         #
-        # Internal implementation of both Initializer and Synchronizer protocols for TestDataV2.
+        # Internal implementation of both Initializer and Synchronizer protocols for TestData.
         #
-        # This component bridges the test data management in TestDataV2 with the FDv2 protocol
+        # This component bridges the test data management in TestData with the FDv2 protocol
         # interfaces. Each instance implements both Initializer and Synchronizer protocols
         # and receives change notifications for dynamic updates.
         #
-        class TestDataSourceV2
+        class TestDataSource
           include LaunchDarkly::Interfaces::DataSystem::Initializer
           include LaunchDarkly::Interfaces::DataSystem::Synchronizer
 
           # @api private
           #
-          # @param test_data [LaunchDarkly::Integrations::TestDataV2] the test data instance
+          # @param test_data [LaunchDarkly::Integrations::TestData] the test data instance
           #
           def initialize(test_data)
             @test_data = test_data
@@ -36,7 +36,7 @@ def initialize(test_data)
           # @return [String]
           #
           def name
-            'TestDataV2'
+            'TestData'
           end
 
           #
@@ -131,7 +131,7 @@ def stop
           end
 
           #
-          # Called by TestDataV2 when a flag is updated.
+          # Called by TestData when a flag is updated.
           #
           # This method converts the flag update into an FDv2 changeset and
           # queues it for delivery through the sync() generator.
@@ -187,7 +187,7 @@ def upsert_flag(flag_data)
           end
 
           #
-          # Called by TestDataV2 when a segment is updated.
+          # Called by TestData when a segment is updated.
           #
           # This method converts the segment update into an FDv2 changeset and
           # queues it for delivery through the sync() generator.
@@ -251,7 +251,7 @@ def upsert_segment(segment_data)
               begin
                 @lock.synchronize do
                   if @closed
-                    next LaunchDarkly::Result.fail('TestDataV2 source has been closed')
+                    next LaunchDarkly::Result.fail('TestData source has been closed')
                   end
 
                   init_data, version = yield

lib/ldclient-rb/integrations.rb

@@ -2,5 +2,5 @@
 require "ldclient-rb/integrations/dynamodb"
 require "ldclient-rb/integrations/file_data"
 require "ldclient-rb/integrations/redis"
-require "ldclient-rb/integrations/test_data_v2"
+require "ldclient-rb/integrations/test_data"
 require "ldclient-rb/integrations/util/persistent_data_store_wrapper"

lib/ldclient-rb/integrations/dynamodb.rb

@@ -23,7 +23,7 @@ module DynamoDB
       #
       # @example Configuring the feature store
       #     store = LaunchDarkly::Integrations::DynamoDB::new_feature_store("my-table-name")
-      #     config = LaunchDarkly::Config.new(data_system_config: LaunchDarkly::DataSystem.persistent_store(store).build)
+      #     config = LaunchDarkly::Config.new(data_system: LaunchDarkly::DataSystem.persistent_store(store).build)
       #     client = LaunchDarkly::LDClient.new(my_sdk_key, config)
       #
       # Note that the specified table must already exist in DynamoDB. It must have a partition key called