rack-tracer 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a5669fdb260f9f92c7d6b807bd55bd4ac3a1560
-  data.tar.gz: 8682a3f0904f69efd5f3f3a6af4af9f170dd9150
+  metadata.gz: 14e847fe82d881c1a45f7980c3f2b5e7e440f9a8
+  data.tar.gz: 1b12ffdbef6149a5f0ccb469367c0682e28d9a53
 SHA512:
-  metadata.gz: 4db8628c41fb256fa56d2a949abdc2e499c183f2a73d56ee1aff640e9308ee703272bcdaed058917b0cb07df83297f31c22daaa93ef18b7404bdf08a3df540df
-  data.tar.gz: '0900be47a4c70cad280587b92387ae5b46e220805d0d656edce7e7ff37f57599ca9f657466a7d3fdcf819aa11b2885b046a140823ad37ca1c8c4415b6dd25082'
+  metadata.gz: 3b5a2f9c86e512e712f5ee07b130b1ec5b4a1f6dc0de05886dc201ff392c35f92b54c70e1413072ed2c7a8225b58c5d8293062dcaed4909e4b57da82ffecd8fe
+  data.tar.gz: 0c0c5e0084d26ed366d9d31c7803ba82cb4c2a41ee0b0902a2887dfd2af22afe8c2c026ae6cecf79075d4e2f1ee9101f0bfabfac35992d7ae1ca557dbf402c7b

data/.rubocop.yml

@@ -20,3 +20,9 @@ RSpec/ExampleLength:
 
 RSpec/MultipleExpectations:
   Enabled: no
+
+Style/FrozenStringLiteralComment:
+  Enabled: yes
+  EnforcedStyle: always
+  Include:
+    - 'lib/**/*'

data/README.md

@@ -23,11 +23,17 @@ You can access the created span using
 env['rack.span']
 ```
 
+or you can use
+```ruby
+OpenTracing.active_span
+```
+See [opentracing-ruby](https://github.com/opentracing/opentracing-ruby) for more information how active_span works and what are its limitations.
+
 You can also add start and finish span callbacks
 ```ruby
 use Rack::Tracer,
-    on_start_span: ->(span) { Thread.current[:root_span] = span },
-    on_finish_span: ->(_span) { Thread.current[:root_span] = nil }
+    on_start_span: ->(span) { do_something(span) },
+    on_finish_span: ->(_span) { do_something(span) }
 ```
 
 ## Development

data/lib/rack/tracer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'opentracing'
 
 module Rack
@@ -32,7 +34,7 @@ module Rack
       method = env[REQUEST_METHOD]
 
       context = @tracer.extract(OpenTracing::FORMAT_RACK, env) if @trust_incoming_span
-      span = @tracer.start_span(
+      scope = @tracer.start_active_span(
         method,
         child_of: context,
         tags: {
@@ -43,6 +45,7 @@ module Rack
           'http.uri' => env[REQUEST_URI] # For zipkin, not OT convention
         }
       )
+      span = scope.span
 
       @on_start_span.call(span) if @on_start_span
 
@@ -66,7 +69,7 @@ module Rack
       raise
     ensure
       begin
-        span.finish
+        scope.close
       ensure
         @on_finish_span.call(span) if @on_finish_span
       end

data/rack-tracer.gemspec

@@ -1,10 +1,9 @@
-
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'rack-tracer'
-  spec.version       = '0.6.0'
+  spec.version       = '0.7.0'
   spec.authors       = ['SaleMove TechMovers']
   spec.email         = ['techmovers@salemove.com']
 
@@ -18,14 +17,13 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'opentracing'
+  spec.add_dependency 'opentracing', '~> 0.4'
 
   spec.add_development_dependency 'bundler', '~> 1.14'
+  spec.add_development_dependency 'opentracing_test_tracer', '~> 0.1'
   spec.add_development_dependency 'rack', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.54.0'
   spec.add_development_dependency 'rubocop-rspec', '~> 1.24.0'
-  spec.add_development_dependency 'test-tracer', '~> 1.0'
-  spec.add_development_dependency 'tracing-matchers', '~> 1.0'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rack-tracer
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - SaleMove TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-26 00:00:00.000000000 Z
+date: 2018-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentracing
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
+- !ruby/object:Gem::Dependency
+  name: opentracing_test_tracer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -108,34 +122,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.24.0
-- !ruby/object:Gem::Dependency
-  name: test-tracer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: tracing-matchers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: ''
 email:
 - techmovers@salemove.com