opentelemetry-instrumentation-rspec 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e51cdff28bf6029108f2cc5c48ceca7127a97e35e243e7d7dac2a7b7de91ad37
-  data.tar.gz: '0459ef8871da363d80523e8ee392adbef5b953d0e8b07d5665d32aa8ba999ccf'
+  metadata.gz: 346fa1787fdfa19148d696aa2d05ebc01cd26886d93940dfc7116ef0b8b19d1f
+  data.tar.gz: 24fdfaabd072e31e881bff0cc2fc0fa40bf1fa6c0128b58afd756fd543ad441e
 SHA512:
-  metadata.gz: 64429ca47726f0427b36a5da874e87ae3bd003f358ba6e16f8ccd6e2ed7843a6087f5b2072858e84fccd2c9ab31266458a82a8eb47fa5286527bdff2da3ff091
-  data.tar.gz: 957feb5be38106f9038eb6d0a4f9bbb0dd9a5d5b9dc073e003140c259c4a19981715110fbed84e356f43bce57cda44520ad5840b694a5391c407309c5eb0dcb6
+  metadata.gz: 741275cf545231874fbad316b6ce6a84f1e73f6666bc2f884afd56d73c18ea75a4e742cf86d931882634edcf881a2f301ded56ed3de32ca00f088d3d7e6e3fd3
+  data.tar.gz: 9a8be568f83f3364e5bab24c92ab363348769e1517dcd59cca2b4b35bebe6c35cfa9c7400229938abf812a88096b0d15ff3649caf860b94317e7b0cad2378b80

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release History: opentelemetry-instrumentation-rspec
 
+### v0.2.0 / 2022-06-09
+
+* Upgrading Base dependency version
+* FIXED: Strip console codes from RSpec messages and better handle multiple failures 
+* FIXED: Broken test file requirements 
+
 ### v0.1.0 / 2021-12-01
 
 * Initial release.

data/lib/opentelemetry/instrumentation/rspec/formatter.rb

@@ -72,11 +72,25 @@ module OpenTelemetry
 
             span.set_attribute('rspec.example.result', result.status.to_s)
 
-            if (exception = result.exception)
-              span.record_exception(exception)
-              span.set_attribute('rspec.example.failure_message', exception.message) if exception.is_a? ::RSpec::Expectations::ExpectationNotMetError
-              span.status = OpenTelemetry::Trace::Status.error(exception.message)
+            add_exception_and_failures(span, result.exception)
+          end
+        end
+
+        def add_exception_and_failures(span, exception)
+          return if exception.nil?
+
+          exception_message = strip_console_codes(exception.message)
+          span.status = OpenTelemetry::Trace::Status.error(exception_message)
+
+          span.set_attribute('rspec.example.failure_message', exception_message) if exception.is_a? ::RSpec::Expectations::ExpectationNotMetError
+
+          if exception.is_a? ::RSpec::Core::MultipleExceptionError
+            exception.all_exceptions.each do |error|
+              record_stripped_exception(span, error)
             end
+            span.set_attribute('rspec.example.failure_message', multiple_failure_message(exception)) if exception.failures.any?
+          else
+            span.record_exception(exception, attributes: { 'exception.message' => exception_message })
           end
         end
 
@@ -96,6 +110,19 @@ module OpenTelemetry
           span.finish(end_timestamp: current_timestamp)
           OpenTelemetry::Context.detach(token)
         end
+
+        def record_stripped_exception(span, error)
+          error_message = strip_console_codes(error.message)
+          span.record_exception(error, attributes: { 'exception.message' => error_message })
+        end
+
+        def strip_console_codes(string)
+          string.gsub(/\e\[([;\d]+)?m/, '')
+        end
+
+        def multiple_failure_message(exception)
+          exception.failures.map(&:message).map(&method(:strip_console_codes)).join("\n\n")
+        end
       end
     end
   end

data/lib/opentelemetry/instrumentation/rspec/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module RSpec
-      VERSION = '0.1.0'
+      VERSION = '0.2.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-rspec
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-01 00:00:00.000000000 Z
+date: 2022-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-test-helpers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 12.3.3
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.10.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -199,10 +227,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-rspec/v0.1.0/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-rspec/v0.2.0/file.CHANGELOG.html
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/instrumentation/rspec
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-rspec/v0.1.0
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-rspec/v0.2.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -211,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="