newrelic_rpm 8.11.0 → 8.13.0

data/lib/new_relic/agent.rb

@@ -102,8 +102,6 @@ module NewRelic
     # An error while serializing data for the collector
     class SerializationError < StandardError; end
 
-    class BackgroundLoadingError < StandardError; end
-
     # placeholder name used when we cannot determine a transaction's name
     UNKNOWN_METRIC = '(unknown)'.freeze
 
@@ -115,6 +113,7 @@ module NewRelic
     # The singleton Agent instance.  Used internally.
     def agent # :nodoc:
       return @agent if @agent
+
       NewRelic::Agent.logger.warn("Agent unavailable as it hasn't been started.")
       NewRelic::Agent.logger.warn(caller.join("\n"))
       nil
@@ -217,6 +216,7 @@ module NewRelic
 
     def increment_metric(metric_name, amount = 1) # THREAD_LOCAL_ACCESS
       return unless agent
+
       if amount == 1
         metrics = [metric_name, SUPPORTABILITY_INCREMENT_METRIC]
         agent.stats_engine.tl_record_unscoped_metrics(metrics) { |stats| stats.increment_count }
@@ -347,6 +347,7 @@ module NewRelic
     #
     def manual_start(options = {})
       raise "Options must be a hash" unless Hash === options
+
       NewRelic::Control.instance.init_plugin({:agent_enabled => true, :sync_startup => true}.merge(options))
       record_api_supportability_metric(:manual_start)
     end
@@ -757,6 +758,7 @@ module NewRelic
       record_api_supportability_metric(:browser_timing_header)
 
       return EMPTY_STR unless agent
+
       agent.javascript_instrumentor.browser_timing_header(nonce)
     end
 

data/lib/new_relic/cli/commands/install.rb

@@ -42,6 +42,7 @@ class NewRelic::Cli::Install < NewRelic::Cli::Command
     if File.exist?(dest_file) && !@force
       raise NewRelic::Cli::Command::CommandFailure, "newrelic.yml file already exists.  Use --force flag to overwrite."
     end
+
     File.open(dest_file, 'w') { |out| out.puts(content) }
 
     puts <<-EOF unless quiet

data/lib/new_relic/coerce.rb

@@ -22,6 +22,7 @@ module NewRelic
 
     def int_or_nil(value, context = nil)
       return nil if value.nil?
+
       Integer(value)
     rescue => error
       log_failure(value, Integer, context, error)
@@ -31,6 +32,7 @@ module NewRelic
     def float(value, context = nil)
       result = Float(value)
       raise "Value #{result.inspect} is not finite." unless result.finite?
+
       result
     rescue => error
       log_failure(value, Float, context, error)
@@ -39,6 +41,7 @@ module NewRelic
 
     def string(value, context = nil)
       return value if value.nil?
+
       String(value)
     rescue => error
       log_failure(value.class, String, context, error)
@@ -62,6 +65,7 @@ module NewRelic
 
     def int!(value)
       return nil unless value_or_nil(value)
+
       Integer(value)
     end
 
@@ -74,11 +78,13 @@ module NewRelic
 
     def float!(value, precision = NewRelic::PRIORITY_PRECISION)
       return nil unless value_or_nil(value)
+
       value.to_f.round(precision)
     end
 
     def value_or_nil(value)
       return nil if value.nil? || (value.respond_to?(:empty?) && value.empty?)
+
       value
     end
 

data/lib/new_relic/collection_helper.rb

@@ -13,6 +13,7 @@ module NewRelic
         when Hash
           # Optimize for empty hash since that is often what this is called with.
           return params if params.empty?
+
           new_params = {}
           params.each do |key, value|
             new_params[truncate(normalize_params(key), 64)] = normalize_params(value)

data/lib/new_relic/constants.rb

@@ -27,6 +27,8 @@ module NewRelic
   TRACEPARENT_KEY = "traceparent"
   TRACESTATE_KEY = "tracestate"
 
+  STANDARD_OUT = 'STDOUT'
+
   HTTP_TRACEPARENT_KEY = "HTTP_#{TRACEPARENT_KEY.upcase}"
   HTTP_TRACESTATE_KEY = "HTTP_#{TRACESTATE_KEY.upcase}"
   HTTP_NEWRELIC_KEY = "HTTP_#{NEWRELIC_KEY.upcase}"

