flipper-cloud 0.23.1 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdc9bab38dc9eda1a623130fc95ef4ea352b3acaaf83f8c36cdc013c8a5bc3c4
-  data.tar.gz: cea3e86dd52a6c74fbd01e93782456f42b5058631b377c58f7d7610b22d81cb3
+  metadata.gz: 7502697176d9e926cf7cf93c18ed11d4f15fa342287dbe2cd757aaf70b62ddfc
+  data.tar.gz: f1efff2fbcc4ebb9c1b0e09cfea3ca68f653a494566a7e52a7b7d5088c7cac72
 SHA512:
-  metadata.gz: 6c5a1104978d3f190687d4374c44a1887953b2955c803eecb995d597662420d2b4edb5d4d5bcb420c444167669c709b8718d7966916034dcee1ddca408b6d6b3
-  data.tar.gz: 3e195dd488dcd230d0dd8f19162b05cac2b663f893b1f3509ffc681557ee3cd79e019d499d78295227d3603899e575daaad2a94c5878de2291ccac60dabcad45
+  metadata.gz: 8c1509933e50811a1d366228639e7a3ddf9d6549778eb228da64e477e16561deb4190635d1c9c0993d284635aaba379e7fd735ba796f78ae5666fa95241dc13c
+  data.tar.gz: ef398dc3057a49a886899b61c3f5290fe13e3f6d8adeb48922ade8ba8d3520f3b4b96f3ba861da0642056b0a84bf8137717b9c4b00f3dd8c1e8af156516920e3

data/flipper-cloud.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |gem|
   gem.metadata      = Flipper::METADATA
 
   gem.add_dependency 'flipper', "~> #{Flipper::VERSION}"
+  gem.add_dependency "brow", "~> 0.4.1"
 end

data/lib/flipper/cloud/configuration.rb

@@ -3,6 +3,9 @@ require "flipper/adapters/http"
 require "flipper/adapters/memory"
 require "flipper/adapters/dual_write"
 require "flipper/adapters/sync"
+require "flipper/cloud/instrumenter"
+require "flipper/cloud/registry"
+require "brow"
 
 module Flipper
   module Cloud
@@ -70,12 +73,6 @@ module Flipper
           raise ArgumentError, "Flipper::Cloud token is missing. Please set FLIPPER_CLOUD_TOKEN or provide the token (e.g. Flipper::Cloud.new(token: 'token'))."
         end
 
-        if ENV["FLIPPER_CLOUD_SYNC_METHOD"]
-          warn "FLIPPER_CLOUD_SYNC_METHOD is deprecated and has no effect."
-        end
-        self.sync_method = options[:sync_method] if options[:sync_method]
-
-        @instrumenter = options.fetch(:instrumenter, Instrumenters::Noop)
         @read_timeout = options.fetch(:read_timeout) { ENV.fetch("FLIPPER_CLOUD_READ_TIMEOUT", 5).to_f }
         @open_timeout = options.fetch(:open_timeout) { ENV.fetch("FLIPPER_CLOUD_OPEN_TIMEOUT", 5).to_f }
         @write_timeout = options.fetch(:write_timeout) { ENV.fetch("FLIPPER_CLOUD_WRITE_TIMEOUT", 5).to_f }
@@ -85,6 +82,16 @@ module Flipper
         @debug_output = options[:debug_output]
         @adapter_block = ->(adapter) { adapter }
         self.url = options.fetch(:url) { ENV.fetch("FLIPPER_CLOUD_URL", DEFAULT_URL) }
+
+        instrumenter = options.fetch(:instrumenter, Instrumenters::Noop)
+
+        # This is alpha. Don't use this unless you are me. And you are not me.
+        cloud_instrument = options.fetch(:cloud_instrument) { ENV["FLIPPER_CLOUD_INSTRUMENT"] == "1" }
+        @instrumenter = if cloud_instrument
+          Instrumenter.new(brow: brow, instrumenter: instrumenter)
+        else
+          instrumenter
+        end
       end
 
       # Public: Read or customize the http adapter. Calling without a block will
@@ -116,16 +123,30 @@ module Flipper
         }).call
       end
 
+      def brow
+        uri = URI.parse(url)
+        uri.path = "#{uri.path}/events".squeeze("/")
+        events_url = uri.to_s
+
+        Registry.default.fetch(events_url) {
+          Brow::Client.new({
+            url: events_url,
+            headers: {
+              "Accept" => "application/json",
+              "Content-Type" => "application/json",
+              "User-Agent" => "Flipper v#{VERSION} via Brow v#{Brow::VERSION}",
+              "Flipper-Cloud-Token" => @token,
+            }
+          })
+        }
+      end
+
       # Public: The method that will be used to synchronize local adapter with
       # cloud. (default: :poll, will be :webhook if sync_secret is set).
       def sync_method
         sync_secret ? :webhook : :poll
       end
 
