Merge branch 'master' into limit-batch-size

Author: rohitpaulk

.rubocop_todo.yml

@@ -18,7 +18,7 @@ Metrics/AbcSize:
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 223
+  Max: 229
 
 # Offense count: 1
 Metrics/CyclomaticComplexity:

lib/segment/analytics/client.rb

@@ -1,13 +1,16 @@
 require 'thread'
 require 'time'
+
+require 'segment/analytics/defaults'
+require 'segment/analytics/logging'
 require 'segment/analytics/utils'
 require 'segment/analytics/worker'
-require 'segment/analytics/defaults'
 
 module Segment
   class Analytics
     class Client
       include Segment::Analytics::Utils
+      include Segment::Analytics::Logging
 
       # public: Creates a new client
       #
@@ -314,7 +317,12 @@ def enqueue(action)
 
           true
         else
-          false # Queue is full
+          logger.warn(
+            'Queue is full, dropping events. The :max_queue_size ' \
+            'configuration parameter can be increased to prevent this from ' \
+            'happening.'
+          )
+          false
         end
       end
 

lib/segment/analytics/request.rb

@@ -112,6 +112,11 @@ def send_request(write_key, batch)
 
           [200, '{}']
         else
+          # If `start` is not called, Ruby adds a 'Connection: close' header to
+          # all requests, preventing us from reusing a connection for multiple
+          # HTTP requests
+          @http.start unless @http.started?
+
           response = @http.request(request, payload)
           [response.code.to_i, response.body]
         end

lib/segment/analytics/worker.rb

@@ -29,6 +29,7 @@ def initialize(queue, write_key, options = {})
         batch_size = options[:batch_size] || Defaults::MessageBatch::MAX_SIZE
         @batch = MessageBatch.new(batch_size)
         @lock = Mutex.new
+        @request = Request.new
       end
 
       # public: Continuously runs the loop to check for new events
@@ -43,7 +44,7 @@ def run
             end
           end
 
-          res = Request.new.post @write_key, @batch
+          res = @request.post(@write_key, @batch)
           @on_error.call(res.status, res.error) unless res.status == 200
 
           @lock.synchronize { @batch.clear }

spec/segment/analytics/client_spec.rb

@@ -275,6 +275,16 @@ class Analytics
           end
         end
 
+        it 'returns false if queue is full' do
+          client.instance_variable_set(:@max_queue_size, 1)
+
+          [:track, :screen, :page, :group, :identify, :alias].each do |s|
+            expect(client.send(s, data)).to eq(true)
+            expect(client.send(s, data)).to eq(false) # Queue is full
+            queue.pop(true)
+          end
+        end
+
         it 'converts message id to string' do
           [:track, :screen, :page, :group, :identify, :alias].each do |s|
             client.send(s, data)

spec/segment/analytics/message_batch_spec.rb

@@ -19,15 +19,6 @@ class Analytics
           subject << message
           expect(subject.length).to eq(0)
         end
-
-        it 'rejects messages that exceed the maximum allowed size' do
-          max_bytes = Defaults::Message::MAX_BYTES
-          hash = { 'a' => 'b' * max_bytes }
-          message = Message.new(hash)
-
-          subject << message
-          expect(subject.length).to eq(0)
-        end
       end
 
       describe '#full?' do