newrelic_rpm 3.15.2.317 → 3.16.0.318

data/lib/new_relic/agent/new_relic_service/encoders.rb

@@ -4,6 +4,7 @@
 
 require 'base64'
 require 'zlib'
+require 'stringio'
 
 module NewRelic
   module Agent
@@ -16,8 +17,23 @@ module NewRelic
         end
 
         module Compressed
-          def self.encode(data, opts=nil)
-            Zlib::Deflate.deflate(data, Zlib::DEFAULT_COMPRESSION)
+          module Deflate
+            def self.encode(data, opts=nil)
+              Zlib::Deflate.deflate(data, Zlib::DEFAULT_COMPRESSION)
+            end
+          end
+
+          module Gzip
+            BINARY = "BINARY".freeze
+
+            def self.encode(data, opts=nil)
+              output = StringIO.new
+              output.set_encoding BINARY
+              gz = Zlib::GzipWriter.new(output, Zlib::DEFAULT_COMPRESSION, Zlib::DEFAULT_STRATEGY)
+              gz.write(data)
+              output.rewind
+              output.string
+            end
           end
         end
 
@@ -29,7 +45,7 @@ module NewRelic
               Agent.config[:normalize_json_string_encodings]
             end
             json = ::NewRelic::JSONWrapper.dump(data, :normalize => normalize_encodings)
-            Base64.encode64(Compressed.encode(json))
+            Base64.encode64(Compressed::Deflate.encode(json))
           end
         end
       end

data/lib/new_relic/agent/new_relic_service/json_marshaller.rb

@@ -55,7 +55,11 @@ module NewRelic
         end
 
         def default_encoder
-          Encoders::Base64CompressedJSON
+          if NewRelic::Agent.config[:simple_compression]
+            Encoders::Identity
+          else
+            Encoders::Base64CompressedJSON
+          end
         end
 
         def format

data/lib/new_relic/agent/supported_versions.rb

