newrelic_rpm 4.0.0.332 → 6.13.1

data/lib/new_relic/coerce.rb

@@ -1,17 +1,20 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 module NewRelic
-  # We really don't want to send bad values to the collector, and it doesn't
-  # accept types like Rational that have occasionally slipped into our data.
-  #
-  # These methods are intended to safely coerce things into the form we want,
-  # to provide documentation of expected types on to_collector_array methods,
-  # and to log failures if totally invalid data gets into outgoing data
   module Coerce
+
     module_function
 
+    # We really don't want to send bad values to the collector, and it doesn't
+    # accept types like Rational that have occasionally slipped into our data.
+    #
+    # These non-bang methods are intended to safely coerce things into the form we want,
+    # to provide documentation of expected types on to_collector_array methods,
+    # and to log failures if totally invalid data gets into outgoing data
+
     def int(value, context=nil)
       Integer(value)
     rescue => error
@@ -61,6 +64,28 @@ module NewRelic
       end
     end
 
+    def int! value
+      return nil unless value_or_nil(value)
+      Integer(value)
+    end
+
+    # Use when you plan to perform a boolean check using the integer 1
+    # for true and the integer 0 for false
+    # String values will be converted to 0
+    def boolean_int! value
+      value.to_i
+    end
+
+    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
+
     def log_failure(value, type, context, error)
       msg = "Unable to convert '#{value}' to #{type}"
       msg += " in context '#{context}'" if context

data/lib/new_relic/collection_helper.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic
   module CollectionHelper
@@ -31,24 +31,6 @@ module NewRelic
     end
   end
 
-  # Return an array of strings (backtrace), cleaned up for readability
-  # Return nil if there is no backtrace
-
-  def strip_nr_from_backtrace(backtrace)
-    if backtrace && !Agent.config[:disable_backtrace_cleanup]
-      # this is for 1.9.1, where strings no longer have Enumerable
-      backtrace = backtrace.split("\n") if String === backtrace
-      backtrace = backtrace.map(&:to_s)
-      backtrace = backtrace.reject do |line|
-        line.include?(NewRelic::Control.newrelic_root) or
-        line =~ /^newrelic_rpm\s/
-      end
-      # rename methods back to their original state
-      backtrace = backtrace.collect {|line| line.gsub(/_without_(newrelic|trace)/, "")}
-    end
-    backtrace
-  end
-
   private
 
   # Convert any kind of object to a short string.

data/lib/new_relic/constants.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
+
+module NewRelic
+  PRIORITY_PRECISION = 6
+
+  EMPTY_ARRAY = [].freeze
+  EMPTY_HASH = {}.freeze
+  EMPTY_STR = ""
+
+  HTTP = "HTTP"
+  HTTPS = "HTTPS"
+  UNKNOWN = "Unknown"
+
+  FORMAT_NON_RACK = 0
+  FORMAT_RACK = 1
+
+  NEWRELIC_KEY = "newrelic"
+  CANDIDATE_NEWRELIC_KEYS = [
+    NEWRELIC_KEY,
+    'NEWRELIC',
+    'NewRelic',
+    'Newrelic'
+  ].freeze
+
+  TRACEPARENT_KEY = "traceparent"
+  TRACESTATE_KEY = "tracestate"
+
+  HTTP_TRACEPARENT_KEY = "HTTP_#{TRACEPARENT_KEY.upcase}"
+  HTTP_TRACESTATE_KEY = "HTTP_#{TRACESTATE_KEY.upcase}"
+  HTTP_NEWRELIC_KEY = "HTTP_#{NEWRELIC_KEY.upcase}"
+
+  CONNECT_RETRY_PERIODS = [15, 15, 30, 60, 120, 300]
+  MIN_RETRY_PERIOD = 15
+  MAX_RETRY_PERIOD = 300
+end

data/lib/new_relic/control.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'yaml'
 require 'new_relic/dependency_detection'

data/lib/new_relic/control/class_methods.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic
   class Control
@@ -49,13 +49,19 @@ module NewRelic
           # maybe it is already loaded by some external system
           # i.e. rpm_contrib or user extensions?
         end