data/lib/new_relic/control/frameworks/rails.rb

@@ -68,11 +68,14 @@ module NewRelic
 
         def install_agent_hooks(config)
           return if defined?(@agent_hooks_installed) && @agent_hooks_installed
+
           @agent_hooks_installed = true
           return if config.nil? || !config.respond_to?(:middleware)
+
           begin
             require 'new_relic/rack/agent_hooks'
             return unless NewRelic::Rack::AgentHooks.needed?
+
             config.middleware.use(NewRelic::Rack::AgentHooks)
             ::NewRelic::Agent.logger.debug("Installed New Relic Agent Hooks middleware")
           rescue => e
@@ -83,8 +86,10 @@ module NewRelic
         def install_browser_monitoring(config)
           @install_lock.synchronize do
             return if defined?(@browser_monitoring_installed) && @browser_monitoring_installed
+
             @browser_monitoring_installed = true
             return if config.nil? || !config.respond_to?(:middleware) || !Agent.config[:'browser_monitoring.auto_instrument']
+
             begin
               require 'new_relic/rack/browser_monitoring'
               config.middleware.use(NewRelic::Rack::BrowserMonitoring)

data/lib/new_relic/control/instrumentation.rb

@@ -62,7 +62,7 @@ module NewRelic
           File.join(instrumentation_path, app.to_s, '*.rb')
         @instrumentation_files.each { |pattern| load_instrumentation_files(pattern) }
         DependencyDetection.detect!
-        ruby_22_deprecation
+        ruby_deprecation
         rails_32_deprecation
         ::NewRelic::Agent.logger.info("Finished instrumentation")
       end
@@ -70,6 +70,7 @@ module NewRelic
 
     def rails_32_deprecation
       return unless defined?(Rails::VERSION) && Gem::Version.new(Rails::VERSION::STRING) <= Gem::Version.new('3.2')
+
       deprecation_msg = 'The Ruby Agent is dropping support for Rails 3.2 ' \
         'in a future major release. Please upgrade your Rails version to continue receiving support. ' \
 
@@ -78,13 +79,12 @@ module NewRelic
         :deprecated_rails_version,
         deprecation_msg
       )
-
-      ::NewRelic::Agent.record_metric("Supportability/Deprecated/Rails32", 1)
     end
 
-    def ruby_22_deprecation
-      return unless RUBY_VERSION <= '2.2.0'
-      deprecation_msg = 'The Ruby Agent is dropping support for Ruby 2.2 ' \
+    def ruby_deprecation
+      return unless RUBY_VERSION < '2.4.0'
+
+      deprecation_msg = 'The Ruby Agent is dropping support for Rubies below 2.4 ' \
         'in version 9.0.0. Please upgrade your Ruby version to continue receiving support. ' \
 
       ::NewRelic::Agent.logger.log_once(
@@ -92,8 +92,6 @@ module NewRelic
         :deprecated_ruby_version,
         deprecation_msg
       )
-
-      ::NewRelic::Agent.record_metric("Supportability/Deprecated/Ruby22", 1)
     end
 
     include Instrumentation

data/lib/new_relic/dependency_detection.rb

@@ -165,6 +165,7 @@ module DependencyDetection
 
     def config_key
       return nil if self.config_name.nil?
+
       @config_key ||= "instrumentation.#{self.config_name}".to_sym
     end
 
@@ -193,6 +194,7 @@ module DependencyDetection
 
     def config_value
       return AUTO_CONFIG_VALUE unless config_key
+
       fetch_config_value(config_key)
     end
 

data/lib/new_relic/helper.rb

@@ -17,6 +17,7 @@ module NewRelic
     # If not force the encoding to ASCII-8BIT (binary)
     def correctly_encoded(string)
       return string unless string.is_a?(String)
+
       # The .dup here is intentional, since force_encoding mutates the target,
       # and we don't know who is going to use this string downstream of us.
       string.valid_encoding? ? string : string.dup.force_encoding(Encoding::ASCII_8BIT)

data/lib/new_relic/language_support.rb

@@ -10,6 +10,7 @@ module NewRelic
     def can_fork?
       # this is expensive to check, so we should only check once
       return @@forkable if !@@forkable.nil?
+
       @@forkable = Process.respond_to?(:fork)
     end
 

data/lib/new_relic/latest_changes.rb

