From bd7c786c9c341e8e48698be0052e621f7f5ac8cb Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <depfu[bot]@users.noreply.github.com>
Date: Thu, 12 Jul 2018 20:36:01 +0000
Subject: [PATCH] gems: update rack-tracer to version 0.8.0

Since rack-tracer now supports OpenTracing.active_span we should start
using it as well and therefore do not need spanmanager gem anymore.

See: Update rack-tracer to version 0.8.0 (#16)
---
 dyndnsd.gemspec       | 3 +--
 lib/dyndnsd.rb        | 3 ---
 lib/dyndnsd/helper.rb | 5 +++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/dyndnsd.gemspec b/dyndnsd.gemspec
index 6d4fae2..a4c0cce 100644
--- a/dyndnsd.gemspec
+++ b/dyndnsd.gemspec
@@ -24,8 +24,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'json'
   s.add_runtime_dependency 'metriks'
   s.add_runtime_dependency 'opentracing', '~> 0.4.0'
-  s.add_runtime_dependency 'rack-tracer', '~> 0.6.0'
-  s.add_runtime_dependency 'spanmanager', '~> 0.3.0'
+  s.add_runtime_dependency 'rack-tracer', '~> 0.8.0'
   s.add_runtime_dependency 'jaeger-client', '~> 0.6.0'
 
   s.add_development_dependency 'bundler'
diff --git a/lib/dyndnsd.rb b/lib/dyndnsd.rb
index 847ef07..2981f83 100755
--- a/lib/dyndnsd.rb
+++ b/lib/dyndnsd.rb
@@ -10,7 +10,6 @@ require 'metriks'
 require 'metriks/reporter/graphite'
 require 'opentracing'
 require 'rack/tracer'
-require 'spanmanager'
 
 require 'dyndnsd/generator/bind'
 require 'dyndnsd/updater/command_with_bind_zone'
@@ -266,8 +265,6 @@ module Dyndnsd
           host: host, port: port, service_name: service_name, flush_interval: 1
         )
       end
-      # always use SpanManager
-      OpenTracing.global_tracer = SpanManager::Tracer.new(OpenTracing.global_tracer)
     end
 
     private_class_method def self.setup_rack(config)
diff --git a/lib/dyndnsd/helper.rb b/lib/dyndnsd/helper.rb
index e2cc70e..e5a75da 100644
--- a/lib/dyndnsd/helper.rb
+++ b/lib/dyndnsd/helper.rb
@@ -28,13 +28,14 @@ module Dyndnsd
     end
 
     def self.span(operation, &block)
-      span = OpenTracing.start_span(operation)
+      scope = OpenTracing.start_active_span(operation)
+      span = scope.span
       span.set_tag('component', 'dyndnsd')
       span.set_tag('span.kind', 'server')
       begin
         block.call(span)
       ensure
-        span.finish
+        scope.close
       end
     end
   end