Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NO-TICKET] automatically trace with correct time even when time is stubbed by timecop #185

Merged
merged 4 commits into from
May 30, 2024
Merged

[NO-TICKET] automatically trace with correct time even when time is stubbed by timecop #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
37e4658
automatically detect timecop when configuring CI mode and set time_no…
anmarchenko May 29, 2024
117dd87
ignore Lint/ConstantDefinitionInBlock when defining minitest test case
anmarchenko May 29, 2024
f8ebeb0
remove timecop from this project's tests
anmarchenko May 30, 2024
4fa4efb
add missing timecop require
anmarchenko May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .standard_todo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ ignore:
- Style/Alias
- spec/datadog/ci/contrib/minitest/instrumentation_spec.rb:
- Lint/ConstantDefinitionInBlock
- spec/datadog/ci/contrib/timecop/instrumentation_spec.rb:
- Lint/ConstantDefinitionInBlock
11 changes: 11 additions & 0 deletions Appraisals
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,16 @@ def self.with_selenium_gem(selenium_versions: 4, capybara_versions: 3)
end
end

def self.with_timecop_gem(timecop_versions: 0)
Array(timecop_versions).each do |timecop_v|
appraise "timecop-#{timecop_v}" do
gem "timecop", "~> #{timecop_v}"

gem "minitest", "~> 5"
end
end
end

ruby_version = Gem::Version.new(RUBY_ENGINE_VERSION)
major, minor, = ruby_version.segments

Expand All @@ -161,6 +171,7 @@ with_minitest_shoulda_context_gem if ruby_version >= Gem::Version.new("3.1")
with_active_support_gem(versions: 4..7)
with_knapsack_pro_rspec_gem
with_selenium_gem if ruby_version >= Gem::Version.new("3.0")
with_timecop_gem

ruby_runtime = "#{RUBY_ENGINE}-#{major}.#{minor}"

Expand Down
4 changes: 1 addition & 3 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@ gem "os"
# To compile native extensions
gem "rake-compiler"

gem "climate_control"

gem "rspec"
gem "rspec-collection_matchers"
gem "rspec_junit_formatter"
gem "climate_control"
gem "appraisal"
gem "timecop"

gem "standard", "~> 1.31"

Expand Down
6 changes: 5 additions & 1 deletion Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ TEST_METADATA = {
},
"selenium" => {
"selenium-4-capybara-3" => "❌ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby"
},
"timecop" => {
"timecop-0" => "✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby"
}
}

Expand Down Expand Up @@ -140,7 +143,8 @@ namespace :spec do
:ci_queue_rspec,
:knapsack_rspec,
:knapsack_rspec_go,
:selenium
:selenium,
:timecop
].each do |contrib|
desc "" # "Explicitly hiding from `rake -T`"
RSpec::Core::RakeTask.new(contrib) do |t, args|
Expand Down
1 change: 1 addition & 0 deletions Steepfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,5 @@ target :lib do
library "bundler"
library "selenium-webdriver"
library "capybara"
library "timecop"
end
3 changes: 1 addition & 2 deletions gemfiles/jruby_9.4_activesupport_4.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ gem "pry"
gem "rake"
gem "os"
gem "rake-compiler"
gem "climate_control"
gem "rspec"
gem "rspec-collection_matchers"
gem "rspec_junit_formatter"
gem "climate_control"
gem "appraisal"
gem "timecop"
gem "standard", "~> 1.31"
gem "yard"
gem "webrick"
Expand Down
2 changes: 0 additions & 2 deletions gemfiles/jruby_9.4_activesupport_4.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ GEM
strscan (3.1.0-java)
thor (1.3.1)
thread_safe (0.3.6-java)
timecop (0.9.8)
tzinfo (1.2.11)
thread_safe (~> 0.1)
unicode-display_width (2.5.0)
Expand All @@ -147,7 +146,6 @@ DEPENDENCIES
simplecov
simplecov-cobertura (~> 2.1.0)
standard (~> 1.31)
timecop
webrick
yard