@@ -56,6 +56,7 @@ EOS
           version_count += 1
         end
         break if version_count >= 2
+
         changes << line.sub(/^  \* /, "* ").chomp
       end
       changes

data/lib/new_relic/local_environment.rb

@@ -71,10 +71,10 @@ module NewRelic
         thin
         mongrel
         litespeed
+        unicorn
         webrick
         fastcgi
         rainbows
-        unicorn
       ]
       # TODO: MAJOR VERSION - remove rainbows
       while dispatchers.any? && @discovered_dispatcher.nil?
@@ -85,6 +85,7 @@ module NewRelic
     def check_for_torquebox
       return unless defined?(::JRuby) &&
         (org.torquebox::TorqueBox rescue nil)
+
       @discovered_dispatcher = :torquebox
     end
 
@@ -93,11 +94,13 @@ module NewRelic
         (((com.sun.grizzly.jruby.rack.DefaultRackApplicationFactory rescue nil) &&
           defined?(com::sun::grizzly::jruby::rack::DefaultRackApplicationFactory)) ||
          (jruby_rack? && defined?(::GlassFish::Server)))
+
       @discovered_dispatcher = :glassfish
     end
 
     def check_for_trinidad
       return unless defined?(::JRuby) && jruby_rack? && defined?(::Trinidad::Server)
+
       @discovered_dispatcher = :trinidad
     end
 
@@ -107,17 +110,20 @@ module NewRelic
 
     def check_for_webrick
       return unless defined?(::WEBrick) && defined?(::WEBrick::VERSION)
+
       @discovered_dispatcher = :webrick
     end
 
     def check_for_fastcgi
       return unless defined?(::FCGI)
+
       @discovered_dispatcher = :fastcgi
     end
 
     # this case covers starting by mongrel_rails
     def check_for_mongrel
       return unless defined?(::Mongrel) && defined?(::Mongrel::HttpServer)
+
       @discovered_dispatcher = :mongrel
     end
 

data/lib/new_relic/metric_spec.rb

@@ -44,6 +44,7 @@ class NewRelic::MetricSpec
 
   def to_s
     return name if scope.empty?
+
     "#{name}:#{scope}"
   end
 
@@ -59,6 +60,7 @@ class NewRelic::MetricSpec
   def <=>(o)
     namecmp = self.name <=> o.name
     return namecmp if namecmp != 0
+
     return (self.scope || '') <=> (o.scope || '')
   end
 end

data/lib/new_relic/rack/agent_middleware.rb

@@ -33,11 +33,13 @@ module NewRelic
       # response code before it goes back to the client.
       def capture_http_response_code(state, result)
         return if NewRelic::Agent.config[:disable_middleware_instrumentation]
+
         super
       end
 
       def capture_response_content_type(state, result)
         return if NewRelic::Agent.config[:disable_middleware_instrumentation]
+
         super
       end
     end

data/lib/new_relic/rack/browser_monitoring.rb

@@ -104,6 +104,7 @@ module NewRelic
       end
 
       def streaming?(env, headers)
+        # Chunked transfer encoding is a streaming data transfer mechanism available only in HTTP/1.1
         return true if headers && headers['Transfer-Encoding'] == 'chunked'
 
         defined?(ActionController::Live) &&

data/lib/new_relic/traced_thread.rb

@@ -28,6 +28,7 @@ module NewRelic
 
     def create_traced_block(*args, &block)
       return block if NewRelic::Agent.config[:'instrumentation.thread.tracing'] # if this is on, don't double trace
+
       NewRelic::Agent::Tracer.thread_block_with_current_transaction(*args, &block)
     end
   end

data/lib/new_relic/version.rb

@@ -6,7 +6,7 @@
 module NewRelic
   module VERSION # :nodoc:
     MAJOR = 8
-    MINOR = 11
+    MINOR = 13
     TINY = 0
 
     STRING = "#{MAJOR}.#{MINOR}.#{TINY}"

data/lib/tasks/helpers/format.rb

@@ -25,6 +25,7 @@ module Format
     sections = Hash.new { |hash, key| hash[key] = [] }
     NewRelic::Agent::Configuration::DEFAULTS.each do |key, value|
       next unless value[:public]
+
       key = key.to_s
       section_key = section_key(key, key.split('.'))
       sections[section_key] << format_sections(key, value)
