newrelic_rpm 8.0.0 → 8.4.0

data/lib/new_relic/agent/instrumentation/active_record.rb

@@ -11,7 +11,7 @@ module NewRelic
         EXPLAINER = lambda do |statement|
           connection = NewRelic::Agent::Database.get_connection(statement.config) do
             ::ActiveRecord::Base.send("#{statement.config[:adapter]}_connection",
-                                      statement.config)
+              statement.config)
           end
           if connection && connection.respond_to?(:execute)
             return connection.execute("EXPLAIN #{statement.sql}")
@@ -46,28 +46,29 @@ module NewRelic
         if RUBY_VERSION < "2.7.0"
           def log_with_newrelic_instrumentation(*args, &block)
             state = NewRelic::Agent::Tracer.state
-  
+
             if !state.is_execution_traced?
               return log_without_newrelic_instrumentation(*args, &block)
             end
-  
+
             sql, name, _ = args
-  
+
             product, operation, collection = ActiveRecordHelper.product_operation_collection_for(
               NewRelic::Helper.correctly_encoded(name),
               NewRelic::Helper.correctly_encoded(sql),
-              @config && @config[:adapter])
-  
+              @config && @config[:adapter]
+            )
+
             host = nil
             port_path_or_id = nil
             database = nil
-  
+
             if ActiveRecordHelper::InstanceIdentification.supported_adapter?(@config)
               host = ActiveRecordHelper::InstanceIdentification.host(@config)
               port_path_or_id = ActiveRecordHelper::InstanceIdentification.port_path_or_id(@config)
               database = @config && @config[:database]
             end
-  
+
             segment = NewRelic::Agent::Tracer.start_datastore_segment(
               product: product,
               operation: operation,
@@ -77,7 +78,7 @@ module NewRelic
               database_name: database
             )
             segment._notice_sql(sql, @config, EXPLAINER)
-  
+
             begin
               NewRelic::Agent::Tracer.capture_segment_error segment do
                 log_without_newrelic_instrumentation(*args, &block)
@@ -86,31 +87,32 @@ module NewRelic
               segment.finish if segment
             end
           end
-        else 
+        else
           def log_with_newrelic_instrumentation(*args, **kwargs, &block)
             state = NewRelic::Agent::Tracer.state
-  
+
             if !state.is_execution_traced?
               return log_without_newrelic_instrumentation(*args, **kwargs, &block)
             end
-  
+
             sql, name, _ = args
-  
+
             product, operation, collection = ActiveRecordHelper.product_operation_collection_for(
               NewRelic::Helper.correctly_encoded(name),
               NewRelic::Helper.correctly_encoded(sql),
-              @config && @config[:adapter])
-  
+              @config && @config[:adapter]
+            )
+
             host = nil
             port_path_or_id = nil
             database = nil
-  
+
             if ActiveRecordHelper::InstanceIdentification.supported_adapter?(@config)
               host = ActiveRecordHelper::InstanceIdentification.host(@config)
               port_path_or_id = ActiveRecordHelper::InstanceIdentification.port_path_or_id(@config)
               database = @config && @config[:database]
             end
-  
+
             segment = NewRelic::Agent::Tracer.start_datastore_segment(
               product: product,
               operation: operation,
@@ -120,7 +122,7 @@ module NewRelic
               database_name: database
             )
             segment._notice_sql(sql, @config, EXPLAINER)
-  
+
             begin
               NewRelic::Agent::Tracer.capture_segment_error segment do
                 log_without_newrelic_instrumentation(*args, **kwargs, &block)

data/lib/new_relic/agent/instrumentation/active_record_helper.rb

@@ -19,7 +19,7 @@ module NewRelic
         def instrument_save_methods
           ::ActiveRecord::Base.class_eval do
             alias_method :save_without_newrelic, :save
-            
+
             def save(*args, &blk)
               ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
                 save_without_newrelic(*args, &blk)
@@ -45,7 +45,7 @@ module NewRelic
                 update_all_without_newrelic(*args, &blk)
               end
             end
-            
+
             alias_method :delete_all_without_newrelic, :delete_all
 
             if RUBY_VERSION < "2.7.0"
@@ -70,7 +70,6 @@ module NewRelic
               end
             end
 
-
             alias_method :calculate_without_newrelic, :calculate
 
             def calculate(*args, &blk)
@@ -79,7 +78,6 @@ module NewRelic
               end
             end
 
-
             if method_defined?(:pluck)
               alias_method :pluck_without_newrelic, :pluck
 
@@ -94,12 +92,12 @@ module NewRelic
         end
 
         ACTIVE_RECORD = "ActiveRecord".freeze
-        OTHER         = "other".freeze
+        OTHER = "other".freeze
 
         def product_operation_collection_for name, sql, adapter_name
