ddtrace 0.46.0 → 0.51.0

data/.dd-ci/ci-app-spec.json

@@ -0,0 +1,31 @@
+[
+  "test.suite",
+  "test.name",
+  "test.status",
+  "test.framework",
+  "test.type",
+  "ci.provider.name",
+  "ci.pipeline.id",
+  "ci.pipeline.name",
+  "ci.pipeline.number",
+  "ci.pipeline.url",
+  "ci.stage.name",
+  "ci.job.name",
+  "ci.job.url",
+  "ci.workspace_path",
+  "git.repository_url",
+  "git.commit.sha",
+  "git.branch",
+  "git.tag",
+  "git.commit.author.date",
+  "git.commit.author.email",
+  "git.commit.author.name",
+  "git.commit.committer.date",
+  "git.commit.committer.email",
+  "git.commit.committer.name",
+  "git.commit.message",
+  "os.architecture",
+  "os.platform",
+  "runtime.name",
+  "runtime.version"
+]

data/.dockerignore

@@ -1 +0,0 @@
-gemfiles/*

data/.gitattributes

@@ -0,0 +1 @@
+gemfiles/**/* linguist-generated=true

data/.github/workflows/create-next-milestone.yml

@@ -9,11 +9,11 @@ jobs:
     steps:
       - name: Get next minor version
         id: semvers
-        uses: WyriHaximus/github-action-next-semvers@0.1.0
+        uses: WyriHaximus/github-action-next-semvers@b135abb108d66990a85e18623d906404f4350ce4
         with:
           version: ${{ github.event.milestone.title }}
       - name: Create next milestone
-        uses: WyriHaximus/github-action-create-milestone@0.1.0
+        uses: WyriHaximus/github-action-create-milestone@ab85332e3150ec018daf497a0f761fe69d52bc7d
         with:
           title: ${{ steps.semvers.outputs.minor }}
         env:

data/.github/workflows/test-head.yaml

@@ -0,0 +1,34 @@
+name: Test unstable
+on: [push]
+jobs:
+  test-head:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [head, jruby-head, truffleruby-head]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@77ca66ce2792fb05b8b204a203328e12593a64f3 # v1.72.1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+        continue-on-error: true
+      - run: bundle exec rake test:main
+        continue-on-error: true
+      - run: bundle exec rake spec:main
+        continue-on-error: true
+      - run: bundle exec rake spec:contrib
+        continue-on-error: true
+      - run: bundle exec rake spec:opentracer
+        continue-on-error: true
+      # A few contrib jobs that `ddtrace` already includes their gem in the global Gemfile.
+      # We technically don't need appraisal to run them, thus are easy candidates for early testing.
+      - run: bundle exec rake spec:rake
+        continue-on-error: true
+      - run: bundle exec rake spec:rspec
+        continue-on-error: true
+      - run: bundle exec rake spec:concurrent_ruby
+        continue-on-error: true
+      - run: bundle exec rake spec:http
+        continue-on-error: true

data/.gitignore

@@ -55,7 +55,6 @@ build-iPhoneSimulator/
 
 # lock files
 Gemfile.lock
-gemfiles/*
 
 # bundle config
 gemfiles/.bundle

data/.gitlab-ci.yml

@@ -2,26 +2,26 @@ stages:
   - deploy
 
 variables:
-  INDEX_FILE: index.txt
+  DOWNSTREAM_BRANCH:
+    value: "master"
+    description: "Run a specific datadog-reliability-env branch downstream"
+  FORCE_TRIGGER:
+    value: "false"
+    description: "Set to true to override rules in the reliability-env pipeline (e.g. override 'only deploy master')"
 
 .common: &common
   tags: [ "runner:main", "size:large" ]
 
-copy_to_s3:
-  <<: *common
+deploy_to_reliability_env:
   stage: deploy
-  image: registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "master"'
-      when: on_success
-    - when: manual
-      allow_failure: true
-  script:
-    - export ACCESS_KEY_ID=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-rb.secret_key_id --with-decryption --query "Parameter.Value" --out text)
-    - export SECRET_ACCESS_KEY=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-rb.secret_sec_key_id --with-decryption --query "Parameter.Value" --out text)
-    - export AWS_ACCESS_KEY_ID=$ACCESS_KEY_ID
-    - export AWS_SECRET_ACCESS_KEY=$SECRET_ACCESS_KEY
-    - echo $CI_COMMIT_REF_NAME >> $INDEX_FILE
-    - echo $CI_COMMIT_SHA >> $INDEX_FILE
-    - echo $GITLAB_USER_NAME >> $INDEX_FILE
-    - aws s3 cp $INDEX_FILE s3://datadog-reliability-env/ruby/$INDEX_FILE
+  when: on_success
+  trigger:
+    project: DataDog/datadog-reliability-env
+    branch: $DOWNSTREAM_BRANCH
+  variables:
+    UPSTREAM_BRANCH: $CI_COMMIT_REF_NAME
+    UPSTREAM_PROJECT_ID: $CI_PROJECT_ID
+    UPSTREAM_PROJECT_NAME: $CI_PROJECT_NAME
+    UPSTREAM_COMMIT_SHA: $CI_COMMIT_SHA
+    FORCE_TRIGGER: $FORCE_TRIGGER
+

data/.rubocop.yml

@@ -5,7 +5,7 @@ require:
   - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.4 # Lowest version supported currently
+  TargetRubyVersion: 2.5 # Lowest version supported as of Rubocop 0.13.0
   Include:
     - 'lib/**/*.rb'
     - 'test/**/*.rb'
@@ -18,6 +18,7 @@ AllCops:
     - 'lib/ddtrace/**/vendor/**/*.rb'
     - 'integration/apps/*/bin/*'
     - 'integration/apps/*/Gemfile'
+    - 'lib/ddtrace/profiling/pprof/pprof_pb.rb'
   NewCops: disable # Don't allow new cops to be enabled implicitly.
 
 # 80 characters is a nice goal, but not worth currently changing in existing
@@ -173,14 +174,6 @@ Performance/StringInclude: # (new in 1.7)
 Performance/Sum: # (new in 1.8)
   Enabled: true
 
