datadog-ci 0.8.2 → 1.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e852419d3e1634964bbe3e707ccd71822976fa868d8c8f6323c365c6af7fdb4b
-  data.tar.gz: 4e2e801de46ebd2590fd38ff694e4f7d911ec4364e776be498959d6b19faf4f8
+  metadata.gz: d8fceb9a2aa80df65f2cac9d910c13253e7c6b1259217af0756f33ecdda8ddd2
+  data.tar.gz: fc946c548d828c80b47612eab9c970968aedf034bfb9f09fb25d7f28acc8da82
 SHA512:
-  metadata.gz: ac8d1b295053fa3323173ea7c1bca27cacdd364757ae59652eb33a216caf978d7a142833239d6fc69da2c68e1ad06853f4f9aadd268c2e8586d64e866e457cc6
-  data.tar.gz: ab09537b0971146e592499f2cf2ab57eb0e84f9116838d322c3708e57b6c3c38c3a875c2aa247c367c95e14c17df2a388aa4b113cedca6a732f4fe6fa8160803
+  metadata.gz: 253e6acd8ff643842d7c976a02eebbaf3ae844ac7b58a514adaf24538ba8bf4778786565760fed03d730f816ed56a3ad56c96c81a67f1c449ce67c0898086c33
+  data.tar.gz: 86bb8eb4b352d099b90c6b59ca4e5fb3b2fdd3a93562c0e9ba7e04123b4b59bc3c690cf1b85ddefb0634010476c80fce5f323ad73c54e1b9e9739444d14a64b4

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 ## [Unreleased]
 