@@ -55,6 +56,7 @@ module Format
 
   def format_default_value(spec)
     return spec[:documentation_default] if !spec[:documentation_default].nil?
+
     if spec[:default].is_a?(Proc)
       '(Dynamic)'
     else
@@ -71,6 +73,7 @@ module Format
 
   def format_env_var(key)
     return "None" if NON_ENV_CONFIGS.include?(key)
+
     "NEW_RELIC_#{key.tr(".", "_").upcase}"
   end
 

data/lib/tasks/helpers/prompt.rb

@@ -15,7 +15,7 @@ module Prompt
     puts
     print "Do you wish to continue? ('y' to continue, return to cancel) [n] "
     continue = STDIN.gets.chomp
-    if continue.casecmp('y').zero?
+    if continue.casecmp('y') == 0
       system(command)
     else
       puts 'Cancelled'

data/lib/tasks/instrumentation_generator/README.md

@@ -58,6 +58,6 @@ Furthermore, we also create very similar snippets inside the default source conf
 
 ## Outcome
 
-A prototype outside the agent has been created that generates the required files to create new instrumentation. This prototype accepts three arguments: name (name of the library), method (method to instrument), args (arguments for the method).
+A prototype outside the agent was first created. This prototype generated the required files to add instrumentation. The prototype accepted three arguments: name (name of the library), method (method to instrument), args (arguments for the method). This prototype has evolved into the current directory.
 
-The Ruby gem Thor, a toolkit for building powerful command-line interfaces used in Bundler, Vagrant, Rails and others powers this CLI.
+This project leverages the Ruby gem Thor, a toolkit for building powerful command-line interfaces used in Bundler, Vagrant, Rails and others powers this CLI.

data/lib/tasks/instrumentation_generator/TODO.md

@@ -22,12 +22,12 @@
 
 # - [ ] Append a new method to instrument to an existing instrumentation class (with tests?)
 
-# - [ ] Documentation: examples of what to add in each gap
-
-# - [ ] Good examples of tests, instrumentation, etc. as comments
+# - [ ] Documentation: examples of what to add in each gap (Good examples of tests, instrumentation, etc. as comments to guide users)
 
 # - [ ] Handle multi-word gem names (camel case for classes, handle hyphens, concurrent-ruby as example)
 
-# - [ ] Make sure multiple arguments can be passed to the command line
+# - [ ] Allow multiple method arguments to be passed to the command line
+
+# - [ ] Add tests for the instrumentation_generator code
 
-# - [ ] Add tests
+# - [ ] See if instrumentation PRs can get automatically generated when an already instrumented library adds methods to its codebase

data/lib/tasks/instrumentation_generator/instrumentation.thor

@@ -11,6 +11,7 @@ class Instrumentation < Thor
   INSTRUMENTATION_ROOT = 'lib/new_relic/agent/instrumentation/'
   MULTIVERSE_SUITE_ROOT = 'test/multiverse/suites/'
   DEFAULT_SOURCE_LOCATION = 'lib/new_relic/agent/configuration/default_source.rb'
+  NEWRELIC_YML_LOCATION = 'newrelic.yml'
 
   desc('scaffold NAME', 'Scaffold the required files for adding new instrumentation')
   long_desc <<-LONGDESC
@@ -37,7 +38,8 @@ class Instrumentation < Thor
 
     empty_directory(base_path)
     create_instrumentation_files(base_path)
-    create_configuration(name)
+    append_to_default_source(name)
+    append_to_newrelic_yml(name)
     create_tests(name)
   end
 
@@ -76,7 +78,7 @@ class Instrumentation < Thor
     template('templates/newrelic.yml.tt', "#{base_path}/config/newrelic.yml")
   end
 
-  def create_configuration(name)
+  def append_to_default_source(name)
     insert_into_file(
       DEFAULT_SOURCE_LOCATION,
       config_block(name.downcase),
@@ -85,18 +87,38 @@ class Instrumentation < Thor
     )
   end
 
-  def config_block(library)
+  def append_to_newrelic_yml(name)
+    insert_into_file(
+      NEWRELIC_YML_LOCATION,
+      yaml_block(name),
+      after: "# instrumentation.bunny: auto\n"
+    )
+  end
+
+  def config_block(name)
     <<-CONFIG