-# Requires Ruby 2.1
-Style/HashConversion:
-  Enabled: false
-
-# Requires Ruby 2.1
-Lint/SendWithMixinArgument:
-  Enabled: false
-
 # Requires Ruby 2.2
 Style/HashSyntax:
   Enabled: false
@@ -201,6 +194,18 @@ Style/HashTransformValues:
 Style/CollectionCompact:
   Enabled: false
 
+# Requires Ruby 2.4
+Performance/RegexpMatch:
+  Enabled: false
+
+# Requires Ruby 2.5
+Style/RedundantBegin:
+  Enabled: false
+
+# Requires Ruby 2.5
+Style/HashTransformKeys:
+  Enabled: false
+
 # Enforces negative/positive branching order,
 # which can hurt readability.
 Style/NegatedIfElseCondition:
@@ -226,6 +231,18 @@ RSpec/LeadingSubject:
 RSpec/ImplicitSubject:
   Enabled: false
 
+# Enforces empty line after hook declaration.
+RSpec/EmptyLineAfterHook:
+  Enabled: false
+
+# Enforces empty line after subject declaration.
+RSpec/EmptyLineAfterSubject:
+  Enabled: false
+
+# Enforces empty line after last let declaration.
+RSpec/EmptyLineAfterFinalLet:
+  Enabled: false
+
 # TODO: Disabling until we categorize which file are safe to do so.
 Style/FrozenStringLiteralComment:
   Enabled: false
@@ -245,6 +262,12 @@ Lint/EmptyBlock:
 RSpec/ContextWording:
   Enabled: false
 
+# Checks for multiple top-level example groups.
+# Multiple descriptions for the same class or module should either
+# be nested or separated into different test files.
+RSpec/MultipleDescribes:
+  Enabled: false
+
 # Enforces that examples should only have a limited amount of assertions.
 RSpec/MultipleExpectations:
   Enabled: false

data/.rubocop_todo.yml

@@ -32,8 +32,8 @@ Lint/DuplicateBranch:
 # Offense count: 3
 Lint/DuplicateRequire:
   Exclude:
-    - 'lib/ddtrace/contrib/cucumber/integration.rb'
-    - 'lib/ddtrace/contrib/rspec/integration.rb'
+    - 'lib/datadog/ci/contrib/cucumber/integration.rb'
+    - 'lib/datadog/ci/contrib/rspec/integration.rb'
     - 'spec/ddtrace/contrib/presto/client_spec.rb'
 
 # Offense count: 1
@@ -79,21 +79,26 @@ Lint/MissingCopEnableDirective:
     - 'spec/ddtrace/contrib/rails/support/database.rb'
     - 'spec/ddtrace/contrib/rails/support/middleware.rb'
     - 'spec/ddtrace/diagnostics/health_spec.rb'
-    - 'spec/ddtrace/runtime/cgroup_spec.rb'
     - 'spec/support/container_helpers.rb'
     - 'spec/support/tracer_helpers.rb'
     - 'test/contrib/rails/controller_test.rb'
     - 'test/contrib/rails/errors_test.rb'
     - 'test/tracer_test.rb'
 
-# Offense count: 25
+# Offense count: 32
 Lint/MissingSuper:
   Exclude:
-    - 'lib/ddtrace/contrib/active_record/configuration/resolver.rb'
     - 'lib/ddtrace/contrib/grpc/datadog_interceptor.rb'
     - 'lib/ddtrace/opentracer/scope.rb'
     - 'lib/ddtrace/opentracer/span.rb'
     - 'lib/ddtrace/opentracer/span_context.rb'
+    - 'lib/ddtrace/profiling/collectors/stack.rb'
+    - 'lib/ddtrace/profiling/pprof/converter.rb'
+    - 'lib/ddtrace/profiling/pprof/template.rb'
+    - 'lib/ddtrace/profiling/recorder.rb'
+    - 'lib/ddtrace/profiling/scheduler.rb'
+    - 'lib/ddtrace/profiling/transport/http/api/instance.rb'
+    - 'lib/ddtrace/profiling/transport/http/api/spec.rb'
     - 'lib/ddtrace/sampler.rb'
     - 'lib/ddtrace/sampling/matcher.rb'
     - 'lib/ddtrace/sampling/rate_limiter.rb'
@@ -109,6 +114,11 @@ Lint/MissingSuper:
     - 'spec/support/spy_transport.rb'
     - 'test/helper.rb'
 
+# Offense count: 1
+Lint/StructNewOverride:
+  Exclude:
+    - 'lib/ddtrace/profiling/pprof/converter.rb'
+
 # Offense count: 1
 # Configuration parameters: AllowComments.
 Lint/SuppressedException:
@@ -150,20 +160,24 @@ Naming/VariableNumber:
     - 'spec/ddtrace/contrib/ethon/typhoeus_integration_spec.rb'
     - 'spec/ddtrace/contrib/resque/instrumentation_spec.rb'
 
-# Offense count: 12
+# Offense count: 18
 Performance/MethodObjectAsBlock:
   Exclude:
-    - 'lib/ddtrace/contrib/cucumber/formatter.rb'
+    - 'lib/datadog/ci/contrib/cucumber/formatter.rb'
     - 'lib/ddtrace/contrib/delayed_job/plugin.rb'
     - 'lib/ddtrace/pipeline.rb'
-    - 'spec/ddtrace/contrib/cucumber/patcher_spec.rb'
+    - 'lib/ddtrace/profiling/collectors/stack.rb'
+    - 'lib/ddtrace/profiling/pprof/builder.rb'
+    - 'lib/ddtrace/profiling/pprof/stack_sample.rb'
+    - 'lib/ddtrace/profiling/pprof/template.rb'
+    - 'spec/datadog/ci/contrib/cucumber/patcher_spec.rb'
 
 # Offense count: 6
 RSpec/EmptyExampleGroup:
   Exclude:
     - 'spec/ddtrace/buffer_spec.rb'
     - 'spec/ddtrace/configuration/components_spec.rb'
-    - 'spec/ddtrace/ext/ci_spec.rb'
+    - 'spec/datadog/ci/ext/environment_spec.rb'
     - 'spec/ddtrace/opentracer/distributed_headers_spec.rb'
 
 # Offense count: 2
