rails_opentracer 0.1.38 → 0.1.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9cacc7a29a63d008cefb04bae669fe266a4f65a
-  data.tar.gz: 431dda27e92b753aee879fcc9aebca5c83e1b8d3
+  metadata.gz: 39d1dfa77075290e901c017c8f00789e30df71a6
+  data.tar.gz: 576088d214e88b6134050705e455d69418f229de
 SHA512:
-  metadata.gz: a4915681e41a6ce227dec39fd686bdcdd06941f3a51f720b65ad93e22a3b3974236969ecf428ddf1e7b79a6cd6f0da3c912f6b333d35030bfdcb06e417f26f64
-  data.tar.gz: 513f453c113d70cca0adb7e0224b6e67ee3328f808f9e8b7835688292cdec517ae1c57a1409b853b21da353ee76d169163ac177a04074ec8177ecfdbcc1393ca
+  metadata.gz: 52a91be480cf4f2961dd69ebef2685274a9ee5cd1a8e487a900eac385aa4f170ca71049a6232414f47da9dd55395e231c0ee3d9899824872247ef3ee53995a71
+  data.tar.gz: '0830abd1913f9f780b2532fd06f170288f8b30bdab4a525c5b267b0ba5de6779cfcd219a14d94109311290af38d6eb907715b98010cae3bd20cfbb2fd1d7929a'

data/.rubocop.yml

@@ -0,0 +1,74 @@
+# Configuration used to check ruby source code with rubocop.
+
+AllCops:
+  TargetRubyVersion: 2.4.2
+  EnabledByDefault: true
+
+# Metrics
+
+Metrics/LineLength:
+  Enabled: no
+
+Metrics/MethodLength:
+  Enabled: no
+
+Metrics/AbcSize:
+  Enabled: yes
+  Exclude:
+    - lib/rails_opentracer/middleware.rb
+
+Metrics/PerceivedComplexity:
+  Enabled: yes
+  Exclude:
+    - lib/rails_opentracer/middleware.rb
+
+# Rails
+
+Rails/ApplicationRecord:
+  Enabled: no
+
+# Style
+
+Style/Copyright:
+  Enabled: no
+
+Style/Documentation:
+  Enabled: no
+
+Style/DocumentationMethod:
+  Enabled: no
+
+Style/FrozenStringLiteralComment:
+  Enabled: no
+
+Style/GlobalVars:
+  Enabled: yes
+  Exclude:
+    - lib/rails_opentracer.rb
+    - lib/rails_opentracer/middleware.rb
+
+Style/HashSyntax:
+  Enabled: yes
+  Exclude:
+    - lib/rails_opentracer/span_helpers.rb
+ 
+Style/MethodCallWithArgsParentheses:
+  Enabled: no
+
+Style/MissingElse:
+  Enabled: no
+
+Style/StringHashKeys:
+  Enabled: no
+
+
+
+# Style/Copyright:
+  # Enabled: no
+# Style/PercentLiteralDelimiters:
+#   Enabled: no
+
+# Style/RedundantBegin:
+#   Exclude:
+#     - app/helpers/metrics_helper.rb
+

data/Gemfile

@@ -1,6 +1,6 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in rails_opentracer.gemspec
 gemspec

data/Rakefile

@@ -1,10 +1,10 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => :test
+task default: :test

data/bin/console

@@ -1,14 +1,14 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "rails_opentracer"
+require 'bundler/setup'
+require 'rails_opentracer'
 
 # 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.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
+# require 'pry'
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/lib/rails_opentracer/active_record/rails_opentracer.rb

@@ -1,13 +1,14 @@
 module ActiveRecord
   module RailsOpentracer
-    DEFAULT_OPERATION_NAME = "sql.query".freeze
+    DEFAULT_OPERATION_NAME = 'sql.query'.freeze
 
     class << self
       def instrument(tracer: OpenTracing.global_tracer, active_span: nil)
         clear_subscribers
-        @subscriber = ::ActiveSupport::Notifications.subscribe('sql.active_record') do |*args|
-          ActiveRecord::RailsOpentracer.sql(tracer: tracer, active_span: active_span, args: args)
-        end
+        @subscriber =
+          ::ActiveSupport::Notifications.subscribe('sql.active_record') do |*args|
+            ActiveRecord::RailsOpentracer.sql(tracer: tracer, active_span: active_span, args: args)
+          end
 
         self
       end