-          product   = map_product(adapter_name)
-          splits    = split_name(name)
-          model     = model_from_splits(splits)
+          product = map_product(adapter_name)
+          splits = split_name(name)
+          model = model_from_splits(splits)
           operation = operation_from_splits(splits, sql)
           NewRelic::Agent::Datastores::MetricHelper.product_operation_collection_for product, operation, model, ACTIVE_RECORD
         end
@@ -118,8 +116,6 @@ module NewRelic
         def model_from_splits(splits)
           if splits.length == 2
             splits.first
-          else
-            nil
           end
         end
 
@@ -135,16 +131,16 @@ module NewRelic
         # known operations coming in. Anything not matching the list is fine,
         # it just needs to get downcased directly for use.
         OPERATION_NAMES = {
-          'Find'    => 'find',
-          'Load'    => 'find',
-          'Count'   => 'find',
-          'Exists'  => 'find',
-          'Create'  => 'create',
+          'Find' => 'find',
+          'Load' => 'find',
+          'Count' => 'find',
+          'Exists' => 'find',
+          'Create' => 'create',
           'Columns' => 'columns',
           'Indexes' => 'indexes',
           'Destroy' => 'destroy',
-          'Update'  => 'update',
-          'Save'    => 'save'
+          'Update' => 'update',
+          'Save' => 'save'
         }.freeze
 
         def map_operation(raw_operation)
@@ -155,41 +151,41 @@ module NewRelic
         end
 
         PRODUCT_NAMES = {
-          "mysql"      => "MySQL",
-          "mysql2"     => "MySQL",
+          "mysql" => "MySQL",
+          "mysql2" => "MySQL",
 
           "postgresql" => "Postgres",
 
-          "sqlite3"    => "SQLite",
+          "sqlite3" => "SQLite",
 
           # https://rubygems.org/gems/activerecord-jdbcpostgresql-adapter
-          "jdbcmysql"  => "MySQL",
+          "jdbcmysql" => "MySQL",
 
           # https://rubygems.org/gems/activerecord-jdbcpostgresql-adapter
           "jdbcpostgresql" => "Postgres",
-          
+
           # https://rubygems.org/gems/activerecord-postgis-adapter
-          "postgis"    => "Postgres",
+          "postgis" => "Postgres",
 
           # https://rubygems.org/gems/activerecord-jdbcsqlite3-adapter
-          "jdbcsqlite3"    => "SQLite",
+          "jdbcsqlite3" => "SQLite",
 
           # https://rubygems.org/gems/activerecord-jdbcderby-adapter
-          "derby"      => "Derby",
-          "jdbcderby"  => "Derby",
+          "derby" => "Derby",
+          "jdbcderby" => "Derby",
 
           # https://rubygems.org/gems/activerecord-jdbc-adapter
-          "jdbc"       => "JDBC",
+          "jdbc" => "JDBC",
 
           # https://rubygems.org/gems/activerecord-jdbcmssql-adapter
-          "jdbcmssql"  => "MSSQL",
-          "mssql"      => "MSSQL",
+          "jdbcmssql" => "MSSQL",
+          "mssql" => "MSSQL",
 
           # https://rubygems.org/gems/activerecord-sqlserver-adapter
-          "sqlserver"  => "MSSQL",
+          "sqlserver" => "MSSQL",
 
           # https://rubygems.org/gems/activerecord-odbc-adapter
-          "odbc"       => "ODBC",
+          "odbc" => "ODBC",
 
           # https://rubygems.org/gems/activerecord-oracle_enhanced-adapter
           "oracle_enhanced" => "Oracle"
@@ -199,24 +195,24 @@ module NewRelic
 
         def map_product(adapter_name)
           PRODUCT_NAMES.fetch(adapter_name,
-                              ACTIVE_RECORD_DEFAULT_PRODUCT_NAME)
+            ACTIVE_RECORD_DEFAULT_PRODUCT_NAME)
         end
 
         module InstanceIdentification
           extend self
 
           PRODUCT_SYMBOLS = {
-            "mysql"      => :mysql,
-            "mysql2"     => :mysql,
-            "jdbcmysql"  => :mysql,
+            "mysql" => :mysql,
+            "mysql2" => :mysql,
+            "jdbcmysql" => :mysql,
 
-            "postgresql"     => :postgres,
+            "postgresql" => :postgres,
             "jdbcpostgresql" => :postgres,
-            "postgis"        => :postgres
+            "postgis" => :postgres
           }.freeze
 
           DATASTORE_DEFAULT_PORTS = {
-            :mysql    => "3306",
+            :mysql => "3306",
             :postgres => "5432"
           }.freeze
 
@@ -228,10 +224,10 @@ module NewRelic
           def host(config)
             return UNKNOWN unless config
 
-            configured_value  = config[:host]
+            configured_value = config[:host]
             adapter = PRODUCT_SYMBOLS[config[:adapter]]
             if configured_value.nil? ||