@@ -171,7 +185,7 @@ RSpec/EmptyExampleGroup:
 RSpec/ExpectActual:
   Exclude:
     - 'spec/routing/**/*'
-    - 'spec/ddtrace/contrib/rspec/instrumentation_spec.rb'
+    - 'spec/datadog/ci/contrib/rspec/instrumentation_spec.rb'
 
 # Offense count: 3
 RSpec/IteratedExpectation:
@@ -308,10 +322,11 @@ RSpec/UnspecifiedException:
     - 'spec/ddtrace/contrib/delayed_job/plugin_spec.rb'
     - 'spec/ddtrace/contrib/sidekiq/tracer_configure_spec.rb'
 
-# Offense count: 303
+# Offense count: 421
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Exclude:
+    - 'spec/datadog/ci/contrib/cucumber/formatter_spec.rb'
     - 'spec/ddtrace/buffer_spec.rb'
     - 'spec/ddtrace/configuration/base_spec.rb'
     - 'spec/ddtrace/configuration/components_spec.rb'
@@ -329,7 +344,6 @@ RSpec/VerifiedDoubles:
     - 'spec/ddtrace/contrib/analytics_spec.rb'
     - 'spec/ddtrace/contrib/configuration/resolver_spec.rb'
     - 'spec/ddtrace/contrib/configuration/settings_spec.rb'
-    - 'spec/ddtrace/contrib/cucumber/formatter_spec.rb'
     - 'spec/ddtrace/contrib/delayed_job/plugin_spec.rb'
     - 'spec/ddtrace/contrib/ethon/easy_patch_spec.rb'
     - 'spec/ddtrace/contrib/extensions_spec.rb'
@@ -352,7 +366,32 @@ RSpec/VerifiedDoubles:
     - 'spec/ddtrace/opentracer/tracer_spec.rb'
     - 'spec/ddtrace/patcher_spec.rb'
     - 'spec/ddtrace/pin_spec.rb'
+    - 'spec/ddtrace/profiling/backtrace_location_spec.rb'
+    - 'spec/ddtrace/profiling/collectors/stack_spec.rb'
+    - 'spec/ddtrace/profiling/encoding/profile_spec.rb'
+    - 'spec/ddtrace/profiling/events/stack_spec.rb'
+    - 'spec/ddtrace/profiling/exporter_spec.rb'
+    - 'spec/ddtrace/profiling/ext/cthread_spec.rb'
+    - 'spec/ddtrace/profiling/ext/forking_spec.rb'
+    - 'spec/ddtrace/profiling/flush_spec.rb'
+    - 'spec/ddtrace/profiling/pprof/builder_spec.rb'
+    - 'spec/ddtrace/profiling/pprof/converter_spec.rb'
+    - 'spec/ddtrace/profiling/pprof/message_set_spec.rb'
+    - 'spec/ddtrace/profiling/pprof/payload_spec.rb'
+    - 'spec/ddtrace/profiling/pprof/template_spec.rb'
+    - 'spec/ddtrace/profiling/transport/http/api/endpoint_spec.rb'
+    - 'spec/ddtrace/profiling/transport/http/api/instance_spec.rb'
+    - 'spec/ddtrace/profiling/transport/http/builder_spec.rb'
+    - 'spec/ddtrace/profiling/transport/http/client_spec.rb'
+    - 'spec/ddtrace/profiling/transport/http/response_spec.rb'
+    - 'spec/ddtrace/profiling/transport/http_spec.rb'
+    - 'spec/ddtrace/profiling/transport/io/client_spec.rb'
+    - 'spec/ddtrace/profiling/transport/io/response_spec.rb'
+    - 'spec/ddtrace/profiling/transport/io_spec.rb'
+    - 'spec/ddtrace/profiling/transport/parcel_spec.rb'
+    - 'spec/ddtrace/profiling_spec.rb'
     - 'spec/ddtrace/runtime/metrics_spec.rb'
+    - 'spec/ddtrace/tasks/exec_spec.rb'
     - 'spec/ddtrace/tracer_spec.rb'
     - 'spec/ddtrace/transport/http/adapters/net_spec.rb'
     - 'spec/ddtrace/transport/http/adapters/registry_spec.rb'
@@ -371,6 +410,8 @@ RSpec/VerifiedDoubles:
     - 'spec/ddtrace/transport/io/traces_spec.rb'
     - 'spec/ddtrace/transport/parcel_spec.rb'
     - 'spec/ddtrace/transport/traces_spec.rb'
+    - 'spec/ddtrace/utils/object_set_spec.rb'
+    - 'spec/ddtrace/utils/string_table_spec.rb'
     - 'spec/ddtrace/worker_spec.rb'
     - 'spec/ddtrace/workers/async_spec.rb'
     - 'spec/ddtrace/workers/loop_spec.rb'

data/.simplecov

@@ -1,3 +1,9 @@
+# Enable branch coverage reporting.
+# SimpleCov only supports branch coverage in
+# Ruby >= 2.5.
+SimpleCov.enable_coverage :branch if RUBY_VERSION >= '2.5.0'
+
+# Categorize SimpleCov report, for easier reading
 SimpleCov.add_group 'contrib', '/lib/ddtrace/contrib'
 SimpleCov.add_group 'transport', '/lib/ddtrace/transport'
 SimpleCov.add_group 'spec', '/spec/'

data/Appraisals

@@ -10,104 +10,6 @@ end
 
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new(Datadog::VERSION::MINIMUM_RUBY_VERSION)
   raise NotImplementedError, "Ruby versions < #{Datadog::VERSION::MINIMUM_RUBY_VERSION} are not supported!"