-      def sync_method=(_)
-        warn "Flipper::Cloud: sync_method is deprecated and has no effect."
-      end
-
       private
 
       def app_adapter
@@ -157,5 +178,3 @@ module Flipper
     end
   end
 end
-
-# "FLIPPER_TIMESTAMP".freeze => Flipper::Timestamp.generate.to_s,

data/lib/flipper/cloud/instrumenter.rb

@@ -0,0 +1,43 @@
+require "delegate"
+require "flipper/instrumenters/noop"
+
+module Flipper
+  module Cloud
+    class Instrumenter < SimpleDelegator
+      def initialize(options = {})
+        @brow = options.fetch(:brow)
+        @instrumenter = options.fetch(:instrumenter, Instrumenters::Noop)
+        super @instrumenter
+      end
+
+      def instrument(name, payload = {}, &block)
+        result = @instrumenter.instrument(name, payload, &block)
+        push name, payload
+        result
+      end
+
+      private
+
+      def push(name, payload)
+        return unless name == Flipper::Feature::InstrumentationName
+        return unless :enabled? == payload[:operation]
+
+        dimensions = {
+          "feature" => payload[:feature_name].to_s,
+          "result" => payload[:result].to_s,
+        }
+        if (thing = payload[:thing])
+          dimensions["flipper_id"] = thing.value.to_s
+        end
+
+        event = {
+          type: "enabled",
+          dimensions: dimensions,
+          measures: {},
+          ts: Time.now.utc,
+        }
+        @brow.push event
+      end
+    end
+  end
+end

data/lib/flipper/cloud/registry.rb

@@ -0,0 +1,46 @@
+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

data/lib/flipper/cloud.rb

@@ -15,14 +15,7 @@ module Flipper
     # options - The Hash of options. See Flipper::Cloud::Configuration.
     # block - The block that configuration will be yielded to allowing you to
     #         customize this cloud instance and its adapter.
-    def self.new(options = {}, deprecated_options = {})
-      if options.is_a?(String)
-        warn "`Flipper::Cloud.new(token)` is deprecated. Use `Flipper::Cloud.new(token: token)` " +
-          "or set the `FLIPPER_CLOUD_TOKEN` environment variable.\n" +
-          caller[0]
-        options = deprecated_options.merge(token: options)
-      end
-
+    def self.new(options = {})
       configuration = Configuration.new(options)
       yield configuration if block_given?
       DSL.new(configuration)
@@ -40,8 +33,9 @@ module Flipper
       builder.use Flipper::Cloud::Middleware, env_key: env_key
       builder.run app
       klass = self
-      builder.define_singleton_method(:inspect) { klass.inspect } # pretty rake routes output
-      builder
+      app = builder.to_app
+      app.define_singleton_method(:inspect) { klass.inspect } # pretty rake routes output
+      app
     end
 
     # Private: Configure Flipper to use Cloud by default

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = '0.23.1'.freeze
+  VERSION = '0.25.0'.freeze
 end

data/spec/flipper/cloud/configuration_spec.rb

@@ -240,4 +240,21 @@ RSpec.describe Flipper::Cloud::Configuration do
     expect(all["search"][:boolean]).to eq("true")
     expect(all["history"][:boolean]).to eq(nil)
   end
+
+  it "can setup brow to report events to cloud" do
+    # skip logging brow
+    Brow.logger = Logger.new(File::NULL)
+    brow = described_class.new(required_options).brow
+
+    stub = stub_request(:post, "https://www.flippercloud.io/adapter/events")
+      .with { |request|
+        data = JSON.parse(request.body)
+        data.keys == ["uuid", "messages"] && data["messages"] == [{"n" => 1}]
+      }
+      .to_return(status: 201, body: "{}", headers: {})
+
+    brow.push({"n" => 1})
+    brow.worker.stop
+    expect(stub).to have_been_requested.times(1)
+  end
 end

data/spec/flipper/cloud/middleware_spec.rb

@@ -267,7 +267,7 @@ RSpec.describe Flipper::Cloud::Middleware do
 
   describe 'Inspecting the built Rack app' do
     it 'returns a String' do
-      expect(Flipper::Cloud.app(flipper).inspect).to be_a(String)
+      expect(Flipper::Cloud.app(flipper).inspect).to eq("Flipper::Cloud")
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper-cloud
 version: !ruby/object:Gem::Version
-  version: 0.23.1
+  version: 0.25.0
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-19 00:00:00.000000000 Z
+date: 2022-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flipper
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.23.1
+        version: 0.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.23.1
+        version: 0.25.0
+- !ruby/object:Gem::Dependency
+  name: brow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 description: 
 email:
 - nunemaker@gmail.com
@@ -42,8 +56,10 @@ files:
 - lib/flipper/cloud/configuration.rb
 - lib/flipper/cloud/dsl.rb
 - lib/flipper/cloud/engine.rb
+- 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