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 #2321 #2331

Merged
merged 7 commits into from
Oct 26, 2022
Merged

Backport #2321 #2331

merged 7 commits into from
Oct 26, 2022

Conversation

lloeki
Copy link
Contributor

@lloeki lloeki commented Oct 26, 2022

What does this PR do?

Backport #2321

Motivation

Rapid opt-in fix for out of band release.

@lloeki lloeki requested a review from a team October 26, 2022 11:48
@github-actions github-actions bot added appsec Application Security monitoring product core Involves Datadog core libraries integrations Involves tracing integrations tracing labels Oct 26, 2022
@lloeki lloeki changed the title Backport/2321 Backport #2321 Oct 26, 2022
ivoanjo and others added 7 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 removes the `_HEADER` part inconsistent with the configuration
setting.
@lloeki
Copy link
Contributor Author

lloeki commented Oct 26, 2022

Needs #2332 to be merged first

@lloeki lloeki merged commit 4a25d31 into 1.5-stable Oct 26, 2022
@lloeki lloeki deleted the backport/2321 branch October 26, 2022 13:27
@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
appsec Application Security monitoring product core Involves Datadog core libraries integrations Involves tracing integrations tracing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants