rails_opentracer 0.1.13 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 458b7625f52d1d8fd46f7441e405b23bf73d44f3
-  data.tar.gz: ecf5a0ffc504ebf4eee8544ce1d3a67d348c87c5
+  metadata.gz: d4b4f1d0da3bb306c29407188d87b0cb91a1c902
+  data.tar.gz: 290f6e32a69786cc9e5cbdbe07cccd0234ae4d11
 SHA512:
-  metadata.gz: 51d88f6bfdd6dd4dc9aad4c0e708429cacef36bcb71bc67df894bef1e7966fbef37d40273cb221ba3fce340d0fa1c666dcd70f10bd0ac3e240cef89f5ad01741
-  data.tar.gz: 7d7623fb1e6bb9b6f94d988209c23cfe2c877b260dcb7790f0af5a7158d7caa5fe14c8cd8d0bba4753daaa1d1d25acb63d3ab5c0681f63348c8cd5239638cbcf
+  metadata.gz: ed247993c756775fe921da26482f61269dae9746ca466b1997464e958c88834521ab07167aa969efd25810d76f1e012b28fe08482b2d14f8d081d859e761ab45
+  data.tar.gz: 7f9add5d7bfb1792f1b76e9e46196f4b21da7c15d24bf3c4405bab59c0b1cc859d0b1528b8ead8304511d00bdd3bfb3510ba79fa3868c9e8215dcec19608ff66

data/README.md

@@ -7,7 +7,6 @@ this can be changed at a later stage.
 
 TODO:
 - Testz
