newrelic_rpm 4.8.0.341 → 6.13.1

data/lib/new_relic/agent/transaction_metrics.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.
 
 # This class represents a set of metrics that were recorded during a single
 # transaction. Since the name of the transaction is not known until its end, we

data/lib/new_relic/agent/transaction_sampler.rb

@@ -1,10 +1,9 @@
 # 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/transaction/slowest_sample_buffer'
 require 'new_relic/agent/transaction/synthetics_sample_buffer'
-require 'new_relic/agent/transaction/xray_sample_buffer'
 require 'new_relic/agent/transaction/trace_builder'
 
 module NewRelic
@@ -19,13 +18,10 @@ module NewRelic
     #
     # @api public
     class TransactionSampler
-      attr_reader :last_sample, :xray_sample_buffer
+      attr_reader :last_sample
 
       def initialize
-        @xray_sample_buffer = NewRelic::Agent::Transaction::XraySampleBuffer.new
-
         @sample_buffers = []
-        @sample_buffers << @xray_sample_buffer
         @sample_buffers << NewRelic::Agent::Transaction::SlowestSampleBuffer.new
         @sample_buffers << NewRelic::Agent::Transaction::SyntheticsSampleBuffer.new
 
@@ -54,14 +50,7 @@ module NewRelic
         Agent.config[:'transaction_tracer.enabled']
       end
 
-      # This is called when we are done with the transaction.  We've
-      # unwound the stack to the top level. It also clears the
-      # transaction sample builder so that it won't continue to have
-      # frames appended to it.
-      #
-      # It sets various instance variables to the finished sample,
-      # depending on which settings are active. See `store_sample`
-      def on_finishing_transaction(state, txn, time=Time.now)
+      def on_finishing_transaction(txn)
         return if !enabled? || txn.ignore_trace?
 
         @samples_lock.synchronize do

data/lib/new_relic/agent/transaction_time_aggregator.rb

@@ -0,0 +1,155 @@
+# 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.
+
+# This module powers the Busy calculation for the Capacity report in
+# APM (https://rpm.newrelic.com/accounts/.../applications/.../optimize/capacity_analysis).
+#
+#               total time spent in transactions this harvest across all threads
+# Busy time = ------------------------------------------------------------------------
+#             (elapsed time for this harvest cycle) * (# threads that had transactions)
+#
+module NewRelic
+  module Agent
+    module TransactionTimeAggregator
+      TransactionStats = Struct.new :transaction_started_at, :elapsed_transaction_time
+
+      @lock                     = Mutex.new
+      @harvest_cycle_started_at = Time.now
+
+      @stats = Hash.new do |h, k|
+        h[k] = TransactionStats.new nil, 0.0
+      end
+
+      def reset!(timestamp = Time.now)
+        @harvest_cycle_started_at = timestamp
+        @stats.clear
+      end
+
+      def transaction_start(timestamp = Time.now)
+        @lock.synchronize do
+          set_transaction_start_time timestamp
+        end
+      end
+
+      def transaction_stop(timestamp = Time.now, starting_thread_id = current_thread)
+        @lock.synchronize do
+          record_elapsed_transaction_time_until timestamp, starting_thread_id
+          set_transaction_start_time nil, starting_thread_id
+        end
+      end
+
+      INSTANCE_BUSY_METRIC = 'Instance/Busy'.freeze
+
+      def harvest!(timestamp = Time.now)
+        active_threads = 0
+        result = @lock.synchronize do
+          # Sum up the transaction times spent in each thread
+          elapsed_transaction_time = @stats.inject(0.0) do |total, (thread_id, entry)|
+            total + transaction_time_in_thread(timestamp, thread_id, entry)
+          end
+
+          active_threads = @stats.size
+          elapsed_harvest_time      = (timestamp - @harvest_cycle_started_at) * active_threads
+          @harvest_cycle_started_at = timestamp
+
+          # Clear out the stats for all threads, _except_ the live ones
+          # that have transactions still open (we'll count the rest of
+          # those in a future harvest)
+          @stats.keep_if do |thread_id, _|
+            in_transaction?(thread_id) && thread_is_alive?(thread_id)
+          end
+
+          if elapsed_harvest_time > 0.0
+            elapsed_transaction_time / elapsed_harvest_time
+          else
+            0.0
+          end
+        end
+
+        if Agent.config[:report_instance_busy]
+          NewRelic::Agent.record_metric(INSTANCE_BUSY_METRIC, result)
+        end
+
+        result
+      end
+
+      module_function :reset!,
+                      :transaction_start,
+                      :transaction_stop,
+                      :harvest!
+
+      class << self
+        private
+
+        def record_elapsed_transaction_time_until(timestamp, thread_id = current_thread)
+          if @stats[thread_id].transaction_started_at
+            @stats[thread_id].elapsed_transaction_time +=
+              (timestamp - (@stats[thread_id].transaction_started_at || 0.0))
+          else
+            log_missing_elapsed_transaction_time
+          end
+        end
+
+        def in_transaction?(thread_id = current_thread)
+          !!@stats[thread_id].transaction_started_at
+        end
+
+        def current_thread
+          Thread.current.object_id
+        end
+
+        def thread_is_alive?(thread_id)
+          thread = thread_by_id thread_id
+          thread && thread.alive?
+        rescue StandardError
+          false
+        end
+
+        # ObjectSpace is faster on MRI, but disabled by default on JRuby for
+        # perfomance reasons. We have two implmentations of `thread_by_id`
+        # based on ruby implementation.
+        if RUBY_ENGINE == 'jruby'
+          def thread_by_id thread_id
+            Thread.list.detect { |t| t.object_id == thread_id }
+          end
+        else
+          require 'objspace'
+
+          def thread_by_id thread_id
+            ObjectSpace._id2ref(thread_id)
+          end
+        end
+
+        def set_transaction_start_time(timestamp, thread_id = current_thread)
+          @stats[thread_id].transaction_started_at = timestamp
+        end
+
+        def split_transaction_at_harvest(timestamp, thread_id = nil)
+          raise ArgumentError, 'thread_id required' unless thread_id
+          @stats[thread_id].transaction_started_at = timestamp
+          @stats[thread_id].elapsed_transaction_time = 0.0
+        end
+
+        def transaction_time_in_thread timestamp, thread_id, entry
+          return entry.elapsed_transaction_time unless in_transaction? thread_id
+
+          # Count the portion of the transaction that's elapsed so far,...
+          elapsed = record_elapsed_transaction_time_until timestamp, thread_id
+
+          # ...then readjust the transaction start time to the next harvest
+          split_transaction_at_harvest timestamp, thread_id
+
+          elapsed
+        end
+
+        def log_missing_elapsed_transaction_time
+          transaction_name = Tracer.current_transaction &&
+            Tracer.current_transaction.best_name ||
+              "unknown"
+          NewRelic::Agent.logger.warn("Unable to calculate elapsed transaction time for #{transaction_name}")
+        end
+      end
+    end
+  end
+end

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'

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,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.
 
 # This is a class for executing commands related to deployment
 # events.  It runs without loading the rails environment
@@ -39,7 +39,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