-        NewRelic::Control::Frameworks.const_get(framework.to_s.capitalize)
+        NewRelic::Control::Frameworks.const_get(camelize(framework.to_s))
       end
 
       # The root directory for the plugin or gem
       def newrelic_root
         File.expand_path(File.join("..", "..", "..", ".."), __FILE__)
       end
+
+      def camelize(snake_case_name)
+        snake_case_name.gsub(/(\_|^)[a-z]/) do |substring|
+          substring[-1].capitalize!
+        end
+      end
     end
     extend ClassMethods
   end

data/lib/new_relic/control/frameworks.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic
   class Control

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'new_relic/control/frameworks/ruby'
 module NewRelic

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic
   class Control

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'new_relic/control/frameworks/ruby'
 module NewRelic
@@ -12,7 +12,7 @@ module NewRelic
       class Rails < NewRelic::Control::Frameworks::Ruby
 
         def env
-          @env ||= RAILS_ENV.dup
+          @env ||= ( ENV['NEW_RELIC_ENV'] || RAILS_ENV.dup )
         end
 
         # Rails can return an empty string from this method, causing
@@ -58,7 +58,6 @@ module NewRelic
             # is running, if it thinks it's a rake task, or if the agent_enabled is false.
             ::NewRelic::Agent.logger.info("New Relic Agent not running.")
           else
-            install_developer_mode(rails_config) if Agent.config[:developer_mode]
             install_browser_monitoring(rails_config)
             install_agent_hooks(rails_config)
           end
@@ -95,25 +94,6 @@ module NewRelic
           end
         end
 
-        def install_developer_mode(rails_config)
-          return if defined?(@developer_mode_installed) && @developer_mode_installed
-          @developer_mode_installed = true
-          if rails_config && rails_config.respond_to?(:middleware)
-            begin
-              require 'new_relic/rack/developer_mode'
-              rails_config.middleware.use NewRelic::Rack::DeveloperMode
-              ::NewRelic::Agent.logger.info("New Relic Agent Developer Mode enabled.")
-              if env == "production"
-                ::NewRelic::Agent.logger.warn("***New Relic Developer Mode is not intended to be enabled in production environments! We highly recommend setting developer_mode: false for the production environment in your newrelic.yml.")
-              end
-            rescue => e
-              ::NewRelic::Agent.logger.warn("Error installing New Relic Developer Mode", e)
-            end
-          elsif rails_config
-            ::NewRelic::Agent.logger.warn("Developer mode not available for Rails versions prior to 2.2")
-          end
-        end
-
         def rails_version
           @rails_version ||= Gem::Version.new(::Rails::VERSION::STRING)
         end

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'new_relic/control/frameworks/rails'
 
@@ -15,7 +15,7 @@ module NewRelic
       class Rails3 < NewRelic::Control::Frameworks::Rails
 
         def env
-          @env ||= ::Rails.env.to_s
+          @env ||= ( ENV['NEW_RELIC_ENV'] || ::Rails.env.to_s )
         end
 
         def rails_root

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'new_relic/control/frameworks/rails3'
 

data/lib/new_relic/control/frameworks/{rails5.rb → rails_notifications.rb}

@@ -1,13 +1,13 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'new_relic/control/frameworks/rails4'
 
 module NewRelic
   class Control
     module Frameworks
-      class Rails5 < NewRelic::Control::Frameworks::Rails4
+      class RailsNotifications < NewRelic::Control::Frameworks::Rails4
       end
     end
   end

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic
   class Control
@@ -8,8 +8,8 @@ module NewRelic
       # A control used when no framework is detected - the default.
       class Ruby < NewRelic::Control
         def env
-          @env ||= ENV['NEW_RELIC_ENV'] || ENV['RUBY_ENV'] ||
-                   ENV['RAILS_ENV']     || ENV['RACK_ENV'] || 'development'
+          @env ||= ENV['NEW_RELIC_ENV'] || ENV['RUBY_ENV'] || ENV['RAILS_ENV'] ||
+                   ENV['APP_ENV']       || ENV['RACK_ENV'] || 'development'
         end
 
         def root

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'new_relic/control/frameworks/ruby'
 module NewRelic

