flipper-cloud 0.25.4 → 0.26.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c798fcaaf0f9c858240f652507202cb26790aca64dc428b5ea4447b54b290534
-  data.tar.gz: eb25193626f19f4bba50e6a1be9dea0f9a5e9b62b94097fb76a027f5c9986cd8
+  metadata.gz: 237f86d236d564cb69735a00ad88c5d833b152f9e6f9a64bd50529ba2c39dd0d
+  data.tar.gz: 11e612037550a9e83b763d0d2c80d2f5191b4a52c9288f2f61e9dbf6640d38f5
 SHA512:
-  metadata.gz: 4aba0c24f6009023a38441e5e81c20ed20c71aeb0e0a4b2ff81dd1c30d744a0f3d811a58552da599b1ff9177cb8f3b093e85dd385f903fe6fa57e4a483a83a76
-  data.tar.gz: f815ec3a46d4c13355d0dfcdc403e574361df07e1e753fae2c9285439356e6a2e0ff19a2b5516b1137d99d86efe423b64422b4e5aacaf37c99ecc7d4a1746449
+  metadata.gz: caa1819e0815fe2ba4a3fad0be799664dce53d86abd66e729f9c14cc870061478718396b610ef0f3221f25334fa83a7d970d3059c09289fa3767b87efeef49be
+  data.tar.gz: ac5113e292581c9842154cdfed2ddbc3d23aa66934845a530aa59b8d2e08a765c057fd8b757cd1bd526a5f11946debb0ea6a69732939f4f79183e998f047e9de

data/examples/cloud/forked.rb

@@ -0,0 +1,31 @@
+# Usage (from the repo root):
+# env FLIPPER_CLOUD_TOKEN=<token> bundle exec ruby examples/cloud/threaded.rb
+
+require_relative "./cloud_setup"
+require 'bundler/setup'
+require 'flipper/cloud'
+
+pids = 5.times.map do |n|
+  fork {
+    # Check every second to see if the feature is enabled
+    threads = []
+    5.times do
+      threads << Thread.new do
+        loop do
+          sleep rand
+
+          if Flipper[:stats].enabled?
+            puts "#{Process.pid} #{Time.now.to_i} Enabled!"
+          else
+            puts "#{Process.pid} #{Time.now.to_i} Disabled!"
+          end
+        end
+      end
+    end
+    threads.map(&:join)
+  }
+end
+
+pids.each do |pid|
+  Process.waitpid pid, 0
+end

data/examples/cloud/threaded.rb

@@ -0,0 +1,36 @@
+# Usage (from the repo root):
+# env FLIPPER_CLOUD_TOKEN=<token> bundle exec ruby examples/cloud/threaded.rb
+
+require_relative "./cloud_setup"
+require 'bundler/setup'
+require 'flipper/cloud'
+require "active_support/notifications"
+require "active_support/isolated_execution_state"
+
+ActiveSupport::Notifications.subscribe(/poller\.flipper/) do |*args|
+  p args: args
+end
+
+Flipper.configure do |config|
+  config.default {
+    Flipper::Cloud.new(local_adapter: config.adapter, instrumenter: ActiveSupport::Notifications)
+  }
+end
+
+# Check every second to see if the feature is enabled
+threads = []
+10.times do
+  threads << Thread.new do
+    loop do
+      sleep rand
+
+      if Flipper[:stats].enabled?
+        puts "#{Time.now.to_i} Enabled!"
+      else
+        puts "#{Time.now.to_i} Disabled!"
+      end
+    end
+  end
+end
+
+threads.map(&:join)

data/lib/flipper/cloud/configuration.rb

@@ -1,10 +1,11 @@
 require "socket"
 require "flipper/adapters/http"
+require "flipper/adapters/poll"
+require "flipper/adapters/poll/poller"
 require "flipper/adapters/memory"
 require "flipper/adapters/dual_write"
-require "flipper/adapters/sync"
+require "flipper/adapters/sync/synchronizer"
 require "flipper/cloud/instrumenter"
-require "flipper/cloud/registry"
 require "brow"
 
 module Flipper
@@ -18,6 +19,12 @@ module Flipper
 
       DEFAULT_URL = "https://www.flippercloud.io/adapter".freeze
 
+      # Private: Keeps track of brow instances so they can be shared across
+      # threads.
+      def self.brow_instances
+        @brow_instances ||= Concurrent::Map.new
+      end
+
       # Public: The token corresponding to an environment on flippercloud.io.
       attr_accessor :token
 
@@ -124,13 +131,12 @@ module Flipper
       end
 
       def brow
-        uri = URI.parse(url)
-        uri.path = "#{uri.path}/events".squeeze("/")
-        events_url = uri.to_s
+        self.class.brow_instances.compute_if_absent(url + token) do
+          uri = URI.parse(url)
+          uri.path = "#{uri.path}/events".squeeze("/")
 
