prefab-cloud-ruby 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1d4612e27cae5a4e66065a16d8d70cb0b1c7120770eac8c7e09ce3ca0e48e82
-  data.tar.gz: 1d1f50b6b4605729b93d62194b17ed9a1fca739f435ec2a4e682482a293bffe6
+  metadata.gz: a34b06515d401b7e73fd8b6adf77294187d94ea3a1d1909d159ebfd63b4046ad
+  data.tar.gz: 6ba449742b1a75517b35a47151452dbdf94c0a8aef0e58a639ae5b2481262d43
 SHA512:
-  metadata.gz: ed5a04b2a16a79b0963d9af2dd71955141fdd06e7d73a4897adf74245435cf33239f78b08bbde797b7420b7e988fbb76e5e4333e6da5350f1037502949c469e7
-  data.tar.gz: 1b6f556bb94a31c272d5cd3c585860cacb4698be61830379c1a1a7e2d2fdcb461c02777e0c6fdb6a2cc939dcb070a27237506bd3c21d69ccd723ec50dccfbf2a
+  metadata.gz: 0a32e0ac965c54d634c579de66927d2982cca26d7098daaf3cdfd2dda88bf04bd33265c1e9f85e303d75fc9360f6df202cee256e59a91012b94f0adcf29252aa
+  data.tar.gz: 2c37b2cfeef43f44d2dcbe8835ff8ea130393ad98dd9dd61328371972bf1818ab12d932f6bec319a52ec2423f9204762c6305ab3643023a3aa5ea4bfd18974bf

data/.envrc.sample

@@ -0,0 +1,3 @@
+export AWS_ACCESS_KEY_ID=
+export AWS_SECRET_ACCESS_KEY=
+export PREFAB_INTEGRATION_TEST_API_KEY=

data/.github/workflows/ruby.yml

@@ -26,6 +26,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: recursive
     - name: Set up Ruby
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
     # change this to (see https://github.com/ruby/setup-ruby#versioning):
@@ -37,3 +39,5 @@ jobs:
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - name: Run tests
       run: bundle exec rake
+      env:
+        PREFAB_INTEGRATION_TEST_API_KEY: ${{ secrets.PREFAB_INTEGRATION_TEST_API_KEY }}

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "test/prefab-cloud-integration-test-data"]
+	path = test/prefab-cloud-integration-test-data
+	url = git@github.com:prefab-cloud/prefab-cloud-integration-test-data

data/Gemfile

@@ -1,23 +1,23 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gem 'concurrent-ruby', '~> 1.0', '>= 1.0.5'
 gem 'faraday'
+gem 'googleapis-common-protos-types', platforms: :ruby
+gem 'google-protobuf', platforms: :ruby
+gem 'grpc', platforms: :ruby
 gem 'ld-eventsource'
-gem 'grpc', :platforms => :ruby
-gem 'google-protobuf', :platforms => :ruby
-gem 'googleapis-common-protos-types', :platforms => :ruby
 
 group :development do
   gem 'benchmark-ips'
-  gem 'grpc-tools', :platforms => :ruby
-  gem "rdoc"
-  gem "bundler"
-  gem "juwelier", "~> 2.4.9"
-  gem "simplecov", ">= 0"
-  gem 'thin'
+  gem 'bundler'
+  gem 'grpc-tools', platforms: :ruby
+  gem 'juwelier', '~> 2.4.9'
+  gem 'rdoc'
+  gem 'simplecov', '>= 0'
 end
 
 group :test do
-  gem "minitest"
-  gem "minitest-focus"
+  gem 'minitest'
+  gem 'minitest-focus'
+  gem 'minitest-reporters'
 end

data/Gemfile.lock

@@ -3,16 +3,15 @@ GEM
   specs:
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
+    ansi (1.5.0)
     benchmark-ips (2.10.0)
     builder (3.2.4)
     concurrent-ruby (1.1.10)
