ddtrace 0.47.0 → 0.48.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9cf1ef2c94e28df64fe5d26a43c3cfb1c31cc9be
-  data.tar.gz: a7daf78f76f691e785946f0e3f2763b424cd6127
+SHA256:
+  metadata.gz: 9418700e29312fa4efc67e04b7ff901950a5ee0d942cc7fe06a49adbf694f08a
+  data.tar.gz: 348acc764a300c51c3e99b02001b0dc238775c6afd7b07fd3ee4c31758e1e906
 SHA512:
-  metadata.gz: 3d4f7408c4ef0b587c3a078cb29b5165a43cbb03bb204b72d04a989de1567cd0ff9ae8c7c0649f6269a531a4041c156970fc0470c7f124b208f7a98435c942e8
-  data.tar.gz: a8e0484124bc54ef8c69e3af13f6f06e8b0070223a6316922e38d2df2d97004d306f3d205babfdfe876dad6f76c69ccfba77ffc5de58c7bb6fc441856f85df60
+  metadata.gz: f1cdbcdef68b68901a5737c3bfae8797709448a6db0b92ee2f1a7e59c64c6610bf327b1d847bd2cd0d18e651807d9c6cead347516f258f7f62169ca71315d7e1
+  data.tar.gz: 4c9e69ff9418143fff7734c2fd7ae2973d230a58e5173e8a1a6e128733a5bdb3fda11874f63b87840fc7e60098c94c746dce7d527726166345e4ca1e4a4b95a2

data/.circleci/config.yml

@@ -390,8 +390,10 @@ jobs:
             echo PRE=$PRE
             sed lib/ddtrace/version.rb -i -e "s/^\([\t ]*PRE\) *=*/\1 = \'${PRE}\' #/g"
       - run:
-          name: Upload prereleas Gem and rebuild index
-          command: S3_DIR=prerelease bundle exec rake release:gem
+          name: Upload prerelease Gem and rebuild index
+          # This was bumped from prerelease to prerelease-v2 to avoid the issue documented in
+          # https://github.com/DataDog/dd-trace-rb/pull/1358
+          command: S3_DIR=prerelease-v2 bundle exec rake release:gem
       - store_artifacts:
           path: pkg/
           destination: gem

data/.circleci/images/primary/Dockerfile-2.0.0

@@ -15,7 +15,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN set -ex; \
         apt-get update; \
         mkdir -p /usr/share/man/man1; \
-        apt-get install -y --no-install-recommends \
+        apt-get install --force-yes --no-install-recommends \
             git mercurial xvfb \
             locales sudo openssh-client ca-certificates tar gzip parallel \
             net-tools netcat unzip zip bzip2 gnupg curl wget \
@@ -62,6 +62,16 @@ RUN DOCKERIZE_URL="https://circle-downloads.s3.amazonaws.com/circleci-images/cac
   && rm -rf /tmp/dockerize-linux-amd64.tar.gz \
   && dockerize --version
 
