newrelic_rpm 3.15.2.317 → 3.16.0.318

data/test/new_relic/agent/method_tracer_test.rb

@@ -205,7 +205,6 @@ class NewRelic::Agent::MethodTracerTest < Minitest::Test
     end
 
     cls.new.instance_method
-    # require 'pry'; binding.pry
     stats = @stats_engine.get_stats("Custom/AnonymousClass/instance_method")
     assert stats.call_count == 1
   end

data/test/new_relic/agent/new_relic_service/json_marshaller_test.rb

@@ -0,0 +1,27 @@
+# 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 File.expand_path(File.join(File.dirname(__FILE__),'../../..','test_helper'))
+require 'new_relic/agent/new_relic_service/json_marshaller'
+require 'new_relic/agent/new_relic_service/encoders'
+
+module NewRelic
+  module Agent
+    class NewRelicService
+      class JsonMarshallerTest < Minitest::Test
+        def test_default_encoder_is_base64_compressed_json
+          marshaller = JsonMarshaller.new
+          assert_equal Encoders::Base64CompressedJSON, marshaller.default_encoder
+        end
+
+        def test_default_encoder_is_identity_with_simple_compression_enabled
+          marshaller = JsonMarshaller.new
+          with_config :simple_compression => true do
+            assert_equal Encoders::Identity, marshaller.default_encoder
+          end
+        end
+      end
+    end
+  end
+end

data/test/new_relic/agent/utilization_data_test.rb

@@ -147,6 +147,92 @@ module NewRelic::Agent
       assert_equal UtilizationData::METADATA_VERSION, utilization_data.to_collector_hash[:metadata_version]
     end
 
+    def test_configured_hostname_added_to_config_hash
+      with_config(:'utilization.billing_hostname' => 'BillNye') do
+        utilization_data = UtilizationData.new
+        assert_equal 'BillNye', utilization_data.to_collector_hash[:config][:hostname]
+      end
+    end
+
+    def test_configured_logical_processors_added_to_config_hash
+      with_config(:'utilization.logical_processors' => 42) do
+        utilization_data = UtilizationData.new
+        assert_equal 42, utilization_data.to_collector_hash[:config][:logical_processors]
+      end
+    end
+
+    def test_configured_total_ram_mib_added_to_config_hash
+      with_config(:'utilization.total_ram_mib' => 42) do
+        utilization_data = UtilizationData.new
+        assert_equal 42, utilization_data.to_collector_hash[:config][:total_ram_mib]
+      end
+    end
+
+    load_cross_agent_test("utilization/utilization_json").each do |test_case|
+
+      test_case = HashExtensions.symbolize_keys_in_object test_case
+      define_method("test_#{test_case[:testname]}".tr(" ", "_")) do
+        setup_cross_agent_test_stubs test_case
+        # This is a little bit ugly, but TravisCI runs these tests in a docker environment,
+        # which means we get an unexpected docker id in the vendors hash. Since none of the
+        # cross agent tests expect docker ids in the vendors hash we can safely turn off
+        # docker detection.
+        options = convert_env_to_config_options(test_case).merge(:'utilization.detect_docker' => false)
+        with_config options do
+          assert_equal test_case[:expected_output_json], UtilizationData.new.to_collector_hash
+        end
+      end
+    end
+
+    def setup_cross_agent_test_stubs test_case
+      stub_utilization_inputs test_case
+      stub_aws_inputs test_case
+    end
+
+    UTILIZATION_INPUTS = {
+      :input_total_ram_mib => :ram_in_mib,
+      :input_logical_processors => :cpu_count,
+      :input_hostname => :hostname
+    }
+
+    def stub_utilization_inputs test_case
+      test_case.keys.each do |key|
+        if meth = UTILIZATION_INPUTS[key]
+          UtilizationData.any_instance.stubs(meth).returns(test_case[key])
+        end
+      end
+    end
+
+    AWS_INPUTS = {
+      :input_aws_id => :instance_id,
+      :input_aws_type => :instance_type,
+      :input_aws_zone => :availability_zone
+    }
+
+    def stub_aws_inputs test_case
+      test_case.keys.each do |key|
+        if meth = AWS_INPUTS[key]
+          AWSInfo.any_instance.stubs(meth).returns(test_case[key])
+        end
+      end
+    end
+
+    ENV_TO_OPTIONS = {
+      :NEW_RELIC_UTILIZATION_LOGICAL_PROCESSORS => :'utilization.logical_processors',
+      :NEW_RELIC_UTILIZATION_TOTAL_RAM_MIB =>  :'utilization.total_ram_mib',
+      :NEW_RELIC_UTILIZATION_BILLING_HOSTNAME => :'utilization.billing_hostname'
+    }
+
+    NUMERIC_ENV_OPTS = [:NEW_RELIC_UTILIZATION_LOGICAL_PROCESSORS, :NEW_RELIC_UTILIZATION_TOTAL_RAM_MIB]
+
+    def convert_env_to_config_options test_case
+      env_inputs = test_case.fetch :input_environment_variables, {}
+      env_inputs.keys.inject({}) do |memo, k|
+        memo[ENV_TO_OPTIONS[k]] = NUMERIC_ENV_OPTS.include?(k) ? env_inputs[k].to_i : env_inputs[k]
+        memo
+      end
+    end
+
     def stub_aws_info(responses = {})
       AWSInfo.any_instance.stubs(:remote_fetch).with("instance-id").returns(responses[:instance_id])
       AWSInfo.any_instance.stubs(:remote_fetch).with("instance-type").returns(responses[:instance_type])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.15.2.317
