newrelic_rpm 3.17.1.326 → 3.17.2.327

data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb

@@ -41,7 +41,7 @@ module NewRelic
             settings.newrelic_ignores[type] += routes.map do |r|
               # Ugly sending to private Base#compile, but we want to mimic
               # exactly Sinatra's mapping of route text to regex
-              send(:compile, r).first
+              Array(send(:compile, r)).first
             end
           end
 

data/lib/new_relic/agent/new_relic_service.rb

@@ -33,7 +33,7 @@ module NewRelic
       attr_reader :collector, :marshaller
 
       def initialize(license_key=nil, collector=control.server)
-        @license_key = license_key || Agent.config[:license_key]
+        @license_key = license_key
         @collector = collector
         @request_timeout = Agent.config[:timeout]
         @ssl_cert_store = nil
@@ -337,7 +337,7 @@ module NewRelic
       # The path on the server that we should post our data to
       def remote_method_uri(method, format)
         params = {'run_id' => @agent_id, 'marshal_format' => format}
-        uri = "/agent_listener/#{PROTOCOL_VERSION}/#{@license_key}/#{method}"
+        uri = "/agent_listener/#{PROTOCOL_VERSION}/#{license_key}/#{method}"
         uri << '?' + params.map do |k,v|
           next unless v
           "#{k}=#{v}"
@@ -345,6 +345,10 @@ module NewRelic
         uri
       end
 
+      def license_key
+        @license_key ||= Agent.config[:license_key]
+      end
+
       # send a message via post to the actual server. This attempts
       # to automatically compress the data via zlib if it is large
       # enough to be worth compressing, and handles any errors the

data/lib/new_relic/agent/transaction/datastore_segment.rb

@@ -5,28 +5,52 @@
 require 'new_relic/agent/transaction/segment'
 require 'new_relic/agent/datastores/metric_helper'
 require 'new_relic/agent/database'
+require 'new_relic/agent/hostname'
 
 module NewRelic
   module Agent
     class Transaction
       class DatastoreSegment < Segment
-        attr_reader :product, :operation, :collection, :sql_statement, :nosql_statement, :port_path_or_id
-        attr_accessor :host, :database_name
 
-        def initialize product, operation, collection = nil, host = nil, port_path_or_id = nil, database_name=nil
+        UNKNOWN = 'unknown'.freeze
+
+        attr_reader :product, :operation, :collection, :sql_statement, :nosql_statement, :host, :port_path_or_id
+        attr_accessor :database_name
+
+        def initialize product, operation, collection = nil, host = nil, port_path_or_id = nil, database_name = nil
           @product = product
           @operation = operation
           @collection = collection
           @sql_statement = nil
           @nosql_statement = nil
-          @host = host
-          self.port_path_or_id = port_path_or_id
+          set_instance_info host, port_path_or_id
           @database_name = database_name ? database_name.to_s : nil
           super Datastores::MetricHelper.scoped_metric_for(product, operation, collection)
         end
 
-        def port_path_or_id= ppi
-          @port_path_or_id = ppi ? ppi.to_s : nil
+        def set_instance_info host = nil, port_path_or_id = nil
+          port_path_or_id = port_path_or_id.to_s if port_path_or_id
+          host_present = host && !host.empty?
+          ppi_present = port_path_or_id && !port_path_or_id.empty?
+
+          host = NewRelic::Agent::Hostname.get_external host if host_present
+
+          case
+          when host_present && ppi_present
+            @host = host
+            @port_path_or_id = port_path_or_id
+
+          when host_present && !ppi_present
+            @host = host
+            @port_path_or_id = UNKNOWN
+
+          when !host_present && ppi_present
+            @host = UNKNOWN
+            @port_path_or_id = port_path_or_id
+
+          else
+            @host = @port_path_or_id = nil
+          end
         end
 
         def notice_sql sql

data/lib/new_relic/agent/transaction/tracing.rb

@@ -17,7 +17,12 @@ module NewRelic
             segment
           end
 