@@ -20,17 +21,20 @@ module ActiveRecord
 
         self
       end
-      alias :clear_subscribers :disable
+      alias clear_subscribers disable
 
       def sql(tracer: OpenTracing.global_tracer, active_span: nil, args:)
         _, start, finish, _, payload = *args
-        span = start_span(payload.fetch(:name),
-                          tracer: tracer,
-                          active_span: active_span,
-                          start_time: start,
-                          sql: payload.fetch(:sql),
-                          cached: payload.fetch(:cached, false),
-                          connection_id: payload.fetch(:connection_id))
+        span =
+          start_span(
+            payload.fetch(:name),
+            tracer: tracer,
+            active_span: active_span,
+            start_time: start,
+            sql: payload.fetch(:sql),
+            cached: payload.fetch(:cached, false),
+            connection_id: payload.fetch(:connection_id)
+          )
 
         if payload[:exception]
           ::RailsOpentracer::SpanHelpers.set_error(span, payload[:exception_object] || payload[:exception])
@@ -39,24 +43,26 @@ module ActiveRecord
         span.finish(end_time: finish)
       end
 
-
-      def start_span(operation_name, tracer: OpenTracing.global_tracer, active_span: nil, start_time: Time.now, **fields)
+      def start_span(operation_name, tracer: OpenTracing.global_tracer, active_span: nil, start_time: Time.now.utc, **fields)
         connection_config = ::ActiveRecord::Base.connection_config
 
-        span = tracer.start_span(operation_name || DEFAULT_OPERATION_NAME,
-                                 child_of: active_span.respond_to?(:call) ? active_span.call : active_span,
-                                 start_time: start_time,
-                                 tags: {
-                                  'component' => 'ActiveRecord',
-                                  'span.kind' => 'client',
-                                  'db.user' => connection_config.fetch(:username, 'unknown'),
-                                  'db.instance' => connection_config.fetch(:database),
-                                  'db.vendor' => connection_config.fetch(:adapter),
-                                  'db.connection_id' => fields.fetch(:connection_id, 'unknown'),
-                                  'db.cached' => fields.fetch(:cached, false),
-                                  'db.statement' => fields.fetch(:sql),
-                                  'db.type' => 'sql'
-                                 })
+        span =
+          tracer.start_span(
+            operation_name || DEFAULT_OPERATION_NAME,
+            child_of: active_span.respond_to?(:call) ? active_span.call : active_span,
+            start_time: start_time,
+            tags: {
+              'component' => 'ActiveRecord',
+              'span.kind' => 'client',
+              'db.user' => connection_config.fetch(:username, 'unknown'),
+              'db.instance' => connection_config.fetch(:database),
+              'db.vendor' => connection_config.fetch(:adapter),
+              'db.connection_id' => fields.fetch(:connection_id, 'unknown'),
+              'db.cached' => fields.fetch(:cached, false),
+              'db.statement' => fields.fetch(:sql),
+              'db.type' => 'sql'
+            }
+          )
         span
       end
     end

data/lib/rails_opentracer/middleware.rb

@@ -31,7 +31,8 @@ module RailsOpentracer
             else
               OpenTracing.start_span(span_name, child_of: extracted_ctx)
             end
-          $active_span = span # yuck
+          # yuck
+          $active_span = span
         rescue StandardError => e
           Rails.logger.error "TRACER_ERROR: #{error_message(e)}"
           return @app.call(env)
@@ -43,13 +44,13 @@ module RailsOpentracer
           carrier = {}
           OpenTracing.inject(span.context, OpenTracing::FORMAT_RACK, carrier)
           span.finish
-          [status, headers , response]
+          [status, headers, response]
         rescue StandardError => e
           Rails.logger.error "TRACER_ERROR: #{error_message(e)}"
           [status, headers, response]
         end
       else
-        if ZipkinConfig.opentracer_enabled? 
+        if ZipkinConfig.opentracer_enabled?
           Rails.logger.error 'TRACER_ERROR: `ZIPKIN_SERVICE_URL` environment variable is not defined'
         end
         return @app.call(env)

data/lib/rails_opentracer/version.rb

@@ -1,3 +1,3 @@
 module RailsOpentracer
