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

Backport #2328 #2330

Merged
merged 4 commits into from
Oct 26, 2022
Merged

Backport #2328 #2330

merged 4 commits into from
Oct 26, 2022

Conversation

lloeki
Copy link
Contributor

@lloeki lloeki commented Oct 26, 2022

What does this PR do?

Backport #2328

Motivation

Rapid crasher fix for out of band release.

@lloeki lloeki requested a review from a team October 26, 2022 11:46
@github-actions github-actions bot added integrations Involves tracing integrations tracing labels Oct 26, 2022
ivoanjo and others added 4 commits October 26, 2022 13:57
This version of rspec-mocks breaks CI for Ruby 2.7, 3.0 and 3.1 on
the following tests:

* ./spec/datadog/core/configuration_spec.rb:377 (Ruby 2.7)
* ./spec/datadog/core_spec.rb:35 (Ruby 2.7)
* ./spec/ddtrace/transport/http/builder_spec.rb:250 (Ruby 3.0, 3.1)

References:

* <https://app.circleci.com/pipelines/github/DataDog/dd-trace-rb/7560/workflows/24205733-d9fb-4781-962c-87499bad162d/jobs/280394>
* <https://app.circleci.com/pipelines/github/DataDog/dd-trace-rb/7560/workflows/24205733-d9fb-4781-962c-87499bad162d/jobs/280387>
* <https://app.circleci.com/pipelines/github/DataDog/dd-trace-rb/7560/workflows/24205733-d9fb-4781-962c-87499bad162d/jobs/280396>

I have not yet reported this upstream, but wanted to first unblock our
CI.
We already have something similar on the `Gemfile` for the gem but did not copy it
to the integration apps.

Bundler on Ruby 2.2 gets confused sometimes and tries to install a
more modern `byebug`/`pry-byebug` than it should:
<https://app.circleci.com/pipelines/github/DataDog/dd-trace-rb/7563/workflows/84415e5e-c561-4312-8e18-ff4d59394471/jobs/280478>
This has been reported to happen on WEBrick, it may happen in other ways
depending on how the variable is set.
@lloeki
Copy link
Contributor Author

lloeki commented Oct 26, 2022

Needs #2332 to be merged first

@codecov-commenter
Copy link

Codecov Report

Merging #2330 (edb2e3f) into 1.5-stable (de13078) will decrease coverage by 0.00%.
The diff coverage is 100.00%.

@@              Coverage Diff               @@
##           1.5-stable    #2330      +/-   ##
==============================================
- Coverage       98.31%   98.31%   -0.01%     
==============================================
  Files            1097     1097              
  Lines           58059    58069      +10     
==============================================
+ Hits            57081    57089       +8     
- Misses            978      980       +2     
Impacted Files Coverage Δ
lib/datadog/tracing/contrib/rack/middlewares.rb 99.20% <100.00%> (ø)
...c/datadog/tracing/contrib/rack/middlewares_spec.rb 100.00% <100.00%> (ø)
...adog/tracing/contrib/sidekiq/client_tracer_spec.rb 97.91% <0.00%> (-2.09%) ⬇️
...adog/tracing/contrib/sidekiq/server_tracer_spec.rb 99.16% <0.00%> (-0.84%) ⬇️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@lloeki lloeki merged commit de0697d into 1.5-stable Oct 26, 2022
@lloeki lloeki deleted the backport/2328 branch October 26, 2022 13:18
@lloeki lloeki added this to the 1.5.2 milestone Oct 27, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrations Involves tracing integrations tracing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants