wip

Author: comandeo-mongo

lib/mongo/client.rb

@@ -592,7 +592,6 @@ def initialize(addresses_or_uri, options = nil)
         @cluster = Cluster.new(
           addresses,
           @monitoring,
-          tracer,
           cluster_options.merge(srv_uri: srv_uri)
         )
       end
@@ -642,6 +641,7 @@ def cluster_options
         # applications should read these values from client, not from cluster
         max_read_retries: options[:max_read_retries],
         read_retry_interval: options[:read_retry_interval],
+        tracer: tracer,
       ).tap do |options|
         # If the client has a cluster already, forward srv_uri to the new
         # cluster to maintain SRV monitoring. If the client is brand new,
@@ -912,7 +912,7 @@ def reconnect
       @connect_lock.synchronize do
         do_close rescue nil
 
-        @cluster = Cluster.new(addresses, monitoring, tracer, cluster_options)
+        @cluster = Cluster.new(addresses, monitoring, cluster_options)
 
         if @options[:auto_encryption_options]
           build_encrypter

lib/mongo/cluster.rb

@@ -117,7 +117,7 @@ class Cluster
     #   - *:deprecation_errors* -- boolean
     #
     # @since 2.0.0
-    def initialize(seeds, monitoring, tracer = nil, options = Options::Redacted.new)
+    def initialize(seeds, monitoring, options = Options::Redacted.new)
       if seeds.nil?
         raise ArgumentError, 'Seeds cannot be nil'
       end
@@ -136,7 +136,7 @@ def initialize(seeds, monitoring, tracer = nil, options = Options::Redacted.new)
       @update_lock = Mutex.new
       @servers = []
       @monitoring = monitoring
-      @tracer = tracer
+      @tracer = options[:tracer]
       @event_listeners = Event::Listeners.new
       @app_metadata = Server::AppMetadata.new(@options.merge(purpose: :application))
       @monitor_app_metadata = Server::Monitor::AppMetadata.new(@options.merge(purpose: :monitor))
@@ -299,8 +299,7 @@ def self.create(client, monitoring: nil)
       cluster = Cluster.new(
         client.cluster.addresses.map(&:to_s),
         monitoring || Monitoring.new,
-        tracer = client.tracer,
-        client.cluster_options,
+        client.cluster_options
       )
       client.instance_variable_set(:@cluster, cluster)
     end

lib/mongo/collection/view/aggregation.rb

@@ -120,7 +120,7 @@ def effective_read_preference(connection)
 
         end
 
-        def send_initial_query(server, context)
+        def send_initial_query(server, context, operation: nil)
           if server.load_balancer?
             # Connection will be checked in when cursor is drained.
             connection = server.pool.check_out(context: context)

lib/mongo/collection/view/iterable.rb

@@ -92,7 +92,7 @@ def select_cursor(session)
           tracer.trace_operation(op, context) do
             if respond_to?(:write?, true) && write?
               server = server_selector.select_server(cluster, nil, session, write_aggregation: true)
-              result = send_initial_query(server, context)
+              result = send_initial_query(server, context, operation: op)
 
               if use_query_cache?
                 CachingCursor.new(view, result, server, session: session, context: context)
@@ -101,7 +101,7 @@ def select_cursor(session)
               end
             else
               read_with_retry_cursor(session, server_selector, view, context: context) do |server|
-                send_initial_query(server, context)
+                send_initial_query(server, context, operation: op)
               end
             end
           end
@@ -169,8 +169,8 @@ def initial_query_op(session)
           end
         end
 
-        def send_initial_query(server, context)
-          operation = initial_query_op(context.session)
+        def send_initial_query(server, context, operation: nil)
+          operation ||= initial_query_op(context.session)
           if server.load_balancer?
             # Connection will be checked in when cursor is drained.
             connection = server.pool.check_out(context: context)

spec/spec_tests/open_telemetry_spec.rb

@@ -21,8 +21,10 @@
   warn "Skipping OpenTelemetry unified spec test: #{filename}"
 end
 
-if [ 1, '1', 'yes', 'true' ].include?(ENV['OTEL_SPEC_TESTS'])
-  define_unified_spec_tests(base, TESTS_TO_RUN)
-else
-  skip 'OTel spec tests are disabled. To enable them set env variable OTEL_SPEC_TESTS to 1'
+describe 'CSOT unified spec tests' do
+  if [ 1, '1', 'yes', 'true' ].include?(ENV['OTEL_SPEC_TESTS'])
+    define_unified_spec_tests(base, TESTS_TO_RUN)
+  else
+    skip 'OTel spec tests are disabled. To enable them set env variable OTEL_SPEC_TESTS to 1'
+  end
 end

spec/support/background_thread_registry.rb

@@ -52,7 +52,7 @@ def verify_empty!
             msg << "\n  not in an example"
           end
         end
-        warn msg
+        raise msg
       end
       @records.clear
     end