-        Registry.default.fetch(events_url) {
           Brow::Client.new({
-            url: events_url,
+            url: uri.to_s,
             headers: {
               "Accept" => "application/json",
               "Content-Type" => "application/json",
@@ -138,7 +144,7 @@ module Flipper
               "Flipper-Cloud-Token" => @token,
             }
           })
-        }
+        end
       end
 
       # Public: The method that will be used to synchronize local adapter with
@@ -150,18 +156,23 @@ module Flipper
       private
 
       def app_adapter
-        sync_method == :webhook ? dual_write_adapter : sync_adapter
+        sync_method == :webhook ? dual_write_adapter : poll_adapter
       end
 
       def dual_write_adapter
         Flipper::Adapters::DualWrite.new(local_adapter, http_adapter)
       end
 
-      def sync_adapter
-        Flipper::Adapters::Sync.new(local_adapter, http_adapter, {
-          instrumenter: instrumenter,
+      def poller
+        Flipper::Adapters::Poll::Poller.get(@url + @token, {
           interval: sync_interval,
-        })
+          remote_adapter: http_adapter,
+          instrumenter: instrumenter,
+        }).tap(&:start)
+      end
+
+      def poll_adapter
+        Flipper::Adapters::Poll.new(poller, dual_write_adapter)
       end
 
       def http_adapter
@@ -169,6 +180,8 @@ module Flipper
           url: @url,
           read_timeout: @read_timeout,
           open_timeout: @open_timeout,