-elsif Gem::Version.new('2.0.0') <= Gem::Version.new(RUBY_VERSION) \
-      && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.1.0')
-  if RUBY_PLATFORM != 'java'
-    appraise 'rails30-postgres' do
-      gem 'test-unit'
-      gem 'rails', '3.0.20'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'rack-cache', '1.7.1'
-      gem 'lograge', '< 0.4'
-    end
-
-    appraise 'rails30-postgres-sidekiq' do
-      gem 'test-unit'
-      gem 'rails', '3.0.20'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'sidekiq', '4.0.0'
-      gem 'rack-cache', '1.7.1'
-      gem 'lograge', '< 0.4'
-    end
-
-    appraise 'rails32-mysql2' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'mysql2', '0.3.21', platform: :ruby
-      gem 'activerecord-mysql-adapter', platform: :ruby
-      gem 'activerecord-jdbcmysql-adapter', platform: :jruby
-      gem 'rack-cache', '1.7.1'
-      gem 'sqlite3', '~> 1.3.5'
-      gem 'lograge', '< 0.4'
-    end
-
-    appraise 'rails32-postgres' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'rack-cache', '1.7.1'
-      gem 'lograge', '< 0.4'
-    end
-
-    appraise 'rails32-postgres-redis' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'redis-rails'
-      gem 'redis', '< 4.0'
-      gem 'rack-cache', '1.7.1'
-      gem 'lograge', '< 0.4'
-    end
-
-    appraise 'rails32-postgres-sidekiq' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'sidekiq', '4.0.0'
-      gem 'rack-cache', '1.7.1'
-      gem 'lograge', '< 0.4'
-    end
-
-    appraise 'contrib-old' do
-      gem 'active_model_serializers', '~> 0.9.0'
-      gem 'activerecord', '3.2.22.5'
-      gem 'activerecord-mysql-adapter', platform: :ruby
-      gem 'aws-sdk', '~> 2.0'
-      gem 'concurrent-ruby'
-      gem 'dalli'
-      gem 'delayed_job'
-      gem 'delayed_job_active_record'
-      gem 'elasticsearch-transport'
-      gem 'ethon'
-      gem 'excon'
-      gem 'hiredis'
-      gem 'http'
-      gem 'httpclient'
-      gem 'mongo', '< 2.5'
-      gem 'mysql2', '0.3.21', platform: :ruby
-      gem 'pg', '< 1.0', platform: :ruby
-      gem 'rack', '1.4.7'
-      gem 'rack-cache', '1.7.1'
-      gem 'rack-test', '0.7.0'
-      gem 'rake', '< 12.3'
-      gem 'redis', '< 4.0'
-      gem 'rest-client'
-      gem 'resque', '< 2.0'
-      gem 'rspec', '>= 3.0.0'
-      gem 'sequel', '~> 4.0', '< 4.37'
-      gem 'sidekiq', '~> 3.5.4'
-      gem 'sinatra', '1.4.5'
-      gem 'sqlite3', '~> 1.3.6'
-      gem 'sucker_punch'
-      gem 'timers', '< 4.2'
-      gem 'typhoeus'
-    end
-  end
 elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.0')
   if RUBY_PLATFORM != 'java'
@@ -117,7 +19,6 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '0.15.1', platform: :ruby
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'rack-cache', '1.7.1'
-      gem 'lograge', '< 0.4'
     end
 
     appraise 'rails30-postgres-sidekiq' do
@@ -127,7 +28,6 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'sidekiq', '4.0.0'
       gem 'rack-cache', '1.7.1'
-      gem 'lograge', '< 0.4'
     end
 
     appraise 'rails32-mysql2' do
@@ -138,7 +38,7 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'activerecord-jdbcmysql-adapter', platform: :jruby
       gem 'rack-cache', '1.7.1'
       gem 'sqlite3', '~> 1.3.5'
-      gem 'lograge', '< 0.4'
+      gem 'makara', '< 0.5.0' # >= 0.5.0 contain Ruby 2.3+ syntax
     end
 
     appraise 'rails32-postgres' do
@@ -147,7 +47,6 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '0.15.1', platform: :ruby
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'rack-cache', '1.7.1'
-      gem 'lograge', '< 0.4'
     end
 
     appraise 'rails32-postgres-redis' do
@@ -158,7 +57,6 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'redis-rails'
       gem 'redis', '< 4.0'
       gem 'rack-cache', '1.7.1'
-      gem 'lograge', '< 0.4'
     end
 
     appraise 'rails32-postgres-sidekiq' do
@@ -168,7 +66,6 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'sidekiq', '4.0.0'
       gem 'rack-cache', '1.7.1'
-      gem 'lograge', '< 0.4'
     end
 
     appraise 'rails4-mysql2' do
@@ -176,7 +73,7 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'mysql2', '< 1', platform: :ruby
       gem 'activerecord-jdbcmysql-adapter', platform: :jruby
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails4-postgres' do
@@ -184,7 +81,15 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
+    end
+
+    appraise 'rails4-semantic-logger' do
+      gem 'rails', '4.2.11.1'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+      gem 'sprockets', '< 4'
+      gem 'rails_semantic_logger', '~> 4.0'
     end
 
     appraise 'rails4-postgres-redis' do
@@ -194,7 +99,7 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'redis-rails'
       gem 'redis', '< 4.0'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'contrib-old' do
@@ -213,6 +118,7 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'hiredis'
       gem 'http'
       gem 'httpclient'
+      gem 'makara', '< 0.5.0' # >= 0.5.0 contain Ruby 2.3+ syntax
       gem 'mongo', '< 2.5'
       gem 'mysql2', '0.3.21', platform: :ruby
       gem 'pg', '< 1.0', platform: :ruby
@@ -225,6 +131,7 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'resque', '< 2.0'
       gem 'ruby-kafka', '>= 0.7.10'
       gem 'rspec', '>= 3.0.0'
+      gem 'semantic_logger', '~> 4.0'
       gem 'sequel', '~> 4.0', '< 4.37'
       gem 'shoryuken'
       gem 'sidekiq', '~> 3.5.4'
@@ -234,6 +141,10 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'timers', '< 4.2'
       gem 'typhoeus'
     end
+
+    appraise 'core-old' do
+      gem 'dogstatsd-ruby', '~> 4'
+    end
   end
 elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0')
@@ -244,7 +155,6 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '0.15.1', platform: :ruby
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'rack-cache', '1.7.1'
-      gem 'lograge', '< 0.4'
     end
 
     appraise 'rails30-postgres-sidekiq' do
@@ -254,7 +164,6 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'sidekiq', '4.0.0'
       gem 'rack-cache', '1.7.1'
-      gem 'lograge', '< 0.4'
     end
 
     appraise 'rails32-mysql2' do
