Merge pull request #775 from flippercloud/rollup-instrumenter

examples/cloud/backoff_policy.rb

@@ -0,0 +1,13 @@
+# Just a simple example that shows how the backoff policy works.
+require 'bundler/setup'
+require 'flipper/cloud/telemetry/backoff_policy'
+
+intervals = []
+policy = Flipper::Cloud::Telemetry::BackoffPolicy.new
+
+10.times do |n|
+  intervals << policy.next_interval
+end
+
+pp intervals.map { |i| i.round(2) }
+puts "Total: #{intervals.sum.round(2)}ms (#{(intervals.sum/1_000.0).round(2)} sec)"

examples/cloud/cloud_setup.rb

@@ -3,9 +3,13 @@
   exit
 end
 
-suffix_rails = ENV["RAILS_VERSION"].split(".").take(2).join
-suffix_ruby = RUBY_VERSION.split(".").take(2).join
-matrix_key = "FLIPPER_CLOUD_TOKEN_#{suffix_ruby}_#{suffix_rails}"
+matrix_key = if ENV["CI"]
+  suffix_rails = ENV["RAILS_VERSION"].split(".").take(2).join
+  suffix_ruby = RUBY_VERSION.split(".").take(2).join
+  "FLIPPER_CLOUD_TOKEN_#{suffix_ruby}_#{suffix_rails}"
+else
+  "FLIPPER_CLOUD_TOKEN"
+end
 
 if matrix_token = ENV[matrix_key]
   puts "Using #{matrix_key} for FLIPPER_CLOUD_TOKEN"

examples/cloud/forked.rb

@@ -5,11 +5,16 @@
 require 'bundler/setup'
 require 'flipper/cloud'
 