-    daemons (1.4.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     docile (1.3.5)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    eventmachine (1.2.7)
     faraday (1.3.0)
       faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
@@ -22,7 +21,8 @@ GEM
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    git (1.11.0)
+    git (1.13.0)
+      addressable (~> 2.8)
       rchardet (~> 1.8)
     github_api (0.19.0)
       addressable (~> 2.4)
@@ -72,35 +72,37 @@ GEM
     minitest (5.16.2)
     minitest-focus (1.3.1)
       minitest (>= 4, < 6)
+    minitest-reporters (1.5.0)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nokogiri (1.13.9)
+    nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    oauth2 (1.4.7)
-      faraday (>= 0.8, < 2.0)
+    oauth2 (1.4.11)
+      faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
+      rack (>= 1.2, < 4)
     psych (3.3.1)
     public_suffix (4.0.6)
-    racc (1.6.0)
-    rack (2.2.4)
+    racc (1.6.1)
+    rack (3.0.4.1)
     rake (13.0.6)
     rchardet (1.8.0)
     rdoc (6.3.3)
+    ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.4)
     semver2 (3.4.2)
     simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
     simplecov-html (0.12.3)
-    thin (1.8.1)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0, >= 1.0.4)
-      rack (>= 1, < 3)
     thread_safe (0.3.6)
     unf (0.1.4)
       unf_ext
@@ -122,9 +124,9 @@ DEPENDENCIES
   ld-eventsource
   minitest
   minitest-focus
+  minitest-reporters
   rdoc
   simplecov
-  thin
 
 BUNDLED WITH
    2.3.5

data/README.md

@@ -41,7 +41,7 @@ end
 ```
 
 ## Logging & Debugging
-In classpath or ~/.prefab.overrides.config.yaml set
+In classpath or ~/.prefab.default.config.yaml set
 
 ```
 log-level:

data/Rakefile

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'rubygems'
@@ -6,21 +5,21 @@ require 'bundler'
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
+  warn e.message
+  warn 'Run `bundle install` to install missing gems'
   exit e.status_code
 end
 require 'rake'
 require 'juwelier'
 Juwelier::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
-  gem.name = "prefab-cloud-ruby"
-  gem.homepage = "http://github.com/prefab-cloud/prefab-cloud-ruby"
-  gem.license = "MIT"
-  gem.summary = %Q{Prefab Ruby Infrastructure}
-  gem.description = %Q{RateLimits & Config as a service}
-  gem.email = "jdwyer@prefab.cloud"
-  gem.authors = ["Jeff Dwyer"]
+  gem.name = 'prefab-cloud-ruby'
+  gem.homepage = 'http://github.com/prefab-cloud/prefab-cloud-ruby'
+  gem.license = 'MIT'
+  gem.summary = %(Prefab Ruby Infrastructure)
+  gem.description = %(RateLimits & Config as a service)
+  gem.email = 'jdwyer@prefab.cloud'
+  gem.authors = ['Jeff Dwyer']
 
   # dependencies defined in Gemfile
 end
@@ -32,17 +31,17 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-desc "Code coverage detail"
+desc 'Code coverage detail'
 task :simplecov do
-  ENV['COVERAGE'] = "true"
+  ENV['COVERAGE'] = 'true'
   Rake::Task['test'].execute
 end
 
-task :default => :test
+task default: :test
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  version = File.exist?('VERSION') ? File.read('VERSION') : ''
 
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "prefab-cloud-ruby #{version}"

data/VERSION

@@ -1 +1 @@
-0.20.0
+0.21.0

data/lib/prefab/auth_interceptor.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+
 module Prefab
   class AuthInterceptor < GRPC::ClientInterceptor
-    VERSION = File.exist?('VERSION') ? File.read('VERSION').chomp : ""
+    VERSION = File.exist?('VERSION') ? File.read('VERSION').chomp : ''
     CLIENT = "prefab-cloud-ruby.#{VERSION}".freeze
 
     def initialize(api_key)

data/lib/prefab/cancellable_interceptor.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Prefab
   class CancellableInterceptor < GRPC::ClientInterceptor
     WAIT_SEC = 3
@@ -8,20 +9,20 @@ module Prefab
     end
 
     def cancel
-      @call.instance_variable_get("@wrapped").instance_variable_get("@call").cancel
+      @call.instance_variable_get('@wrapped').instance_variable_get('@call').cancel
       i = 0
