newrelic_rpm 5.5.0.348 → 7.2.0

data/lib/new_relic/agent/utilization/aws.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/utilization/vendor'
 

data/lib/new_relic/agent/utilization/azure.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 Agent

data/lib/new_relic/agent/utilization/gcp.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/utilization/vendor'
 

data/lib/new_relic/agent/utilization/pcf.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/utilization/vendor'
 

data/lib/new_relic/agent/utilization/vendor.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 'net/http'
 

data/lib/new_relic/agent/utilization_data.rb

@@ -1,16 +1,17 @@
 # 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/utilization/aws'
 require 'new_relic/agent/utilization/gcp'
 require 'new_relic/agent/utilization/azure'
 require 'new_relic/agent/utilization/pcf'
 
+
 module NewRelic
   module Agent
     class UtilizationData
-      METADATA_VERSION = 3
+      METADATA_VERSION = 5
 
       VENDORS = {
         Utilization::AWS   => :'utilization.detect_aws',
@@ -23,6 +24,14 @@ module NewRelic
         NewRelic::Agent::Hostname.get
       end
 
+      def fqdn
+        NewRelic::Agent::Hostname.get_fqdn
+      end
+
+      def ip_addresses
+        ::NewRelic::Agent::SystemInfo.ip_addresses
+      end
+
       def container_id
         ::NewRelic::Agent::SystemInfo.docker_container_id
       end
@@ -69,6 +78,9 @@ module NewRelic
         append_docker_info(result)
         append_configured_values(result)
         append_boot_id(result)
+        append_ip_address(result)
+        append_full_hostname(result)
+        append_kubernetes_info(result)
 
         result
       end
@@ -105,6 +117,29 @@ module NewRelic
         end
       end
 
+      def append_ip_address(collector_hash)
+        ips = ip_addresses
+        collector_hash[:ip_address] = ips unless ips.empty?
+      end
+
+      KUBERNETES_SERVICE_HOST = 'KUBERNETES_SERVICE_HOST'.freeze
+
+      def append_kubernetes_info(collector_hash)
+        return unless Agent.config[:'utilization.detect_kubernetes']
+        if host = ENV[KUBERNETES_SERVICE_HOST]
+          collector_hash[:vendors] ||= {}
+          collector_hash[:vendors][:kubernetes] = {
+            kubernetes_service_host: host
+          }
+        end
+      end
+
+      def append_full_hostname(collector_hash)
+        full_hostname = fqdn
+        return if full_hostname.nil? || full_hostname.empty?
+        collector_hash[:full_hostname] = full_hostname
+      end
+
       def config_hash
         config_hash = {}
 

data/lib/new_relic/agent/vm.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/language_support'
 require 'new_relic/agent/vm/mri_vm'

data/lib/new_relic/agent/vm/jruby_vm.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 'thread'
 require 'new_relic/agent/vm/snapshot'

data/lib/new_relic/agent/vm/monotonic_gc_profiler.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.
 
 # The GC::Profiler class available on MRI has to be reset periodically to avoid
 # memory "leaking" in the underlying implementation. However, it's a major

data/lib/new_relic/agent/vm/mri_vm.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 'thread'
 require 'new_relic/agent/vm/snapshot'
@@ -45,9 +45,11 @@ module NewRelic
 
         def gather_ruby_vm_stats(snap)
           if supports?(:method_cache_invalidations)
-            vm_stats = RubyVM.stat
-            snap.method_cache_invalidations = vm_stats[:global_method_state]
-            snap.constant_cache_invalidations = vm_stats[:global_constant_state]
+            snap.method_cache_invalidations = RubyVM.stat[:global_method_state]
+          end
+
+          if supports?(:constant_cache_invalidations)
+            snap.constant_cache_invalidations = RubyVM.stat[:global_constant_state]
           end
         end
 
@@ -66,7 +68,7 @@ module NewRelic
           when :minor_gc_count
             RUBY_VERSION >= '2.1.0'
           when :method_cache_invalidations
-            RUBY_VERSION >= '2.1.0'
+            RUBY_VERSION >= '2.1.0' && RUBY_VERSION < '3.0.0'
           when :constant_cache_invalidations
             RUBY_VERSION >= '2.1.0'
           else

data/lib/new_relic/agent/vm/snapshot.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 Agent

data/lib/new_relic/agent/worker_loop.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 'thread'
 

data/lib/new_relic/cli/command.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 'optparse'
 

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

@@ -1,13 +1,12 @@
 # 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.
 
 # This is a class for executing commands related to deployment
 # events.  It runs without loading the rails environment
 
 require 'yaml'
 require 'net/http'
-require 'rexml/document'
 require 'new_relic/agent/hostname'
 
 # We need to use the Control object but we don't want to load
@@ -39,7 +38,7 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
     control.env = @environment if @environment
 
     load_yaml_from_env(control.env)
-    @appname ||= NewRelic::Agent.config.app_names[0] || control.env || 'development'
+    @appname ||= NewRelic::Agent.config[:app_name][0] || control.env || 'development'
     @license_key ||= NewRelic::Agent.config[:license_key]
 
     setup_logging(control.env)

data/lib/new_relic/cli/commands/install.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 'fileutils'
 require 'new_relic/version'
@@ -40,8 +40,8 @@ class NewRelic::Cli::Install < NewRelic::Cli::Command
 
   def run
     dest_file = File.expand_path(@dest_dir + "/newrelic.yml")
-    if File.exist?(dest_file)
-      raise NewRelic::Cli::Command::CommandFailure, "newrelic.yml file already exists.  Move it out of the way."
+    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) }
 
@@ -73,6 +73,7 @@ Visit support.newrelic.com if you are experiencing installation issues.
 
   def options
     OptionParser.new "Usage: #{$0} #{self.class.command} [ OPTIONS] 'application name'", 40 do |o|
+      o.on("-f", "--force", "Overwrite newrelic.yml if it exists") { | e | @force = true }
       o.on("-l", "--license_key=NAME", String,
              "Use the given license key") { | e | @license_key = e }
       o.on("-d", "--destdir=name", String,

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

data/lib/new_relic/constants.rb

@@ -0,0 +1,42 @@
+# 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"
+
+  # Right now, old and new Rubies are the same.  Intention is to use "(...)" for
+  # Ruby 2.7+ for argument delegation, but doing so is a breaking API change.
+  ARGS_FOR_RUBY_VERSION = RUBY_VERSION < "2.7.0" ? "*args, &block" : "*args, &block"
+
+  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
@@ -82,15 +82,17 @@ module NewRelic
         end
 
         def install_browser_monitoring(config)
-          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
-            ::NewRelic::Agent.logger.debug("Installed New Relic Browser Monitoring middleware")
-          rescue => e
-            ::NewRelic::Agent.logger.warn("Error installing New Relic Browser Monitoring middleware", e)
+          @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
+              ::NewRelic::Agent.logger.debug("Installed New Relic Browser Monitoring middleware")
+            rescue => e
+              ::NewRelic::Agent.logger.warn("Error installing New Relic Browser Monitoring middleware", e)
+            end
           end
         end