-              postgres_unix_domain_socket_case?(configured_value, adapter)
+                postgres_unix_domain_socket_case?(configured_value, adapter)
 
               LOCALHOST
             elsif configured_value.empty?
@@ -239,7 +235,6 @@ module NewRelic
             else
               configured_value
             end
-
           rescue => e
             NewRelic::Agent.logger.debug "Failed to retrieve ActiveRecord host: #{e}"
             UNKNOWN
@@ -260,7 +255,6 @@ module NewRelic
             else
               UNKNOWN
             end
-
           rescue => e
             NewRelic::Agent.logger.debug "Failed to retrieve ActiveRecord port_path_or_id: #{e}"
             UNKNOWN

data/lib/new_relic/agent/instrumentation/active_record_notifications.rb

@@ -5,7 +5,6 @@
 require 'new_relic/agent/instrumentation/active_record_subscriber'
 require 'new_relic/agent/instrumentation/active_record_prepend'
 
-
 # Provides a way to send :connection through ActiveSupport notifications to avoid
 # looping through connection handlers to locate a connection by connection_id
 # This is not needed in Rails 6+: https://github.com/rails/rails/pull/34602
@@ -20,12 +19,13 @@ module NewRelic
           def log(sql, name = "SQL", binds = [], statement_name = nil)
             @instrumenter.instrument(
               SQL_ACTIVE_RECORD,
-              :sql            => sql,
-              :name           => name,
-              :connection_id  => object_id,
-              :connection     => self,
+              :sql => sql,
+              :name => name,
+              :connection_id => object_id,
+              :connection => self,
               :statement_name => statement_name,
-              :binds          => binds) { yield }
+              :binds => binds
+            ) { yield }
           rescue => e
             # The translate_exception_class method got introduced in 4.1
             if ::ActiveRecord::VERSION::MINOR == 0
@@ -41,13 +41,14 @@ module NewRelic
           def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil)
             @instrumenter.instrument(
               SQL_ACTIVE_RECORD,
-              sql:               sql,
-              name:              name,
-              binds:             binds,
+              sql: sql,
+              name: name,
+              binds: binds,
               type_casted_binds: type_casted_binds,
-              statement_name:    statement_name,
-              connection_id:     object_id,
-              connection:        self) { yield }
+              statement_name: statement_name,
+              connection_id: object_id,
+              connection: self
+            ) { yield }
           rescue => e
             raise translate_exception_class(e, sql)
           end
@@ -58,17 +59,18 @@ module NewRelic
           def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil) # :doc:
             @instrumenter.instrument(
               SQL_ACTIVE_RECORD,
-              sql:               sql,
-              name:              name,
-              binds:             binds,
+              sql: sql,
+              name: name,
+              binds: binds,
               type_casted_binds: type_casted_binds,
-              statement_name:    statement_name,
-              connection_id:     object_id,
-              connection:        self) do
-                @lock.synchronize do
-                  yield
-                end
+              statement_name: statement_name,
+              connection_id: object_id,
+              connection: self
+            ) do
+              @lock.synchronize do
+                yield
               end
+            end
           rescue => e
             raise translate_exception_class(e, sql)
           end
@@ -104,8 +106,9 @@ DependencyDetection.defer do
   executes do
     ActiveSupport.on_load(:active_record) do
       ::NewRelic::Agent::PrependSupportability.record_metrics_for(
-          ::ActiveRecord::Base,
-          ::ActiveRecord::Relation)
+        ::ActiveRecord::Base,
+        ::ActiveRecord::Relation
+      )
 
       # Default to .prepending, unless the ActiveRecord version is <=4
       # **AND** the :prepend_active_record_instrumentation config is false
@@ -113,9 +116,9 @@ DependencyDetection.defer do
           || ::NewRelic::Agent.config[:prepend_active_record_instrumentation]
 
         ::ActiveRecord::Base.send(:prepend,
-            ::NewRelic::Agent::Instrumentation::ActiveRecordPrepend::BaseExtensions)
+          ::NewRelic::Agent::Instrumentation::ActiveRecordPrepend::BaseExtensions)
         ::ActiveRecord::Relation.send(:prepend,
-            ::NewRelic::Agent::Instrumentation::ActiveRecordPrepend::RelationExtensions)
+          ::NewRelic::Agent::Instrumentation::ActiveRecordPrepend::RelationExtensions)
       else
         ::NewRelic::Agent::Instrumentation::ActiveRecordHelper.instrument_additional_methods
       end

data/lib/new_relic/agent/instrumentation/active_record_prepend.rb

@@ -11,13 +11,13 @@ module NewRelic
         ACTIVE_RECORD = 'ActiveRecord'.freeze
 
         module BaseExtensions
-
           if RUBY_VERSION < "2.7.0"
             def save(*args, &blk)
               ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
                 super
               end
             end