-          def start_datastore_segment product, operation, collection=nil, host=nil, port_path_or_id=nil, database_name=nil
+          UNKNOWN_PRODUCT = "Unknown".freeze
+          UNKNOWN_OPERATION = "other".freeze
+
+          def start_datastore_segment product=nil, operation=nil, collection=nil, host=nil, port_path_or_id=nil, database_name=nil
+            product ||= UNKNOWN_PRODUCT
+            operation ||= UNKNOWN_OPERATION
             segment = DatastoreSegment.new product, operation, collection, host, port_path_or_id, database_name
             segment.start
             add_segment segment

data/lib/new_relic/latest_changes.rb

@@ -5,7 +5,7 @@
 module NewRelic
   module LatestChanges
     def self.default_changelog
-      File.join(File.dirname(__FILE__), '..', '..', 'CHANGELOG')
+      File.join(File.dirname(__FILE__), '..', '..', 'CHANGELOG.md')
     end
 
     FOOTER = <<'EOS'

data/lib/new_relic/version.rb

@@ -12,7 +12,7 @@ module NewRelic
 
     MAJOR = 3
     MINOR = 17
-    TINY  = 1
+    TINY  = 2
 
     begin
       require File.join(File.dirname(__FILE__), 'build')
@@ -57,10 +57,10 @@ module NewRelic
       a, b = parts1.first, parts2.first
       case
         when a.nil? && b.nil? then 0
-        when a.nil? then b.is_a?(Fixnum) ?  -1 : 1
+        when a.nil? then b.is_a?(Integer) ?  -1 : 1
         when b.nil? then -compare(parts2, parts1)
         when a.to_s == b.to_s then compare(parts1[1..-1], parts2[1..-1])
-        when a.is_a?(String) then b.is_a?(Fixnum) ?  -1 : (a <=> b)
+        when a.is_a?(String) then b.is_a?(Integer) ?  -1 : (a <=> b)
         when b.is_a?(String) then -compare(parts2, parts1)
         else # they are both fixnums, not nil
           a <=> b

data/newrelic_rpm.gemspec