+## [1.0.0.beta1] - 2024-03-25
+
+### Added
+
+* datadog-cov native extension for per test code coverage ([#137])
+* citestcov transport to serialize and send code coverage events ([#148])
+
+### Removed
+
+* Ruby 2.1-2.6 support is dropped
+
+## [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
@@ -176,7 +198,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.2...main
+[Unreleased]: https://github.com/DataDog/datadog-ci-rb/compare/v0.8.3...main
+[1.0.0.beta1]: https://github.com/DataDog/datadog-ci-rb/compare/v0.8.3...v1.0.0.beta1
+[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
@@ -246,4 +270,9 @@ 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
+[#137]: https://github.com/DataDog/datadog-ci-rb/issues/137
 [#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
+[#148]: https://github.com/DataDog/datadog-ci-rb/issues/148

data/LICENSE-3rdparty.csv

@@ -1,3 +1,3 @@
 Component,Origin,License,Copyright
-dd-trace-rb,https://github.com/DataDog/dd-trace-rb,Apache 2.0,"Copyright 2016-Present Datadog, Inc."
+datadog,https://github.com/DataDog/dd-trace-rb,Apache 2.0,"Copyright 2016-Present Datadog, Inc."
 msgpack,https://rubygems.org/gems/msgpack,Apache-2.0,"Copyright (c) 2008-2015 Sadayuki Furuhashi"

data/README.md

@@ -8,17 +8,14 @@
 Datadog's Ruby Library for instrumenting your test and continuous integration pipeline.
 Learn more on our [official website](https://docs.datadoghq.com/tests/) and check out our [documentation for this library](https://docs.datadoghq.com/tests/setup/ruby/?tab=cloudciprovideragentless).
 
-> [!IMPORTANT]
-> The `datadog-ci` gem is currently a component of [`ddtrace`](https://github.com/datadog/dd-trace-rb) and should not be used without it.
->
-> We expect this to change in the future.
-
 ## Installation
 
 Add to your Gemfile.
 
 ```ruby
-gem "ddtrace"
+group :test do
+  gem "datadog-ci"
+end
 ```
 
 ## Usage
@@ -52,7 +49,6 @@ end
 | --- | ----------- | ------- |
 | `enabled` | Defines whether RSpec tests should be traced. Useful for temporarily disabling tracing. `true` or `false` | `true` |
 | `service_name` | Service name used for `rspec` instrumentation. | `'rspec'` |
-| `operation_name` | *DEPRECATED, to be removed in 1.0* Operation name used for `rspec` instrumentation (has no effect in agentless mode or when using newer agent versions). | `'rspec.example'` |
 
 ### Minitest
 
@@ -79,13 +75,31 @@ 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 |
 | --- | ----------- | ------- |
 | `enabled` | Defines whether Minitest tests should be traced. Useful for temporarily disabling tracing. `true` or `false` | `true` |
 | `service_name` | Service name used for `minitest` instrumentation. | `'minitest'` |
-| `operation_name` | *DEPRECATED, to be removed in 1.0* Operation name used for `minitest` instrumentation (has no effect in agentless mode or when using newer agent versions). | `'minitest.test'` |
 
 ### Cucumber
 
@@ -116,7 +130,6 @@ end
 | --- | ----------- | ------- |
 | `enabled` | Defines whether Cucumber tests should be traced. Useful for temporarily disabling tracing. `true` or `false` | `true` |
 | `service_name` | Service name used for `cucumber` instrumentation. | `'cucumber'` |
-| `operation_name` | *DEPRECATED, to be removed in 1.0* Operation name used for `cucumber` instrumentation (has no effect in agentless mode or when using newer agent versions). | `'cucumber.test'` |
 
 ## Agentless mode
 

data/ext/datadog_cov/datadog_cov.c

@@ -0,0 +1,192 @@
+#include <ruby.h>
+#include <ruby/debug.h>
+
+// constants
+#define DD_COV_TARGET_FILES 1
+#define DD_COV_TARGET_LINES 2
+
+// Data structure
+struct dd_cov_data
+{
+  VALUE root;
+  int mode;
+  VALUE coverage;
+};
+
+static void dd_cov_mark(void *ptr)
+{
+  struct dd_cov_data *dd_cov_data = ptr;
+  rb_gc_mark_movable(dd_cov_data->coverage);
+  rb_gc_mark_movable(dd_cov_data->root);
+}
+
+static void dd_cov_free(void *ptr)
+{
+  struct dd_cov_data *dd_cov_data = ptr;
+
+  xfree(dd_cov_data);
+}
+
+static void dd_cov_compact(void *ptr)
+{
+  struct dd_cov_data *dd_cov_data = ptr;
+  dd_cov_data->coverage = rb_gc_location(dd_cov_data->coverage);
+  dd_cov_data->root = rb_gc_location(dd_cov_data->root);
+}
+
+const rb_data_type_t dd_cov_data_type = {
+    .wrap_struct_name = "dd_cov",
+    .function = {
+        .dmark = dd_cov_mark,
+        .dfree = dd_cov_free,
+        .dsize = NULL,
+        .dcompact = dd_cov_compact},
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY};
+
+static VALUE dd_cov_allocate(VALUE klass)
+{
+  struct dd_cov_data *dd_cov_data;
+  VALUE obj = TypedData_Make_Struct(klass, struct dd_cov_data, &dd_cov_data_type, dd_cov_data);
+  dd_cov_data->coverage = rb_hash_new();
+  dd_cov_data->root = Qnil;
+  dd_cov_data->mode = DD_COV_TARGET_FILES;
+  return obj;
+}
+
+// DDCov methods
+static VALUE dd_cov_initialize(int argc, VALUE *argv, VALUE self)
+{
+  VALUE opt;
+  int mode;
+
+  rb_scan_args(argc, argv, "10", &opt);
+  VALUE rb_root = rb_hash_lookup(opt, ID2SYM(rb_intern("root")));
+  if (!RTEST(rb_root))
+  {
+    rb_raise(rb_eArgError, "root is required");
+  }
+
+  VALUE rb_mode = rb_hash_lookup(opt, ID2SYM(rb_intern("mode")));
+  if (!RTEST(rb_mode) || rb_mode == ID2SYM(rb_intern("files")))
+  {
+    mode = DD_COV_TARGET_FILES;
+  }
+  else if (rb_mode == ID2SYM(rb_intern("lines")))
+  {
+    mode = DD_COV_TARGET_LINES;
+  }
+  else
+  {
+    rb_raise(rb_eArgError, "mode is invalid");
+  }
+
+  struct dd_cov_data *dd_cov_data;
+  TypedData_Get_Struct(self, struct dd_cov_data, &dd_cov_data_type, dd_cov_data);
+
+  dd_cov_data->root = rb_root;
+  dd_cov_data->mode = mode;
+
+  return Qnil;
+}
+
+static void dd_cov_update_line_coverage(rb_event_flag_t event, VALUE data, VALUE self, ID id, VALUE klass)
+{
+  struct dd_cov_data *dd_cov_data;
+  TypedData_Get_Struct(data, struct dd_cov_data, &dd_cov_data_type, dd_cov_data);
+
+  const char *filename = rb_sourcefile();
+  if (filename == NULL)
+  {
+    return;
+  }
+
+  if (dd_cov_data->root == Qnil)
+  {
+    return;
+  }
+
+  char *c_root = RSTRING_PTR(dd_cov_data->root);
+  if (c_root == NULL)
+  {
+    return;
+  }
+  long root_len = RSTRING_LEN(dd_cov_data->root);
+  // check that root is a prefix of the filename
+  // so this file is located under the given root
+  if (strncmp(c_root, filename, root_len) != 0)
+  {
+    return;
+  }
+
+  VALUE rb_str_source_file = rb_str_new2(filename);
+
+  if (dd_cov_data->mode == DD_COV_TARGET_FILES)
+  {
+    rb_hash_aset(dd_cov_data->coverage, rb_str_source_file, Qtrue);
+    return;
+  }
+
+  // this isn't optimized yet, this is a POC to show that lines coverage is possible
+  // ITR beta is going to use files coverage, we'll get back to this part when
+  // we need to implement lines coverage
+  if (dd_cov_data->mode == DD_COV_TARGET_LINES)
+  {
+    int line_number = rb_sourceline();
+    if (line_number <= 0)
+    {
+      return;
+    }
+
+    VALUE rb_lines = rb_hash_aref(dd_cov_data->coverage, rb_str_source_file);
+    if (rb_lines == Qnil)
+    {
+      rb_lines = rb_hash_new();
+      rb_hash_aset(dd_cov_data->coverage, rb_str_source_file, rb_lines);
+    }
+
+    rb_hash_aset(rb_lines, INT2FIX(line_number), Qtrue);
+  }
+}
+
+static VALUE dd_cov_start(VALUE self)
+{
+  // get current thread
+  VALUE thval = rb_thread_current();
+
+  // add event hook
+  rb_thread_add_event_hook(thval, dd_cov_update_line_coverage, RUBY_EVENT_LINE, self);
+
+  return self;
+}
+
+static VALUE dd_cov_stop(VALUE self)
+{
+  // get current thread
+  VALUE thval = rb_thread_current();
+  // remove event hook for the current thread
+  rb_thread_remove_event_hook(thval, dd_cov_update_line_coverage);
+
+  struct dd_cov_data *dd_cov_data;
+  TypedData_Get_Struct(self, struct dd_cov_data, &dd_cov_data_type, dd_cov_data);
+
+  VALUE cov = dd_cov_data->coverage;
+
+  dd_cov_data->coverage = rb_hash_new();
+
+  return cov;
+}
+
+void Init_datadog_cov(void)
+{
+  VALUE mDatadog = rb_define_module("Datadog");
+  VALUE mCI = rb_define_module_under(mDatadog, "CI");
+  VALUE mITR = rb_define_module_under(mCI, "ITR");
+  VALUE mCoverage = rb_define_module_under(mITR, "Coverage");
+  VALUE cDatadogCov = rb_define_class_under(mCoverage, "DDCov", rb_cObject);
+
+  rb_define_alloc_func(cDatadogCov, dd_cov_allocate);
+
+  rb_define_method(cDatadogCov, "initialize", dd_cov_initialize, -1);
+  rb_define_method(cDatadogCov, "start", dd_cov_start, 0);
+  rb_define_method(cDatadogCov, "stop", dd_cov_stop, 0);
+}

data/ext/datadog_cov/extconf.rb

@@ -0,0 +1,18 @@
+if RUBY_ENGINE != "ruby" || Gem.win_platform?
+  warn(
+    "WARN: Skipping build of code coverage native extension because of unsupported platform."
+  )
+
+  File.write("Makefile", "all install clean: # dummy makefile that does nothing")
+  exit
+end
+
+require "mkmf"
+
+# Tag the native extension library with the Ruby version and Ruby platform.
+# This makes it easier for development (avoids "oops I forgot to rebuild when I switched my Ruby") and ensures that
+# the wrong library is never loaded.
+# When requiring, we need to use the exact same string, including the version and the platform.
+EXTENSION_NAME = "datadog_cov.#{RUBY_VERSION}_#{RUBY_PLATFORM}".freeze
+
+create_makefile(EXTENSION_NAME)

data/lib/datadog/ci/configuration/settings.rb

@@ -47,7 +47,7 @@ module Datadog
                 o.after_set do |value|
                   if value
                     Datadog::Core.log_deprecation do
-                      "The experimental_test_suite_level_visibility_enabled setting has no effect and will be removed in 1.0. " \
+                      "The experimental_test_suite_level_visibility_enabled setting has no effect and will be removed in 2.0. " \
                         "Test suite level visibility is now enabled by default. " \
                         "If you want to disable test suite level visibility set configuration.ci.force_test_level_visibility = true."
                     end

data/lib/datadog/ci/contrib/cucumber/configuration/settings.rb

@@ -26,21 +26,6 @@ module Datadog
                 Utils::Configuration.fetch_service_name(Ext::DEFAULT_SERVICE_NAME)
               end
             end
-
-            # @deprecated Will be removed in 1.0
-            option :operation_name do |o|
-              o.type :string
-              o.env Ext::ENV_OPERATION_NAME
-              o.default Ext::OPERATION_NAME
-
-              o.after_set do |value|
-                if value && value != Ext::OPERATION_NAME
-                  Datadog::Core.log_deprecation do
-                    "The operation_name setting has no effect and will be removed in 1.0"
-                  end
-                end
-              end
-            end
           end
         end
       end

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

@@ -5,7 +5,7 @@ module Datadog
     module Contrib
       module Cucumber
         # Cucumber integration constants
-        # TODO: mark as `@public_api` when GA, to protect from resource and tag name changes.
+        # @public_api
         module Ext
           ENV_ENABLED = "DD_TRACE_CUCUMBER_ENABLED"
           DEFAULT_SERVICE_NAME = "cucumber"
@@ -13,10 +13,6 @@ module Datadog
           FRAMEWORK = "cucumber"
 
           STEP_SPAN_TYPE = "step"
-
-          # TODO: remove in 1.0
-          ENV_OPERATION_NAME = "DD_TRACE_CUCUMBER_OPERATION_NAME"
-          OPERATION_NAME = "cucumber.test"
         end
       end
     end

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

@@ -71,8 +71,8 @@ module Datadog
               service: configuration[:service_name]
             )
 
-            if test_span && (parameters = extract_parameters_hash(event.test_case))
-              test_span.set_parameters(parameters)
+            if (parameters = extract_parameters_hash(event.test_case))
+              test_span&.set_parameters(parameters)
             end
           end
 
@@ -100,9 +100,8 @@ module Datadog
           def test_suite_name(test_case)
             feature = if test_case.respond_to?(:feature)
               test_case.feature
-            elsif @ast_lookup
-              gherkin_doc = @ast_lookup.gherkin_document(test_case.location.file)
-              gherkin_doc.feature if gherkin_doc
+            else
+              @ast_lookup&.gherkin_document(test_case.location.file)&.feature
             end
 
             if feature
@@ -113,7 +112,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!
@@ -150,19 +149,13 @@ module Datadog
           end
 
           def finish_current_test_suite
-            test_suite = @current_test_suite
-            return unless test_suite
-
-            test_suite.finish
+            @current_test_suite&.finish
 
             @current_test_suite = nil
           end
 
           def same_test_suite_as_current?(test_suite_name)
-            test_suite = @current_test_suite
-            return false unless test_suite
-
-            test_suite.name == test_suite_name
+            @current_test_suite&.name == test_suite_name
           end
 
           def extract_parameters_hash(test_case)
@@ -186,6 +179,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/contrib/cucumber/integration.rb

@@ -17,8 +17,7 @@ module Datadog
           register_as :cucumber
 
           def self.version
-            Gem.loaded_specs["cucumber"] \
-              && Gem.loaded_specs["cucumber"].version
+            Gem.loaded_specs["cucumber"]&.version
           end
 
           def self.loaded?

data/lib/datadog/ci/contrib/minitest/configuration/settings.rb

@@ -24,21 +24,6 @@ module Datadog
                 Utils::Configuration.fetch_service_name(Ext::DEFAULT_SERVICE_NAME)
               end
             end
-
-            # @deprecated Will be removed in 1.0
-            option :operation_name do |o|
-              o.type :string
-              o.env Ext::ENV_OPERATION_NAME
-              o.default Ext::OPERATION_NAME
-
-              o.after_set do |value|
-                if value && value != Ext::OPERATION_NAME
-                  Datadog::Core.log_deprecation do
-                    "The operation_name setting has no effect and will be removed in 1.0"
-                  end
-                end
-              end
-            end
           end
         end
       end

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

@@ -5,17 +5,13 @@ module Datadog
     module Contrib
       module Minitest
         # Minitest integration constants
-        # TODO: mark as `@public_api` when GA, to protect from resource and tag name changes.
+        # @public_api
         module Ext
           ENV_ENABLED = "DD_TRACE_MINITEST_ENABLED"
 
           FRAMEWORK = "minitest"
 
           DEFAULT_SERVICE_NAME = "minitest"
-
-          # TODO: remove in 1.0
-          ENV_OPERATION_NAME = "DD_TRACE_MINITEST_OPERATION_NAME"
-          OPERATION_NAME = "minitest.test"
         end
       end
     end

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

@@ -25,8 +25,7 @@ module Datadog
           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?
+            klass.const_source_location(klass.name)&.first
           rescue
             nil
           end

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

@@ -17,7 +17,7 @@ module Datadog
           register_as :minitest
 
           def self.version
-            Gem.loaded_specs["minitest"] && Gem.loaded_specs["minitest"].version
+            Gem.loaded_specs["minitest"]&.version
           end
 
           def self.loaded?

data/lib/datadog/ci/contrib/rspec/configuration/settings.rb

@@ -24,21 +24,6 @@ module Datadog
                 Utils::Configuration.fetch_service_name(Ext::DEFAULT_SERVICE_NAME)
               end
             end
-
-            # @deprecated Will be removed in 1.0
-            option :operation_name do |o|
-              o.type :string
-              o.env Ext::ENV_OPERATION_NAME
-              o.default Ext::OPERATION_NAME
-
-              o.after_set do |value|
-                if value && value != Ext::OPERATION_NAME
-                  Datadog::Core.log_deprecation do
-                    "The operation_name setting has no effect and will be removed in 1.0"
-                  end
-                end
-              end
-            end
           end
         end
       end

data/lib/datadog/ci/contrib/rspec/example.rb

@@ -48,28 +48,26 @@ module Datadog
               ) do |test_span|
                 result = super
 
-                if test_span
-                  test_span.set_parameters({}, {"scoped_id" => metadata[:scoped_id]})
-
-                  case execution_result.status
-                  when :passed
-                    test_span.passed!
-                    test_suite_span.passed! if test_suite_span
-                  when :failed
-                    test_span.failed!(exception: execution_result.exception)
-                    test_suite_span.failed! if test_suite_span
-                  else
-                    # :pending or nil
-                    test_span.skipped!(
-                      reason: execution_result.pending_message,
-                      exception: execution_result.pending_exception
-                    )
-
-                    test_suite_span.skipped! if test_suite_span
-                  end
+                test_span&.set_parameters({}, {"scoped_id" => metadata[:scoped_id]})
+
+                case execution_result.status
+                when :passed
+                  test_span&.passed!
+                  test_suite_span&.passed!
+                when :failed
+                  test_span&.failed!(exception: execution_result.exception)
+                  test_suite_span&.failed!
+                else
+                  # :pending or nil
+                  test_span&.skipped!(
+                    reason: execution_result.pending_message,
+                    exception: execution_result.pending_exception
+                  )
+
+                  test_suite_span&.skipped!
                 end
 
-                test_suite_span.finish if test_suite_span
+                test_suite_span&.finish
 
                 result
               end

data/lib/datadog/ci/contrib/rspec/ext.rb

@@ -11,10 +11,6 @@ module Datadog
           DEFAULT_SERVICE_NAME = "rspec"
 
           ENV_ENABLED = "DD_TRACE_RSPEC_ENABLED"
-
-          # TODO: remove in 1.0
-          ENV_OPERATION_NAME = "DD_TRACE_RSPEC_OPERATION_NAME"
-          OPERATION_NAME = "rspec.example"
         end
       end
     end

data/lib/datadog/ci/contrib/rspec/integration.rb

@@ -17,8 +17,7 @@ module Datadog
           register_as :rspec
 
           def self.version
-            Gem.loaded_specs["rspec-core"] \
-              && Gem.loaded_specs["rspec-core"].version
+            Gem.loaded_specs["rspec-core"]&.version
           end
 
           def self.loaded?

data/lib/datadog/ci/contrib/settings.rb

@@ -11,9 +11,6 @@ module Datadog
         option :enabled, default: true
         option :service_name
 
-        # @deprecated Will be removed in 1.0
-        option :operation_name
-
         def configure(options = {})
           self.class.options.each do |name, _value|
             self[name] = options[name] if options.key?(name)

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