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.

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

Move simplecov patch to an overlay in our tree instead of using a forked simplecov repo #4263

Merged
merged 4 commits into from
Jan 8, 2025

Conversation

p-datadog
Copy link
Member

@p-datadog p-datadog commented Jan 7, 2025

What does this PR do?

Moves the patch for simplecov not being able to combine jruby and MRI coverage reports to our repo.

Motivation:

bundler is constantly asking to reinstall simplecov from the fork

Change log entry
None

Additional Notes:

How to test the change?

Copy link

github-actions bot commented Jan 7, 2025

Thank you for updating Change log entry section 👏

Visited at: 2025-01-08 05:00:05 UTC

@datadog-datadog-prod-us1
Copy link
Contributor

datadog-datadog-prod-us1 bot commented Jan 7, 2025

Datadog Report

Branch report: simplecov-overlay-patch
Commit report: ee1a753
Test service: dd-trace-rb

✅ 0 Failed, 22497 Passed, 1488 Skipped, 6m 1.72s Total Time
❄️ 1 New Flaky

New Flaky Tests (1)

  • Server internal tracer traces the looping scheduled wait - rspec - Last Failure

    Expand for error
     Wait time exhausted!
     
     Failure/Error: raise('Wait time exhausted!')
     
     RuntimeError:
       Wait time exhausted!
     ./spec/support/synchronization_helpers.rb:97:in \`try_wait_until'
     ./spec/support/synchronization_helpers.rb:26:in \`expect_in_fork'
     ./spec/datadog/tracing/contrib/sidekiq/support/helper.rb:52:in \`expect_in_sidekiq_server'
     ./spec/datadog/tracing/contrib/sidekiq/server_internal_tracer/scheduled_poller_spec.rb:49:in \`block (2 levels) in <top (required)>'
     ...
    

@pr-commenter
Copy link

pr-commenter bot commented Jan 7, 2025

Benchmarks

Benchmark execution time: 2025-01-08 05:23:45

Comparing candidate commit ee1a753 in PR branch simplecov-overlay-patch with baseline commit d5f88ea in branch master.

Found 0 performance improvements and 0 performance regressions! Performance is the same for 31 metrics, 2 unstable metrics.

@p-datadog p-datadog force-pushed the simplecov-overlay-patch branch from 904c45a to 5e01e5b Compare January 7, 2025 21:59
@codecov-commenter
Copy link

codecov-commenter commented Jan 7, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 97.75%. Comparing base (9605f99) to head (ee1a753).
Report is 3 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #4263   +/-   ##
=======================================
  Coverage   97.74%   97.75%           
=======================================
  Files        1353     1353           
  Lines       82392    82392           
  Branches     4224     4224           
=======================================
+ Hits        80536    80540    +4     
+ Misses       1856     1852    -4     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@p-datadog p-datadog marked this pull request as ready for review January 8, 2025 05:00
@p-datadog p-datadog requested a review from a team as a code owner January 8, 2025 05:00
Copy link
Member

@ivoanjo ivoanjo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 LGTM. This workaround seems much nicer than needing to carry our own fork just for simplecov-ruby/simplecov#972 .

Copy link
Contributor

@TonyCTHsu TonyCTHsu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome!

@p-datadog p-datadog merged commit b86820e into master Jan 8, 2025
347 checks passed
@p-datadog p-datadog deleted the simplecov-overlay-patch branch January 8, 2025 14:32
@github-actions github-actions bot added this to the 2.9.0 milestone Jan 8, 2025
p-datadog pushed a commit to p-datadog/dd-trace-rb that referenced this pull request Jan 9, 2025
* master:
  DEBUG-3210 DI: change logging to be appropriate for customer inspection (DataDog#4266)
  Report timing information if try_wait_until times out (DataDog#4265)
  Move simplecov patch to an overlay in our tree instead of using a forked simplecov repo (DataDog#4263)
  DEBUG-3251 dependency inject logger into DI component (DataDog#4262)
  DEBUG-3182 move Rails utils to core (DataDog#4261)
  add supported versions workflow (DataDog#4210)
  DEBUG-3305 remove dependency on benchmark (DataDog#4259)
  Fix case & grammar in issue template (DataDog#4244)
  [🤖] Update Latest Dependency: https://github.com/DataDog/dd-trace-rb/actions/runs/12614773826
This was referenced Jan 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants