chillout 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8423a0fd777360d79146e8270eeb5536f6132e4f
-  data.tar.gz: 1a2b4337e6ab9d2b62a13a111788f33b192d23a1
+  metadata.gz: 8308f094f935ed83592a06a45fe6b15dfc32fb7a
+  data.tar.gz: 2a23cac7e8d85f95ebf6f6fb5ba82cd531d3cc45
 SHA512:
-  metadata.gz: 952cbad057b400710e7af9ed61e3f012476f673a3f5d6b4733b09f30d50a950517d42d1c24154a4c8cce1746a19cc63f623e23bdd2b7a54a5a5a594ce12a4d4f
-  data.tar.gz: edde4d6c71087cc05108310b764aedc3bed7e10b390f87f49506b7a9698955b2c0ebad3c642d2d120de7f596dc46b2439a90a5344bf780b4c11b76937d3daab1
+  metadata.gz: b1d901f3d22ec457782f8376c30851b338779a2c3f63be2753213ecb111b215f4ed034084f78956db9411a80d6cb123bad0a0ada315da8dc66cf168085755fc9
+  data.tar.gz: 2848b76d928fa80ed56d8633b791744c5c5fe24d43c727570e5543b83c644aef0d3783daebc3ea612b5d1294108fd7159267fc8577f7133919994cc12e35b473

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # chillout gem changes
 
+0.8.4
+-----
+
+- Bugfix for [Custom metrics are not sent after 1st request](https://github.com/chilloutio/chillout/issues/4)
+
 0.8.3
 -----
 

data/lib/chillout.rb

@@ -1,16 +1,21 @@
 require "chillout/version"
 require "chillout/config"
+require "chillout/creations_container"
 require "chillout/middleware/creations_monitor"
 require "chillout/integrations/sidekiq"
 require "chillout/subscribers/action_controller_notifications"
 require "chillout/server_side/dispatcher"
 require "chillout/server_side/server_side"
 require "chillout/server_side/http_client"
-require "chillout/custom_metric"
 require "chillout/client"
 
 module Chillout
-  Metric = CustomMetric.new
+  module Metric
+    def self.track(name)
+      Chillout.creations ||= CreationsContainer.new
+      Chillout.creations.increment!(name)
+    end
+  end
 
   def self.creations
     Thread.current[:creations]
@@ -21,5 +26,4 @@ module Chillout
   end
 end
 
-require 'chillout/railtie' if defined?(Rails)
-
+require 'chillout/railtie' if defined?(Rails)

data/lib/chillout/creation_listener.rb

@@ -12,9 +12,8 @@ module Chillout
       class_name = monitored_class.name
       monitored_class.after_commit :on => :create do
         Rails.logger.debug "[Chillout] Model created: #{class_name}"
-        Thread.current[:creations] ||= CreationsContainer.new
-        creations = Thread.current[:creations]
-        creations.increment!(class_name)
+        Chillout.creations ||= CreationsContainer.new
+        Chillout.creations.increment!(class_name)
       end
     end
   end

data/lib/chillout/middleware/creations_monitor.rb

@@ -14,10 +14,10 @@ module Chillout
         status, headers, body = @app.call(env)
         return status, headers, body
       ensure
-        if Thread.current[:creations]
+        if creations = Chillout.creations
           @client.logger.debug "Non-empty creations container found"
-          @client.enqueue(Thread.current[:creations])
-          Thread.current[:creations] = nil
+          @client.enqueue(creations)
+          Chillout.creations = nil
         end
 
         body.close if body && body.respond_to?(:close) && $!

data/lib/chillout/middleware/sidekiq.rb

@@ -9,8 +9,7 @@ module Chillout
       def call(_worker, _job, _queue)
         yield
       ensure
-        if Chillout.creations
-          creations = Chillout.creations
+        if creations = Chillout.creations
           Chillout.creations = nil
           @client.enqueue(creations)
         end

data/lib/chillout/version.rb

@@ -1,3 +1,3 @@
 module Chillout
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

data/test/chillout_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class ChilloutModuleTest < ChilloutTestCase
+  def test_custom_metrics
+    Chillout::Metric.track('RegistrationCompleted')
+    assert_equal 1, Chillout.creations['RegistrationCompleted']
+  end
+end

data/test/integration/creations_monitor_rack_test.rb

@@ -16,9 +16,9 @@ module Chillout
     def app
       client = @client
       deepest_level = lambda do |env|
-        Thread.current[:creations] = CreationsContainer.new
-        2.times { Thread.current[:creations].increment!("User") }
-        3.times { Thread.current[:creations].increment!("Cart") }
+        Chillout.creations = CreationsContainer.new
+        Chillout.creations.increment!("User", 2)
+        Chillout.creations.increment!("Cart",3 )
         [200, env, ['hello']]
       end
       Rack::Builder.new do

data/test/middleware/creations_monitor_test.rb

@@ -11,7 +11,7 @@ module Chillout
 
       def call_with_model_creation
         @app = lambda do |env|
-          Thread.current[:creations] = :creations
+          Chillout.creations = :creations
           [200, env, ['hello']]
         end
         @middleware = CreationsMonitor.new(@app, @client)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chillout
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Michal Lomnicki
@@ -206,7 +206,6 @@ files:
 - lib/chillout/config.rb
 - lib/chillout/creation_listener.rb
 - lib/chillout/creations_container.rb
-- lib/chillout/custom_metric.rb
 - lib/chillout/generators/install.rb
 - lib/chillout/integrations/sidekiq.rb
 - lib/chillout/job.rb
@@ -228,10 +227,10 @@ files:
 - test/acceptance/client_sends_metrics_test.rb
 - test/acceptance/sidekiq_workers_send_metrics_test.rb
 - test/check_result_test.rb
+- test/chillout_test.rb
 - test/client_test.rb
 - test/config_test.rb
 - test/creations_container_test.rb
-- test/custom_metric_test.rb
 - test/dispatcher_test.rb
 - test/http_client_test.rb
 - test/integration/client_test.rb
@@ -630,10 +629,10 @@ test_files:
 - test/acceptance/client_sends_metrics_test.rb
 - test/acceptance/sidekiq_workers_send_metrics_test.rb
 - test/check_result_test.rb
+- test/chillout_test.rb
 - test/client_test.rb
 - test/config_test.rb
 - test/creations_container_test.rb
-- test/custom_metric_test.rb
 - test/dispatcher_test.rb
 - test/http_client_test.rb
 - test/integration/client_test.rb

data/lib/chillout/custom_metric.rb

@@ -1,27 +0,0 @@
-require 'chillout/creations_container'
-
-module Chillout
-  class CustomMetric
-    def initialize(creations_container = nil)
-      @creations_container = creations_container
-    end
-
-    def track(name)
-      creations_container.increment!(name)
-    end
-   
-    private
-    def creations_container
-      if container_not_initialized?
-        Thread.current[:creations] ||= CreationsContainer.new
-        @creations_container = Thread.current[:creations]
-      else
-        @creations_container
-      end
-    end
-
-    def container_not_initialized?
-      @creations_container.nil?
-    end
-  end
-end

data/test/custom_metric_test.rb

@@ -1,15 +0,0 @@
-require 'test_helper' 
-
-class CustomMetricTest < ChilloutTestCase
-  def setup
-    @creations_container = MiniTest::Mock.new
-  end
-
-  def test_custom_creation
-    @creations_container.expect(:nil?, false, [])
-    @creations_container.expect(:increment!, nil, ['foo'])
-    @custom_metric = Chillout::CustomMetric.new(@creations_container)
-    @custom_metric.track('foo')
-    @creations_container.verify
-  end
-end