@@ -265,7 +174,6 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'activerecord-jdbcmysql-adapter', platform: :jruby
       gem 'rack-cache', '1.7.1'
       gem 'sqlite3', '~> 1.3.5'
-      gem 'lograge', '< 0.4'
     end
 
     appraise 'rails32-postgres' do
@@ -274,7 +182,6 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '0.15.1', platform: :ruby
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'rack-cache', '1.7.1'
-      gem 'lograge', '< 0.4'
     end
 
     appraise 'rails32-postgres-redis' do
@@ -285,7 +192,6 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'redis-rails'
       gem 'redis', '< 4.0'
       gem 'rack-cache', '1.7.1'
-      gem 'lograge', '< 0.4'
     end
 
     appraise 'rails32-postgres-sidekiq' do
@@ -295,7 +201,6 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'sidekiq', '4.0.0'
       gem 'rack-cache', '1.7.1'
-      gem 'lograge', '< 0.4'
     end
 
     appraise 'rails4-mysql2' do
@@ -303,7 +208,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'mysql2', '< 1', platform: :ruby
       gem 'activerecord-jdbcmysql-adapter', platform: :jruby
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails4-postgres' do
@@ -311,7 +216,15 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
+    end
+
+    appraise 'rails4-semantic-logger' do
+      gem 'rails', '4.2.11.1'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+      gem 'sprockets', '< 4'
+      gem 'rails_semantic_logger', '~> 4.0'
     end
 
     appraise 'rails4-postgres-redis' do
@@ -321,7 +234,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'redis-rails'
       gem 'redis', '< 4.0'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails4-postgres-sidekiq' do
@@ -331,21 +244,23 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'sidekiq'
       gem 'activejob'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails5-mysql2' do
       gem 'rails', '5.2.3'
       gem 'mysql2', '< 1', platform: :ruby
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
+      gem 'mimemagic', '0.3.9' # Pinned until https://github.com/mimemagicrb/mimemagic/issues/142 is resolved.
     end
 
     appraise 'rails5-postgres' do
       gem 'rails', '5.2.3'
       gem 'pg', '< 1.0', platform: :ruby
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
+      gem 'mimemagic', '0.3.9' # Pinned until https://github.com/mimemagicrb/mimemagic/issues/142 is resolved.
     end
 
     appraise 'rails5-postgres-redis' do
@@ -353,7 +268,8 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
+      gem 'mimemagic', '0.3.9' # Pinned until https://github.com/mimemagicrb/mimemagic/issues/142 is resolved.
     end
 
     appraise 'rails5-postgres-redis-activesupport' do
@@ -361,7 +277,8 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
+      gem 'mimemagic', '0.3.9' # Pinned until https://github.com/mimemagicrb/mimemagic/issues/142 is resolved.
     end
 
     appraise 'rails5-postgres-sidekiq' do
@@ -370,7 +287,16 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'sidekiq'
       gem 'activejob'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
+      gem 'mimemagic', '0.3.9' # Pinned until https://github.com/mimemagicrb/mimemagic/issues/142 is resolved.
+    end
+
+    appraise 'rails5-semantic-logger' do
+      gem 'rails', '5.2.3'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'sprockets', '< 4'
+      gem 'rails_semantic_logger', '~> 4.0'
+      gem 'mimemagic', '0.3.9' # Pinned until https://github.com/mimemagicrb/mimemagic/issues/142 is resolved.
     end
 
     appraise 'contrib' do
@@ -391,10 +317,12 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'faraday'
       gem 'grape'
       gem 'graphql', '>= 1.12.0'
-      gem 'grpc', '~> 1.21.0' # Last version to support Ruby < 2.3
+      gem 'grpc', '~> 1.19.0' # Last version to support Ruby < 2.3 & google-protobuf < 3.7
       gem 'hiredis'
       gem 'http'
       gem 'httpclient'
+      gem 'lograge', '~> 0.11'
+      gem 'makara', '< 0.5.0' # >= 0.5.0 contain Ruby 2.3+ syntax
       gem 'mongo', '>= 2.8.0'
       gem 'mysql2', '< 0.5', platform: :ruby
       gem 'qless'
@@ -407,6 +335,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'resque', '< 2.0'
       gem 'ruby-kafka', '>= 0.7.10'
       gem 'rspec', '>= 3.0.0'
+      gem 'semantic_logger', '~> 4.0'
       gem 'sequel'
       gem 'shoryuken'
       gem 'sidekiq'
@@ -417,6 +346,10 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'typhoeus'
       gem 'que', '>= 1.0.0.beta2'
     end
+
+    appraise 'core-old' do
+      gem 'dogstatsd-ruby', '~> 4'
+    end
   end
 elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.4.0')
@@ -427,7 +360,6 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '0.15.1', platform: :ruby
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'rack-cache', '1.7.1'
-      gem 'lograge', '< 0.4'
     end
 
     appraise 'rails30-postgres-sidekiq' do
@@ -437,7 +369,6 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'sidekiq', '4.0.0'
       gem 'rack-cache', '1.7.1'
-      gem 'lograge', '< 0.4'
     end
 
     appraise 'rails32-mysql2' do
@@ -448,7 +379,6 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'activerecord-jdbcmysql-adapter', platform: :jruby
       gem 'rack-cache', '1.7.1'
       gem 'sqlite3', '~> 1.3.5'
-      gem 'lograge', '< 0.4'
     end
 
     appraise 'rails32-postgres' do
@@ -457,7 +387,6 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '0.15.1', platform: :ruby
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'rack-cache', '1.7.1'
-      gem 'lograge', '< 0.4'
     end
 
     appraise 'rails32-postgres-redis' do
@@ -468,7 +397,6 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'redis-rails'
       gem 'redis', '< 4.0'
       gem 'rack-cache', '1.7.1'
-      gem 'lograge', '< 0.4'
     end
 
     appraise 'rails32-postgres-sidekiq' do
@@ -478,7 +406,6 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'sidekiq', '4.0.0'
       gem 'rack-cache', '1.7.1'
-      gem 'lograge', '< 0.4'
     end
 
     appraise 'rails4-mysql2' do