@@ -86,7 +86,7 @@ module NewRelic
       {
         :type        => :web,
         :supported   => ["~>2.1.0", "~>2.2.0", "~>2.3.0", "~3.0.0", "~>3.1.0", "~>3.2.0", "~>4.0.0", "~>4.1.0", "~>4.2.0"],
-        :experimental=> ["5.0.0beta2"],
+        :experimental=> ["5.0.0.rc1"],
         :deprecated  => ["~>2.0.0"],
         :url         => "https://rubygems.org/gems/rails",
         :feed        => "https://rubygems.org/gems/rails/versions.atom",

data/lib/new_relic/agent/transaction.rb

@@ -26,12 +26,13 @@ module NewRelic
       RACK_PREFIX                  = 'Controller/Rack/'.freeze
       SINATRA_PREFIX               = 'Controller/Sinatra/'.freeze
       GRAPE_PREFIX                 = 'Controller/Grape/'.freeze
+      ACTION_CABLE_PREFIX          = 'Controller/ActionCable/'.freeze
       OTHER_TRANSACTION_PREFIX     = 'OtherTransaction/'.freeze
 
       CONTROLLER_MIDDLEWARE_PREFIX = 'Controller/Middleware/Rack'.freeze
 
       NESTED_TRACE_STOP_OPTIONS    = { :metric => true }.freeze
-      WEB_TRANSACTION_CATEGORIES   = [:controller, :uri, :rack, :sinatra, :grape, :middleware].freeze
+      WEB_TRANSACTION_CATEGORIES   = [:controller, :uri, :rack, :sinatra, :grape, :middleware, :action_cable].freeze
       TRANSACTION_NAMING_SOURCES   = [:child, :api].freeze
 
       MIDDLEWARE_SUMMARY_METRICS   = ['Middleware/all'.freeze].freeze

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

@@ -12,6 +12,8 @@ module NewRelic
                     :host, :port, :user_agent, :request_method
 
         HTTP_ACCEPT_HEADER_KEY = "HTTP_ACCEPT".freeze
+        REQUEST_URI_KEY = "request_uri".freeze
+        WILDCARD = "*".freeze
 
         def initialize request
           @request_path = path_from_request request
@@ -34,6 +36,14 @@ module NewRelic
             txn.add_agent_attribute :'request.headers.referer', referer, AttributeFilter::DST_ERROR_COLLECTOR
           end
 
+          # This is temporary and aims to avoid collecting this attribute on transaction and error traces, 
+          # which already directly have a path value that the RPM UI depends on. We will either only
+          # collect request_uri as an agent attribute, in conjunction with UI work, or we will stop collecting
+          # this as an agent attribute (RUBY-1573)
+          if request_path && configured_to_collect?
+            txn.add_agent_attribute :request_uri, request_path, AttributeFilter::DST_TRANSACTION_EVENTS
+          end
+
           if accept
             txn.add_agent_attribute :'request.headers.accept', accept, default_destinations
           end
@@ -109,6 +119,11 @@ module NewRelic
             env[key]
           end
         end
+
+        def configured_to_collect?
+          txn_event_attributes = NewRelic::Agent.config[:'transaction_events.attributes.include']
+          txn_event_attributes.any?{|attribute| attribute == REQUEST_URI_KEY || attribute == WILDCARD}
+        end
       end
     end
   end

data/lib/new_relic/agent/utilization_data.rb

@@ -7,7 +7,7 @@ require 'new_relic/agent/aws_info'
 module NewRelic
   module Agent
     class UtilizationData
-      METADATA_VERSION = 1
+      METADATA_VERSION = 2
 
       def hostname
         NewRelic::Agent::Hostname.get
@@ -26,6 +26,27 @@ module NewRelic
         ::NewRelic::Agent::SystemInfo.ram_in_mib
       end
 
+      def configured_hostname
+        Agent.config[:'utilization.billing_hostname']
+      end
+
+      # this is slightly ugly, but if a string value is passed in
+      # for the env var: NEW_RELIC_UTILIZATION_LOGICAL_PROCESSORS the
+      # coercion from EnvironmentSource will turn that into a numerical 0,
+      # which is not a reasonable value for logical_processes and should
+      # not be sent up
+      def configured_logical_processors
+        logical_processors = Agent.config[:'utilization.logical_processors']
+        logical_processors unless logical_processors == 0
+      end
+
+      # see comment above as the situation is the same for:
+      # NEW_RELIC_UTILIZATION_TOTAL_RAM_MIB
+      def configured_total_ram_mib
+        total_ram = Agent.config[:'utilization.total_ram_mib']
+        total_ram unless total_ram == 0
+      end
+
       def to_collector_hash
         result = {
           :metadata_version => METADATA_VERSION,
@@ -36,6 +57,7 @@ module NewRelic
 
         append_aws_info(result)
         append_docker_info(result)
+        append_configured_values(result)
 
         result
       end
@@ -59,6 +81,28 @@ module NewRelic
           collector_hash[:vendors][:docker] = {:id => docker_container_id}
         end
       end
+
+      def append_configured_values(collector_hash)
+        collector_hash[:config] = config_hash unless config_hash.empty?
+      end
+
+      def config_hash
+        config_hash = {}
+
+        if hostname = configured_hostname
+          config_hash[:hostname] = hostname
+        end
+
+        if logical_processors = configured_logical_processors
+          config_hash[:logical_processors] = logical_processors
+        end
+
+        if total_ram_mib = configured_total_ram_mib
+          config_hash[:total_ram_mib] = total_ram_mib
+        end
+
+        config_hash
+      end
     end
   end
 end

data/lib/new_relic/recipes/capistrano3.rb

@@ -9,46 +9,56 @@ namespace :newrelic do
   # notifies New Relic of a deployment
   desc "Record a deployment in New Relic (newrelic.com)"
   task :notice_deployment do
-    run_locally do
-      environment = fetch(:newrelic_rails_env, fetch(:rack_env, fetch(:rails_env, fetch(:stage, "production"))))
+    if fetch(:newrelic_role)
+      on roles(fetch(:newrelic_role)) do
+        send_deployment_notification_to_newrelic
+      end
+    else
+      run_locally do
+        send_deployment_notification_to_newrelic
+      end
+    end
+  end
 
-      require 'new_relic/cli/command.rb'
+  def send_deployment_notification_to_newrelic
+    environment = fetch(:newrelic_rails_env, fetch(:rack_env, fetch(:rails_env, fetch(:stage, "production"))))
 
-      begin
-        # allow overrides to be defined for revision, description, changelog, appname, and user
-        rev         = fetch(:newrelic_revision)
-        description = fetch(:newrelic_desc)
-        changelog   = fetch(:newrelic_changelog)
-        appname     = fetch(:newrelic_appname)
-        user        = fetch(:newrelic_user)
-        license_key = fetch(:newrelic_license_key)
+    require 'new_relic/cli/command.rb'
 
-        unless scm == :none
-          changelog ||= lookup_changelog
-          rev       ||= fetch(:current_revision)
-        end
+    begin
+      # allow overrides to be defined for revision, description, changelog, appname, and user
+      rev         = fetch(:newrelic_revision)
+      description = fetch(:newrelic_desc)
+      changelog   = fetch(:newrelic_changelog)
+      appname     = fetch(:newrelic_appname)
+      user        = fetch(:newrelic_user)
+      license_key = fetch(:newrelic_license_key)
 
-        new_revision = rev
-        deploy_options = {
-          :environment => environment,
-          :revision    => new_revision,
-          :changelog   => changelog,
-          :description => description,
-          :appname     => appname,
-          :user        => user,
-          :license_key => license_key
-        }
+      unless scm == :none
+        changelog ||= lookup_changelog
+        rev       ||= fetch(:current_revision)
+      end
 
-        debug "Uploading deployment to New Relic"
-        deployment = NewRelic::Cli::Deployments.new deploy_options
-        deployment.run
-        info "Uploaded deployment information to New Relic"
+      new_revision = rev
+      deploy_options = {
+        :environment => environment,
+        :revision    => new_revision,
+        :changelog   => changelog,
+        :description => description,
+        :appname     => appname,
+        :user        => user,
+        :license_key => license_key
+      }
 
-      rescue NewRelic::Cli::Command::CommandFailure => e
-        info e.message
-      rescue => e
-        info "Error creating New Relic deployment (#{e})\n#{e.backtrace.join("\n")}"
-      end
+      debug "Uploading deployment to New Relic"
+      deployment = NewRelic::Cli::Deployments.new deploy_options
+      deployment.run
+      info "Uploaded deployment information to New Relic"
+
+    rescue NewRelic::Cli::Command::CommandFailure => e
+      info e.message
+    rescue => e
+      info "Error creating New Relic deployment (#{e})\n#{e.backtrace.join("\n")}"
     end
   end
 

data/lib/new_relic/version.rb

@@ -11,8 +11,8 @@ module NewRelic
     end
 
     MAJOR = 3
-    MINOR = 15
-    TINY  = 2
+    MINOR = 16
+    TINY  = 0
 
     begin
       require File.join(File.dirname(__FILE__), 'build')

data/lib/tasks/versions.preface.html

@@ -1,3 +1,9 @@
-<p>This document lists the official supported versions and frameworks for New Relic's Ruby Agent.</p>
+<p>This document lists compatible operating systems, security requirements, and supported frameworks for the New Relic Ruby Agent.</p>
 
 <h2 id="qiklinks">Contents</h2>
+
+<h2 id="os">Operating systems</h2>
+<p>The Ruby Agent is supported on UNIX-like operating systems such as Linux, Solaris, and Mac OS X.</p>
+
+<h2 id="security">Security requirements</h2>
+<p>As a standard <a href="/docs/accounts-partnerships/accounts/security/data-security">security measure for data collection</a>, your app server must support SHA-2 (256-bit). SHA-1 is not supported.</p>

data/lib/tasks/versions.rake

@@ -53,7 +53,7 @@ namespace :newrelic do
     write_versions("Ruby versions",   :ruby, erb)
     write_versions("Web servers",     :app_server, erb)
     write_versions("Web frameworks",  :web, erb)
-    write_versions("Database",        :database, erb)
+    write_versions("Databases",       :database, erb)
     write_versions("Background jobs", :background, erb)
     write_versions("HTTP clients",    :http, erb)
     write_versions("Other",           :other, erb)

data/newrelic_rpm.gemspec

@@ -52,6 +52,7 @@ EOS
   # Only let Guard run on newer Rubies
   if RUBY_VERSION >= "1.9.3"
     s.add_development_dependency 'guard'
+    s.add_development_dependency 'listen', '< 3.1' if RUBY_VERSION < "2.2.3"
     s.add_development_dependency 'guard-minitest'
     s.add_development_dependency 'rb-fsevent'
   end

data/test/fixtures/cross_agent_tests/README.md

@@ -5,6 +5,10 @@
 None of these tests should contain customer data such as SQL strings.
 Please be careful when adding new tests from real world failures.
 
+### Access
+
+Push access to this repository is granted via membership in the cross-agent-team GHE group. Contact Belinda Runkle if you are on the agent team but don't have push access.
+
 ### Tests
 
 | Test Files    | Description   |
@@ -12,45 +16,19 @@ Please be careful when adding new tests from real world failures.
 | [rum_loader_insertion_location](rum_loader_insertion_location) | Describe where the RUM loader (formerly known as header) should be inserted. |
 | [rum_footer_insertion_location](rum_footer_insertion_location) | Describe where the RUM footer (aka "client config") should be inserted.  These tests do not apply to agents which insert the footer directly after the loader. |
 | [rules.json](rules.json) | Describe how url/metric/txn-name rules should be applied. |
-| [rum_client_config.json](rum_client_config.json) | These tests dictate the format and contents of the browser monitoring client configuration.  For more information see: [SPEC](https://newrelic.atlassian.net/wiki/display/eng/JavaScript+Agent+Auto-Instrumentation) |
+| [rum_client_config.json](rum_client_config.json) | These tests dictate the format and contents of the browser monitoring client configuration.  For more information see: [SPEC](https://newrelic.atlassian.net/wiki/display/eng/BAM+Agent+Auto-Instrumentation) |
 | [sql_parsing.json](sql_parsing.json) | These tests show how an SQL string should be parsed for the operation and table name. |
 | [url_clean.json](url_clean.json) | These tests show how URLs should be cleaned before putting them into a trace segment's parameter hash (under the key 'uri'). |
 | [url_domain_extraction.json](url_domain_extraction.json) | These tests show how the domain of a URL should be extracted (for the purpose of creating external metrics). |
 | [postgres_explain_obfuscation](postgres_explain_obfuscation) | These tests show how plain-text explain plan output from PostgreSQL should be obfuscated when SQL obfuscation is enabled. |
 | [sql_obfuscation](sql_obfuscation) | Describe how agents should obfuscate SQL queries before transmission to the collector. |
-| [attribute_configuration](attribute_configuration.json) | These tests show how agents should respond to the various attribute configuration settings.  For more information see: [Attributes SPEC](https://newrelic.atlassian.net/wiki/display/eng/Agent+Attributes) |
-| [cat_map](cat_map.json) | These tests cover the new Dirac attributes that are added for the CAT Map project. See the [CAT Map Spec](https://newrelic.jiveon.com/docs/DOC-1798) and the section below for details.|
+| [attribute_configuration](attribute_configuration.json) | These tests show how agents should respond to the various attribute configuration settings.  For more information see: [Attributes SPEC](https://source.datanerd.us/agents/agent-specs/blob/master/Agent-Attributes-PORTED.md) |
+| [cat](cat) | These tests cover the new Dirac attributes that are added for the CAT Map project. See the [CAT Spec](https://source.datanerd.us/agents/agent-specs/blob/master/Cross-Application-Tracing-PORTED.md) and the [README](cat/README.md) for details.|
 | [labels](labels.json) | These tests cover the Labels for Language Agents project. See the [Labels for Language Agents Spec](https://newrelic.atlassian.net/wiki/display/eng/Labels+for+Language+Agents) for details.|
 | [proc_cpuinfo](proc_cpuinfo) | These test correct processing of `/proc/cpuinfo` output on Linux hosts. |
 | [proc_meminfo](proc_meminfo) | These test correct processing of `/proc/meminfo` output on Linux hosts. |
 | [transaction_segment_terms.json](transaction_segment_terms.json) | These tests cover agent implementations of the `transaction_segment_terms` transaction renaming rules introduced in collector protocol 14. See [the spec](https://newrelic.atlassian.net/wiki/display/eng/Language+agent+transaction+segment+terms+rules) for details. |
+| [synthetics](synthetics) | These tests cover agent support for Synthetics. For details, see [Agent Support for Synthetics: Forced Transaction Traces and Analytic Events](https://source.datanerd.us/agents/agent-specs/blob/master/Synthetics-PORTED.md). |
 | [docker_container_id](docker_container_id) | These tests cover parsing of Docker container IDs from `/proc/*/cgroup` on Linux hosts. |
-
-### CAT Map test details
-
-The CAT map test cases in `cat_map.json` are meant to be used to verify the
-attributes that agents collect and attach to analytics transaction events for
-the CAT map project.
-
-**NOTE** currently `nr.apdexPerfZone` is not covered by these tests, make sure you test for this yourself until it is added to these tests.
-
-Each test case should correspond to a simulated transaction in the agent under
-test. Here's what the various fields in each test case mean:
-
-| Name | Meaning |
-| ---- | ------- |
-| `name` | A human-meaningful name for the test case. |
-| `appName` | The name of the New Relic application for the simulated transaction. |
-| `transactionName` | The final name of the simulated transaction. |
-| `transactionGuid` | The GUID of the simulated transaction. |
-| `inboundPayload` | The (non-serialized) contents of the `X-NewRelic-Transaction` HTTP request header on the simulated transaction. Note that this value should be serialized to JSON, obfuscated using the CAT obfuscation algorithm, and Base64-encoded before being used in the header value. Note also that the `X-NewRelic-ID` header should be set on the simulated transaction, though its value is not specified in these tests. |
-| `expectedIntrinsicFields` | A set of key-value pairs that are expected to be present in the analytics event generated for the simulated transaction. These fields should be present in the first hash of the analytic event payload (built-in agent-supplied fields). |
-| `nonExpectedIntrinsicFields` | An array of attribute names that should *not* be present in the analytics event generated for the simulated transaction. |
-| `outboundRequests` | An array of objects representing outbound requests that should be made in the context of the simulated transaction. See the table below for details. Only present if the test case involves making outgoing requests from the simulated transaction. |
-
-Here's what the fields of each entry in the `outboundRequests` array mean:
-
-| Name | Meaning |
-| ---- | ------- |
-| `outboundTxnName` | The name of the simulated transaction at the time this outbound request is made. Your test driver should set the transaction name to this value prior to simulating the outbound request. |
-| `expectedOutboundPayload` | The expected (un-obfuscated) content of the outbound `X-NewRelic-Transaction` request header for this request. |
+| [aws](aws.json) | These tests cover the collection and validation of AWS metadata for the [utilization draft spec](https://source.datanerd.us/agents/agent-specs/blob/master/Utilization.md). |
+| [data_transport](data_transport/data_transport.json) | These test correct JSON payload generation and handling collector responses. See [readme](https://source.datanerd.us/agents/cross_agent_tests/blob/master/data_transport/data_transport.md) for details. |

data/test/fixtures/cross_agent_tests/aws.json

@@ -7,7 +7,7 @@
         "timeout":false
       },
       "http://169.254.169.254/2008-02-01/meta-data/instance-id":{
-        "response":"test.id",
+        "response":"i-test.19characters",
         "timeout":false
       },
       "http://169.254.169.254/2008-02-01/meta-data/placement/availability-zone":{
@@ -17,7 +17,7 @@
     },
     "expected_vendors_hash": {
       "aws": {
-        "id": "test.id",
+        "id": "i-test.19characters",
         "type": "test.type",
         "zone": "us-west-2b"
       }

data/test/fixtures/cross_agent_tests/rum_client_config.json

@@ -2,8 +2,8 @@
   {
     "testname":"all fields present",
 
-    "apptime_microseconds":5,
-    "queuetime_microseconds":3,
+    "apptime_milliseconds":5,
+    "queuetime_milliseconds":3,
     "browser_monitoring.attributes.enabled":true,
     "transaction_name":"WebTransaction/brink/of/glory",
     "license_key":"0000111122223333444455556666777788889999",
@@ -32,8 +32,8 @@
   {
     "testname":"browser_monitoring.attributes.enabled disabled",
 
-    "apptime_microseconds":5,
-    "queuetime_microseconds":3,
+    "apptime_milliseconds":5,
+    "queuetime_milliseconds":3,
     "browser_monitoring.attributes.enabled":false,
     "transaction_name":"WebTransaction/brink/of/glory",
     "license_key":"0000111122223333444455556666777788889999",
@@ -58,5 +58,34 @@
       "errorBeacon":"my_error_beacon",
       "agent":"my_js_agent_file"
     }
+  },
+  {
+    "testname":"empty js_agent_file",
+    "apptime_milliseconds":5,
+    "queuetime_milliseconds":3,
+    "browser_monitoring.attributes.enabled":true,
+    "transaction_name":"WebTransaction/brink/of/glory",
+    "license_key":"0000111122223333444455556666777788889999",
+    "connect_reply":
+    {
+      "beacon":"my_beacon",
+      "browser_key":"my_browser_key",
+      "application_id":"my_application_id",
+      "error_beacon":"my_error_beacon",
+      "js_agent_file":""
+    },
+    "user_attributes":{"alpha":"beta"},
+    "expected":
+    {
+      "beacon":"my_beacon",
+      "licenseKey":"my_browser_key",
+      "applicationID":"my_application_id",
+      "transactionName":"Z1VSZENQX0JTUUZbXF4fUkJYX1oeXVQdVV9fQkk=",
+      "queueTime":3,
+      "applicationTime":5,
+      "atts":"SxJFEgtKE1BeQlpTEQoSUlVFUBNMTw==",
+      "errorBeacon":"my_error_beacon",
+      "agent":""
+    }
   }
 ]