-      while (i < WAIT_SEC) do
-        if @call.instance_variable_get("@wrapped").cancelled?
-          @base_client.log_internal Logger::DEBUG, "Cancelled streaming."
+      while i < WAIT_SEC
+        if @call.instance_variable_get('@wrapped').cancelled?
+          @base_client.log_internal Logger::DEBUG, 'Cancelled streaming.'
           return
         else
-          @base_client.log_internal Logger::DEBUG, "Unable to cancel streaming. Trying again"
-          @call.instance_variable_get("@wrapped").instance_variable_get("@call").cancel
+          @base_client.log_internal Logger::DEBUG, 'Unable to cancel streaming. Trying again'
+          @call.instance_variable_get('@wrapped').instance_variable_get('@call').cancel
           i += 1
           sleep(1)
         end
       end
-      @base_client.log_internal Logger::INFO, "Unable to cancel streaming."
+      @base_client.log_internal Logger::INFO, 'Unable to cancel streaming.'
     end
 
     def request_response(request:, call:, method:, metadata:, &block)

data/lib/prefab/client.rb

@@ -1,11 +1,18 @@
 # frozen_string_literal: true
+
 module Prefab
   class Client
     MAX_SLEEP_SEC = 10
     BASE_SLEEP_SEC = 0.5
     NO_DEFAULT_PROVIDED = :no_default_provided
 
-    attr_reader :shared_cache, :stats, :namespace, :interceptor, :api_key, :prefab_api_url, :options
+    attr_reader :shared_cache
+    attr_reader :stats
+    attr_reader :namespace
+    attr_reader :interceptor
+    attr_reader :api_key
+    attr_reader :prefab_api_url
+    attr_reader :options
 
     def initialize(options = Prefab::Options.new)
       @options = options
@@ -15,14 +22,16 @@ module Prefab
       @stubs = {}
 
       if @options.local_only?
-        log_internal Logger::INFO, "Prefab Running in Local Mode"
+        log_internal Logger::INFO, 'Prefab Running in Local Mode'
       else
         @api_key = @options.api_key
-        raise Prefab::Errors::InvalidApiKeyError.new(@api_key) if @api_key.nil? || @api_key.empty? || api_key.count("-") < 1
+        raise Prefab::Errors::InvalidApiKeyError, @api_key if @api_key.nil? || @api_key.empty? || api_key.count('-') < 1
+
         @interceptor = Prefab::AuthInterceptor.new(@api_key)
         @prefab_api_url = @options.prefab_api_url
         @prefab_grpc_url = @options.prefab_grpc_url
-        log_internal Logger::INFO, "Prefab Connecting to: #{@prefab_api_url} and #{@prefab_grpc_url} Secure: #{http_secure?}"
+        log_internal Logger::INFO,
+                     "Prefab Connecting to: #{@prefab_api_url} and #{@prefab_grpc_url} Secure: #{http_secure?}"
         at_exit do
           channel.destroy
         end
@@ -63,16 +72,14 @@ module Prefab
 
       begin
         attempts += 1
-        return stub_for(service, opts[:timeout]).send(method, *params)
-      rescue => exception
+        stub_for(service, opts[:timeout]).send(method, *params)
+      rescue StandardError => e
+        log_internal Logger::WARN, e
 
-        log_internal Logger::WARN, exception
+        raise e if Time.now - start_time > opts[:timeout]
 
-        if Time.now - start_time > opts[:timeout]
-          raise exception
-        end
-        sleep_seconds = [BASE_SLEEP_SEC * (2 ** (attempts - 1)), MAX_SLEEP_SEC].min
-        sleep_seconds = sleep_seconds * (0.5 * (1 + rand()))
+        sleep_seconds = [BASE_SLEEP_SEC * (2**(attempts - 1)), MAX_SLEEP_SEC].min
+        sleep_seconds *= (0.5 * (1 + rand))
         sleep_seconds = [BASE_SLEEP_SEC, sleep_seconds].max
         log_internal Logger::INFO, "Sleep #{sleep_seconds} and Reset #{service} #{method}"
         sleep sleep_seconds
