request_id 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8856a6a5e319b628f1ed4250910bfd7d25dd8c05
-  data.tar.gz: e0a27815a01b39ceca79ce73e66e97200a36cbfd
+  metadata.gz: a15cb25ed02ec17242c57798948853b77d0b097c
+  data.tar.gz: eed296879d558c00b33e507aa195482f29203dc8
 SHA512:
-  metadata.gz: 6867acf52cf09b17c07b97d67d79823720a6120f972dbd253b5871fc0b223f04e54269eec093f072546910a3347a7602f6fb697393a3b836db7e7dcb8749b3f2
-  data.tar.gz: 0564dd04447e5be593c7c73fd8a7e5c23458ed9104d419fa286eeec5dbda6fe29879939351d0941d91b416f9e670dfd220863cb5a523e9982478e0597a1aefab
+  metadata.gz: fe2d085fbe00596365443abcb878130ebcef0c7d367f3207e2e178ea32be493d3a339f217587fb3d08dd7eb9eabac7eade5ebc7d7261244743de58052202f610
+  data.tar.gz: 7f3543a463295b69d9767ac3b10b6f4a9573f843663a1ca68b0edf8276d21a8ac261871e328550747c81ec53f1565ee1536c6326e26e2a225744c8483e364d9d

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Remind101, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/lib/request_id/version.rb

@@ -1,3 +1,3 @@
 module RequestId
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

data/lib/sidekiq/middleware/client/request_id.rb

@@ -2,31 +2,16 @@ module Sidekiq
   module Middleware
     module Client
       class RequestId
-
         def call(worker, item, queue)
           item['request_id'] = request_id if request_id
-          log(request_id, worker, item['args'].inspect) if log_request_id?(worker)
           yield
         end
 
       private
 
-        def log(request_id, worker, args)
-          logger.info "request_id=#{request_id} at=enqueue worker=#{worker.to_s} args=#{args}"
-        end
-
-        def log_request_id?(worker)
-          worker.respond_to?(:get_sidekiq_options) && worker.get_sidekiq_options['log_request_id']
-        end
-
-        def logger
-          Sidekiq.logger
-        end
-
         def request_id
           ::RequestId.request_id
         end
-
       end
     end
   end

data/lib/sidekiq/middleware/server/request_id.rb

@@ -13,22 +13,11 @@ module Sidekiq
         end
 
         def call(worker, item, queue)
-          request_id = ::RequestId.request_id = item['request_id']
-          Sidekiq::Logging.with_context("request_id=#{request_id} worker=#{worker.class.to_s} jid=#{item['jid']} args=#{item['args'].inspect}") do
-            begin
-              start = Time.now
-              logger.info { "at=start" }
-              yield
-              logger.info { "at=done duration=#{elapsed(start)}sec" }
-            rescue Exception
-              logger.info { "at=fail duration=#{elapsed(start)}sec" }
-              raise
-            end
-          end
+          ::RequestId.request_id = item['request_id']
+          yield
         ensure
           ::RequestId.request_id = nil unless self.class.no_reset
         end
-
       end
     end
   end

data/spec/sidekiq/middleware/client/request_id_spec.rb

@@ -9,24 +9,11 @@ describe Sidekiq::Middleware::Client::RequestId do
       let(:worker) { double('worker', to_s: 'Worker') }
 
       context 'when the worker is configured to log request ids' do
-        let(:logger) { double('Logger', info: nil) }
-
-        before { worker.stub get_sidekiq_options: { 'log_request_id' => true } }
-        before { Sidekiq.stub logger: logger }
-
         it 'adds the request id to the item' do
           request_id = Thread.current[:request_id] = SecureRandom.hex
           item = {}
           expect { middleware.call(worker, item, nil) { } }.to change { item }.from({}).to('request_id' => request_id)
         end
-
-        it 'logs the request id' do
-          request_id = Thread.current[:request_id] = SecureRandom.hex
-          logger.should_receive(:info).with(
-            "request_id=#{request_id} at=enqueue worker=Worker args=[\"foo\"]"
-          )
-          expect { |b| middleware.call(worker, { 'args' => ['foo'] }, nil, &b) }.to yield_control
-        end
       end
 
       context 'when the worker is not configured to log request ids' do

data/spec/sidekiq/middleware/server/request_id_spec.rb

@@ -2,11 +2,8 @@ require 'spec_helper'
 require 'securerandom'
 
 describe Sidekiq::Middleware::Server::RequestId do
-  let(:logger) { double('Logger', info: nil) }
   let(:middleware) { described_class.new }
 
-  before { Sidekiq.stub logger: logger }
-
   describe '#call' do
     let(:worker) { double('worker') }
 
@@ -15,20 +12,13 @@ describe Sidekiq::Middleware::Server::RequestId do
     context 'when the worker is configured to log request ids' do
       let(:request_id) { SecureRandom.hex }
       let(:job_id) { SecureRandom.hex }
-      let(:item) { { 'jid' => job_id, 'args' => ['foo'], 'log_request_id' => true, 'request_id' => request_id } }
+      let(:item) { { 'jid' => job_id, 'args' => ['foo'], 'request_id' => request_id } }
 
       it 'sets a thread local to the request id' do
         Thread.current.should_receive(:[]=).with(:request_id, request_id)
         Thread.current.should_receive(:[]=).with(:request_id, nil)
         expect { |b| middleware.call(worker, item, nil, &b) }.to yield_control
       end
-
-      it 'logs the request id' do
-        Sidekiq::Logging.should_receive(:with_context)
-          .with("request_id=#{request_id} worker=Worker jid=#{job_id} args=[\"foo\"]")
-          .and_yield
-        expect { |b| middleware.call(worker, item, nil, &b) }.to yield_control
-      end
     end
 
     context 'when the worker is not configured to log request ids' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: request_id
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Eric J. Holmes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,6 +77,7 @@ files:
 - .rspec
 - .travis.yml
 - Gemfile
+- LICENSE
 - LICENSE.txt
 - README.md
 - Rakefile