launchdarkly-server-sdk 7.1.0 → 7.3.0

data/lib/ldclient-rb/polling.rb

@@ -1,6 +1,7 @@
 require "ldclient-rb/impl/repeating_task"
 
 require "concurrent/atomics"
+require "json"
 require "thread"
 
 module LaunchDarkly
@@ -27,30 +28,75 @@ module LaunchDarkly
     end
 
     def stop
-      @task.stop
-      @config.logger.info { "[LDClient] Polling connection stopped" }
+      stop_with_error_info
     end
 
     def poll
       begin
         all_data = @requestor.request_all_data
         if all_data
-          @config.feature_store.init(all_data)
+          update_sink_or_data_store.init(all_data)
           if @initialized.make_true
             @config.logger.info { "[LDClient] Polling connection initialized" }
             @ready.set
           end
         end
+        @config.data_source_update_sink&.update_status(LaunchDarkly::Interfaces::DataSource::Status::VALID, nil)
+      rescue JSON::ParserError => e
+        @config.logger.error { "[LDClient] JSON parsing failed for polling response." }
+        error_info = LaunchDarkly::Interfaces::DataSource::ErrorInfo.new(
+          LaunchDarkly::Interfaces::DataSource::ErrorInfo::INVALID_DATA,
+          0,
+          e.to_s,
+          Time.now
+        )
+        @config.data_source_update_sink&.update_status(LaunchDarkly::Interfaces::DataSource::Status::INTERRUPTED, error_info)
       rescue UnexpectedResponseError => e
+        error_info = LaunchDarkly::Interfaces::DataSource::ErrorInfo.new(
+          LaunchDarkly::Interfaces::DataSource::ErrorInfo::ERROR_RESPONSE, e.status, nil, Time.now)
         message = Util.http_error_message(e.status, "polling request", "will retry")
         @config.logger.error { "[LDClient] #{message}" }
-        unless Util.http_error_recoverable?(e.status)
+
+        if Util.http_error_recoverable?(e.status)
+          @config.data_source_update_sink&.update_status(
+            LaunchDarkly::Interfaces::DataSource::Status::INTERRUPTED,
+            error_info
+          )
+        else
           @ready.set  # if client was waiting on us, make it stop waiting - has no effect if already set
-          stop
+          stop_with_error_info error_info
         end
       rescue StandardError => e
         Util.log_exception(@config.logger, "Exception while polling", e)
+        @config.data_source_update_sink&.update_status(
+          LaunchDarkly::Interfaces::DataSource::Status::INTERRUPTED,
+          LaunchDarkly::Interfaces::DataSource::ErrorInfo.new(LaunchDarkly::Interfaces::DataSource::ErrorInfo::UNKNOWN, 0, e.to_s, Time.now)
+        )
       end
     end
+
+    #
+    # The original implementation of this class relied on the feature store
+    # directly, which we are trying to move away from. Customers who might have
+    # instantiated this directly for some reason wouldn't know they have to set
+    # the config's sink manually, so we have to fall back to the store if the
+    # sink isn't present.
+    #
+    # The next major release should be able to simplify this structure and
+    # remove the need for fall back to the data store because the update sink
+    # should always be present.
+    #
+    private def update_sink_or_data_store
+      @config.data_source_update_sink || @config.feature_store
+    end
+
+    #
+    # @param [LaunchDarkly::Interfaces::DataSource::ErrorInfo, nil] error_info
+    #
+    private def stop_with_error_info(error_info = nil)
+      @task.stop
+      @config.logger.info { "[LDClient] Polling connection stopped" }
+      @config.data_source_update_sink&.update_status(LaunchDarkly::Interfaces::DataSource::Status::OFF, error_info)
+    end
   end
 end

data/lib/ldclient-rb/stream.rb

@@ -25,6 +25,7 @@ module LaunchDarkly
     def initialize(sdk_key, config, diagnostic_accumulator = nil)
       @sdk_key = sdk_key
       @config = config