@@ -86,24 +93,28 @@ module Prefab
       @_channel = nil
     end
 
-    def enabled?(feature_name, lookup_key=nil, attributes={})
+    def enabled?(feature_name, lookup_key = nil, attributes = {})
       feature_flag_client.feature_is_on_for?(feature_name, lookup_key, attributes: attributes)
     end
 
-    def get(key, default_or_lookup_key=NO_DEFAULT_PROVIDED, attributes={}, ff_default=NO_DEFAULT_PROVIDED)
-      result = config_client.get(key, default_or_lookup_key)
-
-      if result.is_a?(Prefab::FeatureFlag)
-        feature_flag_client.get(key, default_or_lookup_key, attributes, default: ff_default)
+    def get(key, default_or_lookup_key = NO_DEFAULT_PROVIDED, properties = {}, ff_default = nil)
+      if is_ff?(key)
+        feature_flag_client.get(key, default_or_lookup_key, properties, default: ff_default)
       else
-        result
+        config_client.get(key, default_or_lookup_key, properties)
       end
     end
 
     private
 
+    def is_ff?(key)
+      raw = config_client.send(:raw, key)
+
+      raw && raw.allowable_values.any?
+    end
+
     def http_secure?
-      ENV["PREFAB_CLOUD_HTTP"] != "true"
+      ENV['PREFAB_CLOUD_HTTP'] != 'true'
     end
 
     def stub_for(service, timeout)
@@ -119,7 +130,7 @@ module Prefab
     end
 
     def ssl_certs
-      ssl_certs = ""
+      ssl_certs = ''
       Dir["#{OpenSSL::X509::DEFAULT_CERT_DIR}/*.pem"].each do |cert|
         ssl_certs += File.open(cert).read
       end
@@ -127,11 +138,9 @@ module Prefab
         ssl_certs += File.open(OpenSSL::X509::DEFAULT_CERT_FILE).read
       end
       ssl_certs
-    rescue => e
+    rescue StandardError => e
       log.warn("Issue loading SSL certs #{e.message}")
       ssl_certs
     end
-
   end
 end
-

data/lib/prefab/config_client.rb

@@ -1,17 +1,16 @@
 # frozen_string_literal: true
+
 module Prefab
   class ConfigClient
-    include Prefab::ConfigHelper
-
     RECONNECT_WAIT = 5
     DEFAULT_CHECKPOINT_FREQ_SEC = 60
     SSE_READ_TIMEOUT = 300
-    AUTH_USER = "authuser"
+    AUTH_USER = 'authuser'
 
     def initialize(base_client, timeout)
       @base_client = base_client
       @options = base_client.options
-      @base_client.log_internal Logger::DEBUG, "Initialize ConfigClient"
+      @base_client.log_internal Logger::DEBUG, 'Initialize ConfigClient'
       @timeout = timeout
 
       @stream_lock = Concurrent::ReadWriteLock.new
@@ -22,9 +21,9 @@ module Prefab
       @config_resolver = Prefab::ConfigResolver.new(@base_client, @config_loader)
 
       @initialization_lock = Concurrent::ReadWriteLock.new
-      @base_client.log_internal Logger::DEBUG, "Initialize ConfigClient: AcquireWriteLock"
+      @base_client.log_internal Logger::DEBUG, 'Initialize ConfigClient: AcquireWriteLock'
       @initialization_lock.acquire_write_lock
-      @base_client.log_internal Logger::DEBUG, "Initialize ConfigClient: AcquiredWriteLock"
+      @base_client.log_internal Logger::DEBUG, 'Initialize ConfigClient: AcquiredWriteLock'
       @initialized_future = Concurrent::Future.execute { @initialization_lock.acquire_read_lock }
 
       @cancellable_interceptor = Prefab::CancellableInterceptor.new(@base_client)
@@ -45,14 +44,15 @@ module Prefab
     end
 
     def upsert(key, config_value, namespace = nil, previous_key = nil)