-pids = 5.times.map do |n|
+puts Process.pid
+
+# Make a call in the parent process so we can detect forking.
+Flipper.enabled?(:stats)
+
+pids = 2.times.map do |n|
   fork {
     # Check every second to see if the feature is enabled
     threads = []
-    5.times do
+    2.times do
       threads << Thread.new do
         loop do
           sleep rand

examples/cloud/threaded.rb

@@ -4,33 +4,30 @@
 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
+puts Process.pid
 
 Flipper.configure do |config|
   config.default {
-    Flipper::Cloud.new(local_adapter: config.adapter, instrumenter: ActiveSupport::Notifications)
+    Flipper::Cloud.new(
+      local_adapter: config.adapter,
+      debug_output: STDOUT,
+    )
   }
 end
 
+# You might want to do this at some point to see different results:
+# Flipper.enable(:search)
+# Flipper.disable(:stats)
+
 # Check every second to see if the feature is enabled
-threads = []
-10.times do
-  threads << Thread.new do
+5.times.map { |i|
+  Thread.new {
     loop do
       sleep rand
 
-      if Flipper[:stats].enabled?
-        puts "#{Time.now.to_i} Enabled!"
-      else
-        puts "#{Time.now.to_i} Disabled!"
-      end
+      Flipper.enabled?(:stats)
+      Flipper.enabled?(:search)
     end
-  end
-end
-
-threads.map(&:join)
+  }
+}.each(&:join)

flipper.gemspec

@@ -35,5 +35,4 @@ Gem::Specification.new do |gem|
   gem.metadata      = Flipper::METADATA
 
   gem.add_dependency 'concurrent-ruby', '< 2'
-  gem.add_dependency 'brow', '~> 0.4.1'
 end

lib/flipper/adapters/active_record.rb

@@ -221,7 +221,7 @@ def set(feature, gate, thing, options = {})
               @gate_class.create! do |g|
                 g.feature_key = feature.key
                 g.key = gate.key
-                g.value = json_feature ? JSON.dump(thing.value) : thing.value.to_s
+                g.value = json_feature ? Typecast.to_json(thing.value) : thing.value.to_s
               end
             rescue ::ActiveRecord::RecordNotUnique
               # assume this happened concurrently with the same thing and its fine
@@ -263,7 +263,7 @@ def result_for_gates(feature, gates)
               end
             when :json
               if row = gates.detect { |key, value| !key.nil? && key.to_sym == gate.key }
-                JSON.parse(row.last)
+                Typecast.from_json(row.last)
               end
             when :set
               gates.select { |key, value| !key.nil? && key.to_sym == gate.key }.map(&:last).to_set

lib/flipper/adapters/http.rb

@@ -27,7 +27,7 @@ def initialize(options = {})
       def get(feature)
         response = @client.get("/features/#{feature.key}")
         if response.is_a?(Net::HTTPOK)
-          parsed_response = JSON.parse(response.body)
+          parsed_response = Typecast.from_json(response.body)
           result_for_feature(feature, parsed_response.fetch('gates'))
         elsif response.is_a?(Net::HTTPNotFound)
           default_config
@@ -41,7 +41,7 @@ def get_multi(features)
         response = @client.get("/features?keys=#{csv_keys}&exclude_gate_names=true")
         raise Error, response unless response.is_a?(Net::HTTPOK)
 
-        parsed_response = JSON.parse(response.body)
+        parsed_response = Typecast.from_json(response.body)
         parsed_features = parsed_response.fetch('features')
         gates_by_key = parsed_features.each_with_object({}) do |parsed_feature, hash|
           hash[parsed_feature['key']] = parsed_feature['gates']
@@ -59,7 +59,7 @@ def get_all
         response = @client.get("/features?exclude_gate_names=true")
         raise Error, response unless response.is_a?(Net::HTTPOK)
 
-        parsed_response = JSON.parse(response.body)
+        parsed_response = Typecast.from_json(response.body)
         parsed_features = parsed_response.fetch('features')
         gates_by_key = parsed_features.each_with_object({}) do |parsed_feature, hash|
           hash[parsed_feature['key']] = parsed_feature['gates']
@@ -78,7 +78,7 @@ def features
         response = @client.get('/features?exclude_gate_names=true')
         raise Error, response unless response.is_a?(Net::HTTPOK)
 
-        parsed_response = JSON.parse(response.body)
+        parsed_response = Typecast.from_json(response.body)
         parsed_response['features'].map { |feature| feature['key'] }.to_set
       end
 

lib/flipper/adapters/http/client.rb

@@ -30,6 +30,10 @@ def initialize(options = {})
           @debug_output = options[:debug_output]
         end
 
+        def add_header(key, value)
+          @headers[key] = value
+        end
+
         def get(path)
           perform Net::HTTP::Get, path, @headers
         end
@@ -77,13 +81,13 @@ def build_http(uri)
 
         def build_request(http_method, uri, headers, options)
           request_headers = {
-            "Client-Language" => "ruby",
-            "Client-Language-Version" => "#{RUBY_VERSION} p#{RUBY_PATCHLEVEL} (#{RUBY_RELEASE_DATE})",
-            "Client-Platform" => RUBY_PLATFORM,
-            "Client-Engine" => defined?(RUBY_ENGINE) ? RUBY_ENGINE : "",
-            "Client-Pid" => Process.pid.to_s,
-            "Client-Thread" => Thread.current.object_id.to_s,
-            "Client-Hostname" => Socket.gethostname,
+            client_language: "ruby",
+            client_language_version: "#{RUBY_VERSION} p#{RUBY_PATCHLEVEL} (#{RUBY_RELEASE_DATE})",
+            client_platform: RUBY_PLATFORM,
+            client_engine: defined?(RUBY_ENGINE) ? RUBY_ENGINE : "",
+            client_pid: Process.pid.to_s,
+            client_thread: Thread.current.object_id.to_s,
+            client_hostname: Socket.gethostname,
           }.merge(headers)
 
           body = options[:body]

lib/flipper/adapters/http/error.rb

@@ -11,7 +11,7 @@ def initialize(response)
           message = "Failed with status: #{response.code}"
 
           begin
-            data = JSON.parse(response.body)
+            data = Typecast.from_json(response.body)
 
             if error_message = data["message"]
               message << "\n\n#{data["message"]}"

lib/flipper/adapters/mongo.rb

@@ -80,7 +80,7 @@ def enable(feature, gate, thing)
           }
         when :json
           update feature.key, '$set' => {
-            gate.key.to_s => JSON.dump(thing.value),
+            gate.key.to_s => Typecast.to_json(thing.value),
           }
         else
           unsupported_data_type gate.data_type