Expand Down
3 changes: 1 addition & 2 deletions gemfiles/jruby_9.4_activesupport_5.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ gem "pry"
gem "rake"
gem "os"
gem "rake-compiler"
gem "climate_control"
gem "rspec"
gem "rspec-collection_matchers"
gem "rspec_junit_formatter"
gem "climate_control"
gem "appraisal"
gem "timecop"
gem "standard", "~> 1.31"
gem "yard"
gem "webrick"
Expand Down
2 changes: 0 additions & 2 deletions gemfiles/jruby_9.4_activesupport_5.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ GEM
strscan (3.1.0-java)
thor (1.3.1)
thread_safe (0.3.6-java)
timecop (0.9.8)
tzinfo (1.2.11)
thread_safe (~> 0.1)
unicode-display_width (2.5.0)
Expand All @@ -147,7 +146,6 @@ DEPENDENCIES
simplecov
simplecov-cobertura (~> 2.1.0)
standard (~> 1.31)
timecop
webrick
yard

Expand Down
3 changes: 1 addition & 2 deletions gemfiles/jruby_9.4_activesupport_6.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ gem "pry"
gem "rake"
gem "os"
gem "rake-compiler"
gem "climate_control"
gem "rspec"
gem "rspec-collection_matchers"
gem "rspec_junit_formatter"
gem "climate_control"
gem "appraisal"
gem "timecop"
gem "standard", "~> 1.31"
gem "yard"
gem "webrick"
Expand Down
2 changes: 0 additions & 2 deletions gemfiles/jruby_9.4_activesupport_6.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ GEM
rubocop-performance (~> 1.21.0)
strscan (3.1.0-java)
thor (1.3.1)
timecop (0.9.8)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
Expand Down Expand Up @@ -148,7 +147,6 @@ DEPENDENCIES
simplecov
simplecov-cobertura (~> 2.1.0)
standard (~> 1.31)
timecop
webrick
yard

Expand Down
3 changes: 1 addition & 2 deletions gemfiles/jruby_9.4_activesupport_7.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ gem "pry"
gem "rake"
gem "os"
gem "rake-compiler"
gem "climate_control"
gem "rspec"
gem "rspec-collection_matchers"
gem "rspec_junit_formatter"
gem "climate_control"
gem "appraisal"
gem "timecop"
gem "standard", "~> 1.31"
gem "yard"
gem "webrick"
Expand Down
2 changes: 0 additions & 2 deletions gemfiles/jruby_9.4_activesupport_7.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ GEM
rubocop-performance (~> 1.21.0)
strscan (3.1.0-java)
thor (1.3.1)
timecop (0.9.8)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
Expand All @@ -155,7 +154,6 @@ DEPENDENCIES
simplecov
simplecov-cobertura (~> 2.1.0)
standard (~> 1.31)
timecop
webrick
yard

Expand Down
3 changes: 1 addition & 2 deletions gemfiles/jruby_9.4_ci_queue_0_minitest_5.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ gem "pry"
gem "rake"
gem "os"
gem "rake-compiler"
gem "climate_control"
gem "rspec"
gem "rspec-collection_matchers"
gem "rspec_junit_formatter"
gem "climate_control"
gem "appraisal"
gem "timecop"
gem "standard", "~> 1.31"
gem "yard"
gem "webrick"
Expand Down
2 changes: 0 additions & 2 deletions gemfiles/jruby_9.4_ci_queue_0_minitest_5.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ GEM
rubocop-performance (~> 1.21.0)
strscan (3.1.0-java)
thor (1.3.1)
timecop (0.9.8)
unicode-display_width (2.5.0)
webrick (1.8.1)
yard (0.9.36)
Expand All @@ -144,7 +143,6 @@ DEPENDENCIES
simplecov
simplecov-cobertura (~> 2.1.0)
standard (~> 1.31)
timecop
webrick
yard

Expand Down
3 changes: 1 addition & 2 deletions gemfiles/jruby_9.4_ci_queue_0_rspec_3.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ gem "pry"
gem "rake"
gem "os"
gem "rake-compiler"
gem "climate_control"
gem "rspec", "~> 3"
gem "rspec-collection_matchers"
gem "rspec_junit_formatter"
gem "climate_control"
gem "appraisal"
gem "timecop"
gem "standard", "~> 1.31"
gem "yard"
gem "webrick"
Expand Down
2 changes: 0 additions & 2 deletions gemfiles/jruby_9.4_ci_queue_0_rspec_3.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ GEM
rubocop-performance (~> 1.21.0)
strscan (3.1.0-java)
thor (1.3.1)
timecop (0.9.8)
unicode-display_width (2.5.0)
webrick (1.8.1)
yard (0.9.36)
Expand All @@ -134,7 +133,6 @@ DEPENDENCIES
simplecov
simplecov-cobertura (~> 2.1.0)
standard (~> 1.31)
timecop
webrick
yard

