newrelic_rpm 3.17.2.327 → 3.18.0.329

data/test/script/before_install/update_bundler.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+# ruby-1.9.3 travis has bundler 1.7.6 installed, which pulls in dm-types-1.2.0
+# during the datamapper multiverse suite. this causes a dep conflict on json
+# gem. updating bundler to latest on that version pulls in dm-types-1.2.2
+# and does not cause a conflict.
+
+set -ev
+
+if [[ `ruby --version` =~ ^ruby\ 1\.9\.3 ]]; then
+  gem install bundler
+fi

data/test/script/external_server.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+# 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.
+
+$:.unshift File.expand_path('../../../lib', __FILE__)
+$:.unshift File.expand_path('../..', __FILE__)
+
+require 'newrelic_rpm'
+require 'agent_helper'
+require 'new_relic/fake_external_server'
+require 'net/http'
+require 'json'
+
+STDOUT.sync = true
+
+server = NewRelic::FakeExternalServer.new(3035)
+server.reset
+server.run
+
+puts JSON.dump({:message => "started"})
+
+while message = JSON.parse(gets) do
+  case message["command"]
+  when "shutdown"
+    server.stop
+    exit(0)
+  when "add_headers"
+    server.override_response_headers message["payload"]
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.17.2.327
+  version: 3.18.0.329
 platform: ruby
 authors:
 - Tim Krajcar
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -357,6 +357,7 @@ files:
 - lib/new_relic/agent/transaction/attributes.rb
 - lib/new_relic/agent/transaction/datastore_segment.rb
 - lib/new_relic/agent/transaction/developer_mode_sample_buffer.rb
+- lib/new_relic/agent/transaction/external_request_segment.rb
 - lib/new_relic/agent/transaction/request_attributes.rb
 - lib/new_relic/agent/transaction/segment.rb
 - lib/new_relic/agent/transaction/slowest_sample_buffer.rb
@@ -722,9 +723,9 @@ files:
 - test/intentional_fail.rb
 - test/multiverse/.gitignore
 - test/multiverse/README.md
+- test/multiverse/lib/multiverse.rb
 - test/multiverse/lib/multiverse/color.rb
 - test/multiverse/lib/multiverse/envfile.rb
-- test/multiverse/lib/multiverse/environment.rb
 - test/multiverse/lib/multiverse/output_collector.rb
 - test/multiverse/lib/multiverse/runner.rb
 - test/multiverse/lib/multiverse/shell_utils.rb
@@ -1005,7 +1006,6 @@ files:
 - test/new_relic/agent/configuration/server_source_test.rb
 - test/new_relic/agent/configuration/yaml_source_test.rb
 - test/new_relic/agent/cross_app_monitor_test.rb
-- test/new_relic/agent/cross_app_tracing_test.rb
 - test/new_relic/agent/custom_event_aggregator_test.rb
 - test/new_relic/agent/database/postgres_explain_obfuscator_test.rb
 - test/new_relic/agent/database/sql_obfuscation_test.rb
@@ -1097,6 +1097,7 @@ files:
 - test/new_relic/agent/transaction/attributes_test.rb
 - test/new_relic/agent/transaction/datastore_segment_test.rb
 - test/new_relic/agent/transaction/developer_mode_sample_buffer_test.rb
+- test/new_relic/agent/transaction/external_request_segment_test.rb
 - test/new_relic/agent/transaction/request_attributes_test.rb
 - test/new_relic/agent/transaction/segment_test.rb
 - test/new_relic/agent/transaction/slowest_sample_buffer_test.rb
@@ -1201,6 +1202,7 @@ files:
 - test/performance/suites/config.rb
 - test/performance/suites/datastores.rb
 - test/performance/suites/error_collector.rb
+- test/performance/suites/external_segment.rb
 - test/performance/suites/marshalling.rb
 - test/performance/suites/queue_time.rb
 - test/performance/suites/rack_middleware.rb
@@ -1215,10 +1217,11 @@ files:
 - test/performance/suites/trace_execution_scoped.rb
 - test/performance/suites/transaction_tracing.rb
 - test/script/before_install/gemstash_mirror.sh
-- test/script/before_install/jruby_bundler.sh
 - test/script/before_install/revert_rubygems.sh
