ddtrace 0.52.0 → 0.54.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f5ee0735d05ecdadc38bbc0978a2087141d136f31b1848845518d2086f877d2
-  data.tar.gz: dd677af05b413d5593440aedca7b36dc9aba0c9ba08e9213eb8eb9c5443cb2d9
+  metadata.gz: 000f0860f13e54bd5d4e0e2d0c4803eb8c568e808379f6ad58b9c9132c03562e
+  data.tar.gz: 26433871947470f4ba39de8b0790385a7dd3e7d8ff6e04aa28aff717ec81a490
 SHA512:
-  metadata.gz: 9f964c58615348135d915933cea46dac145c1266fa7d573fd8609c7eaf13be8667a8917af8ad5d93340935c00d2dc4bcd89adc7e14db7667eadf005448594f91
-  data.tar.gz: 23ee7b6812d641a0f6bdc65e43baac6f7f17cc68ca2c07a42e87158400a9b97944aa0f6416c2002fdbbfd0e00f92b1e0a6907de7ee3df39e0840f408a6ec1aec
+  metadata.gz: 4f2282c9f65efc83c4b815f64f51cb352adb443ca059b6fbeed921a8db83bd0f076060b190ff2a41e024a77599e80b7e2fdbc0a53c0f701a799f0541a53a64cc
+  data.tar.gz: aa4c8ef2ab73071bd1e58c367d300799483aac3c79e1fee3483bc917316da1cd49fae8a999f4a2c0dfc4a7b081478bd872ca2b6fbfe812f07f6bfa7329de304b

data/CHANGELOG.md

@@ -2,6 +2,107 @@
 
 ## [Unreleased]
 