-- Is faraday_tracer.rb required ?
 - Instrument active record tracing (and give creditz to ruby-rails-tracer's dude)
 - Are all those generators "the way" we want to do things?
 
@@ -61,7 +60,9 @@ with_span 'name of span' do
 end
 ```
 
+## Credits
 
+Devlopment of this gem has leaned heavily on Iaintshine's (https://github.com/iaintshine) work.
 
 ## Development
 

data/lib/generators/rails_opentracer/install_generator.rb

@@ -4,18 +4,13 @@ module RailsOpentracer
   module Generators
     class InstallGenerator < Rails::Generators::Base
       source_root File.expand_path("../../templates", __FILE__)
-      desc "Creates rails_faraday_tracer initializer for your application"
+      desc "Creates rails_opentracer initializer for your application"
 
       def copy_initializer
         template "rails_opentracer_initializer.rb", "config/initializers/rails_opentracer.rb"
         puts "Initializer rails_opentracer added successfully"
       end
 
-      def copy_faraday_tracer_middleware
-        template "faraday_tracer.rb", "app/middleware/faraday_tracer.rb"
-        puts "Faraday middleware added successfully"
-      end
-
       def copy_tracer_middleware
         template "tracer.rb", "app/middleware/tracer.rb"
         puts "Tracer middleware added successfully"

data/lib/generators/templates/rails_opentracer_initializer.rb

@@ -1,7 +1,7 @@
-require 'OpenTracing'
-require 'Zipkin'
-require 'Rails'
+require 'opentracing'
+require 'zipkin'
 
-OpenTracing.global_tracer = Zipkin::Tracer.build(url: ENV['ZIPKIN_SERVICE_URL'], service_name: Rails.application.class.parent_name)
-
-ActiveRecord::RailsOpentracer.instrument(tracer: OpenTracing.global_tracer, active_span: -> { $active_span })
+if ENV.key?('ZIPKIN_SERVICE_URL')
+  OpenTracing.global_tracer = Zipkin::Tracer.build(url: ENV['ZIPKIN_SERVICE_URL'], service_name: Rails.application.class.parent_name)
+  ActiveRecord::RailsOpentracer.instrument(tracer: OpenTracing.global_tracer, active_span: -> { $active_span })
+end

data/lib/generators/templates/tracer.rb

@@ -6,26 +6,36 @@ class Tracer
   end
 
   def call(env)
-    extracted_ctx = OpenTracing.extract(OpenTracing::FORMAT_RACK, env)
-    span_name = get_span_name(env['REQUEST_PATH'])
-
-    span =
-      if extracted_ctx.nil?
-        OpenTracing.start_span(span_name)
-      else
-        OpenTracing.start_span(span_name, child_of: extracted_ctx)
-      end
-    $active_span = span # yuck
+    span = nil
+    begin
+      extracted_ctx = OpenTracing.extract(OpenTracing::FORMAT_RACK, env)
+      span_name = env['REQUEST_PATH']
+      span =
+        if extracted_ctx.nil?
+          OpenTracing.start_span(span_name)
+        else
+          OpenTracing.start_span(span_name, child_of: extracted_ctx)
+        end
+      $active_span = span # yuck
+    rescue StandardError => e
+      Rails.logger.error "TRACER_ERROR: #{error_message(e)}"
+      return @app.call(env)
+    end
 
     status, headers, response = @app.call(env)
-    carrier = {}
-    OpenTracing.inject(span.context, OpenTracing::FORMAT_RACK, carrier)
-    span.finish
 
-    [status, headers , response]
+    begin
+      carrier = {}
+      OpenTracing.inject(span.context, OpenTracing::FORMAT_RACK, carrier)
+      span.finish
+      [status, headers , response]
+    rescue StandardError => e
+      Rails.logger.error "TRACER_ERROR: #{error_message(e)}"
+      [status, headers, response]
+    end
   end
 
-  def get_span_name(request_path)
-    Rails.application.routes.recognize_path(request_path).values.map { |i| i.to_s}.join(", ")
+  def error_message(e)
+    "#{e}\n#{e.backtrace[0, 10].join("\n\t")}"
   end
 end

data/lib/rails_opentracer/version.rb

@@ -1,3 +1,3 @@
 module RailsOpentracer
-  VERSION = "0.1.13"
+  VERSION = "0.1.17"
 end

data/lib/rails_opentracer.rb

@@ -4,7 +4,6 @@ require 'rails_opentracer/version'
 require 'faraday'
 
 module RailsOpentracer
-
   class << self
     def instrument(tracer: OpenTracing.global_tracer, active_span: nil, active_record: true)
       ActiveRecord::RailsOpentracer.instrument(tracer: tracer, active_span: active_span) if active_record
@@ -17,14 +16,12 @@ module RailsOpentracer
 
   def get(url)
     connection = Faraday.new do |con|
-      con.use FaradayTracer
       con.use Faraday::Adapter::NetHttp
     end
-
     carrier = {}
     OpenTracing.inject(@span.context, OpenTracing::FORMAT_RACK, carrier)
     connection.headers = denilize(carrier)
-    response = connection.get(url)
+    connection.get(url)
   end
 
   def with_span(name)
@@ -38,6 +35,8 @@ module RailsOpentracer
     @span.finish
   end
 
+  private
+
   def denilize(hash)
     hash.each {|k,v| hash[k] = "" if hash[k].nil?}
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_opentracer
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.17
 platform: ruby
 authors:
 - Nicholas Erasmus
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-17 00:00:00.000000000 Z
+date: 2017-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -111,7 +111,6 @@ files:
 - bin/console
 - bin/setup
 - lib/generators/rails_opentracer/install_generator.rb
-- lib/generators/templates/faraday_tracer.rb
 - lib/generators/templates/rails_opentracer_initializer.rb
 - lib/generators/templates/tracer.rb
 - lib/rails_opentracer.rb

data/lib/generators/templates/faraday_tracer.rb

@@ -1,13 +0,0 @@
-require 'faraday'
-# This entire thing might not be necessary at all
-class FaradayTracer < Faraday::Middleware
-  def initialize(app, options = {})
-    super(app)
-    @name = options.fetch(:name, 'request.faraday')
-  end
-
-  def call(env)
-    @app.call(env).on_complete do |e|
-    end
-  end
-end