+      @data_source_update_sink = config.data_source_update_sink
       @feature_store = config.feature_store
       @initialized = Concurrent::AtomicBoolean.new(false)
       @started = Concurrent::AtomicBoolean.new(false)
@@ -60,12 +61,31 @@ module LaunchDarkly
           case err
           when SSE::Errors::HTTPStatusError
             status = err.status
+            error_info = LaunchDarkly::Interfaces::DataSource::ErrorInfo.new(
+              LaunchDarkly::Interfaces::DataSource::ErrorInfo::ERROR_RESPONSE, status, nil, Time.now)
             message = Util.http_error_message(status, "streaming connection", "will retry")
             @config.logger.error { "[LDClient] #{message}" }
-            unless Util.http_error_recoverable?(status)
+
+            if Util.http_error_recoverable?(status)
+              @data_source_update_sink&.update_status(
+                LaunchDarkly::Interfaces::DataSource::Status::INTERRUPTED,
+                error_info
+              )
+            else
               @ready.set  # if client was waiting on us, make it stop waiting - has no effect if already set
-              stop
+              stop_with_error_info error_info
             end
+          when SSE::Errors::HTTPContentTypeError, SSE::Errors::HTTPProxyError, SSE::Errors::ReadTimeoutError
+            @data_source_update_sink&.update_status(
+              LaunchDarkly::Interfaces::DataSource::Status::INTERRUPTED,
+              LaunchDarkly::Interfaces::DataSource::ErrorInfo.new(LaunchDarkly::Interfaces::DataSource::ErrorInfo::NETWORK_ERROR, 0, err.to_s, Time.now)
+            )
+
+          else
+            @data_source_update_sink&.update_status(
+              LaunchDarkly::Interfaces::DataSource::Status::INTERRUPTED,
+              LaunchDarkly::Interfaces::DataSource::ErrorInfo.new(LaunchDarkly::Interfaces::DataSource::ErrorInfo::UNKNOWN, 0, err.to_s, Time.now)
+            )
           end
         }
       end
@@ -74,46 +94,86 @@ module LaunchDarkly
     end
 
     def stop
+      stop_with_error_info
+    end
+
+    private
+
+    #
+    # @param [LaunchDarkly::Interfaces::DataSource::ErrorInfo, nil] error_info
+    #
+    def stop_with_error_info(error_info = nil)
       if @stopped.make_true
         @es.close
+        @data_source_update_sink&.update_status(LaunchDarkly::Interfaces::DataSource::Status::OFF, error_info)
         @config.logger.info { "[LDClient] Stream connection stopped" }
       end
     end
 
-    private
+    #
+    # The original implementation of this class relied on the feature store
+    # directly, which we are trying to move away from. Customers who might have
+    # instantiated this directly for some reason wouldn't know they have to set
+    # the config's sink manually, so we have to fall back to the store if the
+    # sink isn't present.
+    #
+    # The next major release should be able to simplify this structure and
+    # remove the need for fall back to the data store because the update sink
+    # should always be present.
+    #
+    def update_sink_or_data_store
+      @data_source_update_sink || @feature_store
+    end
 
     def process_message(message)
       log_connection_result(true)
       method = message.type
       @config.logger.debug { "[LDClient] Stream received #{method} message: #{message.data}" }
-      if method == PUT
-        message = JSON.parse(message.data, symbolize_names: true)
-        all_data = Impl::Model.make_all_store_data(message[:data], @config.logger)
-        @feature_store.init(all_data)
-        @initialized.make_true
-        @config.logger.info { "[LDClient] Stream initialized" }
-        @ready.set
-      elsif method == PATCH
-        data = JSON.parse(message.data, symbolize_names: true)
-        for kind in [FEATURES, SEGMENTS]
-          key = key_for_path(kind, data[:path])
-          if key
-            item = Impl::Model.deserialize(kind, data[:data], @config.logger)
-            @feature_store.upsert(kind, item)
-            break
+
+      begin
+        if method == PUT
+          message = JSON.parse(message.data, symbolize_names: true)
+          all_data = Impl::Model.make_all_store_data(message[:data], @config.logger)
+          update_sink_or_data_store.init(all_data)
+          @initialized.make_true
+          @config.logger.info { "[LDClient] Stream initialized" }
+          @ready.set
+        elsif method == PATCH
+          data = JSON.parse(message.data, symbolize_names: true)
+          for kind in [FEATURES, SEGMENTS]
+            key = key_for_path(kind, data[:path])
+            if key
+              item = Impl::Model.deserialize(kind, data[:data], @config.logger)
+              update_sink_or_data_store.upsert(kind, item)
+              break
+            end
           end