+## [0.54.2] - 2022-01-18
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.54.2
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.54.1...v0.54.2
+
+### Changed
+
+- Bump `debase-ruby_core_source` dependency version; also allow older versions to be used ([#1798][], [#1829][])
+- Profiler: Reduce impact of reporting data in multi-process applications ([#1807][])
+- Profiler: Update API used to report data to backend ([#1820][])
+
+### Fixed
+
+- Gracefully handle installation on environments where Ruby JIT seems to be available but is actually broken ([#1801][])
+
+## [0.54.1] - 2021-11-30
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.54.1
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.54.0...v0.54.1
+
+### Fixed
+
+- Skip building profiling native extension when Ruby has been compiled without JIT ([#1774][], [#1776][])
+
+## [0.54.0] - 2021-11-17
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.54.0
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.53.0...v0.54.0
+
+### Added
+
+- MongoDB service name resolver when using multi cluster ([#1423][]) ([@skcc321][])
+- Service name override for ActiveJob in Rails configuration ([#1703][], [#1770][]) ([@hatstand][])
+- Profiler: Expose profile duration and start to the UI ([#1709][])
+- Profiler: Gather CPU time without monkey patching Thread ([#1735][], [#1740][])
+- Profiler: Link profiler samples to individual web requests ([#1688][])
+- Profiler: Capture threads with empty backtrace ([#1719][])
+- CI-App: Memoize environment tags to improve performance ([#1762][])
+- CI-App: `test.framework_version` tag for rspec and cucumber ([#1713][])
+
+### Changed
+
+- Set minimum version of dogstatsd-ruby 5 series to 5.3 ([#1717][])
+- Use USER_KEEP/USER_REJECT for RuleSampler decisions ([#1769][])
+
+### Fixed
+
+- "private method `ruby2_keywords' called" errors ([#1712][], [#1714][])
+- Configuration warning when Agent port is a String ([#1720][])
+- Ensure internal trace buffer respects its maximum size ([#1715][])
+- Remove erroneous maximum resque version support ([#1761][])
+- CI-App: Environment variables parsing precedence ([#1745][], [#1763][])
+- CI-App: GitHub Metadata Extraction ([#1771][])
+- Profiler: Missing thread id for natively created threads ([#1718][])
+- Docs: Active Job integration example code ([#1721][]) ([@y-yagi][])
+
+### Refactored
+
+- Redis client patch to use prepend ([#1743][]) ([@justinhoward][])
+
+## [0.53.0] - 2021-10-06
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.53.0
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.52.0...v0.53.0
+
+### Added
+
+- ActiveJob integration ([#1639][]) ([@bensheldon][])
+- Instrument Action Cable subscribe/unsubscribe hooks ([#1674][]) ([@agrobbin][])
+- Instrument Sidekiq server internal events (heartbeat, job fetch, and scheduled push) ([#1685][]) ([@agrobbin][])
+- Correlate Active Job logs to the active DataDog trace ([#1694][]) ([@agrobbin][])
+- Runtime Metrics: Global VM cache statistics ([#1680][])
+- Automatically send traces to agent Unix socket if present ([#1700][])
+- CI-App: User Provided Git Metadata ([#1662][])
+- ActionMailer integration ([#1280][])
+
+### Changed
+
+- Profiler: Set Sinatra resource setting at beginning of request and delay setting fallback resource ([#1628][])
+- Profiler: Use most recent event for trace resource name ([#1695][])
+- Profiler: Limit number of threads per sample ([#1699][])
+- Profiler: Rename `extract_trace_resource` to `endpoint.collection.enabled` ([#1702][])
+
+### Fixed
+
+- Capture Rails exception before default error page is rendered ([#1684][])
+- `NoMethodError` in sinatra integration when Tracer middleware is missing ([#1643][], [#1644][]) ([@mscrivo][])
+- CI-App: Require `rspec-core` for RSpec integration ([#1654][]) ([@elliterate][])
+- CI-App: Use the merge request branch on merge requests ([#1687][]) ([@carlallen][])
+- Remove circular dependencies. ([#1668][]) ([@saturnflyer][])
+- Links in the Table of Contents ([#1661][]) ([@chychkan][])
+- CI-App: Fix CI Visibility Spec Tests ([#1706][])
+
+### Refactored
+
+- Profiler: pprof encoding benchmark and improvements ([#1511][])
+
 ## [0.52.0] - 2021-08-09
 
 Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.52.0
@@ -438,26 +539,26 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.39.0...v0.40.0
 ### Fixed
 
 - Sinatra nested modular applications possibly leaking spans ([#1035][], [#1145][])
-  
+
   * **BREAKING** for nested modular Sinatra applications only:
     ```ruby
     class Nested < Sinatra::Base
     end
-    
+
     class TopLevel < Sinatra::Base
       use Nested # Nesting happens here
     end
     ```
   * Non-breaking for classic applications nor modular non-nested applications.
-  
+
   Fixes issues introduced by [#1015][] (in 0.35.0), when we first introduced Sinatra support for modular applications.
-  
+
   The main issue we had to solve for modular support is how to handle nested applications, as only one application is actually responsible for handling the route. A naive implementation would cause the creation of nested `sinatra.request` spans, even for applications that did not handle the request. This is technically correct, as Sinatra is traversing that middleware, accruing overhead, but that does not aligned with our existing behavior of having a single `sinatra.request` span.
-  
+
   While trying to achieve backwards-compatibility, we had to resort to a solution that turned out brittle: `sinatra.request` spans had to start in one middleware level and finished it in another. This allowed us to only capture the `sinatra.request` for the matching route, and skip the non-matching one. This caused unexpected issues on some user setups, specially around Sinatra middleware that created spans in between the initialization and closure of `sinatra.request` spans.
-  
+
   This change now address these implementation issues by creating multiple `sinatra.request`, one for each traversed Sinatra application, even non-matching ones. This instrumentation is more correct, but at the cost of being a breaking change for nested modular applications.
-  
+
   Please see [#1145][] for more information, and example screenshots on how traces for affected applications will look like.
 
 - Rack/Rails span error propagation with `rescue_from` ([#1155][], [#1162][])
@@ -1313,7 +1414,7 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.14.1...v0.14.2
 
 ### Fixed
 
-- Sampling priority from request headers not being used ([#521][])  
+- Sampling priority from request headers not being used ([#521][])
 
 ## [0.14.1] - 2018-08-21
 
@@ -1459,9 +1560,9 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.12.1...v0.13.0
 - Hash quantization into core library ([#410][])
 - MongoDB integration to use Hash quantization library ([#463][])
 
-### Changed 
+### Changed
 
-- Hash quantization truncates arrays with nested objects ([#463][]) 
+- Hash quantization truncates arrays with nested objects ([#463][])
 
 ## [0.13.0.beta1] - 2018-05-09
 
@@ -1810,7 +1911,10 @@ 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/v0.48.0...master
+[Unreleased]: https://github.com/DataDog/dd-trace-rb/compare/v0.54.0...master
+[0.54.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.53.0...v0.54.0
+[0.53.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.52.0...v0.53.0
+[0.52.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.51.1...v0.52.0
 [0.51.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.51.0...v0.51.1
 [0.51.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.50.0...v0.51.0
 [0.48.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.47.0...v0.48.0
@@ -2400,6 +2504,7 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [#1277]: https://github.com/DataDog/dd-trace-rb/issues/1277
 [#1278]: https://github.com/DataDog/dd-trace-rb/issues/1278
 [#1279]: https://github.com/DataDog/dd-trace-rb/issues/1279
+[#1280]: https://github.com/DataDog/dd-trace-rb/issues/1280
 [#1281]: https://github.com/DataDog/dd-trace-rb/issues/1281
 [#1283]: https://github.com/DataDog/dd-trace-rb/issues/1283
 [#1284]: https://github.com/DataDog/dd-trace-rb/issues/1284
@@ -2477,6 +2582,7 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [#1420]: https://github.com/DataDog/dd-trace-rb/issues/1420
 [#1421]: https://github.com/DataDog/dd-trace-rb/issues/1421
 [#1422]: https://github.com/DataDog/dd-trace-rb/issues/1422
+[#1423]: https://github.com/DataDog/dd-trace-rb/issues/1423
 [#1426]: https://github.com/DataDog/dd-trace-rb/issues/1426
 [#1427]: https://github.com/DataDog/dd-trace-rb/issues/1427
 [#1428]: https://github.com/DataDog/dd-trace-rb/issues/1428
@@ -2511,6 +2617,7 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [#1507]: https://github.com/DataDog/dd-trace-rb/issues/1507
 [#1509]: https://github.com/DataDog/dd-trace-rb/issues/1509
 [#1510]: https://github.com/DataDog/dd-trace-rb/issues/1510
+[#1511]: https://github.com/DataDog/dd-trace-rb/issues/1511
 [#1523]: https://github.com/DataDog/dd-trace-rb/issues/1523
 [#1524]: https://github.com/DataDog/dd-trace-rb/issues/1524
 [#1529]: https://github.com/DataDog/dd-trace-rb/issues/1529
@@ -2549,6 +2656,53 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [#1630]: https://github.com/DataDog/dd-trace-rb/issues/1630
 [#1632]: https://github.com/DataDog/dd-trace-rb/issues/1632
 [#1636]: https://github.com/DataDog/dd-trace-rb/issues/1636
+[#1639]: https://github.com/DataDog/dd-trace-rb/issues/1639
+[#1643]: https://github.com/DataDog/dd-trace-rb/issues/1643
+[#1644]: https://github.com/DataDog/dd-trace-rb/issues/1644
+[#1654]: https://github.com/DataDog/dd-trace-rb/issues/1654
+[#1661]: https://github.com/DataDog/dd-trace-rb/issues/1661
+[#1662]: https://github.com/DataDog/dd-trace-rb/issues/1662
+[#1668]: https://github.com/DataDog/dd-trace-rb/issues/1668
+[#1674]: https://github.com/DataDog/dd-trace-rb/issues/1674
+[#1680]: https://github.com/DataDog/dd-trace-rb/issues/1680
+[#1684]: https://github.com/DataDog/dd-trace-rb/issues/1684
+[#1685]: https://github.com/DataDog/dd-trace-rb/issues/1685
+[#1687]: https://github.com/DataDog/dd-trace-rb/issues/1687
+[#1688]: https://github.com/DataDog/dd-trace-rb/issues/1688
+[#1694]: https://github.com/DataDog/dd-trace-rb/issues/1694
+[#1695]: https://github.com/DataDog/dd-trace-rb/issues/1695
+[#1699]: https://github.com/DataDog/dd-trace-rb/issues/1699
+[#1700]: https://github.com/DataDog/dd-trace-rb/issues/1700
+[#1702]: https://github.com/DataDog/dd-trace-rb/issues/1702
+[#1703]: https://github.com/DataDog/dd-trace-rb/issues/1703
+[#1706]: https://github.com/DataDog/dd-trace-rb/issues/1706
+[#1709]: https://github.com/DataDog/dd-trace-rb/issues/1709
+[#1712]: https://github.com/DataDog/dd-trace-rb/issues/1712
+[#1713]: https://github.com/DataDog/dd-trace-rb/issues/1713
+[#1714]: https://github.com/DataDog/dd-trace-rb/issues/1714
+[#1715]: https://github.com/DataDog/dd-trace-rb/issues/1715
+[#1717]: https://github.com/DataDog/dd-trace-rb/issues/1717
+[#1718]: https://github.com/DataDog/dd-trace-rb/issues/1718
+[#1719]: https://github.com/DataDog/dd-trace-rb/issues/1719
+[#1720]: https://github.com/DataDog/dd-trace-rb/issues/1720
+[#1721]: https://github.com/DataDog/dd-trace-rb/issues/1721
+[#1735]: https://github.com/DataDog/dd-trace-rb/issues/1735
+[#1740]: https://github.com/DataDog/dd-trace-rb/issues/1740
+[#1743]: https://github.com/DataDog/dd-trace-rb/issues/1743
+[#1745]: https://github.com/DataDog/dd-trace-rb/issues/1745
+[#1761]: https://github.com/DataDog/dd-trace-rb/issues/1761
+[#1762]: https://github.com/DataDog/dd-trace-rb/issues/1762
+[#1763]: https://github.com/DataDog/dd-trace-rb/issues/1763
+[#1769]: https://github.com/DataDog/dd-trace-rb/issues/1769
+[#1770]: https://github.com/DataDog/dd-trace-rb/issues/1770
+[#1771]: https://github.com/DataDog/dd-trace-rb/issues/1771
+[#1774]: https://github.com/DataDog/dd-trace-rb/issues/1774
+[#1776]: https://github.com/DataDog/dd-trace-rb/issues/1776
+[#1798]: https://github.com/DataDog/dd-trace-rb/issues/1798
+[#1801]: https://github.com/DataDog/dd-trace-rb/issues/1801
+[#1807]: https://github.com/DataDog/dd-trace-rb/issues/1807
+[#1820]: https://github.com/DataDog/dd-trace-rb/issues/1820
+[#1829]: https://github.com/DataDog/dd-trace-rb/issues/1829
 [@AdrianLC]: https://github.com/AdrianLC
 [@Azure7111]: https://github.com/Azure7111
 [@BabyGroot]: https://github.com/BabyGroot
@@ -2577,11 +2731,14 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [@awendt]: https://github.com/awendt
 [@bartekbsh]: https://github.com/bartekbsh
 [@benhutton]: https://github.com/benhutton
+[@bensheldon]: https://github.com/bensheldon
 [@bheemreddy181]: https://github.com/bheemreddy181
 [@blaines]: https://github.com/blaines
 [@brafales]: https://github.com/brafales
 [@bzf]: https://github.com/bzf
 [@callumj]: https://github.com/callumj
+[@carlallen]: https://github.com/carlallen
+[@chychkan]: https://github.com/chychkan
 [@cjford]: https://github.com/cjford
 [@ck3g]: https://github.com/ck3g
 [@components]: https://github.com/components
@@ -2593,6 +2750,7 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [@dorner]: https://github.com/dorner
 [@drcapulet]: https://github.com/drcapulet
 [@e1senh0rn]: https://github.com/e1senh0rn
+[@elliterate]: https://github.com/elliterate
 [@elyalvarado]: https://github.com/elyalvarado
 [@ericmustin]: https://github.com/ericmustin
 [@erict-square]: https://github.com/erict-square
@@ -2607,6 +2765,7 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [@gkampjes]: https://github.com/gkampjes
 [@gottfrois]: https://github.com/gottfrois
 [@guizmaii]: https://github.com/guizmaii
+[@hatstand]: https://github.com/hatstand
 [@hawknewton]: https://github.com/hawknewton
 [@hs-bguven]: https://github.com/hs-bguven
 [@illdelph]: https://github.com/illdelph
@@ -2616,6 +2775,7 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [@jfrancoist]: https://github.com/jfrancoist
 [@joeyAghion]: https://github.com/joeyAghion
 [@jpaulgs]: https://github.com/jpaulgs
+[@justinhoward]: https://github.com/justinhoward
 [@jvalanen]: https://github.com/jvalanen
 [@kelvin-acosta]: https://github.com/kelvin-acosta
 [@kexoth]: https://github.com/kexoth
@@ -2632,6 +2792,7 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [@mdross95]: https://github.com/mdross95
 [@michaelkl]: https://github.com/michaelkl
 [@mriddle]: https://github.com/mriddle
+[@mscrivo]: https://github.com/mscrivo
 [@mstruve]: https://github.com/mstruve
 [@mustela]: https://github.com/mustela
 [@nic-lan]: https://github.com/nic-lan
@@ -2647,10 +2808,12 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [@renchap]: https://github.com/renchap
 [@ricbartm]: https://github.com/ricbartm
 [@roccoblues]: https://github.com/roccoblues
+[@saturnflyer]: https://github.com/saturnflyer
 [@sco11morgan]: https://github.com/sco11morgan
 [@senny]: https://github.com/senny
 [@shayonj]: https://github.com/shayonj
 [@sinsoku]: https://github.com/sinsoku
+[@skcc321]: https://github.com/skcc321
 [@soulcutter]: https://github.com/soulcutter
 [@stefanahman]: https://github.com/stefanahman
 [@steveh]: https://github.com/steveh

data/ddtrace.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
     .reject { |f| f.match(%r{^(test|spec|features|[.]circleci|[.]github|[.]dd-ci|benchmarks|gemfiles|integration|tasks|sorbet)/}) }
     .reject do |f|
       ['.dockerignore', '.env', '.gitattributes', '.gitlab-ci.yml', '.rspec', '.rubocop.yml',
-       '.rubocop_todo.yml', '.simplecov', 'Appraisals', 'Gemfile', 'Rakefile', 'docker-compose.yml'].include?(f)
+       '.rubocop_todo.yml', '.simplecov', 'Appraisals', 'Gemfile', 'Rakefile', 'docker-compose.yml', '.pryrc'].include?(f)
     end
   spec.executables   = ['ddtracerb']
   spec.require_paths = ['lib']
@@ -46,8 +46,11 @@ Gem::Specification.new do |spec|
     spec.add_dependency 'msgpack', '< 1.4'
   end
 
-  # Used by the profiler
-  spec.add_dependency 'ffi', '~> 1.0'
+  # Used by the profiler native extension to support older Rubies (see NativeExtensionDesign.md for notes)
+  #
+  # Because we only use this for older Rubies, and we consider it "feature-complete" for those older Rubies,
+  # we're pinning it at the latest available version and will manually bump the dependency as needed.
+  spec.add_dependency 'debase-ruby_core_source', '<= 0.10.14'
 
   spec.extensions = ['ext/ddtrace_profiling_native_extension/extconf.rb']
 end

data/docs/DevelopmentGuide.md

@@ -42,9 +42,7 @@ Then within this container you can [run tests](#running-tests), or [run code qua
 
 ## Testing
 
-The test suite uses both [Minitest](https://github.com/seattlerb/minitest) and [RSpec](https://rspec.info/) tests to verify the correctness of both the core trace library and its integrations.
-
-Minitest is deprecated in favor of RSpec; all new tests should be written in RSpec, and only existing minitests should be updated.
+The test suite uses [RSpec](https://rspec.info/) tests to verify the correctness of both the core trace library and its integrations.
 
 ### Writing tests
 
@@ -68,9 +66,6 @@ Simplest way to run tests is to run `bundle exec rake ci`, which will run the en
 Run the tests for the core library with:
 
 ```
-# Run Minitest
-$ bundle exec rake test:main
-# Run RSpec
 $ bundle exec rake spec:main
 ```
 

data/docs/GettingStarted.md

@@ -28,8 +28,10 @@ To contribute, check out the [contribution guidelines][contribution docs] and [d
  - [Integration instrumentation](#integration-instrumentation)
      - [Action Cable](#action-cable)
      - [Action View](#action-view)
+     - [Action Mailer](#action-mailer)
      - [Active Model Serializers](#active-model-serializers)
      - [Action Pack](#action-pack)
+     - [Active Job](#active-job)
      - [Active Record](#active-record)
      - [Active Support](#active-support)
      - [AWS](#aws)
@@ -44,12 +46,12 @@ To contribute, check out the [contribution guidelines][contribution docs] and [d
      - [Grape](#grape)
      - [GraphQL](#graphql)
      - [gRPC](#grpc)
-     - [http.rb](#http-rb)
+     - [http.rb](#httprb)
      - [httpclient](#httpclient)
      - [httpx](#httpx)
      - [MongoDB](#mongodb)
      - [MySQL2](#mysql2)
-     - [Net/HTTP](#net-http)
+     - [Net/HTTP](#nethttp)
      - [Presto](#presto)
      - [Qless](#qless)
      - [Que](#que)
@@ -133,13 +135,22 @@ To contribute, check out the [contribution guidelines][contribution docs] and [d
 
 *EOL* indicates support is no longer provided.
 
+### Apple macOS support
+
+Use of `ddtrace` on macOS is supported for development, but not for production deployments.
+
+### Microsoft Windows support
+
+Using `ddtrace` on Microsoft Windows is currently unsupported. We'll still accept community contributions and issues,
+but will consider them as having low priority.
+
 ## Installation
 
 The following steps will help you quickly start tracing your Ruby application.
 
 ### Configure the Datadog Agent for APM
 
-Before downloading tracing on your application, install the Datadog Agent. The Ruby APM tracer sends trace data through the Datadog Agent.
+Before downloading tracing on your application, [install the Datadog Agent on the host](https://docs.datadoghq.com/agent/). The Ruby APM tracer sends trace data through the Datadog Agent.
 
 Install and configure the Datadog Agent to receive traces from your now instrumented application. By default the Datadog Agent is enabled in your `datadog.yaml` file under `apm_enabled: true` and listens for trace traffic at `localhost:8126`. For containerized environments, follow the steps below to enable trace collection within the Datadog Agent.
 
@@ -165,7 +176,7 @@ Install and configure the Datadog Agent to receive traces from your now instrume
 
 2. Install the gem with `bundle install`
 
-3. You can configure, override, or disable any specific integration settings by also adding a [Rails Manual Configuration](#rails-manual-configuration) file.
+3. You can configure, override, or disable any specific integration settings by also adding a Rails manual instrumentation configuration file (next).
 
 #### Manual instrumentation
 
@@ -205,7 +216,7 @@ Install and configure the Datadog Agent to receive traces from your now instrume
     require 'ddtrace/auto_instrument'
     ```
 
-    You can configure, override, or disable any specific integration settings by also adding a [Ruby Manual Configuration Block](#ruby-manual-configuration).
+    You can configure, override, or disable any specific integration settings by also adding a Ruby manual configuration block (next).
 
 #### Manual instrumentation
 
@@ -388,14 +399,16 @@ For a list of available integrations, and their configuration options, please re
 | Name                     | Key                        | Versions Supported: MRI  | Versions Supported: JRuby | How to configure                    | Gem source                                                                     |
 | ------------------------ | -------------------------- | ------------------------ | --------------------------| ----------------------------------- | ------------------------------------------------------------------------------ |
 | Action Cable             | `action_cable`             | `>= 5.0`                 | `>= 5.0`                  | *[Link](#action-cable)*             | *[Link](https://github.com/rails/rails/tree/master/actioncable)*               |
+| Action Mailer            | `action_mailer`            | `>= 5.0`                 | `>= 5.0`                  | *[Link](#action-mailer)*            | *[Link](https://github.com/rails/rails/tree/master/actionmailer)*              |
 | Action View              | `action_view`              | `>= 3.0`                 | `>= 3.0`                  | *[Link](#action-view)*              | *[Link](https://github.com/rails/rails/tree/master/actionview)*                |
 | Active Model Serializers | `active_model_serializers` | `>= 0.9`                 | `>= 0.9`                  | *[Link](#active-model-serializers)* | *[Link](https://github.com/rails-api/active_model_serializers)*                |
 | Action Pack              | `action_pack`              | `>= 3.0`                 | `>= 3.0`                  | *[Link](#action-pack)*              | *[Link](https://github.com/rails/rails/tree/master/actionpack)*                |
+| Active Job               | `active_job`               | `>= 4.2`                 | `>= 4.2`                  | *[Link](#active-job)*               | *[Link](https://github.com/rails/rails/tree/master/activejob)*             |
 | Active Record            | `active_record`            | `>= 3.0`                 | `>= 3.0`                  | *[Link](#active-record)*            | *[Link](https://github.com/rails/rails/tree/master/activerecord)*              |
 | Active Support           | `active_support`           | `>= 3.0`                 | `>= 3.0`                  | *[Link](#active-support)*           | *[Link](https://github.com/rails/rails/tree/master/activesupport)*             |
 | AWS                      | `aws`                      | `>= 2.0`                 | `>= 2.0`                  | *[Link](#aws)*                      | *[Link](https://github.com/aws/aws-sdk-ruby)*                                  |
 | Concurrent Ruby          | `concurrent_ruby`          | `>= 0.9`                 | `>= 0.9`                  | *[Link](#concurrent-ruby)*          | *[Link](https://github.com/ruby-concurrency/concurrent-ruby)*                  |
-| Cucumber                 | `cucumber`                 | `>= 3.0`                 | `>= 1.7.16`               | *[Link](#cucumber)*                | *[Link](https://github.com/cucumber/cucumber-ruby)*                            |
+| Cucumber                 | `cucumber`                 | `>= 3.0`                 | `>= 1.7.16`               | *[Link](#cucumber)*                 | *[Link](https://github.com/cucumber/cucumber-ruby)*                            |
 | Dalli                    | `dalli`                    | `>= 2.0`                 | `>= 2.0`                  | *[Link](#dalli)*                    | *[Link](https://github.com/petergoldstein/dalli)*                              |
 | DelayedJob               | `delayed_job`              | `>= 4.1`                 | `>= 4.1`                  | *[Link](#delayedjob)*               | *[Link](https://github.com/collectiveidea/delayed_job)*                        |
 | Elasticsearch            | `elasticsearch`            | `>= 1.0`                 | `>= 1.0`                  | *[Link](#elasticsearch)*            | *[Link](https://github.com/elastic/elasticsearch-ruby)*                        |
@@ -405,7 +418,7 @@ For a list of available integrations, and their configuration options, please re
 | Grape                    | `grape`                    | `>= 1.0`                 | `>= 1.0`                  | *[Link](#grape)*                    | *[Link](https://github.com/ruby-grape/grape)*                                  |
 | GraphQL                  | `graphql`                  | `>= 1.7.9`               | `>= 1.7.9`                | *[Link](#graphql)*                  | *[Link](https://github.com/rmosolgo/graphql-ruby)*                             |
 | gRPC                     | `grpc`                     | `>= 1.7`                 | *gem not available*       | *[Link](#grpc)*                     | *[Link](https://github.com/grpc/grpc/tree/master/src/rubyc)*                   |
-| http.rb                  | `httprb`                   | `>= 2.0`                 | `>= 2.0`                  | *[Link](#http-rb)*                  | *[Link](https://github.com/httprb/http)*                                       |
+| http.rb                  | `httprb`                   | `>= 2.0`                 | `>= 2.0`                  | *[Link](#httprb)*                  | *[Link](https://github.com/httprb/http)*                                       |
 | httpclient                | `httpclient`              | `>= 2.2`                 | `>= 2.2`                  | *[Link](#httpclient)*               | *[Link](https://github.com/nahi/httpclient)*                                     |
 | httpx                     | `httpx`                   | `>= 0.11`                | `>= 0.11`                 | *[Link](#httpx)*                    | *[Link](https://gitlab.com/honeyryderchuck/httpx)*                             |
 | Kafka                    | `ruby-kafka`               | `>= 0.7.10`              | `>= 0.7.10`               | *[Link](#kafka)*                    | *[Link](https://github.com/zendesk/ruby-kafka)*                                |
@@ -471,6 +484,27 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 | `service_name` | Service name used for rendering instrumentation. | `action_view` |
 | `template_base_path` | Used when the template name is parsed. If you don't store your templates in the `views/` folder, you may need to change this value | `'views/'` |
 
+### Action Mailer
+
+The Action Mailer integration provides tracing for Rails 5 ActionMailer actions.
+
+You can enable it through `Datadog.configure`:
+
+```ruby
+require 'ddtrace'
+ Datadog.configure do |c|
+  c.use :action_mailer, options
+end
+```
+
+Where `options` is an optional `Hash` that accepts the following parameters:
+
+| Key | Description | Default |
+| --- | ----------- | ------- |
+| `analytics_enabled` | Enable analytics for spans produced by this integration. `true` for on, `nil` to defer to global setting, `false` for off. | `false` |
+| `service_name` | Service name used for `action_mailer` instrumentation | `'action_mailer'` |
+| `email_data` | Whether or not to append additional email payload metadata to `action_mailer.deliver` spans. Fields include `['subject', 'to', 'from', 'bcc', 'cc', 'date', 'perform_deliveries']`. | `false` |
+
 ### Active Model Serializers
 
 The Active Model Serializers integration traces the `serialize` event for version 0.9+ and the `render` event for version 0.10+.
@@ -510,6 +544,28 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 | ---| --- | --- |
 | `service_name` | Service name used for rendering instrumentation. | `action_pack` |
 
+### Active Job
+
+Most of the time, Active Job is set up as part of Rails, but it can be activated separately:
+
+```ruby
+require 'active_job'
+require 'ddtrace'
+
+Datadog.configure do |c|
+  c.use :active_job, options
+end
+
+ExampleJob.perform_later
+```
+
+Where `options` is an optional `Hash` that accepts the following parameters:
+
+| Key | Description | Default |
+| --- | ----------- | ------- |
+| `service_name` | Service name used for `active_job` instrumentation | `'active_job'` |
+| `log_injection` | Automatically enables injection [Trace Correlation](#trace-correlation) information, such as `dd.trace_id`, into Active Job logs. Supports the default logger (`ActiveSupport::TaggedLogging`) and `Lograge`. Details on the format of Trace Correlation information can be found in the [Trace Correlation](#trace-correlation) section. | `false` |
+
 ### Active Record
 
 Most of the time, Active Record is set up as part of a web framework (Rails, Sinatra...) however, it can be set up alone:
@@ -1170,6 +1226,37 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 | `quantize` | Hash containing options for quantization. May include `:show` with an Array of keys to not quantize (or `:all` to skip quantization), or `:exclude` with Array of keys to exclude entirely. | `{ show: [:collection, :database, :operation] }` |
 | `service_name` | Service name used for `mongo` instrumentation | `'mongodb'` |
 
+**Configuring trace settings per connection**
+
+You can configure trace settings per connection by using the `describes` option:
+
+```ruby
+# Provide a `:describes` option with a connection key.
+# Any of the following keys are acceptable and equivalent to one another.
+# If a block is provided, it yields a Settings object that
+# accepts any of the configuration options listed above.
+
+Datadog.configure do |c|
+  # Network connection string
+  c.use :mongo, describes: '127.0.0.1:27017', service_name: 'mongo-primary'
+
+  # Network connection regular expression
+  c.use :mongo, describes: /localhost.*/, service_name: 'mongo-secondary'
+end
+
+client = Mongo::Client.new([ '127.0.0.1:27017' ], :database => 'artists')
+collection = client[:people]
+collection.insert_one({ name: 'Steve' })
+# Traced call will belong to `mongo-primary` service
+
+client = Mongo::Client.new([ 'localhost:27017' ], :database => 'artists')
+collection = client[:people]
+collection.insert_one({ name: 'Steve' })
+# Traced call will belong to `mongo-secondary` service
+```
+
+When multiple `describes` configurations match a connection, the latest configured rule that matches will be applied.
+
 ### MySQL2
 
 The MySQL2 integration traces any SQL command sent through `mysql2` gem.
@@ -1424,6 +1511,7 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 | `database_service` | Database service name used when tracing database activity | `'<app_name>-<adapter_name>'` |
 | `distributed_tracing` | Enables [distributed tracing](#distributed-tracing) so that this service trace is connected with a trace of another service if tracing headers are received | `true` |
 | `exception_controller` | Class or Module which identifies a custom exception controller class. Tracer provides improved error behavior when it can identify custom exception controllers. By default, without this option, it 'guesses' what a custom exception controller looks like. Providing this option aids this identification. | `nil` |
+| `job_service` | Service name used when tracing ActiveJob activity. | `<app_name>-active_job` |
 | `middleware` | Add the trace middleware to the Rails application. Set to `false` if you don't want the middleware to load. | `true` |
 | `middleware_names` | Enables any short-circuited middleware requests to display the middleware name as a resource for the trace. | `false` |
 | `service_name` | Service name used when tracing application requests (on the `rack` level) | `'<app_name>'` (inferred from your Rails application namespace) |
@@ -1434,7 +1522,6 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 
 | MRI Versions  | JRuby Versions | Rails Versions |
 | ------------- | -------------- | -------------- |
-|  2.0          |                |  3.0 - 3.2     |
 |  2.1          |                |  3.0 - 4.2     |
 |  2.2 - 2.3    |                |  3.0 - 5.2     |
 |  2.4          |                |  4.2.8 - 5.2   |
@@ -2125,7 +2212,7 @@ For more details on how to activate distributed tracing for integrations, see th
 - [Rack](#rack)
 - [Rails](#rails)
 - [Sinatra](#sinatra)
-- [http.rb](#http-rb)
+- [http.rb](#httprb)
 - [httpclient](#httpclient)
 - [httpx](#httpx)
 
@@ -2343,7 +2430,9 @@ Datadog.tracer.trace('my.operation') { logger.warn('This is a traced operation.'
 
 ### Configuring the transport layer
 
-By default, the tracer submits trace data using `Net::HTTP` to `127.0.0.1:8126`, the default location for the Datadog trace agent process. However, the tracer can be configured to send its trace data to alternative destinations, or by alternative protocols.
+By default, the tracer submits trace data using the Unix socket `/var/run/datadog/apm.socket`, if one is created by the Agent. Otherwise, it connects via HTTP to `127.0.0.1:8126`, the default TCP location the Agent listens on.
+
+However, the tracer can be configured to send its trace data to alternative destinations, or by alternative protocols.
 
 Some basic settings, such as hostname and port, can be configured using [tracer settings](#tracer-settings).
 
@@ -2369,7 +2458,7 @@ To use, first configure your trace agent to listen by Unix socket, then configur
 ```ruby
 Datadog.configure do |c|
   c.tracer.transport_options = proc { |t|
-    # Provide filepath to trace agent Unix socket
+    # Provide local path to trace agent Unix socket
     t.adapter :unix, '/tmp/ddagent/trace.sock'
   }
 end
@@ -2413,7 +2502,7 @@ The tracer and its integrations can produce some additional metrics that can pro
 To configure your application for metrics collection:
 
 1. [Configure your Datadog agent for StatsD](https://docs.datadoghq.com/developers/dogstatsd/#setup)
-2. Add `gem 'dogstatsd-ruby', '~> 5.2'` to your Gemfile
+2. Add `gem 'dogstatsd-ruby', '~> 5.3'` to your Gemfile
 
 #### For application runtime
 
@@ -2442,11 +2531,13 @@ See the [Dogstatsd documentation](https://www.rubydoc.info/github/DataDog/dogsta
 
 The stats are VM specific and will include:
 
-| Name                        | Type    | Description                                              |
-| --------------------------  | ------- | -------------------------------------------------------- |
-| `runtime.ruby.class_count`  | `gauge` | Number of classes in memory space.                       |
-| `runtime.ruby.thread_count` | `gauge` | Number of threads.                                       |
-| `runtime.ruby.gc.*`.        | `gauge` | Garbage collection statistics: collected from `GC.stat`. |
+| Name                        | Type    | Description                                              | Available on |
+| --------------------------  | ------- | -------------------------------------------------------- | ------------ |
+| `runtime.ruby.class_count`  | `gauge` | Number of classes in memory space.                       | CRuby        |
+| `runtime.ruby.gc.*`         | `gauge` | Garbage collection statistics: collected from `GC.stat`. | All runtimes |
+| `runtime.ruby.thread_count` | `gauge` | Number of threads.                                       | All runtimes |
+| `runtime.ruby.global_constant_state` | `gauge` | Global constant cache generation.               | CRuby        |
+| `runtime.ruby.global_method_state`   | `gauge` | [Global method cache generation.](https://tenderlovemaking.com/2015/12/23/inline-caching-in-mri.html) | [CRuby < 3.0.0](https://docs.ruby-lang.org/en/3.0.0/NEWS_md.html#label-Implementation+improvements) |
 
 In addition, all metrics include the following tags:
 
@@ -2492,7 +2583,7 @@ However, additional instrumentation provided by Datadog can be activated alongsi
 
 **Setup**
 
-To get started with profiling, follow the [Profiler Getting Started Guide](https://docs.datadoghq.com/tracing/profiler/getting_started/?code-lang=ruby).
+To get started with profiling, follow the [Enabling the Ruby Profiler](https://docs.datadoghq.com/tracing/profiler/enabling/ruby/) guide.
 
 #### Troubleshooting