-      raise "Key must not contain ':' set namespaces separately" if key.include? ":"
-      raise "Namespace must not contain ':'" if namespace&.include?(":")
+      raise "Key must not contain ':' set namespaces separately" if key.include? ':'
+      raise "Namespace must not contain ':'" if namespace&.include?(':')
+
       config_delta = Prefab::ConfigClient.value_to_delta(key, config_value, namespace)
       upsert_req = Prefab::UpsertRequest.new(config_delta: config_delta)
       upsert_req.previous_key = previous_key if previous_key&.present?
 
       @base_client.request Prefab::ConfigService, :upsert, req_options: { timeout: @timeout }, params: upsert_req
-      @base_client.stats.increment("prefab.config.upsert")
+      @base_client.stats.increment('prefab.config.upsert')
       @config_loader.set(config_delta, :upsert)
       @config_loader.rm(previous_key) if previous_key&.present?
       @config_resolver.update
@@ -68,46 +68,43 @@ module Prefab
     end
 
     def self.value_to_delta(key, config_value, namespace = nil)
-      Prefab::Config.new(key: [namespace, key].compact.join(":"),
+      Prefab::Config.new(key: [namespace, key].compact.join(':'),
                          rows: [Prefab::ConfigRow.new(value: config_value)])
     end
 
-    def get(key, default=Prefab::Client::NO_DEFAULT_PROVIDED)
-      config = _get(key)
-      config ? value_of(config[:value]) : handle_default(key, default)
-    end
-
-    def get_config_obj(key)
-      config = _get(key)
-      config ? config[:config] : nil
+    def get(key, default = Prefab::Client::NO_DEFAULT_PROVIDED, properties = {}, lookup_key = nil)
+      value = _get(key, lookup_key, properties)
+      value ? Prefab::ConfigValueUnwrapper.unwrap(value, key, properties) : handle_default(key, default)
     end
 
     private
 
+    def raw(key)
+      @config_resolver.raw(key)
+    end
+
     def handle_default(key, default)
-      if default != Prefab::Client::NO_DEFAULT_PROVIDED
-        return default
-      end
+      return default if default != Prefab::Client::NO_DEFAULT_PROVIDED
 
-      if @options.on_no_default == Prefab::Options::ON_NO_DEFAULT::RAISE
-        raise Prefab::Errors::MissingDefaultError.new(key)
-      end
+      raise Prefab::Errors::MissingDefaultError, key if @options.on_no_default == Prefab::Options::ON_NO_DEFAULT::RAISE
 
       nil
     end
 
-    def _get(key)
+    def _get(key, lookup_key, properties)
       # wait timeout sec for the initalization to be complete
       @initialized_future.value(@options.initialization_timeout_sec)
       if @initialized_future.incomplete?
-        if @options.on_init_failure == Prefab::Options::ON_INITIALIZATION_FAILURE::RETURN
-          @base_client.log_internal Logger::WARN, "Couldn't Initialize In #{@options.initialization_timeout_sec}. Key #{key}. Returning what we have"
-          @initialization_lock.release_write_lock
-        else
+        unless @options.on_init_failure == Prefab::Options::ON_INITIALIZATION_FAILURE::RETURN
           raise Prefab::Errors::InitializationTimeoutError.new(@options.initialization_timeout_sec, key)
         end
+
+        @base_client.log_internal Logger::WARN,
+                                  "Couldn't Initialize In #{@options.initialization_timeout_sec}. Key #{key}. Returning what we have"
+        @initialization_lock.release_write_lock
+
       end
-      @config_resolver._get(key)
+      @config_resolver.get(key, lookup_key, properties)
     end
 
     def stub
@@ -120,19 +117,15 @@ module Prefab
     def load_checkpoint
       success = load_checkpoint_api_cdn
 
-      if success
-        return
-      else
-        @base_client.log_internal Logger::INFO, "LoadCheckpoint: Fallback to GRPC API"
-      end
+      return if success
+
+      @base_client.log_internal Logger::INFO, 'LoadCheckpoint: Fallback to GRPC API'
 
       success = load_checkpoint_from_grpc_api
 
-      if success
-        return
-      else
-        @base_client.log_internal Logger::WARN, "No success loading checkpoints"
-      end
+      return if success
+
+      @base_client.log_internal Logger::WARN, 'No success loading checkpoints'
     end
 
     def load_checkpoint_from_grpc_api
@@ -142,8 +135,8 @@ module Prefab
       load_configs(resp, :remote_api_grpc)
       true
     rescue GRPC::Unauthenticated
-      @base_client.log_internal Logger::WARN, "Unauthenticated"
-    rescue => e
+      @base_client.log_internal Logger::WARN, 'Unauthenticated'
+    rescue StandardError => e
       @base_client.log_internal Logger::WARN, "Unexpected grpc_api problem loading checkpoint #{e}"
       false
     end
@@ -172,7 +165,7 @@ module Prefab
         @base_client.log_internal Logger::INFO, "Checkpoint #{source} failed to load. Response #{resp.status}"
         false
       end
-    rescue => e
+    rescue StandardError => e
       @base_client.log_internal Logger::WARN, "Unexpected #{source} problem loading checkpoint #{e} #{conn}"
       false
     end
@@ -187,42 +180,39 @@ module Prefab
         @config_loader.set(config, source)
       end
       if @config_loader.highwater_mark > starting_highwater_mark
-        @base_client.log_internal Logger::INFO, "Found new checkpoint with highwater id #{@config_loader.highwater_mark} from #{source} in project #{project_id} environment: #{project_env_id} and namespace: '#{@namespace}'"
+        @base_client.log_internal Logger::INFO,
+                                  "Found new checkpoint with highwater id #{@config_loader.highwater_mark} from #{source} in project #{project_id} environment: #{project_env_id} and namespace: '#{@namespace}'"
       else
-        @base_client.log_internal Logger::DEBUG, "Checkpoint with highwater id #{@config_loader.highwater_mark} from #{source}. No changes.", "load_configs"
+        @base_client.log_internal Logger::DEBUG,
+                                  "Checkpoint with highwater id #{@config_loader.highwater_mark} from #{source}. No changes.", 'load_configs'
       end
-      @base_client.stats.increment("prefab.config.checkpoint.load")
+      @base_client.stats.increment('prefab.config.checkpoint.load')
       @config_resolver.update
       finish_init!(source)
     end
 
     # A thread that checks for a checkpoint
     def start_checkpointing_thread
-
       Thread.new do
         loop do
-          begin
-            load_checkpoint
-
-            started_at = Time.now
-            delta = @checkpoint_freq_secs - (Time.now - started_at)
-            if delta > 0
-              sleep(delta)
-            end
-          rescue StandardError => exn
-            @base_client.log_internal Logger::INFO, "Issue Checkpointing #{exn.message}"
-          end
+          load_checkpoint
+
+          started_at = Time.now
+          delta = @checkpoint_freq_secs - (Time.now - started_at)
+          sleep(delta) if delta > 0
+        rescue StandardError => e
+          @base_client.log_internal Logger::INFO, "Issue Checkpointing #{e.message}"
         end
       end
     end
 
     def finish_init!(source)
-      if @initialization_lock.write_locked?
-        @base_client.log_internal Logger::INFO, "Unlocked Config via #{source}"
-        @initialization_lock.release_write_lock
-        @base_client.log.set_config_client(self)
-        @base_client.log_internal Logger::INFO, to_s
-      end
+      return unless @initialization_lock.write_locked?
+
+      @base_client.log_internal Logger::INFO, "Unlocked Config via #{source}"
+      @initialization_lock.release_write_lock
+      @base_client.log.set_config_client(self)
+      @base_client.log_internal Logger::INFO, to_s
     end
 
     def start_sse_streaming_connection_thread(start_at_id)
@@ -230,7 +220,7 @@ module Prefab
       auth_string = Base64.strict_encode64(auth)
       headers = {
         "x-prefab-start-at-id": start_at_id,
-        "Authorization": "Basic #{auth_string}",
+        "Authorization": "Basic #{auth_string}"
       }
       url = "#{@base_client.prefab_api_url}/api/v1/sse/config"
       @base_client.log_internal Logger::INFO, "SSE Streaming Connect to #{url} start_at #{start_at_id}"
@@ -246,4 +236,3 @@ module Prefab
     end
   end
 end
-