From 270565e527484fcf6467448a63d4a8c6937effc4 Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Thu, 9 Nov 2023 14:09:47 +0100 Subject: [PATCH 01/26] add ddtrace --- .gitignore | 1 + Gemfile | 3 +++ Gemfile.lock | 25 +++++++++++++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/.gitignore b/.gitignore index bbf749a452..80083a2579 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ docs/**/* *.tar.bz2 *.tar.gz *.zip +/test.rb diff --git a/Gemfile b/Gemfile index f276b26383..8f409bc3a3 100644 --- a/Gemfile +++ b/Gemfile @@ -51,6 +51,9 @@ group :test do gem 'minitest' gem 'rack-test', require: false gem 'rr', require: false + + gem "datadog-ci", :path => "../datadog-ci-rb" + gem "ddtrace", :github => "DataDog/dd-trace-rb", :ref => "master" end if ENV['SELENIUM'] == '1' diff --git a/Gemfile.lock b/Gemfile.lock index 68930c1d03..0937479055 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,21 @@ +GIT + remote: https://github.com/DataDog/dd-trace-rb.git + revision: 687661d3ed674513445b845cdfdc992c3ad9466e + ref: master + specs: + ddtrace (1.16.1) + datadog-ci (~> 0.3.0) + debase-ruby_core_source (= 3.2.2) + libdatadog (~> 5.0.0.1.0) + libddwaf (~> 1.14.0.0.0) + msgpack + +PATH + remote: ../datadog-ci-rb + specs: + datadog-ci (0.3.0) + msgpack + GEM remote: https://rubygems.org/ specs: @@ -20,6 +38,7 @@ GEM coffee-script-source (1.12.2) concurrent-ruby (1.1.10) daemons (1.4.1) + debase-ruby_core_source (3.2.2) erubi (1.12.0) ethon (0.16.0) ffi (>= 1.15.0) @@ -45,9 +64,13 @@ GEM image_optim (~> 0.19) image_size (3.2.0) in_threads (1.6.0) + libdatadog (5.0.0.1.0) + libddwaf (1.14.0.0.0) + ffi (~> 1.0) method_source (1.0.0) mini_portile2 (2.8.4) minitest (5.18.1) + msgpack (1.7.2) multi_json (1.15.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) @@ -147,6 +170,8 @@ DEPENDENCIES browser chunky_png coffee-script + datadog-ci! + ddtrace! erubi html-pipeline image_optim From c209a7a94ebeadd48a47a22b797b45013493f3ee Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Thu, 9 Nov 2023 14:10:52 +0100 Subject: [PATCH 02/26] document number of tests --- tests.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 tests.txt diff --git a/tests.txt b/tests.txt new file mode 100644 index 0000000000..34b6e25e4e --- /dev/null +++ b/tests.txt @@ -0,0 +1 @@ +628 tests, 0 failures \ No newline at end of file From 08799781e84d435fb7f248eb0dbdc16c9ee81306 Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Thu, 9 Nov 2023 16:17:26 +0100 Subject: [PATCH 03/26] instrument tests --- test/test_helper.rb | 11 +++++++++++ tests.txt | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/test/test_helper.rb b/test/test_helper.rb index 2bcaa9d543..30669e2502 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -12,6 +12,9 @@ require 'active_support/testing/assertions' require 'rr' +require "datadog/ci" +require "ddtrace/autoinstrument" + Dir[File.dirname(__FILE__) + '/support/*.rb'].each do |file| autoload File.basename(file, '.rb').camelize, file end @@ -21,6 +24,8 @@ class MiniTest::Spec include ActiveSupport::Testing::Assertions + # parallelize_me! + module DSL def context(*args, &block) describe(*args, &block) @@ -45,3 +50,9 @@ def rm_tmp Minitest.after_run do rm_tmp end + +Datadog.configure do |c| + c.service = "devdocs" + c.ci.enabled = true + c.ci.instrument :minitest +end diff --git a/tests.txt b/tests.txt index 34b6e25e4e..35f2ef4b74 100644 --- a/tests.txt +++ b/tests.txt @@ -1 +1,3 @@ -628 tests, 0 failures \ No newline at end of file +628 tests, 0 failures + +parallel tests - 628 tests, 8-30 flakes \ No newline at end of file From 6c649349accaaf07cc42de9c7df86b6e2a346ec9 Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Thu, 9 Nov 2023 16:20:56 +0100 Subject: [PATCH 04/26] instrument parallel tests --- test/test_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_helper.rb b/test/test_helper.rb index 30669e2502..b752ebfc3a 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -13,7 +13,7 @@ require 'rr' require "datadog/ci" -require "ddtrace/autoinstrument" +require "ddtrace/auto_instrument" Dir[File.dirname(__FILE__) + '/support/*.rb'].each do |file| autoload File.basename(file, '.rb').camelize, file @@ -24,7 +24,7 @@ class MiniTest::Spec include ActiveSupport::Testing::Assertions - # parallelize_me! + parallelize_me! module DSL def context(*args, &block) From 74bdd75a90c4cf2de9cf5de48de0fe3663cdaf1b Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Thu, 9 Nov 2023 16:25:00 +0100 Subject: [PATCH 05/26] fdsf From fd122d8a258acc6e45be91c83671a9c89009f37f Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Fri, 24 Nov 2023 15:16:25 +0100 Subject: [PATCH 06/26] fresh deps --- Gemfile.lock | 64 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 26 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0937479055..3859519190 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,10 @@ GIT remote: https://github.com/DataDog/dd-trace-rb.git - revision: 687661d3ed674513445b845cdfdc992c3ad9466e + revision: adc07c4f47071e884aed91d1e55530bf22bb3390 ref: master specs: - ddtrace (1.16.1) - datadog-ci (~> 0.3.0) + ddtrace (1.17.0) + datadog-ci (~> 0.4.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) libddwaf (~> 1.14.0.0.0) @@ -13,21 +13,28 @@ GIT PATH remote: ../datadog-ci-rb specs: - datadog-ci (0.3.0) + datadog-ci (0.4.1) msgpack GEM remote: https://rubygems.org/ specs: - activesupport (7.0.8) + activesupport (7.1.2) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) + base64 (0.2.0) better_errors (2.10.1) erubi (>= 1.0.0) rack (>= 0.9.0) rouge (>= 1.0.0) + bigdecimal (3.1.4) browser (5.3.1) byebug (11.1.3) chunky_png (1.4.0) @@ -36,22 +43,25 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) + connection_pool (2.4.1) daemons (1.4.1) debase-ruby_core_source (3.2.2) + drb (2.2.0) + ruby2_keywords erubi (1.12.0) ethon (0.16.0) ffi (>= 1.15.0) eventmachine (1.2.7) - execjs (2.8.1) - exifr (1.3.10) - ffi (1.15.5) + execjs (2.9.1) + exifr (1.4.0) + ffi (1.16.3) fspath (3.1.2) - highline (2.0.3) + highline (2.1.0) html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) image_optim (0.31.3) exifr (~> 1.2, >= 1.2.2) @@ -59,26 +69,28 @@ GEM image_size (>= 1.5, < 4) in_threads (~> 1.3) progress (~> 3.0, >= 3.0.1) - image_optim_pack (0.9.1.20230526) + image_optim_pack (0.10.0.20231105) fspath (>= 2.1, < 4) image_optim (~> 0.19) - image_size (3.2.0) + image_size (3.3.0) in_threads (1.6.0) libdatadog (5.0.0.1.0) libddwaf (1.14.0.0.0) ffi (~> 1.0) method_source (1.0.0) - mini_portile2 (2.8.4) - minitest (5.18.1) + mini_portile2 (2.8.5) + minitest (5.20.0) msgpack (1.7.2) multi_json (1.15.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) + mutex_m (0.2.0) net-sftp (4.0.0) net-ssh (>= 5.0.0, < 8.0.0) - net-ssh (7.0.1) - newrelic_rpm (8.16.0) - nokogiri (1.15.4) + net-ssh (7.2.0) + newrelic_rpm (9.6.0) + base64 + nokogiri (1.15.5) mini_portile2 (~> 2.8.2) racc (~> 1.4) options (2.3.2) @@ -92,22 +104,22 @@ GEM pry-byebug (3.10.1) byebug (~> 11.0) pry (>= 0.13, < 0.15) - racc (1.6.2) + racc (1.7.3) rack (2.2.8) rack-protection (3.1.0) rack (~> 2.2, >= 2.2.4) rack-ssl-enforcer (0.2.9) rack-test (2.1.0) rack (>= 1.3) - rake (13.0.6) + rake (13.1.0) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) redcarpet (3.6.0) - rexml (3.2.5) - rouge (1.11.1) + rexml (3.2.6) + rouge (4.2.0) rr (3.1.0) - rss (0.2.9) + rss (0.3.0) rexml ruby2_keywords (0.0.5) sass (3.7.4) @@ -145,18 +157,18 @@ GEM eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) thor (1.3.0) - tilt (2.2.0) + tilt (2.3.0) tty-pager (0.14.0) strings (~> 0.2.0) tty-screen (~> 0.8) tty-screen (0.8.1) - typhoeus (1.4.0) + typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (2.3.0) + unicode-display_width (2.5.0) unicode_utils (1.4.0) unix_utils (0.0.15) yajl-ruby (1.4.3) From 224113463b406ddaaa75202fce10ee305b22e72a Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Fri, 24 Nov 2023 15:19:25 +0100 Subject: [PATCH 07/26] Revert "fresh deps" This reverts commit fd122d8a258acc6e45be91c83671a9c89009f37f. --- Gemfile.lock | 64 +++++++++++++++++++++------------------------------- 1 file changed, 26 insertions(+), 38 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3859519190..0937479055 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,10 @@ GIT remote: https://github.com/DataDog/dd-trace-rb.git - revision: adc07c4f47071e884aed91d1e55530bf22bb3390 + revision: 687661d3ed674513445b845cdfdc992c3ad9466e ref: master specs: - ddtrace (1.17.0) - datadog-ci (~> 0.4.0) + ddtrace (1.16.1) + datadog-ci (~> 0.3.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) libddwaf (~> 1.14.0.0.0) @@ -13,28 +13,21 @@ GIT PATH remote: ../datadog-ci-rb specs: - datadog-ci (0.4.1) + datadog-ci (0.3.0) msgpack GEM remote: https://rubygems.org/ specs: - activesupport (7.1.2) - base64 - bigdecimal + activesupport (7.0.8) concurrent-ruby (~> 1.0, >= 1.0.2) - connection_pool (>= 2.2.5) - drb i18n (>= 1.6, < 2) minitest (>= 5.1) - mutex_m tzinfo (~> 2.0) - base64 (0.2.0) better_errors (2.10.1) erubi (>= 1.0.0) rack (>= 0.9.0) rouge (>= 1.0.0) - bigdecimal (3.1.4) browser (5.3.1) byebug (11.1.3) chunky_png (1.4.0) @@ -43,25 +36,22 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.2.2) - connection_pool (2.4.1) + concurrent-ruby (1.1.10) daemons (1.4.1) debase-ruby_core_source (3.2.2) - drb (2.2.0) - ruby2_keywords erubi (1.12.0) ethon (0.16.0) ffi (>= 1.15.0) eventmachine (1.2.7) - execjs (2.9.1) - exifr (1.4.0) - ffi (1.16.3) + execjs (2.8.1) + exifr (1.3.10) + ffi (1.15.5) fspath (3.1.2) - highline (2.1.0) + highline (2.0.3) html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) - i18n (1.14.1) + i18n (1.12.0) concurrent-ruby (~> 1.0) image_optim (0.31.3) exifr (~> 1.2, >= 1.2.2) @@ -69,28 +59,26 @@ GEM image_size (>= 1.5, < 4) in_threads (~> 1.3) progress (~> 3.0, >= 3.0.1) - image_optim_pack (0.10.0.20231105) + image_optim_pack (0.9.1.20230526) fspath (>= 2.1, < 4) image_optim (~> 0.19) - image_size (3.3.0) + image_size (3.2.0) in_threads (1.6.0) libdatadog (5.0.0.1.0) libddwaf (1.14.0.0.0) ffi (~> 1.0) method_source (1.0.0) - mini_portile2 (2.8.5) - minitest (5.20.0) + mini_portile2 (2.8.4) + minitest (5.18.1) msgpack (1.7.2) multi_json (1.15.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) - mutex_m (0.2.0) net-sftp (4.0.0) net-ssh (>= 5.0.0, < 8.0.0) - net-ssh (7.2.0) - newrelic_rpm (9.6.0) - base64 - nokogiri (1.15.5) + net-ssh (7.0.1) + newrelic_rpm (8.16.0) + nokogiri (1.15.4) mini_portile2 (~> 2.8.2) racc (~> 1.4) options (2.3.2) @@ -104,22 +92,22 @@ GEM pry-byebug (3.10.1) byebug (~> 11.0) pry (>= 0.13, < 0.15) - racc (1.7.3) + racc (1.6.2) rack (2.2.8) rack-protection (3.1.0) rack (~> 2.2, >= 2.2.4) rack-ssl-enforcer (0.2.9) rack-test (2.1.0) rack (>= 1.3) - rake (13.1.0) + rake (13.0.6) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) redcarpet (3.6.0) - rexml (3.2.6) - rouge (4.2.0) + rexml (3.2.5) + rouge (1.11.1) rr (3.1.0) - rss (0.3.0) + rss (0.2.9) rexml ruby2_keywords (0.0.5) sass (3.7.4) @@ -157,18 +145,18 @@ GEM eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) thor (1.3.0) - tilt (2.3.0) + tilt (2.2.0) tty-pager (0.14.0) strings (~> 0.2.0) tty-screen (~> 0.8) tty-screen (0.8.1) - typhoeus (1.4.1) + typhoeus (1.4.0) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (2.5.0) + unicode-display_width (2.3.0) unicode_utils (1.4.0) unix_utils (0.0.15) yajl-ruby (1.4.3) From c15ef7a5e9f394a49e13dab149f223f5adffc26e Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Fri, 24 Nov 2023 15:20:30 +0100 Subject: [PATCH 08/26] update ddtrace --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0937479055..90c161ddb0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,10 @@ GIT remote: https://github.com/DataDog/dd-trace-rb.git - revision: 687661d3ed674513445b845cdfdc992c3ad9466e + revision: adc07c4f47071e884aed91d1e55530bf22bb3390 ref: master specs: - ddtrace (1.16.1) - datadog-ci (~> 0.3.0) + ddtrace (1.17.0) + datadog-ci (~> 0.4.0) debase-ruby_core_source (= 3.2.2) libdatadog (~> 5.0.0.1.0) libddwaf (~> 1.14.0.0.0) @@ -13,7 +13,7 @@ GIT PATH remote: ../datadog-ci-rb specs: - datadog-ci (0.3.0) + datadog-ci (0.4.1) msgpack GEM @@ -45,7 +45,7 @@ GEM eventmachine (1.2.7) execjs (2.8.1) exifr (1.3.10) - ffi (1.15.5) + ffi (1.16.3) fspath (3.1.2) highline (2.0.3) html-pipeline (2.14.3) From c2a3b50892d4ef2948ad261090deef573913eff0 Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Wed, 6 Dec 2023 14:15:32 +0100 Subject: [PATCH 09/26] pre-release test 0.5.0 --- test/test_helper.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test_helper.rb b/test/test_helper.rb index b752ebfc3a..9987c98ca2 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -54,5 +54,6 @@ def rm_tmp Datadog.configure do |c| c.service = "devdocs" c.ci.enabled = true + # c.ci.experimental_test_suite_level_visibility_enabled = true c.ci.instrument :minitest end From 6dea54ddacda2d80e42d91d837832c1ae4d5af03 Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Fri, 29 Dec 2023 16:33:34 +0100 Subject: [PATCH 10/26] update minitest --- Gemfile.lock | 14 +++++++------- test/app_test.rb | 2 +- test/lib/docs/core/doc_test.rb | 2 +- test/lib/docs/core/entry_index_test.rb | 2 +- test/lib/docs/core/filter_test.rb | 2 +- test/lib/docs/core/instrumentable_test.rb | 2 +- test/lib/docs/core/manifest_test.rb | 2 +- test/lib/docs/core/models/entry_test.rb | 2 +- test/lib/docs/core/models/type_test.rb | 2 +- test/lib/docs/core/parser_test.rb | 2 +- test/lib/docs/core/request_test.rb | 2 +- test/lib/docs/core/requester_test.rb | 2 +- test/lib/docs/core/response_test.rb | 2 +- test/lib/docs/core/scraper_test.rb | 2 +- test/lib/docs/core/scrapers/file_scraper_test.rb | 2 +- test/lib/docs/core/scrapers/url_scraper_test.rb | 2 +- test/lib/docs/core/url_test.rb | 2 +- test/lib/docs/filters/core/apply_base_url_test.rb | 2 +- test/lib/docs/filters/core/clean_html_test.rb | 2 +- test/lib/docs/filters/core/clean_text_test.rb | 2 +- test/lib/docs/filters/core/container_test.rb | 2 +- test/lib/docs/filters/core/entries_test.rb | 2 +- test/lib/docs/filters/core/inner_html_test.rb | 2 +- test/lib/docs/filters/core/internal_urls_test.rb | 2 +- test/lib/docs/filters/core/normalize_paths_test.rb | 2 +- test/lib/docs/filters/core/normalize_urls_test.rb | 2 +- test/lib/docs/filters/core/parse_cf_email_test.rb | 2 +- test/lib/docs/filters/core/title_test.rb | 2 +- test/lib/docs/storage/abstract_store_test.rb | 2 +- test/lib/docs/storage/file_store_test.rb | 2 +- test/test_helper.rb | 2 +- 31 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 90c161ddb0..ef01bac792 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,11 +1,11 @@ GIT remote: https://github.com/DataDog/dd-trace-rb.git - revision: adc07c4f47071e884aed91d1e55530bf22bb3390 + revision: 572c94bcdf53d138d85085c56f675865af6354bd ref: master specs: - ddtrace (1.17.0) - datadog-ci (~> 0.4.0) - debase-ruby_core_source (= 3.2.2) + ddtrace (1.18.0) + datadog-ci (~> 0.5.0) + debase-ruby_core_source (= 3.2.3) libdatadog (~> 5.0.0.1.0) libddwaf (~> 1.14.0.0.0) msgpack @@ -13,7 +13,7 @@ GIT PATH remote: ../datadog-ci-rb specs: - datadog-ci (0.4.1) + datadog-ci (0.5.1) msgpack GEM @@ -38,7 +38,7 @@ GEM coffee-script-source (1.12.2) concurrent-ruby (1.1.10) daemons (1.4.1) - debase-ruby_core_source (3.2.2) + debase-ruby_core_source (3.2.3) erubi (1.12.0) ethon (0.16.0) ffi (>= 1.15.0) @@ -69,7 +69,7 @@ GEM ffi (~> 1.0) method_source (1.0.0) mini_portile2 (2.8.4) - minitest (5.18.1) + minitest (5.20.0) msgpack (1.7.2) multi_json (1.15.0) mustermann (3.0.0) diff --git a/test/app_test.rb b/test/app_test.rb index 8e9e369b5e..44fca64aab 100644 --- a/test/app_test.rb +++ b/test/app_test.rb @@ -2,7 +2,7 @@ require 'rack/test' require 'app' -class AppTest < MiniTest::Spec +class AppTest < Minitest::Spec include Rack::Test::Methods MODERN_BROWSER = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:39.0) Gecko/20100101 Firefox/39.0' diff --git a/test/lib/docs/core/doc_test.rb b/test/lib/docs/core/doc_test.rb index b0d2341f84..6b41cdd9c8 100644 --- a/test/lib/docs/core/doc_test.rb +++ b/test/lib/docs/core/doc_test.rb @@ -1,7 +1,7 @@ require_relative '../../../test_helper' require_relative '../../../../lib/docs' -class DocsDocTest < MiniTest::Spec +class DocsDocTest < Minitest::Spec let :doc do Class.new Docs::Doc do self.name = 'name' diff --git a/test/lib/docs/core/entry_index_test.rb b/test/lib/docs/core/entry_index_test.rb index 187f5f4ad2..95495eb90a 100644 --- a/test/lib/docs/core/entry_index_test.rb +++ b/test/lib/docs/core/entry_index_test.rb @@ -1,7 +1,7 @@ require_relative '../../../test_helper' require_relative '../../../../lib/docs' -class DocsEntryIndexTest < MiniTest::Spec +class DocsEntryIndexTest < Minitest::Spec let :entry do Docs::Entry.new 'name', 'path', 'type' end diff --git a/test/lib/docs/core/filter_test.rb b/test/lib/docs/core/filter_test.rb index 38c5019a3f..10872c7beb 100644 --- a/test/lib/docs/core/filter_test.rb +++ b/test/lib/docs/core/filter_test.rb @@ -1,7 +1,7 @@ require_relative '../../../test_helper' require_relative '../../../../lib/docs' -class DocsFilterTest < MiniTest::Spec +class DocsFilterTest < Minitest::Spec include FilterTestHelper self.filter_class = Docs::Filter diff --git a/test/lib/docs/core/instrumentable_test.rb b/test/lib/docs/core/instrumentable_test.rb index c3fe2b8b6b..5a244d5199 100644 --- a/test/lib/docs/core/instrumentable_test.rb +++ b/test/lib/docs/core/instrumentable_test.rb @@ -1,7 +1,7 @@ require_relative '../../../test_helper' require_relative '../../../../lib/docs' -class DocsInstrumentableTest < MiniTest::Spec +class DocsInstrumentableTest < Minitest::Spec let :extended_class do Class.new.tap { |klass| klass.send :extend, Docs::Instrumentable } end diff --git a/test/lib/docs/core/manifest_test.rb b/test/lib/docs/core/manifest_test.rb index f121e69b21..636885cd1a 100644 --- a/test/lib/docs/core/manifest_test.rb +++ b/test/lib/docs/core/manifest_test.rb @@ -1,7 +1,7 @@ require_relative '../../../test_helper' require_relative '../../../../lib/docs' -class ManifestTest < MiniTest::Spec +class ManifestTest < Minitest::Spec let :doc do doc = Class.new Docs::Scraper doc.name = 'TestDoc' diff --git a/test/lib/docs/core/models/entry_test.rb b/test/lib/docs/core/models/entry_test.rb index 7487340ff2..56de796661 100644 --- a/test/lib/docs/core/models/entry_test.rb +++ b/test/lib/docs/core/models/entry_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class DocsEntryTest < MiniTest::Spec +class DocsEntryTest < Minitest::Spec Entry = Docs::Entry let :entry do diff --git a/test/lib/docs/core/models/type_test.rb b/test/lib/docs/core/models/type_test.rb index a01d8e6140..e3f3b3368f 100644 --- a/test/lib/docs/core/models/type_test.rb +++ b/test/lib/docs/core/models/type_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class DocsTypeTest < MiniTest::Spec +class DocsTypeTest < Minitest::Spec Type = Docs::Type describe ".new" do diff --git a/test/lib/docs/core/parser_test.rb b/test/lib/docs/core/parser_test.rb index 440516a8e9..2edacacb99 100644 --- a/test/lib/docs/core/parser_test.rb +++ b/test/lib/docs/core/parser_test.rb @@ -1,7 +1,7 @@ require_relative '../../../test_helper' require_relative '../../../../lib/docs' -class DocsParserTest < MiniTest::Spec +class DocsParserTest < Minitest::Spec def parser(content) Docs::Parser.new(content) end diff --git a/test/lib/docs/core/request_test.rb b/test/lib/docs/core/request_test.rb index d05dd1ffe9..4e7353465d 100644 --- a/test/lib/docs/core/request_test.rb +++ b/test/lib/docs/core/request_test.rb @@ -1,7 +1,7 @@ require_relative '../../../test_helper' require_relative '../../../../lib/docs' -class DocsRequestTest < MiniTest::Spec +class DocsRequestTest < Minitest::Spec let :url do 'http://example.com' end diff --git a/test/lib/docs/core/requester_test.rb b/test/lib/docs/core/requester_test.rb index acf8d0a9a2..18a17ec3fc 100644 --- a/test/lib/docs/core/requester_test.rb +++ b/test/lib/docs/core/requester_test.rb @@ -1,7 +1,7 @@ require_relative '../../../test_helper' require_relative '../../../../lib/docs' -class DocsRequesterTest < MiniTest::Spec +class DocsRequesterTest < Minitest::Spec def stub_request(url) Typhoeus.stub(url).and_return(Typhoeus::Response.new) end diff --git a/test/lib/docs/core/response_test.rb b/test/lib/docs/core/response_test.rb index 9e92c034fc..5c06dc0cea 100644 --- a/test/lib/docs/core/response_test.rb +++ b/test/lib/docs/core/response_test.rb @@ -1,7 +1,7 @@ require_relative '../../../test_helper' require_relative '../../../../lib/docs' -class DocsResponseTest < MiniTest::Spec +class DocsResponseTest < Minitest::Spec let :response do Typhoeus::Response.new(options).tap do |response| response.extend Docs::Response diff --git a/test/lib/docs/core/scraper_test.rb b/test/lib/docs/core/scraper_test.rb index 3d49320743..7b5522b3cb 100644 --- a/test/lib/docs/core/scraper_test.rb +++ b/test/lib/docs/core/scraper_test.rb @@ -1,7 +1,7 @@ require_relative '../../../test_helper' require_relative '../../../../lib/docs' -class DocsScraperTest < MiniTest::Spec +class DocsScraperTest < Minitest::Spec class Scraper < Docs::Scraper self.type = 'scraper' self.base_url = 'http://example.com/' diff --git a/test/lib/docs/core/scrapers/file_scraper_test.rb b/test/lib/docs/core/scrapers/file_scraper_test.rb index 46dad3c780..93b2ba43b4 100644 --- a/test/lib/docs/core/scrapers/file_scraper_test.rb +++ b/test/lib/docs/core/scrapers/file_scraper_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class FileScraperTest < MiniTest::Spec +class FileScraperTest < Minitest::Spec ROOT_PATH = File.expand_path('../../../../../../', __FILE__) class Scraper < Docs::FileScraper diff --git a/test/lib/docs/core/scrapers/url_scraper_test.rb b/test/lib/docs/core/scrapers/url_scraper_test.rb index 9a687256ab..77fc235d57 100644 --- a/test/lib/docs/core/scrapers/url_scraper_test.rb +++ b/test/lib/docs/core/scrapers/url_scraper_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class DocsUrlScraperTest < MiniTest::Spec +class DocsUrlScraperTest < Minitest::Spec class Scraper < Docs::UrlScraper self.base_url = 'http://example.com' self.html_filters = Docs::FilterStack.new diff --git a/test/lib/docs/core/url_test.rb b/test/lib/docs/core/url_test.rb index 7d4bda43de..8f08b1404e 100644 --- a/test/lib/docs/core/url_test.rb +++ b/test/lib/docs/core/url_test.rb @@ -1,7 +1,7 @@ require_relative '../../../test_helper' require_relative '../../../../lib/docs' -class DocsUrlTest < MiniTest::Spec +class DocsUrlTest < Minitest::Spec URL = Docs::URL describe ".new" do diff --git a/test/lib/docs/filters/core/apply_base_url_test.rb b/test/lib/docs/filters/core/apply_base_url_test.rb index ba2764e7a8..ce070018e9 100644 --- a/test/lib/docs/filters/core/apply_base_url_test.rb +++ b/test/lib/docs/filters/core/apply_base_url_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class ApplyBaseUrlFilterTest < MiniTest::Spec +class ApplyBaseUrlFilterTest < Minitest::Spec include FilterTestHelper self.filter_class = Docs::ApplyBaseUrlFilter self.filter_type = 'html' diff --git a/test/lib/docs/filters/core/clean_html_test.rb b/test/lib/docs/filters/core/clean_html_test.rb index 2d3c9f8add..a1a47013d2 100644 --- a/test/lib/docs/filters/core/clean_html_test.rb +++ b/test/lib/docs/filters/core/clean_html_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class CleanHtmlFilterTest < MiniTest::Spec +class CleanHtmlFilterTest < Minitest::Spec include FilterTestHelper self.filter_class = Docs::CleanHtmlFilter diff --git a/test/lib/docs/filters/core/clean_text_test.rb b/test/lib/docs/filters/core/clean_text_test.rb index 7babf15e48..4126b88686 100644 --- a/test/lib/docs/filters/core/clean_text_test.rb +++ b/test/lib/docs/filters/core/clean_text_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class CleanTextFilterTest < MiniTest::Spec +class CleanTextFilterTest < Minitest::Spec include FilterTestHelper self.filter_class = Docs::CleanTextFilter diff --git a/test/lib/docs/filters/core/container_test.rb b/test/lib/docs/filters/core/container_test.rb index 7d4993e8b4..d1cc3ab437 100644 --- a/test/lib/docs/filters/core/container_test.rb +++ b/test/lib/docs/filters/core/container_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class ContainerFilterTest < MiniTest::Spec +class ContainerFilterTest < Minitest::Spec include FilterTestHelper self.filter_class = Docs::ContainerFilter self.filter_type = 'html' diff --git a/test/lib/docs/filters/core/entries_test.rb b/test/lib/docs/filters/core/entries_test.rb index e33f778d01..95951e1144 100644 --- a/test/lib/docs/filters/core/entries_test.rb +++ b/test/lib/docs/filters/core/entries_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class EntriesFilterTest < MiniTest::Spec +class EntriesFilterTest < Minitest::Spec include FilterTestHelper self.filter_class = Docs::EntriesFilter diff --git a/test/lib/docs/filters/core/inner_html_test.rb b/test/lib/docs/filters/core/inner_html_test.rb index bbd4095848..74fbc9c72f 100644 --- a/test/lib/docs/filters/core/inner_html_test.rb +++ b/test/lib/docs/filters/core/inner_html_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class InnerHtmlFilterTest < MiniTest::Spec +class InnerHtmlFilterTest < Minitest::Spec include FilterTestHelper self.filter_class = Docs::InnerHtmlFilter diff --git a/test/lib/docs/filters/core/internal_urls_test.rb b/test/lib/docs/filters/core/internal_urls_test.rb index c9194e09e0..9888c9fe67 100644 --- a/test/lib/docs/filters/core/internal_urls_test.rb +++ b/test/lib/docs/filters/core/internal_urls_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class InternalUrlsFilterTest < MiniTest::Spec +class InternalUrlsFilterTest < Minitest::Spec include FilterTestHelper self.filter_class = Docs::InternalUrlsFilter diff --git a/test/lib/docs/filters/core/normalize_paths_test.rb b/test/lib/docs/filters/core/normalize_paths_test.rb index 6d407f2b0b..1fc8272128 100644 --- a/test/lib/docs/filters/core/normalize_paths_test.rb +++ b/test/lib/docs/filters/core/normalize_paths_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class NormalizePathsFilterTest < MiniTest::Spec +class NormalizePathsFilterTest < Minitest::Spec include FilterTestHelper self.filter_class = Docs::NormalizePathsFilter diff --git a/test/lib/docs/filters/core/normalize_urls_test.rb b/test/lib/docs/filters/core/normalize_urls_test.rb index 804b05b159..0122c8fcc7 100644 --- a/test/lib/docs/filters/core/normalize_urls_test.rb +++ b/test/lib/docs/filters/core/normalize_urls_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class NormalizeUrlsFilterTest < MiniTest::Spec +class NormalizeUrlsFilterTest < Minitest::Spec include FilterTestHelper self.filter_class = Docs::NormalizeUrlsFilter diff --git a/test/lib/docs/filters/core/parse_cf_email_test.rb b/test/lib/docs/filters/core/parse_cf_email_test.rb index d6124fedac..7f2485822b 100644 --- a/test/lib/docs/filters/core/parse_cf_email_test.rb +++ b/test/lib/docs/filters/core/parse_cf_email_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class ParseCfEmailFilterTest < MiniTest::Spec +class ParseCfEmailFilterTest < Minitest::Spec include FilterTestHelper self.filter_class = Docs::ParseCfEmailFilter diff --git a/test/lib/docs/filters/core/title_test.rb b/test/lib/docs/filters/core/title_test.rb index 9a28bd3bee..24189555a0 100644 --- a/test/lib/docs/filters/core/title_test.rb +++ b/test/lib/docs/filters/core/title_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class TitleFilterTest < MiniTest::Spec +class TitleFilterTest < Minitest::Spec include FilterTestHelper self.filter_class = Docs::TitleFilter diff --git a/test/lib/docs/storage/abstract_store_test.rb b/test/lib/docs/storage/abstract_store_test.rb index d63e95f226..2bdf391e70 100644 --- a/test/lib/docs/storage/abstract_store_test.rb +++ b/test/lib/docs/storage/abstract_store_test.rb @@ -1,7 +1,7 @@ require_relative '../../../test_helper' require_relative '../../../../lib/docs' -class DocsAbstractStoreTest < MiniTest::Spec +class DocsAbstractStoreTest < Minitest::Spec InvalidPathError = Docs::AbstractStore::InvalidPathError LockError = Docs::AbstractStore::LockError diff --git a/test/lib/docs/storage/file_store_test.rb b/test/lib/docs/storage/file_store_test.rb index aa3ce3f8ec..1068b7d745 100644 --- a/test/lib/docs/storage/file_store_test.rb +++ b/test/lib/docs/storage/file_store_test.rb @@ -1,7 +1,7 @@ require_relative '../../../test_helper' require_relative '../../../../lib/docs' -class DocsFileStoreTest < MiniTest::Spec +class DocsFileStoreTest < Minitest::Spec let :store do Docs::FileStore.new(tmp_path) end diff --git a/test/test_helper.rb b/test/test_helper.rb index 9987c98ca2..a35ee2b250 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -21,7 +21,7 @@ ActiveSupport::TestCase.test_order = :random -class MiniTest::Spec +class Minitest::Spec include ActiveSupport::Testing::Assertions parallelize_me! From 146d1d09f8dffe4761865cf56fea059153a4fe45 Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Fri, 29 Dec 2023 16:35:59 +0100 Subject: [PATCH 11/26] enable TSLV --- test/test_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_helper.rb b/test/test_helper.rb index a35ee2b250..73e2162bc1 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -54,6 +54,6 @@ def rm_tmp Datadog.configure do |c| c.service = "devdocs" c.ci.enabled = true - # c.ci.experimental_test_suite_level_visibility_enabled = true + c.ci.experimental_test_suite_level_visibility_enabled = true c.ci.instrument :minitest end From 899119a4d38cb3b56c934f7fe7044501e3407d28 Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Fri, 29 Dec 2023 16:39:56 +0100 Subject: [PATCH 12/26] turn off TSLV --- test/test_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_helper.rb b/test/test_helper.rb index 73e2162bc1..30db7af08d 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -54,6 +54,6 @@ def rm_tmp Datadog.configure do |c| c.service = "devdocs" c.ci.enabled = true - c.ci.experimental_test_suite_level_visibility_enabled = true + c.ci.experimental_test_suite_level_visibility_enabled = false c.ci.instrument :minitest end From a60b62cf2400a8977cfd2f04d151d4692b45483f Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Fri, 29 Dec 2023 16:44:19 +0100 Subject: [PATCH 13/26] enable TSLV --- test/test_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_helper.rb b/test/test_helper.rb index 30db7af08d..73e2162bc1 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -54,6 +54,6 @@ def rm_tmp Datadog.configure do |c| c.service = "devdocs" c.ci.enabled = true - c.ci.experimental_test_suite_level_visibility_enabled = false + c.ci.experimental_test_suite_level_visibility_enabled = true c.ci.instrument :minitest end From 5b030d4c34754ed847b7666315bd855bca0f481b Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Fri, 29 Dec 2023 16:50:22 +0100 Subject: [PATCH 14/26] xxx From 2025de84cf7bba09399e5369fc141d50c264d6d6 Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Fri, 29 Dec 2023 17:28:33 +0100 Subject: [PATCH 15/26] remove auto instrument for easier debugging --- test/test_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_helper.rb b/test/test_helper.rb index 73e2162bc1..f233eaf8e6 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -13,7 +13,7 @@ require 'rr' require "datadog/ci" -require "ddtrace/auto_instrument" +# require "ddtrace/auto_instrument" Dir[File.dirname(__FILE__) + '/support/*.rb'].each do |file| autoload File.basename(file, '.rb').camelize, file From 47370079b877dbd83fea32f48bc680c9df5938eb Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Fri, 29 Dec 2023 18:18:20 +0100 Subject: [PATCH 16/26] again From 9c6e97ddb4f16ae665389075bae38d10c7c2df31 Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Fri, 29 Dec 2023 18:24:40 +0100 Subject: [PATCH 17/26] new test run From 8989d6b0cdb0a21e6f4ca2bcae30b3af693c8f43 Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Fri, 29 Dec 2023 18:30:39 +0100 Subject: [PATCH 18/26] test with increased buffer size From c339195bb8d94f2ad2ec3f9edd52a60a605bdb19 Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Wed, 3 Jan 2024 09:08:47 +0100 Subject: [PATCH 19/26] another try with parallel detection changes From fb09e89f4f4d4800f0e81bfba848122a3eee7980 Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Mon, 22 Jan 2024 15:28:29 +0100 Subject: [PATCH 20/26] remove deprecated option, update ddtrace --- Gemfile.lock | 12 ++++++------ test/test_helper.rb | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ef01bac792..74d9f7694c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,11 +1,11 @@ GIT remote: https://github.com/DataDog/dd-trace-rb.git - revision: 572c94bcdf53d138d85085c56f675865af6354bd + revision: 916472f9db3d73fa92ad068df7495f25c7a45f86 ref: master specs: - ddtrace (1.18.0) - datadog-ci (~> 0.5.0) - debase-ruby_core_source (= 3.2.3) + ddtrace (1.19.0) + datadog-ci (~> 0.6.0) + debase-ruby_core_source (= 3.3.1) libdatadog (~> 5.0.0.1.0) libddwaf (~> 1.14.0.0.0) msgpack @@ -13,7 +13,7 @@ GIT PATH remote: ../datadog-ci-rb specs: - datadog-ci (0.5.1) + datadog-ci (0.6.0) msgpack GEM @@ -38,7 +38,7 @@ GEM coffee-script-source (1.12.2) concurrent-ruby (1.1.10) daemons (1.4.1) - debase-ruby_core_source (3.2.3) + debase-ruby_core_source (3.3.1) erubi (1.12.0) ethon (0.16.0) ffi (>= 1.15.0) diff --git a/test/test_helper.rb b/test/test_helper.rb index f233eaf8e6..e88beda73e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -54,6 +54,5 @@ def rm_tmp Datadog.configure do |c| c.service = "devdocs" c.ci.enabled = true - c.ci.experimental_test_suite_level_visibility_enabled = true c.ci.instrument :minitest end From 426ff9591ca4a5f0c5385af8c501814b1a09ef9f Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Thu, 25 Jan 2024 13:52:20 +0100 Subject: [PATCH 21/26] ga test From ba01f79b001868c7d97e70eaea6f71918d7b4b85 Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Thu, 25 Jan 2024 16:17:24 +0100 Subject: [PATCH 22/26] pre ga test 2 From 00063d2c03a95f3adb9ad3274950754d7e3de1ab Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Thu, 7 Mar 2024 17:21:14 +0100 Subject: [PATCH 23/26] ruby 3.3.0 --- .ruby-version | 2 +- Gemfile | 2 +- Gemfile.lock | 14 +++++++------- test/test_helper.rb | 5 ++--- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.ruby-version b/.ruby-version index be94e6f53d..15a2799817 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.2 +3.3.0 diff --git a/Gemfile b/Gemfile index 8f409bc3a3..101853f0ae 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -ruby '3.2.2' +ruby '3.3.0' gem 'activesupport', require: false gem 'html-pipeline' diff --git a/Gemfile.lock b/Gemfile.lock index 74d9f7694c..f90a68298e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,19 +1,19 @@ GIT remote: https://github.com/DataDog/dd-trace-rb.git - revision: 916472f9db3d73fa92ad068df7495f25c7a45f86 + revision: 44b9c6cfb8d19a4aac43c637700d42e970484c2e ref: master specs: - ddtrace (1.19.0) - datadog-ci (~> 0.6.0) + ddtrace (1.20.0) + datadog-ci (~> 0.7.0) debase-ruby_core_source (= 3.3.1) - libdatadog (~> 5.0.0.1.0) + libdatadog (~> 6.0.0.2.0) libddwaf (~> 1.14.0.0.0) msgpack PATH remote: ../datadog-ci-rb specs: - datadog-ci (0.6.0) + datadog-ci (0.7.0) msgpack GEM @@ -64,7 +64,7 @@ GEM image_optim (~> 0.19) image_size (3.2.0) in_threads (1.6.0) - libdatadog (5.0.0.1.0) + libdatadog (6.0.0.2.0) libddwaf (1.14.0.0.0) ffi (~> 1.0) method_source (1.0.0) @@ -205,7 +205,7 @@ DEPENDENCIES yajl-ruby RUBY VERSION - ruby 3.2.2p53 + ruby 3.3.0p0 BUNDLED WITH 2.4.6 diff --git a/test/test_helper.rb b/test/test_helper.rb index e88beda73e..c4ac0a7df0 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -5,6 +5,8 @@ $LOAD_PATH.unshift 'lib' +require "datadog/ci" + require 'minitest/autorun' require 'minitest/pride' require 'active_support' @@ -12,9 +14,6 @@ require 'active_support/testing/assertions' require 'rr' -require "datadog/ci" -# require "ddtrace/auto_instrument" - Dir[File.dirname(__FILE__) + '/support/*.rb'].each do |file| autoload File.basename(file, '.rb').camelize, file end From 0469dcaacd2b3b297764c93bfb05a5e2a2a23149 Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Thu, 21 Nov 2024 15:46:15 +0100 Subject: [PATCH 24/26] update datadog gems --- Gemfile | 4 ++-- Gemfile.lock | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Gemfile b/Gemfile index 101853f0ae..e553be81fe 100644 --- a/Gemfile +++ b/Gemfile @@ -52,8 +52,8 @@ group :test do gem 'rack-test', require: false gem 'rr', require: false - gem "datadog-ci", :path => "../datadog-ci-rb" - gem "ddtrace", :github => "DataDog/dd-trace-rb", :ref => "master" + gem "datadog-ci", :path => "../../p/datadog-ci-rb" + gem "datadog", :github => "DataDog/dd-trace-rb", :ref => "master" end if ENV['SELENIUM'] == '1' diff --git a/Gemfile.lock b/Gemfile.lock index f90a68298e..a3d879f9d4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,19 +1,19 @@ GIT remote: https://github.com/DataDog/dd-trace-rb.git - revision: 44b9c6cfb8d19a4aac43c637700d42e970484c2e + revision: 0dec3428ff3ffbdd49b89f7f1b4cf58492cc39fa ref: master specs: - ddtrace (1.20.0) - datadog-ci (~> 0.7.0) - debase-ruby_core_source (= 3.3.1) - libdatadog (~> 6.0.0.2.0) - libddwaf (~> 1.14.0.0.0) + datadog (2.7.0) + datadog-ruby_core_source (~> 3.3) + libdatadog (~> 14.1.0.1.0) + libddwaf (~> 1.15.0.0.0) msgpack PATH - remote: ../datadog-ci-rb + remote: ../../p/datadog-ci-rb specs: - datadog-ci (0.7.0) + datadog-ci (1.8.1) + datadog (~> 2.4) msgpack GEM @@ -38,7 +38,7 @@ GEM coffee-script-source (1.12.2) concurrent-ruby (1.1.10) daemons (1.4.1) - debase-ruby_core_source (3.3.1) + datadog-ruby_core_source (3.3.6) erubi (1.12.0) ethon (0.16.0) ffi (>= 1.15.0) @@ -64,13 +64,13 @@ GEM image_optim (~> 0.19) image_size (3.2.0) in_threads (1.6.0) - libdatadog (6.0.0.2.0) - libddwaf (1.14.0.0.0) + libdatadog (14.1.0.1.0) + libddwaf (1.15.0.0.0) ffi (~> 1.0) method_source (1.0.0) mini_portile2 (2.8.4) minitest (5.20.0) - msgpack (1.7.2) + msgpack (1.7.5) multi_json (1.15.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) @@ -170,8 +170,8 @@ DEPENDENCIES browser chunky_png coffee-script + datadog! datadog-ci! - ddtrace! erubi html-pipeline image_optim From dec6e6e233601ea4a12845e3cbfac4b1942f1f33 Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Fri, 22 Nov 2024 12:30:48 +0100 Subject: [PATCH 25/26] remove manual datadog instrumentation --- test/test_helper.rb | 8 -------- 1 file changed, 8 deletions(-) diff --git a/test/test_helper.rb b/test/test_helper.rb index c4ac0a7df0..19b511604c 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -5,8 +5,6 @@ $LOAD_PATH.unshift 'lib' -require "datadog/ci" - require 'minitest/autorun' require 'minitest/pride' require 'active_support' @@ -49,9 +47,3 @@ def rm_tmp Minitest.after_run do rm_tmp end - -Datadog.configure do |c| - c.service = "devdocs" - c.ci.enabled = true - c.ci.instrument :minitest -end From 96c52109a8c28f35c510f0673db81fb240171467 Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Fri, 22 Nov 2024 12:32:12 +0100 Subject: [PATCH 26/26] small change --- test/test_helper.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/test/test_helper.rb b/test/test_helper.rb index 19b511604c..34486aec4d 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -22,7 +22,6 @@ class Minitest::Spec include ActiveSupport::Testing::Assertions parallelize_me! - module DSL def context(*args, &block) describe(*args, &block)