newrelic_rpm 5.5.0.348 → 6.2.0.354

data/lib/new_relic/agent/utilization_data.rb

@@ -7,10 +7,11 @@ 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.rb

@@ -76,7 +76,11 @@ module NewRelic
     class ForceDisconnectException < StandardError; end
 
     # An exception that forces an agent to restart.
-    class ForceRestartException < StandardError; end
+    class ForceRestartException < StandardError
+      def message
+        "#{super}, restarting."
+      end
+    end
 
     # Used to blow out of a periodic task without logging a an error, such as for routine
     # failures.
@@ -487,7 +491,7 @@ module NewRelic
     # Yield to the block without collecting any metrics or traces in
     # any of the subsequent calls.  If executed recursively, will keep
     # track of the first entry point and turn on tracing again after
-    # leaving that block.  This uses the thread local TransactionState.
+    # leaving that block.  This uses the thread local Tracer::State.
     #
     # @api public
     #
@@ -544,13 +548,13 @@ module NewRelic
 
     # Check to see if we are capturing metrics currently on this thread.
     def tl_is_execution_traced?
-      NewRelic::Agent::TransactionState.tl_get.is_execution_traced?
+      NewRelic::Agent::Tracer.state.is_execution_traced?
     end
 
     # helper method to check the thread local to determine whether sql
     # is being recorded or not
     def tl_is_sql_recorded?
-      NewRelic::Agent::TransactionState.tl_get.is_sql_recorded?
+      NewRelic::Agent::Tracer.state.is_sql_recorded?
     end
 
     # @!group Adding custom attributes to traces

data/lib/new_relic/build.rb

@@ -1,2 +1,2 @@
-# GITSHA: abfff6456eb7a1c07b7ba490f170821a52742f92
-module NewRelic; module VERSION; BUILD='348'; end; end
+# GITSHA: aa8729185abae27cfa81e0e908b89b5572b8d365
+module NewRelic; module VERSION; BUILD='354'; end; end

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

@@ -0,0 +1,14 @@
+# 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.
+
+require 'new_relic/control/frameworks/rails4'
+
+module NewRelic
+  class Control
+    module Frameworks
+      class Rails6 < NewRelic::Control::Frameworks::Rails4
+      end
+    end
+  end
+end

data/lib/new_relic/latest_changes.rb

@@ -26,7 +26,7 @@ EOS
     # * This is a patch item (3.7.1.188)
     def self.read_patch(patch_level, changelog=default_changelog)
       latest = extract_latest_changes(File.read(changelog))
-      changes = ["## v#{patch_level} ##", ""]
+      changes = ["## v#{patch_level}", ""]
 
       current_item = nil
       latest.each do |line|
@@ -52,7 +52,7 @@ EOS
       changes = []
       version_count = 0
       contents.each_line do |line|
