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

merged 7 commits into from
Oct 26, 2022

Commits on Oct 26, 2022

  1. 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.
    @ivoanjo @lloeki
    ivoanjo authored and lloeki committed Oct 26, 2022
    Configuration menu
    Copy the full SHA
    fc1dc4b View commit details
    Browse the repository at this point in the history

  2. Avoid using pry-byebug on legacy rubies 

    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>
    @ivoanjo @lloeki
    ivoanjo authored and lloeki committed Oct 26, 2022
    Configuration menu
    Copy the full SHA
    b366384 View commit details
    Browse the repository at this point in the history

  3. Default to disable http.client_ip tag collection

    @lloeki
    lloeki committed Oct 26, 2022
    Configuration menu
    Copy the full SHA
    679e81a View commit details
    Browse the repository at this point in the history

  4. Collect client IP unconditionally in AppSec

    @lloeki
    lloeki committed Oct 26, 2022
    Configuration menu
    Copy the full SHA
    27a9d2c View commit details
    Browse the repository at this point in the history

  5. Change client ip env var to ENABLED

    @lloeki
    lloeki committed Oct 26, 2022
    Configuration menu
    Copy the full SHA
    4c373e4 View commit details
    Browse the repository at this point in the history

  6. Disable Metrics/AbcSize for event recording

    @lloeki
    lloeki committed Oct 26, 2022
    Configuration menu
    Copy the full SHA
    1c0c6ab View commit details
    Browse the repository at this point in the history

  7. Use DD_TRACE_CLIENT_IP_ENABLED as an env var 

    This removes the `_HEADER` part inconsistent with the configuration
setting.
    @lloeki
    lloeki committed Oct 26, 2022
    Configuration menu
    Copy the full SHA
    59203ec View commit details
    Browse the repository at this point in the history