data/lib/new_relic/control/instance_methods.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'new_relic/agent/null_logger'
 require 'new_relic/agent/memory_logger'
@@ -68,7 +68,10 @@ module NewRelic
         Module.send :include, NewRelic::Agent::MethodTracer
         init_config(options)
         NewRelic::Agent.agent = NewRelic::Agent::Agent.instance
-        if Agent.config[:agent_enabled] && !NewRelic::Agent.instance.started?
+
+        if !security_settings_valid?
+          handle_invalid_security_settings
+        elsif Agent.config[:agent_enabled] && !NewRelic::Agent.instance.started?
           start_agent
           install_instrumentation
         elsif !Agent.config[:agent_enabled]
@@ -98,14 +101,34 @@ module NewRelic
         Agent.config.replace_or_add_config(manual)
 
         config_file_path = @config_file_override || Agent.config[:config_path]
-        Agent.config.replace_or_add_config(Agent::Configuration::YamlSource.new(config_file_path, env))
+        yaml_source = Agent::Configuration::YamlSource.new(config_file_path, env)
+        if yaml_source.failed?
+          yaml_source.failures.each do |msg|
+            stdout.puts Agent::AgentLogger.format_fatal_error(msg)
+          end
+        end
+        Agent.config.replace_or_add_config(yaml_source)
 
-        if Agent.config[:high_security]
+        if security_settings_valid? && Agent.config[:high_security]
           Agent.logger.info("Installing high security configuration based on local configuration")
           Agent.config.replace_or_add_config(Agent::Configuration::HighSecuritySource.new(Agent.config))
         end
       end
 
+      def security_settings_valid?
+        !Agent.config[:high_security] ||
+          Agent.config[:security_policies_token].empty?
+      end
+
+      def handle_invalid_security_settings
+        NewRelic::Agent.logger.error "Security Policies and High Security " \
+          "Mode cannot both be present in the agent configuration. If " \
+          "Security Policies have been set for your account, please " \
+          "ensure the security_policies_token is set but high_security is " \
+          "disabled (default)."
+        install_shim
+      end
+
       # Install the real agent into the Agent module, and issue the start command.
       def start_agent
         @started_in_env = self.env
@@ -155,6 +178,9 @@ module NewRelic
         '.'
       end
 
+      def stdout
+        STDOUT
+      end
     end
     include InstanceMethods
   end

data/lib/new_relic/control/instrumentation.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic
   class Control

data/lib/new_relic/control/server_methods.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic
   class Control

data/lib/new_relic/delayed_job_injection.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic
   module DelayedJobInjection

data/lib/new_relic/dependency_detection.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module DependencyDetection
 
@@ -93,8 +93,8 @@ module DependencyDetection
       end
     end
 
-    def depends_on
-      @dependencies << Proc.new
+    def depends_on &block
+      @dependencies << block if block_given?
     end
 
     def allowed_by_config?
@@ -114,8 +114,8 @@ module DependencyDetection
       self.name = new_name
     end
 
-    def executes
-      @executes << Proc.new
+    def executes &block
+      @executes << block if block_given?
     end
   end
 end

data/lib/new_relic/environment_report.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic
   # The EnvironmentReport is responsible for analyzing the application's
@@ -70,7 +70,11 @@ module NewRelic
     report_on('OS version'        ) { ::NewRelic::Agent::SystemInfo.os_version             }
     report_on('OS'                ) { ::NewRelic::Agent::SystemInfo.ruby_os_identifier     }
     report_on('Database adapter'  ) do
-      ActiveRecord::Base.configurations[NewRelic::Control.instance.env]['adapter']
+      begin
+        ActiveRecord::Base.configurations.configs_for(env_name: NewRelic::Control.instance.env, spec_name: "primary").config['adapter']
+      rescue NoMethodError
+        ActiveRecord::Base.configurations[NewRelic::Control.instance.env]['adapter']
+      end
     end
     report_on('Framework'       ) { Agent.config[:framework].to_s  }
     report_on('Dispatcher'      ) { Agent.config[:dispatcher].to_s }