rack-tracer 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcdf093205910aa4ebbf86106ae6929cb357dea6
-  data.tar.gz: 05b02d43b23d13608c6290dca697314c13a389fa
+  metadata.gz: 7a5669fdb260f9f92c7d6b807bd55bd4ac3a1560
+  data.tar.gz: 8682a3f0904f69efd5f3f3a6af4af9f170dd9150
 SHA512:
-  metadata.gz: 4b6ca1127b3e86a814e99dd243c059ba282696dfa878e873c9930a43b036ec0f7ff23df63981248ce3cfacaa622d8ce2895aaaad38c75d3412ed3d9461fe0292
-  data.tar.gz: e04d7645b819e853ca9cde4b25dd2121aca8717ef20bc85a9457fb8a05f3724b16cd1987c558633bcea6275b54b3e356a2ec64f62e0aa714d867267b375f0704
+  metadata.gz: 4db8628c41fb256fa56d2a949abdc2e499c183f2a73d56ee1aff640e9308ee703272bcdaed058917b0cb07df83297f31c22daaa93ef18b7404bdf08a3df540df
+  data.tar.gz: '0900be47a4c70cad280587b92387ae5b46e220805d0d656edce7e7ff37f57599ca9f657466a7d3fdcf819aa11b2885b046a140823ad37ca1c8c4415b6dd25082'

data/.rubocop.yml

@@ -0,0 +1,22 @@
+require: rubocop-rspec
+
+Metrics/AbcSize:
+  Enabled: no
+
+Metrics/BlockLength:
+  Enabled: no
+
+Metrics/LineLength:
+  Max: 120
+
+Metrics/MethodLength:
+  Enabled: no
+
+Style/Documentation:
+  Enabled: no
+
+RSpec/ExampleLength:
+  Enabled: no
+
+RSpec/MultipleExpectations:
+  Enabled: no

data/Rakefile

@@ -1,6 +1,9 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+RuboCop::RakeTask.new(:rubocop)
+
+task default: %i[rubocop spec]

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "rack/tracer"
+require 'bundler/setup'
+require 'rack/tracer'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "rack/tracer"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/lib/rack/tracer.rb

@@ -14,7 +14,12 @@ module Rack
     # @param on_finish_span [Proc, nil] A callback evaluated after a span is finished.
     # @param errors [Array<Class>] An array of error classes to be captured by the tracer
     #        as errors. Errors are **not** muted by the middleware, they're re-raised afterwards.
-    def initialize(app, tracer: OpenTracing.global_tracer, on_start_span: nil, on_finish_span: nil, trust_incoming_span: true, errors: [StandardError])
+    def initialize(app, # rubocop:disable Metrics/ParameterLists
+                   tracer: OpenTracing.global_tracer,
+                   on_start_span: nil,
+                   on_finish_span: nil,
+                   trust_incoming_span: true,
+                   errors: [StandardError])
       @app = app
       @tracer = tracer
       @on_start_span = on_start_span
@@ -27,7 +32,8 @@ module Rack
       method = env[REQUEST_METHOD]
 
       context = @tracer.extract(OpenTracing::FORMAT_RACK, env) if @trust_incoming_span
-      span = @tracer.start_span(method,
+      span = @tracer.start_span(
+        method,
         child_of: context,
         tags: {
           'component' => 'rack',
@@ -45,13 +51,18 @@ module Rack
       @app.call(env).tap do |status_code, _headers, _body|
         span.set_tag('http.status_code', status_code)
 
-        if route = route_from_env(env)
-          span.set_tag('route', route)
-        end
+        route = route_from_env(env)
+        span.set_tag('route', route) if route
       end
     rescue *@errors => e
       span.set_tag('error', true)
-      span.log(event: 'error', :'error.object' => e)
+      span.log_kv(
+        event: 'error',
+        :'error.kind' => e.class.to_s,
+        :'error.object' => e,
+        message: e.message,
+        stack: e.backtrace.join("\n")
+      )
       raise
     ensure
       begin
@@ -64,9 +75,8 @@ module Rack
     private
 
     def route_from_env(env)
-      if route = env['sinatra.route']
-        route.split(' ').last
-      end
+      route = env['sinatra.route']
+      route.split(' ').last if route
     end
   end
 end

data/rack-tracer.gemspec

@@ -1,15 +1,15 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+
+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.5.0'
+  spec.version       = '0.6.0'
   spec.authors       = ['SaleMove TechMovers']
   spec.email         = ['techmovers@salemove.com']
 
-  spec.summary       = %q{Rack OpenTracing middleware}
-  spec.description   = %q{}
+  spec.summary       = 'Rack OpenTracing middleware'
+  spec.description   = ''
   spec.homepage      = 'https://github.com/opentracing-contrib/ruby-rack-tracer'
   spec.license       = 'MIT'
 
@@ -21,8 +21,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentracing'
 
   spec.add_development_dependency 'bundler', '~> 1.14'
+  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 'logasm-tracer', '~> 0.2.1'
-  spec.add_development_dependency 'rack', '~> 2.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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-tracer
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - SaleMove TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-09 00:00:00.000000000 Z
+date: 2018-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentracing
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -67,33 +81,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: logasm-tracer
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.54.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.54.0
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.24.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        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
@@ -103,6 +145,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt