datadog-ci 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae9b964bc83f82487cc72d99641bcd08a575c104ec311327d49715d88852d02d
-  data.tar.gz: 7f787507a51166a49e95c9b55049fc68f3b1d0952fa49d7974f857b37b10e56f
+  metadata.gz: e852419d3e1634964bbe3e707ccd71822976fa868d8c8f6323c365c6af7fdb4b
+  data.tar.gz: 4e2e801de46ebd2590fd38ff694e4f7d911ec4364e776be498959d6b19faf4f8
 SHA512:
-  metadata.gz: 5947c6dd42ab0d629d1e7eecd2f116ea2c28e89b657e47e80eb0b127caf21e25b68e182ba5f3039671491f9335b0dda917091cbd43f18f64c9136e3e38ef1239
-  data.tar.gz: 7790297ed83c4bfedc4cfb9c2b9116a540c8f7c3cdc78ccd9b5ece5ecb506be427765851834f8abca4594ff5908ca99c4e7f4cd8ab601fe5c0228cf2c62f8971
+  metadata.gz: ac8d1b295053fa3323173ea7c1bca27cacdd364757ae59652eb33a216caf978d7a142833239d6fc69da2c68e1ad06853f4f9aadd268c2e8586d64e866e457cc6
+  data.tar.gz: ab09537b0971146e592499f2cf2ab57eb0e84f9116838d322c3708e57b6c3c38c3a875c2aa247c367c95e14c17df2a388aa4b113cedca6a732f4fe6fa8160803

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## [Unreleased]
 
+## [0.8.2] - 2024-03-19
+
+### Fixed
+
+* assign the single running test suite for a test if none found by test suite name ([#139][])
+
+## [0.8.1] - 2024-03-12
+
+### Fixed
+
+* fix minitest instrumentation with mixins ([#134][])
+
 ## [0.8.0] - 2024-03-08
 
 ### Added
@@ -164,7 +176,9 @@ Currently test suite level visibility is not used by our instrumentation: it wil
 
 * Ruby versions < 2.7 no longer supported ([#8][])
 
-[Unreleased]: https://github.com/DataDog/datadog-ci-rb/compare/v0.8.0...main
+[Unreleased]: https://github.com/DataDog/datadog-ci-rb/compare/v0.8.2...main
+[0.8.2]: https://github.com/DataDog/datadog-ci-rb/compare/v0.8.1...v0.8.2
+[0.8.1]: https://github.com/DataDog/datadog-ci-rb/compare/v0.8.0...v0.8.1
 [0.8.0]: https://github.com/DataDog/datadog-ci-rb/compare/v0.7.0...v0.8.0
 [0.7.0]: https://github.com/DataDog/datadog-ci-rb/compare/v0.6.0...v0.7.0
 [0.6.0]: https://github.com/DataDog/datadog-ci-rb/compare/v0.5.1...v0.6.0
@@ -231,3 +245,5 @@ Currently test suite level visibility is not used by our instrumentation: it wil
 [#122]: https://github.com/DataDog/datadog-ci-rb/issues/122
 [#123]: https://github.com/DataDog/datadog-ci-rb/issues/123
 [#131]: https://github.com/DataDog/datadog-ci-rb/issues/131
+[#134]: https://github.com/DataDog/datadog-ci-rb/issues/134
+[#139]: https://github.com/DataDog/datadog-ci-rb/issues/139

data/lib/datadog/ci/contrib/minitest/helpers.rb

@@ -6,7 +6,12 @@ module Datadog
       module Minitest
         module Helpers
           def self.test_suite_name(klass, method_name)
-            source_location, = klass.instance_method(method_name).source_location
+            source_location = extract_source_location_from_class(klass)
+            # if we are in anonymous class, fallback to the method source location
+            if source_location.nil?
+              source_location, = klass.instance_method(method_name).source_location
+            end
+
             source_file_path = Pathname.new(source_location.to_s).relative_path_from(Pathname.pwd).to_s
 
             "#{klass.name} at #{source_file_path}"
@@ -16,6 +21,15 @@ module Datadog
             klass.ancestors.include?(::Minitest::Parallel::Test) ||
               (defined?(::Minitest::Queue) && ::Minitest.singleton_class.ancestors.include?(::Minitest::Queue))
           end
+
+          def self.extract_source_location_from_class(klass)
+            return nil if klass.nil? || klass.name.nil?
+
+            source_location = klass.const_source_location(klass.name)
+            source_location.first unless source_location.nil?
+          rescue
+            nil
+          end
         end
       end
     end

data/lib/datadog/ci/test_visibility/context/global.rb

@@ -21,6 +21,14 @@ module Datadog
             end
           end
 
+          def fetch_single_test_suite
+            @mutex.synchronize do
+              return nil if @test_suites.empty? || @test_suites.size > 1
+
+              @test_suites.values.first
+            end
+          end
+
           def fetch_or_activate_test_module(&block)
             @mutex.synchronize do
               @test_module ||= block.call

data/lib/datadog/ci/test_visibility/recorder.rb

@@ -227,6 +227,11 @@ module Datadog
         def build_test(tracer_span, tags)
           test = Test.new(tracer_span)
           set_initial_tags(test, tags)
+
+          # sometimes test suite is not being assigned correctly
+          # fix it by fetching the one single running test suite from the global context
+          fix_test_suite!(test) if test.test_suite_id.nil?
+
           validate_test_suite_level_visibility_correctness(test)
           set_codeowners(test)
 
@@ -294,6 +299,24 @@ module Datadog
           end
         end
 
+        def fix_test_suite!(test)
+          test_suite = @global_context.fetch_single_test_suite
+          unless test_suite
+            Datadog.logger.debug do
+              "Trying to fix test suite for test [#{test.name}] but no single test suite is running."
+            end
+            return
+          end
+
+          Datadog.logger.debug do
+            "For test [#{test.name}]: expected test suite [#{test.test_suite_name}] to be running, " \
+            "but it was not found. Fixing it by assigning test suite [#{test_suite.name}] to the test."
+          end
+
+          test.set_tag(Ext::Test::TAG_TEST_SUITE_ID, test_suite.id.to_s)
+          test.set_tag(Ext::Test::TAG_SUITE, test_suite.name)
+        end
+
         def start_datadog_tracer_span(span_name, span_options, &block)
           if block
             Datadog::Tracing.trace(span_name, **span_options) do |tracer_span, trace|

data/lib/datadog/ci/version.rb

@@ -5,7 +5,7 @@ module Datadog
     module VERSION
       MAJOR = "0"
       MINOR = "8"
-      PATCH = "0"
+      PATCH = "2"
       PRE = nil
       BUILD = nil
       # PRE and BUILD above are modified for dev gems during gem build GHA workflow

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog-ci
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-08 00:00:00.000000000 Z
+date: 2024-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: Datadog CI visibility for your ruby application