newrelic_rpm 6.5.0.357 → 6.10.0.364
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +1 -0
- data/.travis.yml +65 -5
- data/CHANGELOG.md +243 -0
- data/Guardfile +18 -1
- data/lib/new_relic/agent.rb +89 -7
- data/lib/new_relic/agent/agent.rb +116 -57
- data/lib/new_relic/agent/agent_logger.rb +4 -0
- data/lib/new_relic/agent/attribute_filter.rb +7 -7
- data/lib/new_relic/agent/attributes.rb +150 -0
- data/lib/new_relic/agent/autostart.rb +19 -14
- data/lib/new_relic/agent/configuration/default_source.rb +132 -13
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +11 -5
- data/lib/new_relic/agent/configuration/manager.rb +13 -9
- data/lib/new_relic/agent/configuration/server_source.rb +3 -2
- data/lib/new_relic/agent/configuration/yaml_source.rb +11 -6
- data/lib/new_relic/agent/connect/request_builder.rb +5 -13
- data/lib/new_relic/agent/connect/response_handler.rb +1 -1
- data/lib/new_relic/agent/database.rb +1 -2
- data/lib/new_relic/agent/datastores/mongo.rb +1 -1
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +2 -2
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +8 -8
- data/lib/new_relic/agent/distributed_tracing.rb +155 -6
- data/lib/new_relic/agent/{cross_app_payload.rb → distributed_tracing/cross_app_payload.rb} +0 -0
- data/lib/new_relic/agent/{cross_app_tracing.rb → distributed_tracing/cross_app_tracing.rb} +60 -45
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_intrinsics.rb +80 -0
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +75 -0
- data/lib/new_relic/agent/{distributed_trace_payload.rb → distributed_tracing/distributed_trace_payload.rb} +23 -99
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +39 -0
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +246 -0
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +126 -0
- data/lib/new_relic/agent/error_collector.rb +35 -18
- data/lib/new_relic/agent/error_event_aggregator.rb +9 -6
- data/lib/new_relic/agent/error_trace_aggregator.rb +1 -0
- data/lib/new_relic/agent/event_aggregator.rb +26 -32
- data/lib/new_relic/agent/external.rb +7 -7
- data/lib/new_relic/agent/guid_generator.rb +28 -0
- data/lib/new_relic/agent/hostname.rb +7 -1
- data/lib/new_relic/agent/http_clients/abstract.rb +82 -0
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +24 -19
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +28 -13
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +17 -21
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +10 -11
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +16 -4
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +4 -6
- data/lib/new_relic/agent/http_clients/uri_util.rb +3 -2
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +5 -7
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +4 -0
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +11 -2
- data/lib/new_relic/agent/instrumentation/active_record.rb +4 -2
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +7 -2
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +8 -4
- data/lib/new_relic/agent/instrumentation/bunny.rb +45 -28
- data/lib/new_relic/agent/instrumentation/curb.rb +59 -18
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +3 -1
- data/lib/new_relic/agent/instrumentation/excon.rb +1 -1
- data/lib/new_relic/agent/instrumentation/excon/connection.rb +6 -3
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +2 -1
- data/lib/new_relic/agent/instrumentation/grape.rb +5 -10
- data/lib/new_relic/agent/instrumentation/http.rb +6 -3
- data/lib/new_relic/agent/instrumentation/httpclient.rb +5 -3
- data/lib/new_relic/agent/instrumentation/memcache.rb +3 -1
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +6 -2
- data/lib/new_relic/agent/instrumentation/mongo.rb +9 -3
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +13 -0
- data/lib/new_relic/agent/instrumentation/net.rb +6 -3
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +25 -1
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +2 -3
- data/lib/new_relic/agent/instrumentation/redis.rb +9 -3
- data/lib/new_relic/agent/instrumentation/resque.rb +3 -0
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +0 -1
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +23 -6
- data/lib/new_relic/agent/javascript_instrumentor.rb +1 -1
- data/lib/new_relic/agent/logging.rb +139 -0
- data/lib/new_relic/agent/messaging.rb +5 -73
- data/lib/new_relic/agent/method_tracer.rb +3 -2
- data/lib/new_relic/agent/method_tracer_helpers.rb +2 -2
- data/lib/new_relic/agent/monitors.rb +27 -0
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +110 -0
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +27 -0
- data/lib/new_relic/agent/{inbound_request_monitor.rb → monitors/inbound_request_monitor.rb} +3 -3
- data/lib/new_relic/agent/{synthetics_monitor.rb → monitors/synthetics_monitor.rb} +2 -4
- data/lib/new_relic/agent/new_relic_service.rb +7 -5
- data/lib/new_relic/agent/noticible_error.rb +22 -0
- data/lib/new_relic/agent/span_event_aggregator.rb +2 -4
- data/lib/new_relic/agent/span_event_primitive.rb +82 -53
- data/lib/new_relic/agent/sql_sampler.rb +3 -3
- data/lib/new_relic/agent/supported_versions.rb +2 -2
- data/lib/new_relic/agent/tracer.rb +65 -18
- data/lib/new_relic/agent/transaction.rb +84 -79
- data/lib/new_relic/agent/transaction/abstract_segment.rb +28 -2
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +171 -0
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +57 -146
- data/lib/new_relic/agent/transaction/external_request_segment.rb +29 -36
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +3 -11
- data/lib/new_relic/agent/transaction/segment.rb +7 -1
- data/lib/new_relic/agent/transaction/trace.rb +2 -4
- data/lib/new_relic/agent/transaction/trace_context.rb +168 -0
- data/lib/new_relic/agent/transaction/trace_node.rb +10 -8
- data/lib/new_relic/agent/transaction_error_primitive.rb +10 -15
- data/lib/new_relic/agent/transaction_event_primitive.rb +28 -39
- data/lib/new_relic/agent/transaction_event_recorder.rb +3 -3
- data/lib/new_relic/cli/commands/deployments.rb +1 -1
- data/lib/new_relic/cli/commands/install.rb +3 -2
- data/lib/new_relic/coerce.rb +31 -6
- data/lib/new_relic/constants.rb +34 -0
- data/lib/new_relic/control/instance_methods.rb +10 -1
- data/lib/new_relic/dependency_detection.rb +4 -4
- data/lib/new_relic/noticed_error.rb +38 -17
- data/lib/new_relic/rack/browser_monitoring.rb +5 -0
- data/lib/new_relic/supportability_helper.rb +14 -0
- data/lib/new_relic/version.rb +1 -1
- data/lib/tasks/multiverse.rb +25 -0
- data/lib/tasks/tests.rake +6 -1
- data/newrelic_rpm.gemspec +16 -5
- data/test/agent_helper.rb +329 -70
- data/true +0 -0
- metadata +98 -30
- data/lib/new_relic/agent/cross_app_monitor.rb +0 -110
- data/lib/new_relic/agent/distributed_trace_monitor.rb +0 -40
- data/lib/new_relic/agent/http_clients/abstract_request.rb +0 -31
- data/lib/new_relic/agent/transaction/attributes.rb +0 -154
- data/lib/tasks/versions.html.erb +0 -28
- data/lib/tasks/versions.postface.html +0 -8
- data/lib/tasks/versions.preface.html +0 -9
- data/lib/tasks/versions.rake +0 -65
- data/lib/tasks/versions.txt.erb +0 -14
@@ -17,8 +17,14 @@ module NewRelic
|
|
17
17
|
end
|
18
18
|
end
|
19
19
|
|
20
|
+
# calling hostname with -f on some OS's (NetBSD, FreeBSD, Solaris)
|
21
|
+
# produces invalid option error, but doesn't raise exception. Instead,
|
22
|
+
# we get back empty string. So, solution here is to check for non-zero
|
23
|
+
# exit status and retry the command without the -f flag.
|
20
24
|
def self.get_fqdn
|
21
|
-
%x[hostname -f].chomp!
|
25
|
+
fqdn = %x[hostname -f].chomp!
|
26
|
+
fqdn = %x[hostname].chomp! unless $?.exitstatus.zero?
|
27
|
+
fqdn
|
22
28
|
rescue => e
|
23
29
|
NewRelic::Agent.logger.debug "Unable to determine fqdn #{e}"
|
24
30
|
nil
|
@@ -0,0 +1,82 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
5
|
+
|
6
|
+
module NewRelic
|
7
|
+
module Agent
|
8
|
+
module HTTPClients
|
9
|
+
MUST_IMPLEMENT_ERROR = "Subclasses of %s must implement a :%s method"
|
10
|
+
WHINY_NIL_ERROR = "%s cannot initialize with a nil wrapped_response object."
|
11
|
+
|
12
|
+
# This class provides a public interface for wrapping HTTP requests. This
|
13
|
+
# may be used to create wrappers that are compatible with New Relic's
|
14
|
+
# external request API.
|
15
|
+
#
|
16
|
+
# @api public
|
17
|
+
class AbstractRequest
|
18
|
+
|
19
|
+
def []
|
20
|
+
raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
|
21
|
+
end
|
22
|
+
|
23
|
+
def []=
|
24
|
+
raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
|
25
|
+
end
|
26
|
+
|
27
|
+
def type
|
28
|
+
raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
|
29
|
+
end
|
30
|
+
|
31
|
+
def host_from_header
|
32
|
+
raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
|
33
|
+
end
|
34
|
+
|
35
|
+
def host
|
36
|
+
raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
|
37
|
+
end
|
38
|
+
|
39
|
+
def method
|
40
|
+
raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
|
41
|
+
end
|
42
|
+
end
|
43
|
+
|
44
|
+
# This class implements the adaptor pattern and is used internally provide
|
45
|
+
# uniform access to the underlying HTTP Client's response object
|
46
|
+
# NOTE: response_object should be non-nil!
|
47
|
+
class AbstractResponse # :nodoc:
|
48
|
+
|
49
|
+
def initialize wrapped_response
|
50
|
+
if wrapped_response.nil?
|
51
|
+
raise ArgumentError, WHINY_NIL_ERROR % self.class
|
52
|
+
end
|
53
|
+
@wrapped_response = wrapped_response
|
54
|
+
end
|
55
|
+
|
56
|
+
def has_status_code?
|
57
|
+
!!status_code
|
58
|
+
end
|
59
|
+
|
60
|
+
# most HTTP client libraries report the HTTP status code as an integer, so
|
61
|
+
# we expect status_code to be set only if a non-zero value is present
|
62
|
+
def status_code
|
63
|
+
@status_code ||= get_status_code
|
64
|
+
end
|
65
|
+
|
66
|
+
private
|
67
|
+
|
68
|
+
def get_status_code_using method_name
|
69
|
+
return unless @wrapped_response.respond_to?(method_name)
|
70
|
+
code = @wrapped_response.send(method_name).to_i
|
71
|
+
code == 0 ? nil : code
|
72
|
+
end
|
73
|
+
|
74
|
+
# Override this method to memoize a non-zero Integer representation
|
75
|
+
# of HTTP status code from the response object
|
76
|
+
def get_status_code
|
77
|
+
get_status_code_using :code
|
78
|
+
end
|
79
|
+
end
|
80
|
+
end
|
81
|
+
end
|
82
|
+
end
|
@@ -1,19 +1,20 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
|
-
|
6
|
+
require_relative 'abstract'
|
6
7
|
|
7
8
|
module NewRelic
|
8
9
|
module Agent
|
9
10
|
module HTTPClients
|
10
11
|
|
11
12
|
class CurbRequest
|
12
|
-
CURB = 'Curb'
|
13
|
-
LHOST = 'host'
|
14
|
-
UHOST = 'Host'
|
13
|
+
CURB = 'Curb'
|
14
|
+
LHOST = 'host'
|
15
|
+
UHOST = 'Host'
|
15
16
|
|
16
|
-
def initialize
|
17
|
+
def initialize curlobj
|
17
18
|
@curlobj = curlobj
|
18
19
|
end
|
19
20
|
|
@@ -34,41 +35,45 @@ module NewRelic
|
|
34
35
|
end
|
35
36
|
|
36
37
|
def []( key )
|
37
|
-
@curlobj.headers[
|
38
|
+
@curlobj.headers[key]
|
38
39
|
end
|
39
40
|
|
40
|
-
def []=(
|
41
|
-
@curlobj.headers[
|
41
|
+
def []=(key, value)
|
42
|
+
@curlobj.headers[key] = value
|
42
43
|
end
|
43
44
|
|
44
45
|
def uri
|
45
|
-
@uri ||=
|
46
|
+
@uri ||= URIUtil.parse_and_normalize_url(@curlobj.url)
|
46
47
|
end
|
47
48
|
end
|
48
49
|
|
50
|
+
class CurbResponse < AbstractResponse
|
49
51
|
|
50
|
-
|
51
|
-
|
52
|
-
def initialize(curlobj)
|
52
|
+
def initialize wrapped_response
|
53
|
+
super wrapped_response
|
53
54
|
@headers = {}
|
54
|
-
@curlobj = curlobj
|
55
55
|
end
|
56
56
|
|
57
57
|
def [](key)
|
58
|
-
@headers[
|
58
|
+
@headers[key.downcase]
|
59
59
|
end
|
60
60
|
|
61
61
|
def to_hash
|
62
62
|
@headers.dup
|
63
63
|
end
|
64
64
|
|
65
|
-
def append_header_data
|
66
|
-
key, value = data.split(
|
67
|
-
@headers[
|
68
|
-
@
|
69
|
-
@
|
65
|
+
def append_header_data data
|
66
|
+
key, value = data.split(/:\s*/, 2)
|
67
|
+
@headers[key.downcase] = value
|
68
|
+
@wrapped_response._nr_header_str ||= String.new
|
69
|
+
@wrapped_response._nr_header_str << data
|
70
70
|
end
|
71
71
|
|
72
|
+
private
|
73
|
+
|
74
|
+
def get_status_code
|
75
|
+
get_status_code_using :response_code
|
76
|
+
end
|
72
77
|
end
|
73
78
|
|
74
79
|
end
|
@@ -1,20 +1,21 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
|
-
|
6
|
+
require_relative 'abstract'
|
6
7
|
|
7
8
|
module NewRelic
|
8
9
|
module Agent
|
9
10
|
module HTTPClients
|
10
|
-
class ExconHTTPResponse
|
11
|
-
def initialize
|
12
|
-
|
11
|
+
class ExconHTTPResponse < AbstractResponse
|
12
|
+
def initialize wrapped_response
|
13
|
+
super wrapped_response
|
14
|
+
|
13
15
|
# Since HTTP headers are case-insensitive, we normalize all of them to
|
14
16
|
# upper case here, and then also in our [](key) implementation.
|
15
17
|
@normalized_headers = {}
|
16
|
-
|
17
|
-
(headers || {}).each do |key, val|
|
18
|
+
(get_attribute(:headers) || {}).each do |key, val|
|
18
19
|
@normalized_headers[key.upcase] = val
|
19
20
|
end
|
20
21
|
end
|
@@ -26,15 +27,30 @@ module NewRelic
|
|
26
27
|
def to_hash
|
27
28
|
@normalized_headers.dup
|
28
29
|
end
|
30
|
+
|
31
|
+
private
|
32
|
+
|
33
|
+
def get_attribute name
|
34
|
+
if @wrapped_response.respond_to?(name)
|
35
|
+
@wrapped_response.send(name)
|
36
|
+
else
|
37
|
+
@wrapped_response[name]
|
38
|
+
end
|
39
|
+
end
|
40
|
+
|
41
|
+
def get_status_code
|
42
|
+
code = get_attribute(:status).to_i
|
43
|
+
code == 0 ? nil : code
|
44
|
+
end
|
29
45
|
end
|
30
46
|
|
31
47
|
class ExconHTTPRequest < AbstractRequest
|
32
48
|
attr_reader :method
|
33
49
|
|
34
|
-
EXCON = "Excon"
|
35
|
-
LHOST = 'host'
|
36
|
-
UHOST = 'Host'
|
37
|
-
COLON = ':'
|
50
|
+
EXCON = "Excon"
|
51
|
+
LHOST = 'host'
|
52
|
+
UHOST = 'Host'
|
53
|
+
COLON = ':'
|
38
54
|
|
39
55
|
def initialize(datum)
|
40
56
|
@datum = datum
|
@@ -70,9 +86,8 @@ module NewRelic
|
|
70
86
|
end
|
71
87
|
|
72
88
|
def uri
|
73
|
-
|
74
|
-
|
75
|
-
)
|
89
|
+
url = "#{@scheme}://#{host}:#{@port}#{@path}"
|
90
|
+
URIUtil.parse_and_normalize_url url
|
76
91
|
end
|
77
92
|
end
|
78
93
|
end
|
@@ -1,39 +1,35 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
|
-
|
6
|
+
require_relative 'abstract'
|
6
7
|
|
7
8
|
module NewRelic
|
8
9
|
module Agent
|
9
10
|
module HTTPClients
|
10
|
-
class HTTPResponse
|
11
|
-
attr_reader :response
|
12
|
-
|
13
|
-
def initialize(response)
|
14
|
-
@response = response
|
15
|
-
end
|
16
|
-
|
11
|
+
class HTTPResponse < AbstractResponse
|
17
12
|
def [](key)
|
18
|
-
_, value =
|
13
|
+
_, value = @wrapped_response.headers.find{ |k, _| key.downcase == k.downcase }
|
19
14
|
value unless value.nil?
|
20
15
|
end
|
21
16
|
|
22
17
|
def to_hash
|
23
|
-
|
18
|
+
@wrapped_response.headers
|
24
19
|
end
|
25
20
|
end
|
26
21
|
|
27
22
|
class HTTPRequest < AbstractRequest
|
28
|
-
HTTP_RB = 'http.rb'
|
29
|
-
HOST = 'host'
|
30
|
-
COLON = ':'
|
23
|
+
HTTP_RB = 'http.rb'
|
24
|
+
HOST = 'host'
|
25
|
+
COLON = ':'
|
31
26
|
|
32
|
-
|
27
|
+
def initialize wrapped_request
|
28
|
+
@wrapped_request = wrapped_request
|
29
|
+
end
|
33
30
|
|
34
|
-
def
|
35
|
-
@
|
36
|
-
@uri = request.uri
|
31
|
+
def uri
|
32
|
+
@uri ||= URIUtil.parse_and_normalize_url(@wrapped_request.uri)
|
37
33
|
end
|
38
34
|
|
39
35
|
def type
|
@@ -47,19 +43,19 @@ module NewRelic
|
|
47
43
|
end
|
48
44
|
|
49
45
|
def host
|
50
|
-
host_from_header ||
|
46
|
+
host_from_header || @wrapped_request.host
|
51
47
|
end
|
52
48
|
|
53
49
|
def method
|
54
|
-
|
50
|
+
@wrapped_request.verb.upcase
|
55
51
|
end
|
56
52
|
|
57
53
|
def [](key)
|
58
|
-
|
54
|
+
@wrapped_request.headers[key]
|
59
55
|
end
|
60
56
|
|
61
57
|
def []=(key, value)
|
62
|
-
|
58
|
+
@wrapped_request.headers[key] = value
|
63
59
|
end
|
64
60
|
end
|
65
61
|
end
|
@@ -1,21 +1,17 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
|
-
|
6
|
+
require_relative 'abstract'
|
6
7
|
|
7
8
|
module NewRelic
|
8
9
|
module Agent
|
9
10
|
module HTTPClients
|
10
|
-
class HTTPClientResponse
|
11
|
-
attr_reader :response
|
12
|
-
|
13
|
-
def initialize(response)
|
14
|
-
@response = response
|
15
|
-
end
|
11
|
+
class HTTPClientResponse < AbstractResponse
|
16
12
|
|
17
13
|
def [](key)
|
18
|
-
|
14
|
+
@wrapped_response.headers.each do |k,v|
|
19
15
|
if key.downcase == k.downcase
|
20
16
|
return v
|
21
17
|
end
|
@@ -24,12 +20,12 @@ module NewRelic
|
|
24
20
|
end
|
25
21
|
|
26
22
|
def to_hash
|
27
|
-
|
23
|
+
@wrapped_response.headers
|
28
24
|
end
|
29
25
|
end
|
30
26
|
|
31
27
|
class HTTPClientRequest < AbstractRequest
|
32
|
-
attr_reader :request
|
28
|
+
attr_reader :request
|
33
29
|
|
34
30
|
HTTP_CLIENT = "HTTPClient".freeze
|
35
31
|
LHOST = 'host'.freeze
|
@@ -38,7 +34,6 @@ module NewRelic
|
|
38
34
|
|
39
35
|
def initialize(request)
|
40
36
|
@request = request
|
41
|
-
@uri = request.header.request_uri
|
42
37
|
end
|
43
38
|
|
44
39
|
def type
|
@@ -59,6 +54,10 @@ module NewRelic
|
|
59
54
|
host_from_header || uri.host.to_s
|
60
55
|
end
|
61
56
|
|
57
|
+
def uri
|
58
|
+
@uri ||= URIUtil.parse_and_normalize_url(request.header.request_uri)
|
59
|
+
end
|
60
|
+
|
62
61
|
def [](key)
|
63
62
|
request.headers[key]
|
64
63
|
end
|
@@ -1,26 +1,38 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
|
-
|
6
|
+
require_relative 'abstract'
|
6
7
|
|
7
8
|
module NewRelic
|
8
9
|
module Agent
|
9
10
|
module HTTPClients
|
11
|
+
class NetHTTPResponse < AbstractResponse
|
12
|
+
|
13
|
+
def [](key)
|
14
|
+
@wrapped_response[key]
|
15
|
+
end
|
16
|
+
|
17
|
+
def to_hash
|
18
|
+
@wrapped_response.to_hash
|
19
|
+
end
|
20
|
+
end
|
21
|
+
|
10
22
|
class NetHTTPRequest < AbstractRequest
|
11
23
|
def initialize(connection, request)
|
12
24
|
@connection = connection
|
13
25
|
@request = request
|
14
26
|
end
|
15
27
|
|
16
|
-
NET_HTTP = 'Net::HTTP'
|
28
|
+
NET_HTTP = 'Net::HTTP'
|
17
29
|
|
18
30
|
def type
|
19
31
|
NET_HTTP
|
20
32
|
end
|
21
33
|
|
22
|
-
HOST = 'host'
|
23
|
-
COLON = ':'
|
34
|
+
HOST = 'host'
|
35
|
+
COLON = ':'
|
24
36
|
|
25
37
|
def host_from_header
|
26
38
|
if hostname = self[HOST]
|
@@ -1,16 +1,14 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
|
-
|
6
|
+
require_relative 'abstract'
|
6
7
|
|
7
8
|
module NewRelic
|
8
9
|
module Agent
|
9
10
|
module HTTPClients
|
10
|
-
class TyphoeusHTTPResponse
|
11
|
-
def initialize(response)
|
12
|
-
@response = response
|
13
|
-
end
|
11
|
+
class TyphoeusHTTPResponse < AbstractResponse
|
14
12
|
|
15
13
|
def [](key)
|
16
14
|
unless headers.nil?
|
@@ -33,7 +31,7 @@ module NewRelic
|
|
33
31
|
private
|
34
32
|
|
35
33
|
def headers
|
36
|
-
@
|
34
|
+
@wrapped_response.headers
|
37
35
|
end
|
38
36
|
end
|
39
37
|
|