Merge pull request #2338 from DataDog/bump_to_version_1.5.2

Bump to version 1.5.2
DataDog · Oct 27, 2022 · 15125bc · 15125bc
2 parents 4a25d31 + 4128584
commit 15125bc
Show file tree

Hide file tree

Showing 254 changed files with 273 additions and 254 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 ## [Unreleased]
 
+## [1.5.2] - 2022-10-27
+
+### Deprecation notice
+
+- `DD_TRACE_CLIENT_IP_HEADER_DISABLED` was changed to `DD_TRACE_CLIENT_IP_ENABLED`. Although the former still works we encourage usage of the latter instead.
+
+### Changed
+
+- `http.client_ip` tag collection is made opt-in for APM. Note that `http.client_ip` is always collected when ASM is enabled as part of the security service provided ([#2321][], [#2331][])
+
+### Fixed
+
+- Handle REQUEST_URI with base url ([#2328][], [#2330][])
+
 ## [1.5.1] - 2022-10-19
 
 ### Changed
@@ -2145,7 +2159,8 @@ Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.3.1
 
 Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 
-[Unreleased]: https://github.com/DataDog/dd-trace-rb/compare/v1.5.1...master
+[Unreleased]: https://github.com/DataDog/dd-trace-rb/compare/v1.5.2...master
+[1.5.2]: https://github.com/DataDog/dd-trace-rb/compare/v1.5.1...v1.5.2
 [1.5.1]: https://github.com/DataDog/dd-trace-rb/compare/v1.5.0...v1.5.1
 [1.5.0]: https://github.com/DataDog/dd-trace-rb/compare/v1.4.2...v1.5.0
 [1.4.1]: https://github.com/DataDog/dd-trace-rb/compare/v1.4.1...v1.4.2
@@ -3052,6 +3067,10 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [#2311]: https://github.com/DataDog/dd-trace-rb/issues/2311
 [#2318]: https://github.com/DataDog/dd-trace-rb/issues/2318
 [#2319]: https://github.com/DataDog/dd-trace-rb/issues/2319
+[#2321]: https://github.com/DataDog/dd-trace-rb/issues/2321
+[#2328]: https://github.com/DataDog/dd-trace-rb/issues/2328
+[#2330]: https://github.com/DataDog/dd-trace-rb/issues/2330
+[#2331]: https://github.com/DataDog/dd-trace-rb/issues/2331
 [@AdrianLC]: https://github.com/AdrianLC
 [@Azure7111]: https://github.com/Azure7111
 [@BabyGroot]: https://github.com/BabyGroot

diff --git a/Gemfile b/Gemfile
@@ -30,7 +30,7 @@ gem 'rake-compiler', '~> 1.1', '>= 1.1.1' # To compile native extensions
 gem 'redcarpet', '~> 3.4' if RUBY_PLATFORM != 'java'
 gem 'rspec', '~> 3.11'
 gem 'rspec-collection_matchers', '~> 1.1'
-gem 'rspec-mocks', '!= 3.11.2'
+gem 'rspec-mocks', ['!= 3.11.2', '!= 3.12.0'] # Temporary workaround for #2327
 if RUBY_VERSION >= '2.3.0'
   gem 'rspec_junit_formatter', '>= 0.5.1'
 else

diff --git a/gemfiles/jruby_9.2.18.0_contrib.gemfile.lock b/gemfiles/jruby_9.2.18.0_contrib.gemfile.lock
diff --git a/gemfiles/jruby_9.2.18.0_contrib_old.gemfile.lock b/gemfiles/jruby_9.2.18.0_contrib_old.gemfile.lock
diff --git a/gemfiles/jruby_9.2.18.0_core_old.gemfile.lock b/gemfiles/jruby_9.2.18.0_core_old.gemfile.lock
diff --git a/gemfiles/jruby_9.2.18.0_cucumber3.gemfile.lock b/gemfiles/jruby_9.2.18.0_cucumber3.gemfile.lock
diff --git a/gemfiles/jruby_9.2.18.0_cucumber4.gemfile.lock b/gemfiles/jruby_9.2.18.0_cucumber4.gemfile.lock
diff --git a/gemfiles/jruby_9.2.18.0_cucumber5.gemfile.lock b/gemfiles/jruby_9.2.18.0_cucumber5.gemfile.lock
diff --git a/gemfiles/jruby_9.2.18.0_rails5_mysql2.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails5_mysql2.gemfile.lock
diff --git a/gemfiles/jruby_9.2.18.0_rails5_postgres.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails5_postgres.gemfile.lock
diff --git a/gemfiles/jruby_9.2.18.0_rails5_postgres_redis.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails5_postgres_redis.gemfile.lock
diff --git a/gemfiles/jruby_9.2.18.0_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails5_postgres_redis_activesupport.gemfile.lock
diff --git a/gemfiles/jruby_9.2.18.0_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails5_postgres_sidekiq.gemfile.lock
diff --git a/gemfiles/jruby_9.2.18.0_rails5_semantic_logger.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails5_semantic_logger.gemfile.lock
diff --git a/gemfiles/jruby_9.2.18.0_rails61_mysql2.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails61_mysql2.gemfile.lock
diff --git a/gemfiles/jruby_9.2.18.0_rails61_postgres.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails61_postgres.gemfile.lock
diff --git a/gemfiles/jruby_9.2.18.0_rails61_postgres_redis.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails61_postgres_redis.gemfile.lock
diff --git a/gemfiles/jruby_9.2.18.0_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails61_postgres_sidekiq.gemfile.lock
diff --git a/gemfiles/jruby_9.2.18.0_rails61_semantic_logger.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails61_semantic_logger.gemfile.lock
diff --git a/gemfiles/jruby_9.2.18.0_rails6_mysql2.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails6_mysql2.gemfile.lock
diff --git a/gemfiles/jruby_9.2.18.0_rails6_postgres.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails6_postgres.gemfile.lock
diff --git a/gemfiles/jruby_9.2.18.0_rails6_postgres_redis.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails6_postgres_redis.gemfile.lock
diff --git a/gemfiles/jruby_9.2.18.0_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails6_postgres_redis_activesupport.gemfile.lock
diff --git a/gemfiles/jruby_9.2.18.0_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails6_postgres_sidekiq.gemfile.lock
diff --git a/gemfiles/jruby_9.2.18.0_rails6_semantic_logger.gemfile.lock b/gemfiles/jruby_9.2.18.0_rails6_semantic_logger.gemfile.lock
diff --git a/gemfiles/jruby_9.2.18.0_resque2_redis3.gemfile.lock b/gemfiles/jruby_9.2.18.0_resque2_redis3.gemfile.lock
diff --git a/gemfiles/jruby_9.2.18.0_resque2_redis4.gemfile.lock b/gemfiles/jruby_9.2.18.0_resque2_redis4.gemfile.lock
diff --git a/gemfiles/jruby_9.2.8.0_contrib.gemfile.lock b/gemfiles/jruby_9.2.8.0_contrib.gemfile.lock
diff --git a/gemfiles/jruby_9.2.8.0_contrib_old.gemfile.lock b/gemfiles/jruby_9.2.8.0_contrib_old.gemfile.lock
diff --git a/gemfiles/jruby_9.2.8.0_core_old.gemfile.lock b/gemfiles/jruby_9.2.8.0_core_old.gemfile.lock
diff --git a/gemfiles/jruby_9.2.8.0_cucumber3.gemfile.lock b/gemfiles/jruby_9.2.8.0_cucumber3.gemfile.lock
diff --git a/gemfiles/jruby_9.2.8.0_cucumber4.gemfile.lock b/gemfiles/jruby_9.2.8.0_cucumber4.gemfile.lock
diff --git a/gemfiles/jruby_9.2.8.0_cucumber5.gemfile.lock b/gemfiles/jruby_9.2.8.0_cucumber5.gemfile.lock
diff --git a/gemfiles/jruby_9.2.8.0_rails5_mysql2.gemfile.lock b/gemfiles/jruby_9.2.8.0_rails5_mysql2.gemfile.lock
diff --git a/gemfiles/jruby_9.2.8.0_rails5_postgres.gemfile.lock b/gemfiles/jruby_9.2.8.0_rails5_postgres.gemfile.lock
diff --git a/gemfiles/jruby_9.2.8.0_rails5_postgres_redis.gemfile.lock b/gemfiles/jruby_9.2.8.0_rails5_postgres_redis.gemfile.lock
diff --git a/gemfiles/jruby_9.2.8.0_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/jruby_9.2.8.0_rails5_postgres_redis_activesupport.gemfile.lock
diff --git a/gemfiles/jruby_9.2.8.0_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.2.8.0_rails5_postgres_sidekiq.gemfile.lock
diff --git a/gemfiles/jruby_9.2.8.0_rails5_semantic_logger.gemfile.lock b/gemfiles/jruby_9.2.8.0_rails5_semantic_logger.gemfile.lock
diff --git a/gemfiles/jruby_9.2.8.0_rails61_mysql2.gemfile.lock b/gemfiles/jruby_9.2.8.0_rails61_mysql2.gemfile.lock