Expand Down
3 changes: 1 addition & 2 deletions gemfiles/jruby_9.4_cucumber_3.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ gem "pry"
gem "rake"
gem "os"
gem "rake-compiler"
gem "climate_control"
gem "rspec"
gem "rspec-collection_matchers"
gem "rspec_junit_formatter"
gem "climate_control"
gem "appraisal"
gem "timecop"
gem "standard", "~> 1.31"
gem "yard"
gem "webrick"
Expand Down
2 changes: 0 additions & 2 deletions gemfiles/jruby_9.4_cucumber_3.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ GEM
rubocop-performance (~> 1.21.0)
strscan (3.1.0-java)
thor (1.3.1)
timecop (0.9.8)
unicode-display_width (2.5.0)
webrick (1.8.1)
yard (0.9.36)
Expand All @@ -154,7 +153,6 @@ DEPENDENCIES
simplecov
simplecov-cobertura (~> 2.1.0)
standard (~> 1.31)
timecop
webrick
yard

Expand Down
3 changes: 1 addition & 2 deletions gemfiles/jruby_9.4_cucumber_4.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ gem "pry"
gem "rake"
gem "os"
gem "rake-compiler"
gem "climate_control"
gem "rspec"
gem "rspec-collection_matchers"
gem "rspec_junit_formatter"
gem "climate_control"
gem "appraisal"
gem "timecop"
gem "standard", "~> 1.31"
gem "yard"
gem "webrick"
Expand Down
2 changes: 0 additions & 2 deletions gemfiles/jruby_9.4_cucumber_4.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ GEM
ffi (~> 1.1)
thor (1.3.1)
thread_safe (0.3.6-java)
timecop (0.9.8)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
Expand All @@ -187,7 +186,6 @@ DEPENDENCIES
simplecov
simplecov-cobertura (~> 2.1.0)
standard (~> 1.31)
timecop
webrick
yard

Expand Down
3 changes: 1 addition & 2 deletions gemfiles/jruby_9.4_cucumber_5.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ gem "pry"
gem "rake"
gem "os"
gem "rake-compiler"
gem "climate_control"
gem "rspec"
gem "rspec-collection_matchers"
gem "rspec_junit_formatter"
gem "climate_control"
gem "appraisal"
gem "timecop"
gem "standard", "~> 1.31"
gem "yard"
gem "webrick"
Expand Down
2 changes: 0 additions & 2 deletions gemfiles/jruby_9.4_cucumber_5.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ GEM
ffi (~> 1.1)
thor (1.3.1)
thread_safe (0.3.6-java)
timecop (0.9.8)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
Expand All @@ -187,7 +186,6 @@ DEPENDENCIES
simplecov
simplecov-cobertura (~> 2.1.0)
standard (~> 1.31)
timecop
webrick
yard

Expand Down
3 changes: 1 addition & 2 deletions gemfiles/jruby_9.4_cucumber_6.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ gem "pry"
gem "rake"
gem "os"
gem "rake-compiler"
gem "climate_control"
gem "rspec"
gem "rspec-collection_matchers"
gem "rspec_junit_formatter"
gem "climate_control"
gem "appraisal"
gem "timecop"
gem "standard", "~> 1.31"
gem "yard"
gem "webrick"
Expand Down
2 changes: 0 additions & 2 deletions gemfiles/jruby_9.4_cucumber_6.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ GEM
ffi (~> 1.1)
thor (1.3.1)
thread_safe (0.3.6-java)
timecop (0.9.8)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
Expand All @@ -191,7 +190,6 @@ DEPENDENCIES
simplecov
simplecov-cobertura (~> 2.1.0)
standard (~> 1.31)
timecop
webrick
yard

Expand Down
3 changes: 1 addition & 2 deletions gemfiles/jruby_9.4_cucumber_7.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ gem "pry"
gem "rake"
gem "os"
gem "rake-compiler"
gem "climate_control"
gem "rspec"
gem "rspec-collection_matchers"
gem "rspec_junit_formatter"
gem "climate_control"
gem "appraisal"
gem "timecop"
gem "standard", "~> 1.31"
gem "yard"
gem "webrick"
Expand Down
Loading
Loading