@@ -486,7 +413,7 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'mysql2', '< 1', platform: :ruby
       gem 'activerecord-jdbcmysql-adapter', platform: :jruby
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails4-postgres' do
@@ -494,7 +421,15 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
+    end
+
+    appraise 'rails4-semantic-logger' do
+      gem 'rails', '4.2.11.1'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+      gem 'sprockets', '< 4'
+      gem 'rails_semantic_logger', '~> 4.0'
     end
 
     appraise 'rails4-postgres-redis' do
@@ -504,7 +439,7 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'redis-rails'
       gem 'redis', '< 4.0'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails4-postgres-sidekiq' do
@@ -514,21 +449,21 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'sidekiq'
       gem 'activejob'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails5-mysql2' do
       gem 'rails', '~> 5.2.1'
       gem 'mysql2', '< 1', platform: :ruby
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails5-postgres' do
       gem 'rails', '~> 5.2.1'
       gem 'pg', '< 1.0', platform: :ruby
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails5-postgres-redis' do
@@ -536,7 +471,14 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
+    end
+
+    appraise 'rails5-semantic-logger' do
+      gem 'rails', '~> 5.2.1'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'sprockets', '< 4'
+      gem 'rails_semantic_logger', '~> 4.0'
     end
 
     appraise 'rails5-postgres-redis-activesupport' do
@@ -544,7 +486,7 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails5-postgres-sidekiq' do
@@ -553,7 +495,7 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'sidekiq'
       gem 'activejob'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'resque2-redis3' do
@@ -589,6 +531,8 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'hiredis'
       gem 'http'
       gem 'httpclient'
+      gem 'lograge', '~> 0.11'
+      gem 'makara'
       gem 'mongo', '>= 2.8.0'
       gem 'mysql2', '< 0.5', platform: :ruby
       gem 'pg', platform: :ruby
@@ -603,6 +547,7 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'resque'
       gem 'ruby-kafka', '>= 0.7.10'
       gem 'rspec', '>= 3.0.0'
+      gem 'semantic_logger', '~> 4.0'
       gem 'sequel'
       gem 'shoryuken'
       gem 'sidekiq'
@@ -617,6 +562,10 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
     appraise 'contrib-old' do
       gem 'faraday', '0.17'
     end
+
+    appraise 'core-old' do
+      gem 'dogstatsd-ruby', '~> 4'
+    end
   end
 elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
       && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.5.0')
@@ -625,14 +574,21 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'rails', '~> 5.2.1'
       gem 'mysql2', '< 1', platform: :ruby
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails5-postgres' do
       gem 'rails', '~> 5.2.1'
       gem 'pg', '< 1.0', platform: :ruby
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
+    end
+
+    appraise 'rails5-semantic-logger' do
+      gem 'rails', '~> 5.2.1'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'sprockets', '< 4'
+      gem 'rails_semantic_logger', '~> 4.0'
     end
 
     appraise 'rails5-postgres-redis' do
@@ -640,7 +596,7 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails5-postgres-redis-activesupport' do
@@ -648,7 +604,7 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails5-postgres-sidekiq' do
@@ -657,7 +613,7 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'sidekiq'
       gem 'activejob'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'resque2-redis3' do
@@ -694,12 +650,14 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'hiredis'
       gem 'http'
       gem 'httpclient'
+      gem 'lograge', '~> 0.11'
+      gem 'makara'
       gem 'mongo', '>= 2.8.0'
       gem 'mysql2', '< 0.5', platform: :ruby
       gem 'pg', platform: :ruby
       gem 'presto-client', '>=  0.5.14'
       gem 'qless'
-      gem 'racecar', '>= 0.3.5'
+      gem 'racecar', '>= 0.3.5', '< 2.3.0' # Locked until https://github.com/zendesk/racecar/issues/252 is addressed
       gem 'rack'
       gem 'rack-test'
       gem 'rake', '>= 12.3'
@@ -708,6 +666,7 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'resque'
       gem 'ruby-kafka', '>= 0.7.10'
       gem 'rspec', '>= 3.0.0'
+      gem 'semantic_logger', '~> 4.0'
       gem 'sequel'
       gem 'shoryuken'
       gem 'sidekiq'
@@ -722,6 +681,10 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
     appraise 'contrib-old' do
       gem 'faraday', '0.17'
     end
+
+    appraise 'core-old' do
+      gem 'dogstatsd-ruby', '~> 4'
+    end
   end
 elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
       && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.6.0')
@@ -730,7 +693,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     gem 'mysql2', '< 1', platform: :ruby
     gem 'activerecord-jdbcmysql-adapter', platform: :jruby
     gem 'sprockets', '< 4'
-    gem 'lograge'
+    gem 'lograge', '~> 0.11'
     gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
   end
 
@@ -739,7 +702,16 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     gem 'pg', '< 1.0', platform: :ruby
     gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
     gem 'sprockets', '< 4'
-    gem 'lograge'
+    gem 'lograge', '~> 0.11'
+    gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
+  end
+
+  appraise 'rails5-semantic-logger' do
+    gem 'rails', '~> 5.2.1'
+    gem 'pg', '< 1.0', platform: :ruby
+    gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+    gem 'sprockets', '< 4'
+    gem 'rails_semantic_logger', '~> 4.0'
     gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
   end
 
@@ -749,7 +721,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
     gem 'redis', '>= 4.0.1'
     gem 'sprockets', '< 4'
-    gem 'lograge'
+    gem 'lograge', '~> 0.11'
     gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
   end
 
@@ -759,7 +731,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
     gem 'redis', '>= 4.0.1'
     gem 'sprockets', '< 4'
-    gem 'lograge'
+    gem 'lograge', '~> 0.11'
     gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
   end
 
@@ -770,7 +742,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     gem 'sidekiq'
     gem 'activejob'
     gem 'sprockets', '< 4'
-    gem 'lograge'
+    gem 'lograge', '~> 0.11'
     gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
   end
 
@@ -779,7 +751,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     gem 'mysql2', '< 1', platform: :ruby
     gem 'activerecord-jdbcmysql-adapter', '>= 60', platform: :jruby # try remove >= 60
     gem 'sprockets', '< 4'
-    gem 'lograge'
+    gem 'lograge', '~> 0.11'
     gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
   end
 