-  VERSION = "0.1.38"
+  VERSION = '0.1.39'.freeze
 end

data/lib/rails_opentracer/zipkin_config.rb

@@ -1,7 +1,7 @@
 module RailsOpentracer
   class ZipkinConfig
     def self.opentracer_enabled?
-     ENV['RAILS_OPENTRACER_ENABLED'] == 'yes' 
+      ENV['RAILS_OPENTRACER_ENABLED'] == 'yes'
     end
 
     def self.opentracer_enabled_and_zipkin_url_present?
@@ -14,6 +14,6 @@ module RailsOpentracer
       else
         ENV['ZIPKIN_SERVICE_URL']
       end
-    end 
+    end
   end
 end

data/lib/rails_opentracer.rb

@@ -9,9 +9,10 @@ require 'zipkin'
 
 module RailsOpentracer
   def get(url)
-    connection = Faraday.new do |con|
-      con.use Faraday::Adapter::NetHttp
-    end
+    connection =
+      Faraday.new do |con|
+        con.use Faraday::Adapter::NetHttp
+      end
     if ZipkinConfig.opentracer_enabled_and_zipkin_url_present?
       carrier = {}
       OpenTracing.inject(@span.context, OpenTracing::FORMAT_RACK, carrier)
@@ -23,7 +24,7 @@ module RailsOpentracer
   end
 
   def with_span(name)
-    if ZipkinConfig.opentracer_enabled_and_zipkin_url_present? 
+    if ZipkinConfig.opentracer_enabled_and_zipkin_url_present?
       @span =
         if $active_span.present?
           OpenTracing.start_span(name, child_of: $active_span)
@@ -32,13 +33,14 @@ module RailsOpentracer
         end
       yield if block_given?
       @span.finish
-    else
-      yield if block_given?
+    elsif block_given?
+      yield
     end
   end
 
   private
+
   def denilize(hash)
-    hash.each { |k, _v| hash[k] = '' if hash[k].nil? }
+    hash.each_key { |k, _v| hash[k] = '' if hash[k].nil? }
   end
 end

data/rails_opentracer.gemspec

@@ -1,44 +1,35 @@
-# coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "rails_opentracer/version"
+require 'rails_opentracer/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "rails_opentracer"
+  spec.name          = 'rails_opentracer'
   spec.version       = RailsOpentracer::VERSION
-  spec.authors       = ["Nicholas Erasmus"]
-  spec.email         = ["nuclearnicdev@gmail.com"]
+  spec.authors       = ['Nicholas Erasmus']
+  spec.email         = ['nuclearnicdev@gmail.com']
 
-  spec.summary       = %q{Gem that auto-instruments application with OpenTracing}
+  spec.summary       = %(Gem that auto-instruments application with OpenTracing)
   # spec.description   = %q{TODO: Write a longer description or delete this line.}
-  spec.homepage      = "https://github.com/nuclearnic/rails_opentracer"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/nuclearnic/rails_opentracer'
+  spec.license       = 'MIT'
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  # if spec.respond_to?(:metadata)
-  #   spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-  # else
-  #   raise "RubyGems 2.0 or newer is required to protect against " \
-  #     "public gem pushes."
-  # end
-
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.bindir        = "exe"
+  spec.files         =
+    `git ls-files -z`.split("\x0").reject do |f|
+      f.match(%r{^(test|spec|features)/})
+    end
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "faraday", "~> 0.13.1"
-  spec.add_dependency "opentracing", "~> 0.3.1"
-  spec.add_dependency "zipkin", "~> 0.4.2"
+  spec.add_dependency 'faraday', '~> 0.13.1'
+  spec.add_dependency 'opentracing', '~> 0.3.1'
+  spec.add_dependency 'zipkin', '~> 0.4.2'
 
-  spec.add_development_dependency "rails"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'combustion', '~> 0.7.0'
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rails'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'sqlite3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_opentracer
 version: !ruby/object:Gem::Version
-  version: 0.1.38
+  version: 0.1.39
 platform: ruby
 authors:
 - Nicholas Erasmus
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2018-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -53,75 +53,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.4.2
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: combustion
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -137,19 +137,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 description: 
 email:
 - nuclearnicdev@gmail.com
@@ -158,6 +158,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -193,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Gem that auto-instruments application with OpenTracing