@@ -175,7 +175,7 @@ def result_for_feature(feature, doc)
               doc.fetch(gate.key.to_s) { Set.new }.to_set
             when :json
               value = doc[gate.key.to_s]
-              JSON.parse(value) if value
+              Typecast.from_json(value)
             else
               unsupported_data_type gate.data_type
             end

lib/flipper/adapters/pstore.rb

@@ -85,7 +85,7 @@ def enable(feature, gate, thing)
           when :set
             set_add key(feature, gate), thing.value.to_s
           when :json
-            write key(feature, gate), JSON.dump(thing.value)
+            write key(feature, gate), Typecast.to_json(thing.value)
           else
             raise "#{gate} is not supported by this adapter yet"
           end
@@ -161,7 +161,7 @@ def result_for_feature(feature)
               set_members key
             when :json
               value = read(key)
-              JSON.parse(value) if value
+              Typecast.from_json(value)
             else
               raise "#{gate} is not supported by this adapter yet"
             end

lib/flipper/adapters/redis.rb

@@ -94,7 +94,7 @@ def enable(feature, gate, thing)
         when :set
           @client.hset feature_key, to_field(gate, thing), 1
         when :json
-          @client.hset feature_key, gate.key, JSON.dump(thing.value)
+          @client.hset feature_key, gate.key, Typecast.to_json(thing.value)
         else
           unsupported_data_type gate.data_type
         end
@@ -174,7 +174,7 @@ def result_for_feature(feature, doc)
               fields_to_gate_value fields, gate
             when :json
               value = doc[gate.key.to_s]
-              JSON.parse(value) if value
+              Typecast.from_json(value)
             else
               unsupported_data_type gate.data_type
             end

lib/flipper/adapters/sequel.rb

@@ -206,7 +206,7 @@ def gate_attrs(feature, gate, thing, json: false)
         {
           feature_key: feature.key.to_s,
           key: gate.key.to_s,
-          value: json ? JSON.dump(thing.value) : thing.value.to_s,
+          value: json ? Typecast.to_json(thing.value) : thing.value.to_s,
         }
       end
 
@@ -227,7 +227,7 @@ def result_for_feature(feature, db_gates)
               db_gates.select { |db_gate| db_gate.key == gate.key.to_s }.map(&:value).to_set
             when :json
               if detected_db_gate = db_gates.detect { |db_gate| db_gate.key == gate.key.to_s }
-                JSON.parse(detected_db_gate.value)
+                Typecast.from_json(detected_db_gate.value)
               end
             else
               unsupported_data_type gate.data_type

lib/flipper/api/action.rb

@@ -116,7 +116,7 @@ def halt(response)
       def json_response(object, status = 200)
         header 'content-type', Api::CONTENT_TYPE
         status(status)
-        body = JSON.dump(object)
+        body = Typecast.to_json(object)
         halt [@code, @headers, [body]]
       end
 

lib/flipper/api/json_params.rb

@@ -34,7 +34,7 @@ def call(env)
       # This method accomplishes similar functionality
       def update_params(env, data)
         return if data.empty?
-        parsed_request_body = JSON.parse(data)
+        parsed_request_body = Typecast.from_json(data)
         env["parsed_request_body".freeze] = parsed_request_body
         parsed_query_string = parse_query(env[QUERY_STRING])
         parsed_query_string.merge!(parsed_request_body)