Merge branch 'master' into add-ruby-vm-metrics

Appraisals

@@ -503,7 +503,7 @@ elsif ruby_version?('2.3')
     gem 'httpclient'
     gem 'lograge', '~> 0.11'
     gem 'makara'
-    gem 'mongo', '>= 2.8.0'
+    gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596
     gem 'mysql2', '< 0.5'
     gem 'pg'
     gem 'presto-client', '>=  0.5.14'
@@ -621,7 +621,7 @@ elsif ruby_version?('2.4')
     gem 'httpclient'
     gem 'lograge', '~> 0.11'
     gem 'makara'
-    gem 'mongo', '>= 2.8.0', '!= 2.15.0' # TODO: FIX TEST BREAKAGES ON 2.15.0
+    gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596
     gem 'mysql2', '< 0.5'
     gem 'pg'
     gem 'presto-client', '>=  0.5.14'
@@ -857,7 +857,7 @@ elsif ruby_version?('2.5')
     gem 'lograge', '~> 0.11'
     gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
     gem 'makara'
-    gem 'mongo', '>= 2.8.0', '!= 2.15.0' # TODO: FIX TEST BREAKAGES ON 2.15.0
+    gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596
     gem 'mysql2', '< 1', platform: :ruby
     gem 'activerecord-jdbcmysql-adapter', '>= 60.2', platform: :jruby
     gem 'pg', platform: :ruby
@@ -1062,7 +1062,7 @@ elsif ruby_version?('2.6')
       gem 'httpclient'
       gem 'lograge', '~> 0.11'
       gem 'makara'
-      gem 'mongo', '>= 2.8.0', '!= 2.15.0' # TODO: FIX TEST BREAKAGES ON 2.15.0
+      gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596
       gem 'mysql2', '< 1', platform: :ruby
       gem 'pg', platform: :ruby
       gem 'presto-client', '>=  0.5.14'
@@ -1264,7 +1264,7 @@ elsif ruby_version?('2.7')
       gem 'httpclient'
       gem 'lograge', '~> 0.11'
       gem 'makara'
-      gem 'mongo', '>= 2.8.0', '!= 2.15.0' # TODO: FIX TEST BREAKAGES ON 2.15.0
+      gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596
       gem 'mysql2', '< 1', platform: :ruby
       gem 'pg', platform: :ruby
       gem 'presto-client', '>=  0.5.14'
@@ -1372,7 +1372,7 @@ elsif ruby_version?('3.0')
     gem 'httpclient'
     # gem 'lograge', '~> 0.11'  # creates conflict with qless dependancy on thor ~0.19.1
     gem 'makara', '>= 0.6.0.pre' # Ruby 3 requires >= 0.6.0, which is currently in pre-release: https://rubygems.org/gems/makara/versions
-    gem 'mongo', '>= 2.8.0', '!= 2.15.0' # TODO: FIX TEST BREAKAGES ON 2.15.0
+    gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596
     gem 'mysql2', '>= 0.5.3', platform: :ruby
     gem 'pg', '>= 1.1', platform: :ruby
     gem 'presto-client', '>=  0.5.14'

Gemfile

@@ -70,5 +70,8 @@ gem 'opentracing', '>= 0.4.1'
 gem 'google-protobuf', ['~> 3.0', '!= 3.7.0', '!= 3.7.1'] if RUBY_PLATFORM != 'java'
 
 # For type checking
-gem 'sorbet', '>= 0.5.6513', '< 0.6' if RUBY_VERSION >= '2.3.0'
+# Sorbet releases almost daily, with new checks introduced that can make a
+# previously-passing codebase start failing. Thus, we need to lock to a specific
+# version and bump it from time to time.
+gem 'sorbet', '= 0.5.9120' if RUBY_VERSION >= '2.3.0'
 gem 'spoom', '~> 1.1' if RUBY_VERSION >= '2.4.0'

benchmarks/dogstatsd_reporter.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace'
 require 'datadog/statsd'
 require 'benchmark/ips'

docs/GettingStarted.md

@@ -167,7 +167,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
 
@@ -207,7 +207,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
 
@@ -409,7 +409,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)*                                |
@@ -2170,7 +2170,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)