-        if line.match(/##\s+v[\d.]+\s+##/)
+        if line.match(/##\s+v[\d.]+/)
           version_count += 1
         end
         break if version_count >= 2

data/lib/new_relic/rack/agent_middleware.rb

@@ -2,7 +2,7 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-require 'new_relic/agent/transaction_state'
+require 'new_relic/agent/tracer'
 require 'new_relic/agent/instrumentation/controller_instrumentation'
 require 'new_relic/agent/instrumentation/middleware_tracing'
 

data/lib/new_relic/version.rb

@@ -10,8 +10,8 @@ module NewRelic
       parts.compact.join('.')
     end
 
-    MAJOR = 5
-    MINOR = 5
+    MAJOR = 6
+    MINOR = 2
     TINY  = 0
 
     begin

data/newrelic_rpm.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.version = NewRelic::VERSION::STRING
   s.required_ruby_version = '>= 2.0.0'
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = [ "Matthew Wear", "Chris Pine", "Erin Dees", "Rachel Klein" ]
+  s.authors = [ "Matthew Wear", "Chris Pine", "Rachel Klein", "Justin Foote" ]
   s.date = Time.now.strftime('%Y-%m-%d')
   s.licenses    = ['New Relic']
   s.description = <<-EOS
@@ -45,15 +45,8 @@ EOS
   s.add_development_dependency 'minitest', '~> 4.7.5'
   s.add_development_dependency 'mocha', '~> 0.13.0'
   s.add_development_dependency 'yard'
-  s.add_development_dependency 'rails', '~> 3.2.13'
-  s.add_development_dependency 'json', '>= 2.0.2' if RUBY_VERSION >= '2.4.0' # possible bundler issue?
   s.add_development_dependency 'pry-nav', '~> 0.2.4'
   s.add_development_dependency 'pry-stack_explorer', '~> 0.4.9'
   s.add_development_dependency 'hometown', '~> 0.2.5'
-
-  if RUBY_PLATFORM == 'java'
-    s.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
-  else
-    s.add_development_dependency 'sqlite3'
-  end
+  s.add_development_dependency 'bundler', '< 2.0'
 end

data/test/agent_helper.rb

@@ -334,10 +334,10 @@ def in_transaction(*args, &blk)
   name = opts.key?(:transaction_name) ? opts.delete(:transaction_name) :
                                         args.first || 'dummy'
 
-  state = NewRelic::Agent::TransactionState.tl_get
+  state = NewRelic::Agent::Tracer.state
   txn = nil
 
-  NewRelic::Agent::Transaction.wrap(state, name, category, opts) do
+  NewRelic::Agent::Tracer.in_transaction(name: name, category: category, options: opts) do
     txn = state.current_transaction
     yield state.current_transaction
   end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 5.5.0.348
+  version: 6.2.0.354
 platform: ruby
 authors:
 - Matthew Wear
 - Chris Pine
-- Erin Dees
 - Rachel Klein
+- Justin Foote
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2019-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -69,34 +69,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
@@ -140,19 +112,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.5
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 description: |
   New Relic is a performance management system, developed by New Relic,
   Inc (http://www.newrelic.com).  New Relic provides you with deep
@@ -273,6 +245,8 @@ files:
 - lib/new_relic/agent/instrumentation/active_record_helper.rb
 - lib/new_relic/agent/instrumentation/active_record_prepend.rb
 - lib/new_relic/agent/instrumentation/active_record_subscriber.rb
+- lib/new_relic/agent/instrumentation/active_storage.rb
+- lib/new_relic/agent/instrumentation/active_storage_subscriber.rb
 - lib/new_relic/agent/instrumentation/acts_as_solr.rb
 - lib/new_relic/agent/instrumentation/authlogic.rb
 - lib/new_relic/agent/instrumentation/bunny.rb
@@ -369,6 +343,7 @@ files:
 - lib/new_relic/agent/threading/backtrace_service.rb
 - lib/new_relic/agent/threading/thread_profile.rb
 - lib/new_relic/agent/timestamp_sampled_buffer.rb
+- lib/new_relic/agent/tracer.rb
 - lib/new_relic/agent/transaction.rb
 - lib/new_relic/agent/transaction/abstract_segment.rb
 - lib/new_relic/agent/transaction/attributes.rb
@@ -392,7 +367,6 @@ files:
 - lib/new_relic/agent/transaction_event_recorder.rb
 - lib/new_relic/agent/transaction_metrics.rb
 - lib/new_relic/agent/transaction_sampler.rb
-- lib/new_relic/agent/transaction_state.rb
 - lib/new_relic/agent/transaction_time_aggregator.rb
 - lib/new_relic/agent/utilization/aws.rb
 - lib/new_relic/agent/utilization/azure.rb
@@ -421,6 +395,7 @@ files:
 - lib/new_relic/control/frameworks/rails3.rb
 - lib/new_relic/control/frameworks/rails4.rb
 - lib/new_relic/control/frameworks/rails5.rb
+- lib/new_relic/control/frameworks/rails6.rb
 - lib/new_relic/control/frameworks/ruby.rb
 - lib/new_relic/control/frameworks/sinatra.rb
 - lib/new_relic/control/instance_methods.rb
@@ -486,8 +461,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: New Relic Ruby Agent

data/lib/new_relic/agent/transaction_state.rb

@@ -1,186 +0,0 @@
-# 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.
-
-module NewRelic
-  module Agent
-
-    # This is THE location to store thread local information during a transaction
-    # Need a new piece of data? Add a method here, NOT a new thread local variable.
-    class TransactionState
-      class << self
-        def tl_get
-          tl_state_for(Thread.current)
-        end
-
-        alias_method :trace_state, :tl_get
-
-        def tracing_enabled?
-          trace_state.tracing_enabled?
-        end
-
-        def current_transaction
-          trace_state.current_transaction
-        end
-
-        # A more ergonomic API would be to have transaction derive the
-        # category from the transaction name and we should explore this as an
-        # option.
-        def start_transaction(name: nil, category: nil, **options)
-          raise ArgumentError, 'missing required argument: name' if name.nil?
-          raise ArgumentError, 'missing required argument: category' if category.nil?
-
-          state = trace_state
-          return state.current_transaction if state.current_transaction
-
-          options[:transaction_name] = name
-
-          Transaction.start_new_transaction(trace_state,
-                                            category,
-                                            options)
-        end
-
-        def create_distributed_trace_payload
-          if txn = current_transaction
-            txn.create_distributed_trace_payload
-          end
-        end
-
-        def accept_distributed_trace_payload(payload)
-          if txn = current_transaction
-            txn.accept_distributed_trace_payload(payload)
-          end
-        end
-
-        def start_segment(name:nil,
-                          unscoped_metrics:nil,
-                          start_time: nil,
-                          parent: nil)
-
-          Transaction.start_segment(name: name,
-                                    unscoped_metrics: unscoped_metrics,
-                                    start_time: start_time,
-                                    parent: parent)
-        end
-
-        def start_datastore_segment(product: nil,
-                                    operation: nil,
-                                    collection: nil,
-                                    host: nil,
-                                    port_path_or_id: nil,
-                                    database_name: nil,
-                                    start_time: nil,
-                                    parent: nil)
-
-          Transaction.start_datastore_segment(product: product,
-                                              operation: operation,
-                                              collection: collection,
-                                              host: host,
-                                              port_path_or_id: port_path_or_id,
-                                              database_name: database_name,
-                                              start_time: start_time,
-                                              parent: parent)
-        end
-
-        def start_external_request_segment(library: nil,
-                                           uri: nil,
-                                           procedure: nil,
-                                           start_time: nil,
-                                           parent: nil)
-
-          Transaction.start_external_request_segment(library: library,
-                                                     uri: uri,
-                                                     procedure: procedure,
-                                                     start_time: start_time,
-                                                     parent: parent)
-        end
-
-        def start_message_broker_segment(action: nil,
-                                         library: nil,
-                                         destination_type: nil,
-                                         destination_name: nil,
-                                         headers: nil,
-                                         parameters: nil,
-                                         start_time: nil,
-                                         parent: nil)
-
-          Transaction.start_message_broker_segment(action: action,
-                                                   library: library,
-                                                   destination_type: destination_type,
-                                                   destination_name: destination_name,
-                                                   headers: headers,
-                                                   parameters: parameters,
-                                                   start_time: start_time,
-                                                   parent: parent)
-        end
-
-        # This method should only be used by TransactionState for access to the
-        # current thread's state or to provide read-only accessors for other threads
-        #
-        # If ever exposed, this requires additional synchronization
-        def tl_state_for(thread)
-          state = thread[:newrelic_transaction_state]
-
-          if state.nil?
-            state = TransactionState.new
-            thread[:newrelic_transaction_state] = state
-          end
-
-          state
-        end
-
-        def tl_clear
-          Thread.current[:newrelic_transaction_state] = nil
-        end
-      end
-
-      def initialize
-        @untraced = []
-        @current_transaction = nil
-        @record_sql = nil
-      end
-
-      # This starts the timer for the transaction.
-      def reset(transaction=nil)
-        # We purposefully don't reset @untraced or @record_sql
-        # since those are managed by NewRelic::Agent.disable_* calls explicitly
-        # and (more importantly) outside the scope of a transaction
-
-        @current_transaction = transaction
-        @sql_sampler_transaction_data = nil
-      end
-
-      # Current transaction stack
-      attr_reader :current_transaction
-
-      # Execution tracing on current thread
-      attr_accessor :untraced
-
-      def push_traced(should_trace)
-        @untraced << should_trace
-      end
-
-      def pop_traced
-        @untraced.pop if @untraced
-      end
-
-      def is_execution_traced?
-        @untraced.nil? || @untraced.last != false
-      end
-
-      alias_method :tracing_enabled?, :is_execution_traced?
-
-      # TT's and SQL
-      attr_accessor :record_sql
-
-      def is_sql_recorded?
-        @record_sql != false
-      end
-
-      # Sql Sampler Transaction Data
-      attr_accessor :sql_sampler_transaction_data
-    end
-
-    Tracer = TransactionState
-  end
-end