rspec-otel 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5e1d1bb621033e9a0fb1d1195d745a2d4300f00723b83ca8cb380f170a660d5
-  data.tar.gz: 0d4812bb0b05657bcae39dae45e89f2db35cbb13c25bb47c8ff180e562e6c050
+  metadata.gz: 494c22ee6a688468f77094d8b4f27242edd872ec3a24232337375b8dd611d38e
+  data.tar.gz: ecc743b5a1752adfa8d624d17ab3f6ce87a291ce4393d480fb33f7ef92068e77
 SHA512:
-  metadata.gz: 948d9807ebe6e5a96c6555c6e707f170928feae596cfc304550342ce894b94aa51db2c755c0aa77814ff8a3e7bd518d5004a328ec9e9f4f67c278d806a5fd265
-  data.tar.gz: 7780de8e139754b3255514c49ebbf742f09c73011737245d509cc9f04284a90f28d6edf9dac148d357e09e0839d22242ffae05c4df3ad5d2cc3c8f19a9d7613c
+  metadata.gz: 496f2ac07d3b62cc36c4027266d0dbd6188e75fb075140b52791d3697845585223cdaebaf7e79e60b733a175b1b2352ffbbac88c00c0920c7567c319f2526253
+  data.tar.gz: d26ee3edc01891c632cb97cd92b02507849ee4c33c20faae47057a7f523f01e010c38ccabf4940dbdc601ac9f8734ffe56fae5f0c7c6aea4aced9ce7103feb2f

data/lib/rspec_otel/matchers/emit_span.rb

@@ -9,18 +9,23 @@ module RspecOtel
         @name = name
         @filters = []
         @before_spans = []
+        @closest_span = nil
 
         @filters << name_filter
       end
 
-      def matches?(block)
+      def matches?(block) # rubocop:disable Metrics/MethodLength
         if block.respond_to?(:call)
           @before_spans = RspecOtel.exporter.finished_spans
           block.call
         end
 
+        closest_count = 0
         (RspecOtel.exporter.finished_spans - @before_spans).each do |span|
-          return true if @filters.all? { |f| f.call(span) }
+          count = @filters.count { |f| f.call(span) }
+          @closest_span = span if count > closest_count
+          closest_count = count
+          return true if count == @filters.count
         end
 
         false
@@ -111,15 +116,12 @@ module RspecOtel
 
       def failure_message
         closest = closest_span
-        expect_content = "expected span #{failure_match_description} #{printable_name} to have been emitted"
+        prefix = "expected span #{failure_match_description} #{printable_name} to have been emitted"
 
         case closest
-        when nil
-          "#{expect_content}, but there were no spans emitted at all"
-        when OpenTelemetry::SDK::Trace::SpanData
-          "#{expect_content}, but it couldn't be found. Found a close matching span named `#{closest.name}`"
-        else
-          raise "I don't know what to do with a #{closest.class} span"
+        when nil then "#{prefix}, but there were no spans emitted at all"
+        when OpenTelemetry::SDK::Trace::SpanData then closest_not_found_message(prefix, closest)
+        else raise "I don't know what to do with a #{closest.class} span"
         end
       end
 
@@ -134,12 +136,9 @@ module RspecOtel
       private
 
       def closest_span
-        all_spans = (RspecOtel.exporter.finished_spans - @before_spans)
-        span = all_spans.filter_map do |s|
-          span if name_filter.call(s)
-        end.first
-        span = all_spans.first if span.nil?
-        span
+        return @closest_span unless @closest_span.nil?
+
+        (RspecOtel.exporter.finished_spans - @before_spans).first
       end
 
       def failure_match_description
@@ -173,9 +172,13 @@ module RspecOtel
 
       def exception_attributes(exception)
         attributes = {}
-        unless exception.nil?
+        return attributes if exception.nil?
+
+        if exception.is_a?(Exception)
           attributes['exception.type'] = exception.class.to_s
           attributes['exception.message'] = exception.message
+        else
+          attributes['exception.type'] = exception.to_s
         end
 
         attributes
@@ -213,6 +216,11 @@ module RspecOtel
 
         !link.empty?
       end
+
+      def closest_not_found_message(prefix, span)
+        "#{prefix}, but it couldn't be found. " \
+          "Found a close matching span named `#{span.name}`#{SpanDetails.new(span)}"
+      end
     end
   end
 end

data/lib/rspec_otel/matchers/span_details.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module RspecOtel
+  module Matchers
+    class SpanDetails
+      def initialize(span)
+        @span = span
+      end
+
+      def to_s
+        lines = [attributes_details, events_details, links_details, status_details].compact
+        return '' if lines.empty?
+
+        "\n#{lines.join("\n")}"
+      end
+
+      private
+
+      def attributes_details
+        return unless @span.attributes&.any?
+
+        "  attributes: #{@span.attributes.inspect}"
+      end
+
+      def events_details
+        return unless @span.events&.any?
+
+        format_collection('events', @span.events) { |e| format_item(e.name, e.attributes) }
+      end
+
+      def links_details
+        return unless @span.links&.any?
+
+        format_collection('links', @span.links) { |l| format_item('link', l.attributes) }
+      end
+
+      def status_details
+        return if @span.status.nil? || @span.status.code == OpenTelemetry::Trace::Status::UNSET
+
+        label = status_label(@span.status.code)
+        desc = @span.status.description
+        status_str = desc.to_s.empty? ? label : "#{label} (#{desc})"
+        "  status: #{status_str}"
+      end
+
+      def format_collection(header, collection, &)
+        item_lines = collection.map(&)
+        "  #{header}:\n#{item_lines.join("\n")}"
+      end
+
+      def format_item(label, attributes)
+        attributes&.any? ? "    - #{label} #{attributes.inspect}" : "    - #{label}"
+      end
+
+      def status_label(code)
+        case code
+        when OpenTelemetry::Trace::Status::OK    then 'ok'
+        when OpenTelemetry::Trace::Status::ERROR then 'error'
+        else 'unknown'
+        end
+      end
+    end
+  end
+end

data/lib/rspec_otel/matchers.rb

@@ -9,3 +9,4 @@ module RspecOtel
 end
 
 require 'rspec_otel/matchers/emit_span'
+require 'rspec_otel/matchers/span_details'

data/lib/rspec_otel/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RspecOtel
-  VERSION = '0.0.6'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,14 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: rspec-otel
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Damien MATHIEU
 bindir: bin
 cert_chain: []
-date: 2025-03-21 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
   requirement: !ruby/object:Gem::Requirement
@@ -77,6 +91,7 @@ files:
 - lib/rspec_otel.rb
 - lib/rspec_otel/matchers.rb
 - lib/rspec_otel/matchers/emit_span.rb
+- lib/rspec_otel/matchers/span_details.rb
 - lib/rspec_otel/rspec.rb
 - lib/rspec_otel/version.rb
 homepage: https://github.com/dmathieu/rspec-otel
@@ -98,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.6
 specification_version: 4
 summary: RSpec matchers for the OpenTelemetry framework
 test_files: []