RCBC-534: Correctly set tracer to external tracer if one is provided (#199)

Author: DemetrisChr

lib/couchbase/cluster.rb

@@ -401,20 +401,22 @@ def initialize(connection_string, *args)
       end
 
       @observability = Observability::Wrapper.new do |w|
-        if !(open_options[:enable_tracing].nil? && !open_options[:enable_tracing])
-          w.tracer = Tracing::NoopTracer.new
-        elsif tracer.nil?
-          w.tracer = Tracing::ThresholdLoggingTracer.new(
-            emit_interval: open_options[:threshold_emit_interval],
-            kv_threshold: open_options[:key_value_threshold],
-            query_threshold: open_options[:query_threshold],
-            views_threshold: open_options[:view_threshold],
-            search_threshold: open_options[:search_threshold],
-            analytics_threshold: open_options[:analytics_threshold],
-            management_threshold: open_options[:management_threshold],
-            sample_size: open_options[:threshold_sample_size],
-          )
-        end
+        w.tracer = if !(open_options[:enable_tracing].nil? && !open_options[:enable_tracing])
+                     Tracing::NoopTracer.new
+                   elsif tracer.nil?
+                     Tracing::ThresholdLoggingTracer.new(
+                       emit_interval: open_options[:threshold_emit_interval],
+                       kv_threshold: open_options[:key_value_threshold],
+                       query_threshold: open_options[:query_threshold],
+                       views_threshold: open_options[:view_threshold],
+                       search_threshold: open_options[:search_threshold],
+                       analytics_threshold: open_options[:analytics_threshold],
+                       management_threshold: open_options[:management_threshold],
+                       sample_size: open_options[:threshold_sample_size],
+                     )
+                   else
+                     tracer
+                   end
       end
 
       @backend = Backend.new

test/utils/tracing/test_span.rb

@@ -18,15 +18,15 @@
 
 module Couchbase
   module TestUtilities
-    class TestSpan < RequestSpan
+    class TestSpan < Couchbase::Tracing::RequestSpan
       attr_accessor :name
       attr_accessor :start_time, :end_time
       attr_accessor :attributes
       attr_accessor :parent
       attr_accessor :children
 
       def initialize(name, parent: nil, start_timestamp: nil)
-        super
+        super()
         @name = name
         @start_time = start_timestamp.nil? ? Time.now : start_timestamp
         @parent = parent

test/utils/tracing/test_tracer.rb

@@ -20,7 +20,7 @@
 
 module Couchbase
   module TestUtilities
-    class TestTracer < RequestTracer
+    class TestTracer < Couchbase::Tracing::RequestTracer
       def initialize
         super
         @spans = []