-        :'instrumentation.#{library}' => {
+        :'instrumentation.#{name.downcase}' => {
           :default => 'auto',
           :public => true,
           :type => String,
           :dynamic_name => true,
           :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of the #{library} library at start up. May be one of [auto|prepend|chain|disabled].'
+          :description => 'Controls auto-instrumentation of the #{name} library at start up. May be one of [auto|prepend|chain|disabled].'
         },
     CONFIG
   end
+
+  # TODO: OLD RUBIES - RUBY_VERSION 2.2
+  # When we only support 2.3+ this can be changed to a sqiggle heredoc (<<~)
+  # and use standard indentation
+  def yaml_block(name)
+<<HEREDOC # rubocop:disable Layout/IndentationWidth
+
+  # Controls auto-instrumentation of #{name} at start up.
+  # May be one of [auto|prepend|chain|disabled]
+  # instrumentation.#{name.downcase}: auto
+HEREDOC
+  end
 end
 
 Instrumentation.start(ARGV)

data/lib/tasks/instrumentation_generator/templates/chain.tt

@@ -9,9 +9,10 @@ module NewRelic::Agent::Instrumentation
         include NewRelic::Agent::Instrumentation::<%= @class_name %>
 
         alias_method(:<%= @method.downcase %>_without_new_relic, :<%= @method.downcase %>)
+        alias_method(:<%= @method.downcase %>, :<%= @method.downcase %>_with_new_relic)
 
         def <%= @method.downcase %><%= "(#{@args})" unless @args.empty? %>
-          <%= @method.downcase %>_with_tracing<%= "(#{@args})" unless @args.empty? %> do
+          <%= @method.downcase %>_with_new_relic<%= "(#{@args})" unless @args.empty? %> do
             <%= @method.downcase %>_without_new_relic<%= "(#{@args})" unless @args.empty? %>
           end
         end

data/lib/tasks/instrumentation_generator/templates/chain_method.tt

@@ -1,7 +1,8 @@
-alias_method :<%= @method.downcase %>_without_new_relic, :<%= @method.downcase %>
+alias_method(:<%= @method.downcase %>_without_new_relic, :<%= @method.downcase %>)
+alias_method(:<%= @method.downcase %>, :<%= @method.downcase %>_with_new_relic)
 
 def <%= @method.downcase %><%= "(#{@args})" unless @args.empty? %>
-  <%= @method.downcase %>_with_tracing<%= "(#{@args})" unless @args.empty? %> do
+  <%= @method.downcase %>_with_new_relic<%= "(#{@args})" unless @args.empty? %> do
     <%= @method.downcase %>_without_new_relic<%= "(#{@args})" unless @args.empty? %>
   end
 end

data/lib/tasks/instrumentation_generator/templates/instrumentation.tt

@@ -5,8 +5,9 @@
 module NewRelic::Agent::Instrumentation
   module <%= @class_name %>
 
-    def <%= @method.downcase %>_with_tracing<%= "(#{@args})" unless @args.empty? %>
+    def <%= @method.downcase %>_with_new_relic<%= "(#{@args})" unless @args.empty? %>
       # add instrumentation content here
+      yield
     end
   end
 end

data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt

@@ -1,3 +1,3 @@
-def <%= @method.downcase %>_with_tracing<%= "(#{@args})" unless @args.empty? %>
+def <%= @method.downcase %>_with_new_relic<%= "(#{@args})" unless @args.empty? %>
   # add instrumentation content here
 end

data/lib/tasks/instrumentation_generator/templates/prepend.tt

@@ -7,7 +7,7 @@ module NewRelic::Agent::Instrumentation
     include NewRelic::Agent::Instrumentation::<%= @class_name %>
 
     def <%= @method.downcase %><%= "(#{@args})" unless @args.empty? %>
-      <%= @method.downcase %>_with_tracing<%= "(#{@args})" unless @args.empty? %> { super }
+      <%= @method.downcase %>_with_new_relic<%= "(#{@args})" unless @args.empty? %> { super }
     end
   end
 end

data/lib/tasks/instrumentation_generator/templates/prepend_method.tt

@@ -1,3 +1,3 @@
 def <%= @method.downcase %><%= "(#{@args})" unless @args.empty? %>
-  <%= @method.downcase %>_with_tracing<%= "(#{@args})" unless @args.empty? %> { super }
+  <%= @method.downcase %>_with_new_relic<%= "(#{@args})" unless @args.empty? %> { super }
 end

data/lib/tasks/instrumentation_generator/templates/test.tt

@@ -11,5 +11,5 @@ class <%= @class_name %>InstrumentationTest < Minitest::Test
     NewRelic::Agent.instance.stats_engine.clear_stats
   end
 
-  # Add tests Here
+  # Add tests here
 end

data/newrelic.yml

@@ -145,7 +145,7 @@ common: &default_settings
 
   # Specify a maximum number of custom Insights events to buffer in memory at a
   # time.
-  # custom_insights_events.max_samples_stored: 1000
+  # custom_insights_events.max_samples_stored: 3000
 
   # If false, the agent will not add database_name parameter to transaction or #
   # slow sql traces.
@@ -271,7 +271,7 @@ common: &default_settings
 
   # Forces the exit handler that sends all cached data to collector before
   # shutting down to be installed regardless of detecting scenarios where it
-  # generally should bot be. Known use-case for this option is where Sinatra is
+  # generally should not be. Known use-case for this option is where Sinatra is
   # running as an embedded service within another framework and the agent is
   # detecting the Sinatra app and skipping the at_exit handler as a result.
   # Sinatra classically runs the entire application in an at_exit block and would
@@ -322,6 +322,10 @@ common: &default_settings
   # May be one of [auto|prepend|chain|disabled].
   # instrumentation.delayed_job: auto
 
+  # Controls auto-instrumentation of the elasticsearch library at start up.
+  # May be one of [auto|prepend|chain|disabled].
+  # instrumentation.elasticsearch: auto
+
   # Controls auto-instrumentation of Excon at start up.
   # May be one of [enabled|disabled].
   # instrumentation.excon: auto
@@ -434,7 +438,7 @@ common: &default_settings
   # instrumentation.grpc.host_denylist: ""
 
   # A dictionary of label names and values that will be applied to the data sent
-  # from this agent. May also be expressed asa semicolon-delimited ; string of
+  # from this agent. May also be expressed as a semicolon-delimited ; string of
   # colon-separated : pairs.
   # For example,<var>Server</var>:<var>One</var>;<var>Data Center</var>:<var>Primary</var>.
   # labels: ""
@@ -459,6 +463,12 @@ common: &default_settings
   # If true, the agent obfuscates Mongo queries in transaction traces.
   # mongo.obfuscate_queries: true
 
+  # If true, the agent captures Elasticsearch queries in transaction traces.
+  # elasticsearch.capture_queries: true
+
+  # If true, the agent obfuscates Elasticsearch queries in transaction traces.
+  # elasticsearch.obfuscate_queries: true
+
   # When true, the agent transmits data about your app to the New Relic collector.
   # monitor_mode: true
 

data/newrelic_rpm.gemspec

@@ -51,14 +51,14 @@ https://github.com/newrelic/newrelic-ruby-agent/
   s.add_development_dependency 'httparty' unless ENV['CI'] # for perf tests and Gabby
   s.add_development_dependency 'minitest', "#{RUBY_VERSION >= '2.7.0' ? '5.3.3' : '4.7.5'}"
   s.add_development_dependency 'minitest-stub-const', '0.6'
-  s.add_development_dependency 'mocha', '~> 1.14.0'
+  s.add_development_dependency 'mocha', '~> 1.16'
   s.add_development_dependency 'pry' unless ENV['CI']
   s.add_development_dependency 'rake', '12.3.3'
-  s.add_development_dependency 'rubocop' if RUBY_VERSION > '2.5.0'
-  s.add_development_dependency 'rubocop-minitest' if RUBY_VERSION > '2.5.0'
-  s.add_development_dependency 'rubocop-performance' if RUBY_VERSION > '2.5.0'
-  s.add_development_dependency 'rubocop-rake' if RUBY_VERSION > '2.5.0'
+  s.add_development_dependency 'rubocop' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
+  s.add_development_dependency 'rubocop-minitest' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
+  s.add_development_dependency 'rubocop-performance' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
+  s.add_development_dependency 'rubocop-rake' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
   s.add_development_dependency 'simplecov' if RUBY_VERSION >= '2.7.0'
-  s.add_development_dependency 'thor'
-  s.add_development_dependency 'yard'
+  s.add_development_dependency 'thor' unless ENV['CI']
+  s.add_development_dependency 'yard', "#{RUBY_VERSION < '2.3.0' ? '0.9.26' : '> 0.9.26'}"
 end