+          write_timeout: @write_timeout,
+          max_retries: 0, # we'll handle retries ourselves
           debug_output: @debug_output,
           headers: {
             "Flipper-Cloud-Token" => @token,

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = '0.25.4'.freeze
+  VERSION = '0.26.0.rc2'.freeze
 end

data/spec/flipper/cloud/configuration_spec.rb

@@ -72,7 +72,8 @@ RSpec.describe Flipper::Cloud::Configuration do
     stub_request(:get, /flippercloud\.io/).to_return(status: 200, body: "{}")
 
     instance = described_class.new(required_options.merge(sync_interval: 1))
-    expect(instance.adapter.synchronizer.interval).to be(1)
+    poller = instance.send(:poller)
+    expect(poller.interval).to eq(1)
   end
 
   it "can set debug_output" do
@@ -85,7 +86,7 @@ RSpec.describe Flipper::Cloud::Configuration do
     stub_request(:get, /flippercloud\.io/).to_return(status: 200, body: "{}")
 
     instance = described_class.new(required_options)
-    expect(instance.adapter).to be_instance_of(Flipper::Adapters::Sync)
+    expect(instance.adapter).to be_instance_of(Flipper::Adapters::Poll)
   end
 
   it "can override adapter block" do
@@ -234,7 +235,7 @@ RSpec.describe Flipper::Cloud::Configuration do
     expect(stub).to have_been_requested
 
     # Check that local adapter really did sync.
-    local_adapter = instance.adapter.instance_variable_get("@local")
+    local_adapter = instance.local_adapter
     all = local_adapter.get_all
     expect(all.keys).to eq(["search", "history"])
     expect(all["search"][:boolean]).to eq("true")

data/spec/flipper/cloud_spec.rb

@@ -12,10 +12,6 @@ RSpec.describe Flipper::Cloud do
 
     before do
       @instance = described_class.new(token: token)
-      memoized_adapter = @instance.adapter
-      sync_adapter = memoized_adapter.adapter
-      @http_adapter = sync_adapter.instance_variable_get('@remote')
-      @http_client = @http_adapter.instance_variable_get('@client')
     end
 
     it 'returns Flipper::DSL instance' do
@@ -26,40 +22,29 @@ RSpec.describe Flipper::Cloud do
       expect(@instance.cloud_configuration).to be_instance_of(Flipper::Cloud::Configuration)
     end
 
-    it 'configures instance to use http adapter' do
-      expect(@http_adapter).to be_instance_of(Flipper::Adapters::Http)
-    end
-
-    it 'sets up correct url' do
-      uri = @http_client.instance_variable_get('@uri')
-      expect(uri.scheme).to eq('https')
-      expect(uri.host).to eq('www.flippercloud.io')
-      expect(uri.path).to eq('/adapter')
-    end
-
-    it 'sets correct token header' do
-      headers = @http_client.instance_variable_get('@headers')
-      expect(headers['Flipper-Cloud-Token']).to eq(token)
-    end
-
-    it 'uses noop instrumenter' do
+    it 'configures the correct adapter' do
+      # pardon the nesting...
+      memoized_adapter = @instance.adapter
+      poll_adapter = memoized_adapter.adapter
+      dual_write_adapter = poll_adapter.adapter
+
+      expect(poll_adapter).to be_instance_of(Flipper::Adapters::Poll)
+      expect(dual_write_adapter).to be_instance_of(Flipper::Adapters::DualWrite)
+
+      http_adapter = dual_write_adapter.remote
+      client = http_adapter.client
+      expect(client.uri.scheme).to eq('https')
+      expect(client.uri.host).to eq('www.flippercloud.io')
+      expect(client.uri.path).to eq('/adapter')
+      expect(client.headers['Flipper-Cloud-Token']).to eq(token)
       expect(@instance.instrumenter).to be(Flipper::Instrumenters::Noop)
     end
   end
 
   context 'initialize with token and options' do
-    before do
-      stub_request(:get, /fakeflipper\.com/).to_return(status: 200, body: "{}")
-
-      @instance = described_class.new(token: 'asdf', url: 'https://www.fakeflipper.com/sadpanda')
-      memoized_adapter = @instance.adapter
-      sync_adapter = memoized_adapter.adapter
-      @http_adapter = sync_adapter.instance_variable_get('@remote')
-      @http_client = @http_adapter.instance_variable_get('@client')
-    end
-
     it 'sets correct url' do
-      uri = @http_client.instance_variable_get('@uri')
+      @instance = described_class.new(token: 'asdf', url: 'https://www.fakeflipper.com/sadpanda')
+      uri = @instance.adapter.adapter.adapter.remote.client.uri
       expect(uri.scheme).to eq('https')
       expect(uri.host).to eq('www.fakeflipper.com')
       expect(uri.path).to eq('/sadpanda')
@@ -89,26 +74,26 @@ RSpec.describe Flipper::Cloud do
 
   it 'can set debug_output' do
     expect(Flipper::Adapters::Http::Client).to receive(:new)
-      .with(hash_including(debug_output: STDOUT))
+      .with(hash_including(debug_output: STDOUT)).at_least(:once)
     described_class.new(token: 'asdf', debug_output: STDOUT)
   end
 
   it 'can set read_timeout' do
     expect(Flipper::Adapters::Http::Client).to receive(:new)
-      .with(hash_including(read_timeout: 1))
+      .with(hash_including(read_timeout: 1)).at_least(:once)
     described_class.new(token: 'asdf', read_timeout: 1)
   end
 
   it 'can set open_timeout' do
     expect(Flipper::Adapters::Http::Client).to receive(:new)
-      .with(hash_including(open_timeout: 1))
+      .with(hash_including(open_timeout: 1)).at_least(:once)
     described_class.new(token: 'asdf', open_timeout: 1)
   end
 
   if RUBY_VERSION >= '2.6.0'
     it 'can set write_timeout' do
       expect(Flipper::Adapters::Http::Client).to receive(:new)
-        .with(hash_including(open_timeout: 1))
+        .with(hash_including(open_timeout: 1)).at_least(:once)
       described_class.new(token: 'asdf', open_timeout: 1)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper-cloud
 version: !ruby/object:Gem::Version
-  version: 0.25.4
+  version: 0.26.0.rc2
 platform: ruby
 authors:
 - John Nunemaker
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-07 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flipper
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.25.4
+        version: 0.26.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.25.4
+        version: 0.26.0.rc2
 - !ruby/object:Gem::Dependency
   name: brow
   requirement: !ruby/object:Gem::Requirement
@@ -49,7 +49,9 @@ files:
 - examples/cloud/app.ru
 - examples/cloud/basic.rb
 - examples/cloud/cloud_setup.rb
+- examples/cloud/forked.rb
 - examples/cloud/import.rb
+- examples/cloud/threaded.rb
 - flipper-cloud.gemspec
 - lib/flipper-cloud.rb
 - lib/flipper/cloud.rb
@@ -59,7 +61,6 @@ files:
 - lib/flipper/cloud/instrumenter.rb
 - lib/flipper/cloud/message_verifier.rb
 - lib/flipper/cloud/middleware.rb
-- lib/flipper/cloud/registry.rb
 - lib/flipper/cloud/routes.rb
 - lib/flipper/version.rb
 - spec/flipper/cloud/configuration_spec.rb
@@ -84,9 +85,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.7
 signing_key:

data/lib/flipper/cloud/registry.rb

@@ -1,46 +0,0 @@
-require "thread"
-
-module Flipper
-  module Cloud
-    class Registry
-      def self.default
-        @default ||= new
-      end
-
-      def initialize
-        @mutex = Mutex.new
-        @data = {}
-      end
-
-      def fetch(key, &block)
-        @mutex.synchronize do
-          if data = @data[key]
-            data
-          else
-            @data[key] = yield
-          end
-        end
-      end
-
-      def keys
-        @mutex.synchronize do
-          @data.keys
-        end
-      end
-
-      def each(&block)
-        data = @mutex.synchronize do
-          @data.dup
-        end
-
-        data.each(&block)
-      end
-
-      def clear
-        @mutex.synchronize do
-          @data = {}
-        end
-      end
-    end
-  end
-end