+# Install Protobuf compiler
+RUN export PROTOC_URL="https://github.com/protocolbuffers/protobuf/releases/download/v3.6.1/protoc-3.6.1-linux-x86_64.zip" \
+  && echo Protoc URL: $PROTOC_URL \
+  && curl --silent --show-error --location --fail --retry 3 --output /tmp/protoc.zip "${PROTOC_URL}" \
+  && ls -lha /tmp/protoc.zip \
+  && unzip /tmp/protoc.zip -d /tmp/protoc \
+  && mv /tmp/protoc/bin/* /usr/bin \
+  && rm -rf /tmp/protoc /tmp/protoc.zip \
+  && protoc --version
+
 # Install RubyGems
 RUN gem update --system 2.7.9
 RUN gem install bundler -v '1.17.3'

data/.circleci/images/primary/Dockerfile-2.1.10

@@ -15,7 +15,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN set -ex; \
         apt-get update; \
         mkdir -p /usr/share/man/man1; \
-        apt-get install -y --no-install-recommends \
+        apt-get install --force-yes --no-install-recommends \
             git mercurial xvfb \
             locales sudo openssh-client ca-certificates tar gzip parallel \
             net-tools netcat unzip zip bzip2 gnupg curl wget \
@@ -62,6 +62,16 @@ RUN DOCKERIZE_URL="https://circle-downloads.s3.amazonaws.com/circleci-images/cac
   && rm -rf /tmp/dockerize-linux-amd64.tar.gz \
   && dockerize --version
 
+# Install Protobuf compiler
+RUN export PROTOC_URL="https://github.com/protocolbuffers/protobuf/releases/download/v3.6.1/protoc-3.6.1-linux-x86_64.zip" \
+  && echo Protoc URL: $PROTOC_URL \
+  && curl --silent --show-error --location --fail --retry 3 --output /tmp/protoc.zip "${PROTOC_URL}" \
+  && ls -lha /tmp/protoc.zip \
+  && unzip /tmp/protoc.zip -d /tmp/protoc \
+  && mv /tmp/protoc/bin/* /usr/bin \
+  && rm -rf /tmp/protoc /tmp/protoc.zip \
+  && protoc --version
+
 # Install RubyGems
 RUN gem update --system 2.7.9
 RUN gem install bundler -v '1.17.3'

data/.circleci/images/primary/Dockerfile-2.2.10

@@ -15,7 +15,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN set -ex; \
         apt-get update; \
         mkdir -p /usr/share/man/man1; \
-        apt-get install -y --no-install-recommends \
+        apt-get install --force-yes --no-install-recommends \
             git mercurial xvfb \
             locales sudo openssh-client ca-certificates tar gzip parallel \
             net-tools netcat unzip zip bzip2 gnupg curl wget \
@@ -62,6 +62,16 @@ RUN DOCKERIZE_URL="https://circle-downloads.s3.amazonaws.com/circleci-images/cac
   && rm -rf /tmp/dockerize-linux-amd64.tar.gz \
   && dockerize --version
 
+# Install Protobuf compiler
+RUN export PROTOC_URL="https://github.com/protocolbuffers/protobuf/releases/download/v3.6.1/protoc-3.6.1-linux-x86_64.zip" \
+  && echo Protoc URL: $PROTOC_URL \
+  && curl --silent --show-error --location --fail --retry 3 --output /tmp/protoc.zip "${PROTOC_URL}" \
+  && ls -lha /tmp/protoc.zip \
+  && unzip /tmp/protoc.zip -d /tmp/protoc \
+  && mv /tmp/protoc/bin/* /usr/bin \
+  && rm -rf /tmp/protoc /tmp/protoc.zip \
+  && protoc --version
+
 # Install RubyGems
 RUN gem update --system 2.7.9
 RUN gem install bundler -v '1.17.3'

data/.circleci/images/primary/Dockerfile-2.3.8

@@ -58,6 +58,16 @@ RUN DOCKERIZE_URL="https://circle-downloads.s3.amazonaws.com/circleci-images/cac
   && rm -rf /tmp/dockerize-linux-amd64.tar.gz \
   && dockerize --version
 
+# Install Protobuf compiler
+RUN export PROTOC_URL=$(curl -s https://api.github.com/repos/protocolbuffers/protobuf/releases/latest | grep browser_download_url | cut -d '"' -f 4 | grep -e 'protoc-[.0-9]*-linux-x86_64\.zip' | sort -r | head -n 1) \
+  && echo Protoc URL: $PROTOC_URL \
+  && curl --silent --show-error --location --fail --retry 3 --output /tmp/protoc.zip "${PROTOC_URL}" \
+  && ls -lha /tmp/protoc.zip \
+  && unzip /tmp/protoc.zip -d /tmp/protoc \
+  && mv /tmp/protoc/bin/* /usr/bin \
+  && rm -rf /tmp/protoc /tmp/protoc.zip \
+  && protoc --version
+
 # Install RubyGems
 RUN gem update --system
 RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"

data/.circleci/images/primary/Dockerfile-2.4.6

@@ -58,6 +58,16 @@ RUN DOCKERIZE_URL="https://circle-downloads.s3.amazonaws.com/circleci-images/cac
   && rm -rf /tmp/dockerize-linux-amd64.tar.gz \
   && dockerize --version
 
+# Install Protobuf compiler
+RUN export PROTOC_URL=$(curl -s https://api.github.com/repos/protocolbuffers/protobuf/releases/latest | grep browser_download_url | cut -d '"' -f 4 | grep -e 'protoc-[.0-9]*-linux-x86_64\.zip' | sort -r | head -n 1) \
+  && echo Protoc URL: $PROTOC_URL \
+  && curl --silent --show-error --location --fail --retry 3 --output /tmp/protoc.zip "${PROTOC_URL}" \
+  && ls -lha /tmp/protoc.zip \
+  && unzip /tmp/protoc.zip -d /tmp/protoc \
+  && mv /tmp/protoc/bin/* /usr/bin \
+  && rm -rf /tmp/protoc /tmp/protoc.zip \
+  && protoc --version
+
 # Install RubyGems
 RUN gem update --system
 RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"

data/.circleci/images/primary/Dockerfile-2.5.6

@@ -58,6 +58,16 @@ RUN DOCKERIZE_URL="https://circle-downloads.s3.amazonaws.com/circleci-images/cac
   && rm -rf /tmp/dockerize-linux-amd64.tar.gz \
   && dockerize --version
 
+# Install Protobuf compiler
+RUN export PROTOC_URL=$(curl -s https://api.github.com/repos/protocolbuffers/protobuf/releases/latest | grep browser_download_url | cut -d '"' -f 4 | grep -e 'protoc-[.0-9]*-linux-x86_64\.zip' | sort -r | head -n 1) \
+  && echo Protoc URL: $PROTOC_URL \
+  && curl --silent --show-error --location --fail --retry 3 --output /tmp/protoc.zip "${PROTOC_URL}" \
+  && ls -lha /tmp/protoc.zip \
+  && unzip /tmp/protoc.zip -d /tmp/protoc \
+  && mv /tmp/protoc/bin/* /usr/bin \
+  && rm -rf /tmp/protoc /tmp/protoc.zip \
+  && protoc --version
+
 # Install RubyGems
 RUN gem update --system
 RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"

data/.circleci/images/primary/Dockerfile-2.6.4

@@ -58,6 +58,16 @@ RUN DOCKERIZE_URL="https://circle-downloads.s3.amazonaws.com/circleci-images/cac
   && rm -rf /tmp/dockerize-linux-amd64.tar.gz \
   && dockerize --version
 
+# Install Protobuf compiler
+RUN export PROTOC_URL=$(curl -s https://api.github.com/repos/protocolbuffers/protobuf/releases/latest | grep browser_download_url | cut -d '"' -f 4 | grep -e 'protoc-[.0-9]*-linux-x86_64\.zip' | sort -r | head -n 1) \
+  && echo Protoc URL: $PROTOC_URL \
+  && curl --silent --show-error --location --fail --retry 3 --output /tmp/protoc.zip "${PROTOC_URL}" \
+  && ls -lha /tmp/protoc.zip \
+  && unzip /tmp/protoc.zip -d /tmp/protoc \
+  && mv /tmp/protoc/bin/* /usr/bin \
+  && rm -rf /tmp/protoc /tmp/protoc.zip \
+  && protoc --version
+
 # Install RubyGems
 RUN gem update --system
 RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"

data/.circleci/images/primary/Dockerfile-2.7.0

@@ -58,6 +58,16 @@ RUN DOCKERIZE_URL="https://circle-downloads.s3.amazonaws.com/circleci-images/cac
   && rm -rf /tmp/dockerize-linux-amd64.tar.gz \
   && dockerize --version
 
+# Install Protobuf compiler
+RUN export PROTOC_URL=$(curl -s https://api.github.com/repos/protocolbuffers/protobuf/releases/latest | grep browser_download_url | cut -d '"' -f 4 | grep -e 'protoc-[.0-9]*-linux-x86_64\.zip' | sort -r | head -n 1) \
+  && echo Protoc URL: $PROTOC_URL \
+  && curl --silent --show-error --location --fail --retry 3 --output /tmp/protoc.zip "${PROTOC_URL}" \
+  && ls -lha /tmp/protoc.zip \
+  && unzip /tmp/protoc.zip -d /tmp/protoc \
+  && mv /tmp/protoc/bin/* /usr/bin \
+  && rm -rf /tmp/protoc /tmp/protoc.zip \
+  && protoc --version
+
 # Install RubyGems
 # RUN gem update --system # Upgrading disabled until https://github.com/thoughtbot/appraisal/issues/162 is fixed
 RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"

data/.circleci/images/primary/Dockerfile-jruby-9.2-latest

@@ -60,6 +60,16 @@ RUN DOCKERIZE_URL="https://circle-downloads.s3.amazonaws.com/circleci-images/cac
   && rm -rf /tmp/dockerize-linux-amd64.tar.gz \
   && dockerize --version
 
+# Install Protobuf compiler
+RUN export PROTOC_URL=$(curl -s https://api.github.com/repos/protocolbuffers/protobuf/releases/latest | grep browser_download_url | cut -d '"' -f 4 | grep -e 'protoc-[.0-9]*-linux-x86_64\.zip' | sort -r | head -n 1) \
+  && echo Protoc URL: $PROTOC_URL \
+  && curl --silent --show-error --location --fail --retry 3 --output /tmp/protoc.zip "${PROTOC_URL}" \
+  && ls -lha /tmp/protoc.zip \
+  && unzip /tmp/protoc.zip -d /tmp/protoc \
+  && mv /tmp/protoc/bin/* /usr/bin \
+  && rm -rf /tmp/protoc /tmp/protoc.zip \
+  && protoc --version
+
 # Install RubyGems
 RUN gem update --system
 RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"

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

@@ -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
@@ -201,6 +202,10 @@ Style/HashTransformValues:
 Style/CollectionCompact:
   Enabled: false
 
+# Requires Ruby 2.4
+Performance/RegexpMatch:
+  Enabled: false
+
 # Enforces negative/positive branching order,
 # which can hurt readability.
 Style/NegatedIfElseCondition:
@@ -226,6 +231,14 @@ RSpec/LeadingSubject:
 RSpec/ImplicitSubject:
   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 +258,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

@@ -86,13 +86,20 @@ Lint/MissingCopEnableDirective:
     - 'test/contrib/rails/errors_test.rb'
     - 'test/tracer_test.rb'
 
-# Offense count: 24
+# Offense count: 32
 Lint/MissingSuper:
   Exclude:
     - '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'
@@ -108,6 +115,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:
@@ -149,12 +161,16 @@ 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/ddtrace/contrib/delayed_job/plugin.rb'
     - 'lib/ddtrace/pipeline.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/ddtrace/contrib/cucumber/patcher_spec.rb'
 
 # Offense count: 6
@@ -307,7 +323,7 @@ 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:
@@ -351,7 +367,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'

data/Appraisals

@@ -41,6 +41,8 @@ elsif Gem::Version.new('2.0.0') <= Gem::Version.new(RUBY_VERSION) \
       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
+      gem 'safe_yaml' # Required for makara, as YAML.safe_load is not available in Ruby 2.0
     end
 
     appraise 'rails32-postgres' do
@@ -88,6 +90,7 @@ elsif Gem::Version.new('2.0.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
@@ -99,6 +102,7 @@ elsif Gem::Version.new('2.0.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'rest-client'
       gem 'resque', '< 2.0'
       gem 'rspec', '>= 3.0.0'
+      gem 'safe_yaml' # Required for makara, as YAML.safe_load is not available in Ruby 2.0
       gem 'sequel', '~> 4.0', '< 4.37'
       gem 'sidekiq', '~> 3.5.4'
       gem 'sinatra', '1.4.5'
@@ -107,6 +111,10 @@ elsif Gem::Version.new('2.0.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.1.0') <= Gem::Version.new(RUBY_VERSION) \
       && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.0')
@@ -139,6 +147,7 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       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
@@ -213,6 +222,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
@@ -234,6 +244,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')
@@ -339,6 +353,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'mysql2', '< 1', platform: :ruby
       gem 'sprockets', '< 4'
       gem 'lograge'
+      gem 'mimemagic', '0.3.9' # Pinned until https://github.com/mimemagicrb/mimemagic/issues/142 is resolved.
     end
 
     appraise 'rails5-postgres' do
@@ -346,6 +361,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'sprockets', '< 4'
       gem 'lograge'
+      gem 'mimemagic', '0.3.9' # Pinned until https://github.com/mimemagicrb/mimemagic/issues/142 is resolved.
     end
 
     appraise 'rails5-postgres-redis' do
@@ -354,6 +370,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
       gem 'lograge'
+      gem 'mimemagic', '0.3.9' # Pinned until https://github.com/mimemagicrb/mimemagic/issues/142 is resolved.
     end
 
     appraise 'rails5-postgres-redis-activesupport' do
@@ -362,6 +379,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
       gem 'lograge'
+      gem 'mimemagic', '0.3.9' # Pinned until https://github.com/mimemagicrb/mimemagic/issues/142 is resolved.
     end
 
     appraise 'rails5-postgres-sidekiq' do
@@ -371,6 +389,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'activejob'
       gem 'sprockets', '< 4'
       gem 'lograge'
+      gem 'mimemagic', '0.3.9' # Pinned until https://github.com/mimemagicrb/mimemagic/issues/142 is resolved.
     end
 
     appraise 'contrib' do
@@ -391,10 +410,11 @@ 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 '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'
@@ -417,6 +437,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')
@@ -589,6 +613,7 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'hiredis'
       gem 'http'
       gem 'httpclient'
+      gem 'makara'
       gem 'mongo', '>= 2.8.0'
       gem 'mysql2', '< 0.5', platform: :ruby
       gem 'pg', platform: :ruby
@@ -617,6 +642,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')
@@ -694,6 +723,7 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'hiredis'
       gem 'http'
       gem 'httpclient'
+      gem 'makara'
       gem 'mongo', '>= 2.8.0'
       gem 'mysql2', '< 0.5', platform: :ruby
       gem 'pg', platform: :ruby
@@ -722,6 +752,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')
@@ -895,6 +929,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     gem 'http'
     gem 'httpclient'
     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
@@ -926,6 +961,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'
@@ -1070,6 +1109,7 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'hiredis'
       gem 'http'
       gem 'httpclient'
+      gem 'makara'
       gem 'mongo', '>= 2.8.0'
       gem 'mysql2', '< 1', platform: :ruby
       gem 'pg', platform: :ruby
@@ -1098,6 +1138,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')
@@ -1246,6 +1290,7 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'hiredis'
       gem 'http'
       gem 'httpclient'
+      gem 'makara'
       gem 'mongo', '>= 2.8.0'
       gem 'mysql2', '< 1', platform: :ruby
       gem 'pg', platform: :ruby
@@ -1274,6 +1319,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
@@ -1338,6 +1387,7 @@ elsif Gem::Version.new('3.0.0') <= Gem::Version.new(RUBY_VERSION)
     gem 'hiredis'
     gem 'http'
     gem 'httpclient'
+    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
@@ -1362,4 +1412,8 @@ 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