-        end
-      elsif method == DELETE
-        data = JSON.parse(message.data, symbolize_names: true)
-        for kind in [FEATURES, SEGMENTS]
-          key = key_for_path(kind, data[:path])
-          if key
-            @feature_store.delete(kind, key, data[:version])
-            break
+        elsif method == DELETE
+          data = JSON.parse(message.data, symbolize_names: true)
+          for kind in [FEATURES, SEGMENTS]
+            key = key_for_path(kind, data[:path])
+            if key
+              update_sink_or_data_store.delete(kind, key, data[:version])
+              break
+            end
           end
+        else
+          @config.logger.warn { "[LDClient] Unknown message received: #{method}" }
         end
-      else
-        @config.logger.warn { "[LDClient] Unknown message received: #{method}" }
+
+        @data_source_update_sink&.update_status(LaunchDarkly::Interfaces::DataSource::Status::VALID, nil)
+      rescue JSON::ParserError => e
+        @config.logger.error { "[LDClient] JSON parsing failed for method #{method}. Ignoring event." }
+        error_info = LaunchDarkly::Interfaces::DataSource::ErrorInfo.new(
+          LaunchDarkly::Interfaces::DataSource::ErrorInfo::INVALID_DATA,
+          0,
+          e.to_s,
+          Time.now
+        )
+        @data_source_update_sink&.update_status(LaunchDarkly::Interfaces::DataSource::Status::INTERRUPTED, error_info)
+
+        # Re-raise the exception so the SSE implementation can catch it and restart the stream.
+        raise
       end
     end
 

data/lib/ldclient-rb/version.rb

@@ -1,3 +1,3 @@
 module LaunchDarkly
-  VERSION = "7.1.0"
+  VERSION = "7.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: launchdarkly-server-sdk
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 7.3.0
 platform: ruby
 authors:
 - LaunchDarkly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-13 00:00:00.000000000 Z
+date: 2023-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-dynamodb
@@ -38,6 +38,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.2.33
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -274,8 +288,12 @@ files:
 - lib/ldclient-rb/flags_state.rb
 - lib/ldclient-rb/impl.rb
 - lib/ldclient-rb/impl/big_segments.rb
+- lib/ldclient-rb/impl/broadcaster.rb
 - lib/ldclient-rb/impl/context.rb
 - lib/ldclient-rb/impl/context_filter.rb
+- lib/ldclient-rb/impl/data_source.rb
+- lib/ldclient-rb/impl/data_store.rb
+- lib/ldclient-rb/impl/dependency_tracker.rb
 - lib/ldclient-rb/impl/diagnostic_events.rb
 - lib/ldclient-rb/impl/evaluator.rb
 - lib/ldclient-rb/impl/evaluator_bucketing.rb
@@ -284,6 +302,7 @@ files:
 - lib/ldclient-rb/impl/event_sender.rb
 - lib/ldclient-rb/impl/event_summarizer.rb
 - lib/ldclient-rb/impl/event_types.rb
+- lib/ldclient-rb/impl/flag_tracker.rb
 - lib/ldclient-rb/impl/integrations/consul_impl.rb
 - lib/ldclient-rb/impl/integrations/dynamodb_impl.rb
 - lib/ldclient-rb/impl/integrations/file_data_source.rb
@@ -338,7 +357,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
+rubygems_version: 3.4.20
 signing_key: 
 specification_version: 4
 summary: LaunchDarkly SDK for Ruby