more specs

Author: comandeo-mongo

lib/mongo/client.rb

@@ -984,7 +984,10 @@ def list_databases(filter = {}, name_only = false, opts = {})
       cmd[:nameOnly] = !!name_only
       cmd[:filter] = filter unless filter.empty?
       cmd[:authorizedDatabases] = true if opts[:authorized_databases]
-      use(Database::ADMIN).database.read_command(cmd, opts).first[Database::DATABASES]
+      use(Database::ADMIN)
+        .database
+        .read_command(cmd, opts.merge(op_name: 'listDatabases'))
+        .first[Database::DATABASES]
     end
 
     # Returns a list of Mongo::Database objects.

lib/mongo/database.rb

@@ -268,10 +268,12 @@ def command(operation, opts = {})
     # @option opts :session [ Session ] The session to use for this command.
     # @option opts [ Object ] :comment A user-provided
     #   comment to attach to this command.
-    # @option options [ Integer ] :timeout_ms The operation timeout in milliseconds.
+    # @option opts [ Integer ] :timeout_ms The operation timeout in milliseconds.
     #    Must be a non-negative integer. An explicit value of 0 means infinite.
     #    The default value is unset which means the value is inherited from
     #    the database or the client.
+    # @option opts :op_name [ String | nil ] The name of the operation for
+    #    tracing purposes.
     #
     # @return [ Hash ] The result of the command execution.
     # @api private
@@ -291,14 +293,18 @@ def read_command(operation, opts = {})
           session: session,
           operation_timeouts: operation_timeouts(opts)
         )
-        read_with_retry(session, preference, context) do |server|
-          Operation::Command.new(
-            selector: operation.dup,
-            db_name: name,
-            read: preference,
-            session: session,
-            comment: opts[:comment],
-          ).execute(server, context: context)
+        operation = Operation::Command.new(
+          selector: operation.dup,
+          db_name: name,
+          read: preference,
+          session: session,
+          comment: opts[:comment],
+        )
+        op_name = opts[:op_name] || 'command'
+        tracer.trace_operation(operation, context, op_name: op_name) do
+          read_with_retry(session, preference, context) do |server|
+            operation.execute(server, context: context)
+          end
         end
       end
     end

lib/mongo/tracing/open_telemetry/operation_tracer.rb

@@ -111,6 +111,8 @@ def collection_name(operation)
         end
 
         def operation_span_name(operation, op_name = nil)
+          return 'listDatabases' if op_name == 'listDatabases'
+
           coll_name = collection_name(operation)
           if coll_name && !coll_name.empty?
             "#{operation_name(operation, op_name)} #{operation.db_name}.#{coll_name}"

spec/spec_tests/data/open_telemetry/operation/list_databases.yml

@@ -0,0 +1,47 @@
+description: operation list databases
+schemaVersion: '1.26'
+createEntities:
+  - client:
+      id: &client0 client0
+      useMultipleMongoses: false
+      observeTracingMessages:
+        enableCommandPayload: true
+tests:
+  - description: list databases
+    operations:
+      - object: *client0
+        name: listDatabases
+
+    expectTracingMessages:
+      - client: *client0
+        ignoreExtraSpans: false
+        spans:
+          - name: listDatabases
+            tags:
+              db.system: mongodb
+            db.namespace: admin
+            db.operation.name: listDatabases
+            db.operation.summary: listDatabases admin
+            nested:
+              - name: listDatabases admin
+                tags:
+                  db.system: mongodb
+                  db.namespace: admin
+                  db.command.name: listDatabases
+                  network.transport: tcp
+                  db.mongodb.cursor_id: { $$exists: false }
+                  db.response.status_code: { $$exists: false }
+                  exception.message: { $$exists: false }
+                  exception.type: { $$exists: false }
+                  exception.stacktrace: { $$exists: false }
+                  server.address: { $$type: string }
+                  server.port: { $$type: ['int', 'long'] }
+                  db.query.summary: listDatabases
+                  db.query.text:
+                    $$matchAsDocument:
+                      $$matchAsRoot:
+                        listDatabases: 1
+                  db.mongodb.server_connection_id:
+                    $$type: [ 'int', 'long' ]
+                  db.mongodb.driver_connection_id:
+                    $$type: [ 'int', 'long' ]