datadog-ci 0.8.1 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6437d01abc30b7fd5bb6ec729d6b5a22877a85b1f82cd71c075353251b98bcd4
-  data.tar.gz: 2b872c9737bd530287f719bf7b7a475638e61e662677b772aa3fe22e8dfb1504
+  metadata.gz: bf750f24412b0800ba1599f22c5b12e8679dddc1d0e9a30aed98d0a51a6badd3
+  data.tar.gz: 652631fac9702beb340f136e32d4b72b3b38d7c84a8de7dc8ce4f203dc67983b
 SHA512:
-  metadata.gz: '084bdc7fa2dfa45581f8a11f3882ff56e71e241744ecbde54f6ca32b2d1086d78f00019af75d86f33b9ce8c3faaccc9bb4d9f54a08fd1f467080c0dc287fa9ea'
-  data.tar.gz: '028f261a9674fc42378e5b47bf142d375e060b0ee8e9518ed59f89f022a60779ccbe10eee65633cf358b90a6c4311a455284ec98669b6eb44d073b18101beced'
+  metadata.gz: 3295d136609aca4be41cc041613873297a5e91bb37a428a6612a1e62f7e547db2bb2c836f4a0348fdd4466d085a29ec78a26962d48f1c59e05163dcb26668783
+  data.tar.gz: 5446bba62689a4133a75b64437efd47f8369814e863c8ddab0c91d52692b5bf71b5be2a4f4264839ec81374ff3c4ff498e4c2cd7a8c54f566e63558cb1f55cff

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 ## [Unreleased]
 
+## [0.8.3] - 2024-03-20
+
+### Fixed
+
+* fix: cucumber-ruby 9.2 includes breaking change for Cucumber::Core::Test::Result ([#145][])
+
+### Changed
+
+* remove temporary hack and use Core::Remote::Negotiation's new constructor param ([#142][])
+* use filter_basic_auth method from Datadog::Core ([#141][])
+
+## [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
@@ -170,7 +187,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.1...main
+[Unreleased]: https://github.com/DataDog/datadog-ci-rb/compare/v0.8.3...main
+[0.8.3]: https://github.com/DataDog/datadog-ci-rb/compare/v0.8.2...v0.8.3
+[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
@@ -239,3 +258,7 @@ Currently test suite level visibility is not used by our instrumentation: it wil
 [#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
+[#141]: https://github.com/DataDog/datadog-ci-rb/issues/141
+[#142]: https://github.com/DataDog/datadog-ci-rb/issues/142
+[#145]: https://github.com/DataDog/datadog-ci-rb/issues/145

data/README.md

@@ -79,6 +79,25 @@ if ENV["DD_ENV"] == "ci"
 end
 ```
 
+> [!IMPORTANT]
+> When using `minitest/autorun` the order of requires matters: `datadog/ci` must be
+> always required before `minitest/autorun`.
+
+Example using `minitest/autorun`
+
+```ruby
+require 'datadog/ci'
+require 'minitest/autorun'
+
+if ENV["DD_ENV"] == "ci"
+  Datadog.configure do |c|
+    c.ci.enabled = true
+    c.service = 'my-ruby-app'
+    c.ci.instrument :minitest
+  end
+end
+```
+
 `options` are the following keyword arguments:
 
 | Key | Description | Default |

data/lib/datadog/ci/contrib/cucumber/formatter.rb

@@ -113,7 +113,7 @@ module Datadog
           end
 
           def finish_span(span, result)
-            if !result.passed? && result.ok?(@config.strict)
+            if !result.passed? && ok?(result, @config.strict)
               span.skipped!(reason: result.message)
             elsif result.passed?
               span.passed!
@@ -186,6 +186,16 @@ module Datadog
             nil
           end
 
+          def ok?(result, strict)
+            # in minor update in Cucumber 9.2.0, the arity of the `ok?` method changed
+            parameters = result.method(:ok?).parameters
+            if parameters == [[:opt, :be_strict]]
+              result.ok?(strict)
+            else
+              result.ok?(strict: strict)
+            end
+          end
+
           def configuration
             Datadog.configuration.ci[:cucumber]
           end

data/lib/datadog/ci/ext/environment/extractor.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
+require "datadog/core/utils/url"
+
 require_relative "../git"
 require_relative "../../utils/git"
-require_relative "../../utils/url"
 require_relative "providers"
 
 module Datadog
@@ -76,7 +77,7 @@ module Datadog
 
             @tags[Git::TAG_TAG] = Utils::Git.normalize_ref(@tags[Git::TAG_TAG])
             @tags[Git::TAG_BRANCH] = Utils::Git.normalize_ref(@tags[Git::TAG_BRANCH])
-            @tags[Git::TAG_REPOSITORY_URL] = Utils::Url.filter_sensitive_info(
+            @tags[Git::TAG_REPOSITORY_URL] = Datadog::Core::Utils::Url.filter_basic_auth(
               @tags[Git::TAG_REPOSITORY_URL]
             )
           end

data/lib/datadog/ci/ext/environment/providers/github_actions.rb

@@ -2,8 +2,9 @@
 
 require "json"
 
+require "datadog/core/utils/url"
+
 require_relative "base"
-require_relative "../../../utils/url"
 
 module Datadog
   module CI
@@ -79,7 +80,7 @@ module Datadog
             def github_server_url
               return @github_server_url if defined?(@github_server_url)
 
-              @github_server_url ||= Utils::Url.filter_sensitive_info(env["GITHUB_SERVER_URL"])
+              @github_server_url ||= Datadog::Core::Utils::Url.filter_basic_auth(env["GITHUB_SERVER_URL"])
             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/transport/api/builder.rb

@@ -29,10 +29,11 @@ module Datadog
 
           def self.build_evp_proxy_api(settings)
             agent_settings = Datadog::Core::Configuration::AgentSettingsResolver.call(settings)
-            negotiation = Datadog::Core::Remote::Negotiation.new(settings, agent_settings)
-
-            # temporary, remove this when patch will be accepted in Core to make logging configurable
-            negotiation.instance_variable_set(:@logged, {no_config_endpoint: true})
+            negotiation = Datadog::Core::Remote::Negotiation.new(
+              settings,
+              agent_settings,
+              suppress_logging: {no_config_endpoint: true}
+            )
 
             evp_proxy_path_prefix = Ext::Transport::EVP_PROXY_PATH_PREFIXES.find do |path_prefix|
               negotiation.endpoint?(path_prefix)

data/lib/datadog/ci/version.rb

@@ -5,7 +5,7 @@ module Datadog
     module VERSION
       MAJOR = "0"
       MINOR = "8"
-      PATCH = "1"
+      PATCH = "3"
       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.1
+  version: 0.8.3
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-12 00:00:00.000000000 Z
+date: 2024-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -129,7 +129,6 @@ files:
 - lib/datadog/ci/utils/configuration.rb
 - lib/datadog/ci/utils/git.rb
 - lib/datadog/ci/utils/test_run.rb
-- lib/datadog/ci/utils/url.rb
 - lib/datadog/ci/version.rb
 homepage: https://github.com/DataDog/datadog-ci-rb
 licenses:
@@ -157,7 +156,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

data/lib/datadog/ci/utils/url.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Datadog
-  module CI
-    module Utils
-      module Url
-        def self.filter_sensitive_info(url)
-          return nil if url.nil?
-
-          url.gsub(%r{((https?|ssh)://)[^/]*@}, '\1')
-        end
-      end
-    end
-  end
-end