+  version: 3.16.0.318
 platform: ruby
 authors:
 - Tim Krajcar
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -286,6 +286,7 @@ files:
 - lib/new_relic/agent/http_clients/uri_util.rb
 - lib/new_relic/agent/inbound_request_monitor.rb
 - lib/new_relic/agent/instrumentation.rb
+- lib/new_relic/agent/instrumentation/action_cable_subscriber.rb
 - lib/new_relic/agent/instrumentation/action_controller_subscriber.rb
 - lib/new_relic/agent/instrumentation/action_view_subscriber.rb
 - lib/new_relic/agent/instrumentation/active_job.rb
@@ -328,6 +329,7 @@ files:
 - lib/new_relic/agent/instrumentation/rails4/action_controller.rb
 - lib/new_relic/agent/instrumentation/rails4/action_view.rb
 - lib/new_relic/agent/instrumentation/rails4/errors.rb
+- lib/new_relic/agent/instrumentation/rails5/action_cable.rb
 - lib/new_relic/agent/instrumentation/rails5/action_controller.rb
 - lib/new_relic/agent/instrumentation/rails5/action_view.rb
 - lib/new_relic/agent/instrumentation/rails_middleware.rb
@@ -408,7 +410,6 @@ files:
 - lib/new_relic/agent/transaction_sampler.rb
 - lib/new_relic/agent/transaction_state.rb
 - lib/new_relic/agent/transaction_timings.rb
-- lib/new_relic/agent/transction_event_recorder.rb
 - lib/new_relic/agent/utilization_data.rb
 - lib/new_relic/agent/vm.rb
 - lib/new_relic/agent/vm/jruby_vm.rb
@@ -744,6 +745,8 @@ files:
 - test/fixtures/cross_agent_tests/transaction_segment_terms.json
 - test/fixtures/cross_agent_tests/url_clean.json
 - test/fixtures/cross_agent_tests/url_domain_extraction.json
+- test/fixtures/cross_agent_tests/utilization/README.md
+- test/fixtures/cross_agent_tests/utilization/utilization_json.json
 - test/helpers/exceptions.rb
 - test/helpers/file_searching.rb
 - test/helpers/mongo_metric_builder.rb
@@ -905,6 +908,7 @@ files:
 - test/multiverse/suites/rack/response_content_type_test.rb
 - test/multiverse/suites/rack/url_map_test.rb
 - test/multiverse/suites/rails/Envfile
+- test/multiverse/suites/rails/action_cable_test.rb
 - test/multiverse/suites/rails/action_controller_live_rum_test.rb
 - test/multiverse/suites/rails/activejob_test.rb
 - test/multiverse/suites/rails/app.rb
@@ -1054,6 +1058,7 @@ files:
 - test/new_relic/agent/hostname_test.rb
 - test/new_relic/agent/http_clients/uri_util_test.rb
 - test/new_relic/agent/inbound_request_monitor_test.rb
+- test/new_relic/agent/instrumentation/action_cable_subscriber_test.rb
 - test/new_relic/agent/instrumentation/action_controller_subscriber_test.rb
 - test/new_relic/agent/instrumentation/action_view_subscriber_test.rb
 - test/new_relic/agent/instrumentation/active_job_test.rb
@@ -1081,6 +1086,7 @@ files:
 - test/new_relic/agent/method_tracer_test.rb
 - test/new_relic/agent/method_visibility_test.rb
 - test/new_relic/agent/mock_scope_listener.rb
+- test/new_relic/agent/new_relic_service/json_marshaller_test.rb
 - test/new_relic/agent/new_relic_service_test.rb
 - test/new_relic/agent/obfuscator_test.rb
 - test/new_relic/agent/parameter_filtering_test.rb
@@ -1333,7 +1339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: New Relic Ruby Agent

data/lib/new_relic/agent/transction_event_recorder.rb

@@ -1,35 +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.
-require 'new_relic/agent/transaction_event_aggregator'
-require 'new_relic/agent/synthetics_event_aggregator'
-
-module NewRelic
-  module Agent
-    # This is responsibile for recording transaction events and managing
-    # the relationship between events generated from synthetics requests
-    # vs normal requests.
-    class TransactionEventRecorder
-      attr_reader :transaction_event_aggregator
-      attr_reader :synthetics_event_aggregator
-
-      def initialize
-        @transaction_event_aggregator = NewRelic::Agent::TransactionEventAggregator.new
-        @synthetics_event_aggregator = NewRelic::Agent::SyntheticsEventAggregator.new
-      end
-
-      def record payload
-        return unless NewRelic::Agent.config[:'analytics_events.enabled']
-
-        event = TransactionEvent.new payload
-
-        if event.synthetics?
-          _, rejected = synthetics_event_aggregator.append_or_reject event.to_collector_array
-          transaction_event_aggregator.record event if rejected
-        else
-          transaction_event_aggregator.record event.to_collector_array
-        end
-      end
-    end
-  end
-end