+
             def save!(*args, &blk)
               ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
                 super
@@ -30,11 +30,12 @@ module NewRelic
                 super
               end
             end
+
             def save!(*args, **kwargs, &blk)
               ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
                 super
               end
-            end  
+            end
 
           end
         end
@@ -58,7 +59,6 @@ module NewRelic
               end
             end
           end
-
         end
 
         module RelationExtensions

data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb

@@ -43,7 +43,7 @@ module NewRelic
           end
         end
 
-        def start(name, id, payload) #THREAD_LOCAL_ACCESS
+        def start(name, id, payload) # THREAD_LOCAL_ACCESS
           return if cached?(payload)
           return unless NewRelic::Agent.tl_is_execution_traced?
 
@@ -54,7 +54,7 @@ module NewRelic
           log_notification_error(e, name, 'start')
         end
 
-        def finish(name, id, payload) #THREAD_LOCAL_ACCESS
+        def finish(name, id, payload) # THREAD_LOCAL_ACCESS
           return if cached?(payload)
           return unless state.is_execution_traced?
 
@@ -64,7 +64,6 @@ module NewRelic
             end
             segment.finish
           end
-
         rescue => e
           log_notification_error(e, name, 'finish')
         end
@@ -72,12 +71,12 @@ module NewRelic
         def get_explain_plan(statement)
           connection = NewRelic::Agent::Database.get_connection(statement.config) do
             ::ActiveRecord::Base.send("#{statement.config[:adapter]}_connection",
-                                      statement.config)
+              statement.config)
           end
           if connection && connection.respond_to?(:exec_query)
             return connection.exec_query("EXPLAIN #{statement.sql}",
-                                         "Explain #{statement.name}",
-                                         statement.binds)
+              "Explain #{statement.name}",
+              statement.binds)
           end
         rescue => e
           NewRelic::Agent.logger.debug "Couldn't fetch the explain plan for #{statement} due to #{e}"

data/lib/new_relic/agent/instrumentation/active_storage.rb

@@ -13,7 +13,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info 'Installing ActiveStorage 5 instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing ActiveStorage instrumentation'
   end
 
   executes do

data/lib/new_relic/agent/instrumentation/acts_as_solr.rb

@@ -8,17 +8,16 @@ module NewRelic
   module Instrumentation
     module ActsAsSolrInstrumentation
       module ParserMethodsInstrumentation
-
-          def parse_query_with_newrelic(*args)
-            self.class.trace_execution_scoped(["SolrClient/ActsAsSolr/query"]) do
-              begin
-                parse_query_without_newrelic(*args)
-              ensure
-                return unless txn = ::NewRelic::Agent::Tracer.current_transaction
-                txn.current_segment.params[:statement] = ::NewRelic::Agent::Database.truncate_query(args.first.inspect) rescue nil
-              end
+        def parse_query_with_newrelic(*args)
+          self.class.trace_execution_scoped(["SolrClient/ActsAsSolr/query"]) do
+            begin
+              parse_query_without_newrelic(*args)
+            ensure
+              return unless txn = ::NewRelic::Agent::Tracer.current_transaction
+              txn.current_segment.params[:statement] = ::NewRelic::Agent::Database.truncate_query(args.first.inspect) rescue nil
             end
           end
+        end
       end
     end
   end

data/lib/new_relic/agent/instrumentation/bunny/chain.rb

@@ -42,4 +42,4 @@ module NewRelic::Agent::Instrumentation
       end
     end
   end
-end
+end

data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb

@@ -12,7 +12,7 @@ module NewRelic
         LIBRARY = 'RabbitMQ'
         DEFAULT_NAME = 'Default'
         DEFAULT_TYPE = :direct
-        SLASH   = '/'
+        SLASH = '/'
 
         def exchange_name name
           name.empty? ? DEFAULT_NAME : name
@@ -74,11 +74,11 @@ module NewRelic
 
             begin
               exch_name, exch_type = if delivery_info
-                [ exchange_name(delivery_info.exchange),
-                  exchange_type(delivery_info, channel) ]
+                [exchange_name(delivery_info.exchange),
+                  exchange_type(delivery_info, channel)]
               else
-                [ exchange_name(NewRelic::EMPTY_STR),
-                  exchange_type({}, channel) ]
+                [exchange_name(NewRelic::EMPTY_STR),
+                  exchange_type({}, channel)]
               end
 
               segment = NewRelic::Agent::Messaging.start_amqp_consume_segment(
@@ -139,12 +139,11 @@ module NewRelic
               delivery_info: delivery_info,
               message_properties: message_properties,
               exchange_type: exchange_type(delivery_info, channel),
-              queue_name: queue_name) do
-
+              queue_name: queue_name
+            ) do
               yield
             end
           end
-
         end
       end
     end