+- test/script/before_install/update_bundler.sh
 - test/script/before_script/install_mongodb.sh
 - test/script/ci.sh
+- test/script/external_server.rb
 - test/script/path_hash.rb
 - test/test_helper.rb
 - ui/helpers/developer_mode_helper.rb

data/test/multiverse/lib/multiverse/environment.rb

@@ -1,19 +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 'fileutils'
-module Multiverse
-  ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
-  $: << File.expand_path(File.join(ROOT, 'lib'))
-
-  # Include from our unit testing path to share fake_collector
-  $: << File.expand_path(File.join(ROOT, '..', 'new_relic'))
-
-  SUITES_DIRECTORY = ENV['SUITES_DIRECTORY'] || File.join(ROOT, '/suites')
-  require 'multiverse/color'
-  require 'multiverse/output_collector'
-  require 'multiverse/runner'
-  require 'multiverse/envfile'
-  require 'multiverse/suite'
-end

data/test/new_relic/agent/cross_app_tracing_test.rb

@@ -1,71 +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 File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
-require 'new_relic/agent/cross_app_tracing'
-
-module NewRelic
-  module Agent
-    class CrossAppTracingTest < Minitest::Test
-
-      attr_reader :node, :request, :response
-
-      def setup
-        @node = stub_everything
-        @request = stub_everything(:uri => URI.parse("http://newrelic.com"),
-                                   :type => "Fake",
-                                   :method => "GET")
-        @response = stub_everything
-        @state = NewRelic::Agent::TransactionState.tl_get
-      end
-
-      def test_start_trace
-        t0   = Time.now
-        node = CrossAppTracing.start_trace(@state, t0, request)
-        refute_nil node
-      end
-
-      def test_start_trace_has_nil_node_on_agent_failure
-        @state.traced_method_stack.stubs(:push_frame).raises("Boom!")
-        t0      = Time.now
-        node = CrossAppTracing.start_trace(@state, t0, request)
-        assert_nil node
-      end
-
-      def test_finish_trace_treats_nil_start_time_as_agent_error
-        expects_logging(:error, any_parameters)
-        expects_no_pop_frame
-        CrossAppTracing.finish_trace(@state, nil, node, request, response)
-      end
-
-      # Since we log and swallow errors, assert on the logging to ensure these
-      # paths are cleanly accepting nils, not just smothering the exceptions.
-
-      def test_finish_trace_allows_nil_node
-        expects_no_logging(:error)
-        CrossAppTracing.finish_trace(@state, Time.now, nil, request, response)
-      end
-
-      def test_finish_trace_allows_nil_request
-        expects_no_logging(:error)
-        expects_pop_frame
-        CrossAppTracing.finish_trace(@state, Time.now, node, nil, response)
-      end
-
-      def test_finish_trace_allows_nil_response
-        expects_no_logging(:error)
-        expects_pop_frame
-        CrossAppTracing.finish_trace(@state, Time.now, node, request, nil)
-      end
-
-      def expects_pop_frame
-        @state.traced_method_stack.stubs(:pop_frame).once
-      end
-
-      def expects_no_pop_frame
-        @state.traced_method_stack.stubs(:pop_frame).never
-      end
-    end
-  end
-end

data/test/script/before_install/jruby_bundler.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-#
-# currently there's an incompatibility between Bundler 1.13 with JRuby 1.7, see Bundler issue #4975
-# so we revert bundler versions to 1.12.5 on that version
-#
-# further digging suggests the bundler/jruby problem was actually a jruby bug,
-# apparently fixed in 1.7.26. if we upgrade our older jruby testing, which seems
-# unlikely at this point, be sure to change this uninstall line to point to the
-# correct location.
-#
-# TODO: remove when older rubies are deprecated, RUBY-1668
-
-set -ev
-
-if [[ `ruby --version` =~ ^jruby\ 1\. ]]; then
-  gem uninstall -x -i $HOME/.rvm/gems/jruby-1.7.23@global bundler
-  if [ -n "$GEMSTASH_MIRROR" ]; then
-    gem install --clear-sources --source $GEMSTASH_MIRROR bundler -v 1.12.5
-  else
-    gem install bundler -v 1.12.5
-  fi
-fi