@@ -24,7 +24,7 @@ EOS
   s.email = "support@newrelic.com"
   s.executables = [ "mongrel_rpm", "newrelic_cmd", "newrelic", "nrdebug" ]
   s.extra_rdoc_files = [
-    "CHANGELOG",
+    "CHANGELOG.md",
     "LICENSE",
     "README.md",
     "CONTRIBUTING.md",
@@ -46,6 +46,7 @@ EOS
   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', '~> 0.9.12'
   s.add_development_dependency 'hometown', '~> 0.2.5'
 

data/test/environments/rails21/Gemfile

@@ -6,7 +6,6 @@ gem 'rake', '~>10.1.1'
 gem 'minitest', '~>4.7.5'
 gem "mocha", :require => false
 gem "jeweler", "1.4.0"
-gem "rdoc"
 gem 'rack', '< 2.0.0'
 gem 'rack-test'
 gem 'newrelic_rpm', :path => "../../.."
@@ -26,5 +25,6 @@ gem 'hometown', '~> 0.2.5'
 if RUBY_VERSION < '1.9'
   gem 'git', '< 1.3' # git 1.3.0 requires Ruby version >= 1.9
   gem 'json_pure', '< 2.0'
+  gem 'rdoc', '4.2.0'
 end
 

data/test/environments/rails22/Gemfile

@@ -6,7 +6,6 @@ gem 'rake', '~>10.1.1'
 gem 'minitest', '~>4.7.5'
 gem "mocha", :require => false
 gem "jeweler", "1.4.0"
-gem "rdoc"
 
 gem 'rack', '< 2.0.0'
 gem 'rack-test'
@@ -27,4 +26,6 @@ gem 'hometown', '~> 0.2.5'
 if RUBY_VERSION < '1.9'
   gem 'git', '< 1.3' # git 1.3.0 requires Ruby version >= 1.9
   gem 'json_pure', '< 2.0'
+  gem 'rdoc', '4.2.0'
 end
+

data/test/environments/rails23/Gemfile

@@ -7,7 +7,12 @@ gem 'minitest', '~>4.7.5'
 gem 'mocha', :require => false
 gem 'rack', '< 2.0.0'
 gem 'rack-test'
-gem 'rdoc'
+
+if RUBY_VERSION < '2.0'
+  gem 'rdoc', '4.2.0'
+else
+  gem 'rdoc'
+end
 
 gem "newrelic_rpm", :path => '../../..'
 

data/test/fixtures/cross_agent_tests/datastores/README.md

@@ -9,7 +9,7 @@ The datastore instance tests provide attributes similar to what an agent could e
 | product | always | the database product for this configuration
 | port | sometimes | the port reported by the database adapter |
 | unix_socket | sometimes |the path to a unix domain socket reported by a database adapter |
-| db_path | sometimes |the path to a filesystem database |
+| database_path | sometimes |the path to a filesystem database |
 | expected\_instance\_metric | always | the instance metric expected to be generated from the given attributes |
 
 ## Implementing the test cases

data/test/fixtures/cross_agent_tests/datastores/datastore_api.json

@@ -0,0 +1,443 @@
+[
+  {
+    "test_name": "all required fields present, everything enabled",
+    "input":{
+      "parameters":{
+        "product":"MySQL",
+        "collection":"users",
+        "operation":"INSERT",
+        "host":"db-server-1",
+        "port_path_or_id":"3306",
+        "database_name":"my_db"
+      },
+      "is_web":true,
+      "system_hostname":"datanerd-01",
+      "configuration":{
+        "datastore_tracer.instance_reporting.enabled":true,
+        "datastore_tracer.database_name_reporting.enabled":true
+      }
+    },
+    "expectation":{
+      "metrics_unscoped":[
+        "Datastore/all",
+        "Datastore/allWeb",
+        "Datastore/MySQL/all",
+        "Datastore/MySQL/allWeb",
+        "Datastore/operation/MySQL/INSERT",
+        "Datastore/statement/MySQL/users/INSERT",
+        "Datastore/instance/MySQL/db-server-1/3306"
+      ],
+      "metrics_scoped":[
+        "Datastore/statement/MySQL/users/INSERT"
+      ],
+      "transaction_segment_and_slow_query_trace":{
+        "metric_name":"Datastore/statement/MySQL/users/INSERT",
+        "host":"db-server-1",
+        "port_path_or_id":"3306",
+        "database_name":"my_db"
+      }
+    }
+  },
+  {
+    "test_name": "database name missing",
+    "input":{
+      "parameters":{
+        "product":"MySQL",
+        "collection":"users",
+        "operation":"INSERT",
+        "host":"db-server-1",
+        "port_path_or_id":"3306"
+      },
+      "is_web":true,
+      "system_hostname":"datanerd-01",
+      "configuration":{
+        "datastore_tracer.instance_reporting.enabled":true,
+        "datastore_tracer.database_name_reporting.enabled":true
+      }
+    },
+    "expectation":{
+      "metrics_unscoped":[
+        "Datastore/all",
+        "Datastore/allWeb",
+        "Datastore/MySQL/all",
+        "Datastore/MySQL/allWeb",
+        "Datastore/operation/MySQL/INSERT",
+        "Datastore/statement/MySQL/users/INSERT",
+        "Datastore/instance/MySQL/db-server-1/3306"
+      ],
+      "metrics_scoped":[
+        "Datastore/statement/MySQL/users/INSERT"
+      ],
+      "transaction_segment_and_slow_query_trace":{
+        "metric_name":"Datastore/statement/MySQL/users/INSERT",
+        "host":"db-server-1",
+        "port_path_or_id":"3306"
+      }
+    }
+  },
+  {
+    "test_name": "host and port missing",
+    "input":{
+      "parameters":{
+        "product":"MySQL",
+        "collection":"users",
+        "operation":"INSERT",
+        "database_name":"my_db"
+      },
+      "is_web":true,
+      "system_hostname":"datanerd-01",
+      "configuration":{
+        "datastore_tracer.instance_reporting.enabled":true,
+        "datastore_tracer.database_name_reporting.enabled":true
+      }
+    },
+    "expectation":{
+      "metrics_unscoped":[
+        "Datastore/all",
+        "Datastore/allWeb",
+        "Datastore/MySQL/all",
+        "Datastore/MySQL/allWeb",
+        "Datastore/operation/MySQL/INSERT",
+        "Datastore/statement/MySQL/users/INSERT"
+      ],
+      "metrics_scoped":[
+        "Datastore/statement/MySQL/users/INSERT"
+      ],
+      "transaction_segment_and_slow_query_trace":{
+        "metric_name":"Datastore/statement/MySQL/users/INSERT",
+        "database_name":"my_db"
+      }
+    }
+  },
+  {
+    "test_name": "host missing, but port present",
+    "input":{
+      "parameters":{
+        "product":"MySQL",
+        "collection":"users",
+        "operation":"INSERT",
+        "port_path_or_id":"3306",
+        "database_name":"my_db"
+      },
+      "is_web":true,
+      "configuration":{
+        "datastore_tracer.instance_reporting.enabled":true,
+        "datastore_tracer.database_name_reporting.enabled":true
+      }
+    },
+    "expectation":{
+      "metrics_unscoped":[
+        "Datastore/all",
+        "Datastore/allWeb",
+        "Datastore/MySQL/all",
+        "Datastore/MySQL/allWeb",
+        "Datastore/operation/MySQL/INSERT",
+        "Datastore/statement/MySQL/users/INSERT",
+        "Datastore/instance/MySQL/unknown/3306"
+      ],
+      "metrics_scoped":[
+        "Datastore/statement/MySQL/users/INSERT"
+      ],
+      "transaction_segment_and_slow_query_trace":{
+        "metric_name":"Datastore/statement/MySQL/users/INSERT",
+        "host":"unknown",
+        "port_path_or_id":"3306",
+        "database_name":"my_db"
+      }
+    }
+  },
+  {
+    "test_name": "instance reporting false",
+    "input":{
+      "parameters":{
+        "product":"MySQL",
+        "collection":"users",
+        "operation":"INSERT",
+        "host":"db-server-1",
+        "port_path_or_id":"3306",
+        "database_name":"my_db"
+      },
+      "is_web":true,
+      "system_hostname":"datanerd-01",
+      "configuration":{
+        "datastore_tracer.instance_reporting.enabled":false,
+        "datastore_tracer.database_name_reporting.enabled":true
+      }
+    },
+    "expectation":{
+      "metrics_unscoped":[
+        "Datastore/all",
+        "Datastore/allWeb",
+        "Datastore/MySQL/all",
+        "Datastore/MySQL/allWeb",
+        "Datastore/operation/MySQL/INSERT",
+        "Datastore/statement/MySQL/users/INSERT"
+      ],
+      "metrics_scoped":[
+        "Datastore/statement/MySQL/users/INSERT"
+      ],
+      "transaction_segment_and_slow_query_trace":{
+        "metric_name":"Datastore/statement/MySQL/users/INSERT",
+        "database_name":"my_db"
+      }
+    }
+  },
+  {
+    "test_name": "database name disabled",
+    "input":{
+      "parameters":{
+        "product":"MySQL",
+        "collection":"users",
+        "operation":"INSERT",
+        "host":"db-server-1",
+        "port_path_or_id":"3306",
+        "database_name":"my_db"
+      },
+      "is_web":true,
+      "system_hostname":"datanerd-01",
+      "configuration":{
+        "datastore_tracer.instance_reporting.enabled":true,
+        "datastore_tracer.database_name_reporting.enabled":false
+      }
+    },
+    "expectation":{
+      "metrics_unscoped":[
+        "Datastore/all",
+        "Datastore/allWeb",
+        "Datastore/MySQL/all",
+        "Datastore/MySQL/allWeb",
+        "Datastore/operation/MySQL/INSERT",
+        "Datastore/statement/MySQL/users/INSERT",
+        "Datastore/instance/MySQL/db-server-1/3306"
+      ],
+      "metrics_scoped":[
+        "Datastore/statement/MySQL/users/INSERT"
+      ],
+      "transaction_segment_and_slow_query_trace":{
+        "metric_name":"Datastore/statement/MySQL/users/INSERT",
+        "host":"db-server-1",
+        "port_path_or_id":"3306"
+      }
+    }
+  },
+  {
+    "test_name": "all fields missing",
+    "input":{
+      "parameters":{
+      },
+      "is_web":true,
+      "system_hostname":"datanerd-01",
+      "configuration":{
+        "datastore_tracer.instance_reporting.enabled":true,
+        "datastore_tracer.database_name_reporting.enabled":true
+      }
+    },
+    "expectation":{
+      "metrics_unscoped":[
+        "Datastore/all",
+        "Datastore/allWeb",
+        "Datastore/Unknown/all",
+        "Datastore/Unknown/allWeb",
+        "Datastore/operation/Unknown/other"
+      ],
+      "metrics_scoped":[
+        "Datastore/operation/Unknown/other"
+      ],
+      "transaction_segment_and_slow_query_trace":{
+        "metric_name":"Datastore/operation/Unknown/other"
+      }
+    }
+  },
+  {
+    "test_name": "missing collection",
+    "input":{
+      "parameters":{
+        "product":"MySQL",
+        "operation":"INSERT",
+        "host":"db-server-1",
+        "port_path_or_id":"3306",
+        "database_name":"my_db"
+      },
+      "is_web":true,
+      "system_hostname":"datanerd-01",
+      "configuration":{
+        "datastore_tracer.instance_reporting.enabled":true,
+        "datastore_tracer.database_name_reporting.enabled":true
+      }
+    },
+    "expectation":{
+      "metrics_unscoped":[
+        "Datastore/all",
+        "Datastore/allWeb",
+        "Datastore/MySQL/all",
+        "Datastore/MySQL/allWeb",
+        "Datastore/operation/MySQL/INSERT",
+        "Datastore/instance/MySQL/db-server-1/3306"
+      ],
+      "metrics_scoped":[
+        "Datastore/operation/MySQL/INSERT"
+      ],
+      "transaction_segment_and_slow_query_trace":{
+        "metric_name":"Datastore/operation/MySQL/INSERT",
+        "host":"db-server-1",
+        "port_path_or_id":"3306",
+        "database_name":"my_db"
+      }
+    }
+  },
+  {
+    "test_name": "host present, port missing",
+    "input":{
+      "parameters":{
+        "product":"MySQL",
+        "collection":"users",
+        "operation":"INSERT",
+        "host":"db-server-1",
+        "database_name":"my_db"
+      },
+      "is_web":true,
+      "system_hostname":"datanerd-01",
+      "configuration":{
+        "datastore_tracer.instance_reporting.enabled":true,
+        "datastore_tracer.database_name_reporting.enabled":true
+      }
+    },
+    "expectation":{
+      "metrics_unscoped":[
+        "Datastore/all",
+        "Datastore/allWeb",
+        "Datastore/MySQL/all",
+        "Datastore/MySQL/allWeb",
+        "Datastore/operation/MySQL/INSERT",
+        "Datastore/statement/MySQL/users/INSERT",
+        "Datastore/instance/MySQL/db-server-1/unknown"
+      ],
+      "metrics_scoped":[
+        "Datastore/statement/MySQL/users/INSERT"
+      ],
+      "transaction_segment_and_slow_query_trace":{
+        "metric_name":"Datastore/statement/MySQL/users/INSERT",
+        "host":"db-server-1",
+        "port_path_or_id":"unknown",
+        "database_name":"my_db"
+      }
+    }
+  },
+  {
+    "test_name": "localhost replacement",
+    "input":{
+      "parameters":{
+        "product":"MySQL",
+        "collection":"users",
+        "operation":"INSERT",
+        "host":"localhost",
+        "port_path_or_id":"3306",
+        "database_name":"my_db"
+      },
+      "is_web":true,
+      "system_hostname":"datanerd-01",
+      "configuration":{
+        "datastore_tracer.instance_reporting.enabled":true,
+        "datastore_tracer.database_name_reporting.enabled":true
+      }
+    },
+    "expectation":{
+      "metrics_unscoped":[
+        "Datastore/all",
+        "Datastore/allWeb",
+        "Datastore/MySQL/all",
+        "Datastore/MySQL/allWeb",
+        "Datastore/operation/MySQL/INSERT",
+        "Datastore/statement/MySQL/users/INSERT",
+        "Datastore/instance/MySQL/datanerd-01/3306"
+      ],
+      "metrics_scoped":[
+        "Datastore/statement/MySQL/users/INSERT"
+      ],
+      "transaction_segment_and_slow_query_trace":{
+        "metric_name":"Datastore/statement/MySQL/users/INSERT",
+        "host":"datanerd-01",
+        "port_path_or_id":"3306",
+        "database_name":"my_db"
+      }
+    }
+  },
+  {
+    "test_name": "background transaction",
+    "input":{
+      "parameters":{
+        "product":"MySQL",
+        "collection":"users",
+        "operation":"INSERT",
+        "host":"db-server-1",
+        "port_path_or_id":"3306",
+        "database_name":"my_db"
+      },
+      "is_web":false,
+      "system_hostname":"datanerd-01",
+      "configuration":{
+        "datastore_tracer.instance_reporting.enabled":true,
+        "datastore_tracer.database_name_reporting.enabled":true
+      }
+    },
+    "expectation":{
+      "metrics_unscoped":[
+        "Datastore/all",
+        "Datastore/allOther",
+        "Datastore/MySQL/all",
+        "Datastore/MySQL/allOther",
+        "Datastore/operation/MySQL/INSERT",
+        "Datastore/statement/MySQL/users/INSERT",
+        "Datastore/instance/MySQL/db-server-1/3306"
+      ],
+      "metrics_scoped":[
+        "Datastore/statement/MySQL/users/INSERT"
+      ],
+      "transaction_segment_and_slow_query_trace":{
+        "metric_name":"Datastore/statement/MySQL/users/INSERT",
+        "host":"db-server-1",
+        "port_path_or_id":"3306",
+        "database_name":"my_db"
+      }
+    }
+  },
+  {
+    "test_name": "socket path port",
+    "input":{
+      "parameters":{
+        "product":"MySQL",
+        "collection":"users",
+        "operation":"INSERT",
+        "host":"db-server-1",
+        "port_path_or_id":"/var/mysql/mysql.sock",
+        "database_name":"my_db"
+      },
+      "is_web":true,
+      "system_hostname":"datanerd-01",
+      "configuration":{
+        "datastore_tracer.instance_reporting.enabled":true,
+        "datastore_tracer.database_name_reporting.enabled":true
+      }
+    },
+    "expectation":{
+      "metrics_unscoped":[
+        "Datastore/all",
+        "Datastore/allWeb",
+        "Datastore/MySQL/all",
+        "Datastore/MySQL/allWeb",
+        "Datastore/operation/MySQL/INSERT",
+        "Datastore/statement/MySQL/users/INSERT",
+        "Datastore/instance/MySQL/db-server-1//var/mysql/mysql.sock"
+      ],
+      "metrics_scoped":[
+        "Datastore/statement/MySQL/users/INSERT"
+      ],
+      "transaction_segment_and_slow_query_trace":{
+        "metric_name":"Datastore/statement/MySQL/users/INSERT",
+        "host":"db-server-1",
+        "port_path_or_id":"/var/mysql/mysql.sock",
+        "database_name":"my_db"
+      }
+    }
+  }
+]