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

Jump to bottom

Backport #2321 #2331

Merged
merged 7 commits into from
Oct 26, 2022
Merged

Backport #2321 #2331

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fc1dc4b
Avoid using problematic rspec-mocks 3.11.2
ivoanjo Oct 25, 2022
b366384
Avoid using pry-byebug on legacy rubies
ivoanjo Oct 25, 2022
679e81a
Default to disable http.client_ip tag collection
lloeki Oct 19, 2022
27a9d2c
Collect client IP unconditionally in AppSec
lloeki Oct 24, 2022
4c373e4
Change client ip env var to ENABLED
lloeki Oct 25, 2022
1c0c6ab
Disable Metrics/AbcSize for event recording
lloeki Oct 25, 2022
59203ec
Use DD_TRACE_CLIENT_IP_ENABLED as an env var
lloeki Oct 25, 2022
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
Next Next commit
Avoid using problematic rspec-mocks 3.11.2 
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.
  • Loading branch information
@ivoanjo @lloeki
ivoanjo authored and lloeki committed Oct 26, 2022
commit fc1dc4bd0ace1814e38acbb10b230d5e20c17b92
3 changes: 2 additions & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ end
gem 'rake', '>= 10.5'
gem 'rake-compiler', '~> 1.1', '>= 1.1.1' # To compile native extensions
gem 'redcarpet', '~> 3.4' if RUBY_PLATFORM != 'java'
gem 'rspec', '~> 3.10'
gem 'rspec', '~> 3.11'
gem 'rspec-collection_matchers', '~> 1.1'
gem 'rspec-mocks', '!= 3.11.2'
if RUBY_VERSION >= '2.3.0'
gem 'rspec_junit_formatter', '>= 0.5.1'
else
Expand Down