@@ -788,7 +760,16 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     gem 'pg', '< 1.0', platform: :ruby
     gem 'activerecord-jdbcpostgresql-adapter', '>= 60', platform: :jruby
     gem 'sprockets', '< 4'
-    gem 'lograge'
+    gem 'lograge', '~> 0.11'
+    gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
+  end
+
+  appraise 'rails6-semantic-logger' do
+    gem 'rails', '~> 6.0.0'
+    gem 'pg', '< 1.0', platform: :ruby
+    gem 'activerecord-jdbcpostgresql-adapter', '>= 60', platform: :jruby
+    gem 'sprockets', '< 4'
+    gem 'rails_semantic_logger', '~> 4.0'
     gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
   end
 
@@ -798,7 +779,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     gem 'activerecord-jdbcpostgresql-adapter', '>= 60', platform: :jruby
     gem 'redis', '>= 4.0.1'
     gem 'sprockets', '< 4'
-    gem 'lograge'
+    gem 'lograge', '~> 0.11'
     gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
   end
 
@@ -808,7 +789,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     gem 'activerecord-jdbcpostgresql-adapter', '>= 60', platform: :jruby
     gem 'redis', '>= 4.0.1'
     gem 'sprockets', '< 4'
-    gem 'lograge'
+    gem 'lograge', '~> 0.11'
     gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
   end
 
@@ -819,7 +800,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     gem 'sidekiq'
     gem 'activejob'
     gem 'sprockets', '< 4'
-    gem 'lograge'
+    gem 'lograge', '~> 0.11'
     gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
   end
 
@@ -861,6 +842,15 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
   end
 
+  appraise 'rails61-semantic-logger' do
+    gem 'rails', '~> 6.1.0'
+    gem 'pg', '>= 1.1', platform: :ruby
+    gem 'activerecord-jdbcpostgresql-adapter', '>= 61', platform: :jruby
+    gem 'sprockets', '< 4'
+    gem 'rails_semantic_logger', '~> 4.0'
+    gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
+  end
+
   appraise 'resque2-redis3' do
     gem 'redis', '< 4.0'
     gem 'resque', '>= 2.0'
@@ -894,14 +884,16 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     gem 'hiredis'
     gem 'http'
     gem 'httpclient'
+    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'
     gem 'mysql2', '< 1', platform: :ruby
     gem 'activerecord-jdbcmysql-adapter', '>= 60.2', platform: :jruby
     gem 'pg', platform: :ruby
     gem 'activerecord-jdbcpostgresql-adapter', '>= 60.2', platform: :jruby
     gem 'presto-client', '>=  0.5.14'
-    gem 'qless'
+    gem 'qless', (RUBY_PLATFORM == 'java' ? '0.10.0' : '>= 0') # Newer releases require `rusage`, which is not available for JRuby
     gem 'racecar', '>= 0.3.5'
     gem 'rack'
     gem 'rack-test'
@@ -911,6 +903,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     gem 'resque'
     gem 'ruby-kafka', '>= 0.7.10'
     gem 'rspec', '>= 3.0.0'
+    gem 'semantic_logger', '~> 4.0'
     gem 'sequel'
     gem 'shoryuken'
     gem 'sidekiq'
@@ -926,6 +919,10 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
   appraise 'contrib-old' do
     gem 'faraday', '0.17'
   end
+
+  appraise 'core-old' do
+    gem 'dogstatsd-ruby', '~> 4'
+  end
 elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
       && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7.0')
   if RUBY_PLATFORM != 'java'
@@ -933,14 +930,21 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'rails', '~> 5.2.1'
       gem 'mysql2', '< 1', platform: :ruby
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails5-postgres' do
       gem 'rails', '~> 5.2.1'
       gem 'pg', '< 1.0', platform: :ruby
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
+    end
+
+    appraise 'rails5-semantic-logger' do
+      gem 'rails', '~> 5.2.1'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'sprockets', '< 4'
+      gem 'rails_semantic_logger', '~> 4.0'
     end
 
     appraise 'rails5-postgres-redis' do
@@ -948,7 +952,7 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails5-postgres-redis-activesupport' do
@@ -956,7 +960,7 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails5-postgres-sidekiq' do
@@ -965,21 +969,28 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'sidekiq'
       gem 'activejob'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails6-mysql2' do
       gem 'rails', '~> 6.0.0'
       gem 'mysql2', '< 1', platform: :ruby
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails6-postgres' do
       gem 'rails', '~> 6.0.0'
       gem 'pg', '< 1.0', platform: :ruby
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
+    end
+
+    appraise 'rails6-semantic-logger' do
+      gem 'rails', '~> 6.0.0'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'sprockets', '< 4'
+      gem 'rails_semantic_logger', '~> 4.0'
     end
 
     appraise 'rails6-postgres-redis' do
@@ -987,7 +998,7 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails6-postgres-redis-activesupport' do
@@ -995,7 +1006,7 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails6-postgres-sidekiq' do
@@ -1004,7 +1015,7 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'sidekiq'
       gem 'activejob'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails61-mysql2' do
@@ -1037,6 +1048,13 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'lograge', '~> 0.11'
     end
 
+    appraise 'rails61-semantic-logger' do
+      gem 'rails', '~> 6.1.0'
+      gem 'pg', '>= 1.1', platform: :ruby
+      gem 'sprockets', '< 4'
+      gem 'rails_semantic_logger', '~> 4.0'
+    end
+
     appraise 'resque2-redis3' do
       gem 'redis', '< 4.0'
       gem 'resque', '>= 2.0'
@@ -1070,6 +1088,8 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'hiredis'
       gem 'http'
       gem 'httpclient'
+      gem 'lograge', '~> 0.11'
+      gem 'makara'
       gem 'mongo', '>= 2.8.0'
       gem 'mysql2', '< 1', platform: :ruby
       gem 'pg', platform: :ruby
@@ -1084,6 +1104,7 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'resque'
       gem 'ruby-kafka', '>= 0.7.10'
       gem 'rspec', '>= 3.0.0'
+      gem 'semantic_logger', '~> 4.0'
       gem 'sequel'
       gem 'shoryuken'
       gem 'sidekiq'
