Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: DataDog/dd-trace-rb
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.5.1
Choose a base ref
...
head repository: DataDog/dd-trace-rb
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.5.2
Choose a head ref
  • 18 commits
  • 266 files changed
  • 3 contributors

Commits on Oct 19, 2022

  1. Merge pull request #2322 from DataDog/bump_to_version_1.5.1 

    Bump to version 1.5.1
    @lloeki
    lloeki committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    de13078 View commit details
    Browse the repository at this point in the history

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

  8. Handle REQUEST_URI with base url 

    This has been reported to happen on WEBrick, it may happen in other ways
depending on how the variable is set.
    @lloeki
    lloeki committed Oct 26, 2022
    Configuration menu
    Copy the full SHA
    e38bf92 View commit details
    Browse the repository at this point in the history

  9. Add unit testing

    @marcotc @lloeki
    marcotc authored and lloeki committed Oct 26, 2022
    Configuration menu
    Copy the full SHA
    edb2e3f View commit details
    Browse the repository at this point in the history

  10. Merge pull request #2332 from DataDog/backport/2327 

    Backport #2327
    @lloeki
    lloeki committed Oct 26, 2022
    Configuration menu
    Copy the full SHA
    b11eb37 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #2330 from DataDog/backport/2328 

    Backport #2328
    @lloeki
    lloeki committed Oct 26, 2022
    Configuration menu
    Copy the full SHA
    de0697d View commit details
    Browse the repository at this point in the history

  12. Merge pull request #2331 from DataDog/backport/2321 

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

Commits on Oct 27, 2022

  1. Added: 1.5.2 to CHANGELOG.md

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

  2. Bumping version 1.5.1 to 1.5.2

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

  3. Updated: gemfiles for 1.5.2

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

  4. Workaround issue with rspec-mocks 3.12.0 

    The same issue we ran into in #2327 is present on the newly-released
rspec-mocks 3.12.0.

I have not yet reported this upstream, but want to unblock our CI.
    @ivoanjo @lloeki
    ivoanjo authored and lloeki committed Oct 27, 2022
    Configuration menu
    Copy the full SHA
    4128584 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #2338 from DataDog/bump_to_version_1.5.2 

    Bump to version 1.5.2
    @lloeki
    lloeki committed Oct 27, 2022
    Configuration menu
    Copy the full SHA
    15125bc View commit details
    Browse the repository at this point in the history
Loading