@@ -1098,6 +1119,10 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
     appraise 'contrib-old' do
       gem 'faraday', '0.17'
     end
+
+    appraise 'core-old' do
+      gem 'dogstatsd-ruby', '~> 4'
+    end
   end
 elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION) \
       && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.0.0')
@@ -1106,14 +1131,21 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'rails', '~> 5.2.1'
       gem 'mysql2', '< 1', platform: :ruby
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails5-postgres' do
       gem 'rails', '~> 5.2.1'
       gem 'pg', '< 1.0', platform: :ruby
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
+    end
+
+    appraise 'rails5-semantic-logger' do
+      gem 'rails', '~> 5.2.1'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'sprockets', '< 4'
+      gem 'rails_semantic_logger', '~> 4.0'
     end
 
     appraise 'rails5-postgres-redis' do
@@ -1122,7 +1154,7 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'redis-rails'
       gem 'redis'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails5-postgres-redis-activesupport' do
@@ -1131,7 +1163,7 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'redis-rails'
       gem 'redis'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails5-postgres-sidekiq' do
@@ -1140,30 +1172,37 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'sidekiq'
       gem 'activejob'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails6-mysql2' do
       gem 'rails', '~> 6.0.0'
       gem 'mysql2', '< 1', platform: :ruby
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails6-postgres' do
       gem 'rails', '~> 6.0.0'
       gem 'pg', '< 1.0', platform: :ruby
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
+    appraise 'rails6-semantic-logger' do
+      gem 'rails', '~> 6.0.0'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'sprockets', '< 4'
+      gem 'rails_semantic_logger', '~> 4.0'
+    end    
+
     appraise 'rails6-postgres-redis' do
       gem 'rails', '~> 6.0.0'
       gem 'pg', '< 1.0', platform: :ruby
       gem 'redis-rails'
       gem 'redis'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails6-postgres-redis-activesupport' do
@@ -1172,7 +1211,7 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'redis-rails'
       gem 'redis'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails6-postgres-sidekiq' do
@@ -1181,7 +1220,7 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'sidekiq'
       gem 'activejob'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
     appraise 'rails61-mysql2' do
@@ -1214,6 +1253,13 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'lograge', '~> 0.11'
     end
 
+    appraise 'rails61-semantic-logger' do
+      gem 'rails', '~> 6.1.0'
+      gem 'pg', '>= 1.1', platform: :ruby
+      gem 'sprockets', '< 4'
+      gem 'rails_semantic_logger', '~> 4.0'
+    end
+
     appraise 'resque2-redis3' do
       gem 'redis', '< 4.0'
       gem 'resque', '>= 2.0'
@@ -1246,6 +1292,8 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'hiredis'
       gem 'http'
       gem 'httpclient'
+      gem 'lograge', '~> 0.11'
+      gem 'makara'
       gem 'mongo', '>= 2.8.0'
       gem 'mysql2', '< 1', platform: :ruby
       gem 'pg', platform: :ruby
@@ -1261,6 +1309,7 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'ruby-kafka', '>= 0.7.10'
       gem 'rspec', '>= 3.0.0'
       gem 'sequel'
+      gem 'semantic_logger', '~> 4.0'
       gem 'shoryuken'
       gem 'sidekiq'
       gem 'sinatra'
@@ -1274,6 +1323,10 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION) \
     appraise 'contrib-old' do
       gem 'faraday', '0.17'
     end
+
+    appraise 'core-old' do
+      gem 'dogstatsd-ruby', '~> 4'
+    end
   end
 elsif Gem::Version.new('3.0.0') <= Gem::Version.new(RUBY_VERSION)
   appraise 'rails61-mysql2' do
@@ -1304,6 +1357,14 @@ elsif Gem::Version.new('3.0.0') <= Gem::Version.new(RUBY_VERSION)
     gem 'sidekiq', '>= 6.1.2'
     gem 'sprockets', '< 4'
     gem 'lograge', '~> 0.11'
+    gem 'rails_semantic_logger', '~> 4.0'
+  end
+
+  appraise 'rails61-semantic-logger' do
+    gem 'rails', '~> 6.1.0'
+    gem 'pg', '>= 1.1', platform: :ruby
+    gem 'sprockets', '< 4'
+    gem 'rails_semantic_logger', '~> 4.0'
   end
 
   appraise 'resque2-redis3' do
@@ -1334,10 +1395,12 @@ elsif Gem::Version.new('3.0.0') <= Gem::Version.new(RUBY_VERSION)
     gem 'excon'
     gem 'grape'
     gem 'graphql', '>= 1.12.0'
-    # gem 'grpc' # Pending 3.0 support by transient protobuf dependency https://github.com/protocolbuffers/protobuf/issues/7922
+    gem 'grpc', '>= 1.38.0' # Minimum version with Ruby 3.0 support
     gem 'hiredis'
     gem 'http'
     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'
     gem 'mysql2', '>= 0.5.3', platform: :ruby
     gem 'pg', '>= 1.1', platform: :ruby
@@ -1352,6 +1415,7 @@ elsif Gem::Version.new('3.0.0') <= Gem::Version.new(RUBY_VERSION)
     gem 'resque'
     gem 'ruby-kafka', '>= 0.7.10'
     gem 'rspec', '>= 3.0.0'
+    gem 'semantic_logger', '~> 4.0'
     gem 'sequel'
     gem 'shoryuken'
     gem 'sidekiq'
@@ -1362,4 +1426,18 @@ elsif Gem::Version.new('3.0.0') <= Gem::Version.new(RUBY_VERSION)
     gem 'typhoeus'
     gem 'que', '>= 1.0.0.beta2'
   end
+
+  appraise 'core-old' do
+    gem 'dogstatsd-ruby', '~> 4'
+  end
+end
+
+ruby_runtime = if defined?(RUBY_ENGINE_VERSION)
+                 "#{RUBY_ENGINE}-#{RUBY_ENGINE_VERSION}"
+               else
+                 "#{RUBY_ENGINE}-#{RUBY_VERSION}" # For Ruby < 2.3
+               end
+
+appraisals.each do |appraisal|
+  appraisal.name.prepend("#{ruby_runtime}-")
 end