newrelic_rpm 6.15.0 → 8.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +2 -0
- data/CHANGELOG.md +260 -22
- data/CONTRIBUTING.md +13 -2
- data/README.md +4 -2
- data/lib/new_relic/agent/adaptive_sampler.rb +2 -2
- data/lib/new_relic/agent/agent.rb +8 -7
- data/lib/new_relic/agent/autostart.rb +1 -2
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +7 -3
- data/lib/new_relic/agent/configuration/default_source.rb +456 -233
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +28 -12
- data/lib/new_relic/agent/configuration/manager.rb +3 -4
- data/lib/new_relic/agent/configuration/server_source.rb +3 -2
- data/lib/new_relic/agent/configuration/yaml_source.rb +22 -1
- data/lib/new_relic/agent/connect/request_builder.rb +4 -2
- data/lib/new_relic/agent/custom_event_aggregator.rb +2 -1
- data/lib/new_relic/agent/database.rb +5 -2
- data/lib/new_relic/agent/datastores/mongo.rb +5 -10
- data/lib/new_relic/agent/datastores/redis.rb +0 -4
- data/lib/new_relic/agent/datastores.rb +7 -7
- data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +5 -5
- data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +10 -6
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +0 -1
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing.rb +0 -66
- data/lib/new_relic/agent/error_collector.rb +52 -37
- data/lib/new_relic/agent/error_filter.rb +167 -0
- data/lib/new_relic/agent/event_loop.rb +6 -6
- data/lib/new_relic/agent/external.rb +0 -32
- data/lib/new_relic/agent/http_clients/abstract.rb +2 -2
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +1 -1
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +3 -3
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +0 -16
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +1 -3
- data/lib/new_relic/agent/instrumentation/bunny/chain.rb +45 -0
- data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +152 -0
- data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/bunny.rb +10 -152
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +2 -1
- data/lib/new_relic/agent/instrumentation/curb/chain.rb +93 -0
- data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +222 -0
- data/lib/new_relic/agent/instrumentation/curb/prepend.rb +63 -0
- data/lib/new_relic/agent/instrumentation/curb.rb +9 -241
- data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +38 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +53 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +34 -0
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +8 -50
- data/lib/new_relic/agent/instrumentation/excon.rb +4 -22
- data/lib/new_relic/agent/instrumentation/grape/chain.rb +25 -0
- data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +100 -0
- data/lib/new_relic/agent/instrumentation/grape/prepend.rb +17 -0
- data/lib/new_relic/agent/instrumentation/grape.rb +13 -113
- data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +25 -0
- data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +38 -0
- data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +17 -0
- data/lib/new_relic/agent/instrumentation/httpclient.rb +8 -30
- data/lib/new_relic/agent/instrumentation/httprb/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +30 -0
- data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/httprb.rb +29 -0
- data/lib/new_relic/agent/instrumentation/memcache/chain.rb +16 -0
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +38 -121
- data/lib/new_relic/agent/instrumentation/memcache/helper.rb +56 -0
- data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +88 -0
- data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +88 -0
- data/lib/new_relic/agent/instrumentation/memcache.rb +54 -69
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +2 -0
- data/lib/new_relic/agent/instrumentation/mongo.rb +3 -134
- data/lib/new_relic/agent/instrumentation/net_http/chain.rb +25 -0
- data/lib/new_relic/agent/instrumentation/{net_prepend.rb → net_http/instrumentation.rb} +3 -3
- data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +21 -0
- data/lib/new_relic/agent/instrumentation/net_http.rb +44 -0
- data/lib/new_relic/agent/instrumentation/padrino/chain.rb +34 -0
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +27 -0
- data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +20 -0
- data/lib/new_relic/agent/instrumentation/padrino.rb +18 -53
- data/lib/new_relic/agent/instrumentation/queue_time.rb +4 -4
- data/lib/new_relic/agent/instrumentation/rack/chain.rb +58 -0
- data/lib/new_relic/agent/instrumentation/rack/helpers.rb +32 -0
- data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +73 -0
- data/lib/new_relic/agent/instrumentation/rack/prepend.rb +37 -0
- data/lib/new_relic/agent/instrumentation/rack.rb +29 -139
- data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +5 -5
- data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +5 -41
- data/lib/new_relic/agent/instrumentation/rake/chain.rb +25 -0
- data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +144 -0
- data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/rake.rb +13 -154
- data/lib/new_relic/agent/instrumentation/redis/chain.rb +34 -0
- data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +65 -0
- data/lib/new_relic/agent/instrumentation/redis/prepend.rb +24 -0
- data/lib/new_relic/agent/instrumentation/redis.rb +12 -107
- data/lib/new_relic/agent/instrumentation/resque/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/resque/helper.rb +19 -0
- data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +35 -0
- data/lib/new_relic/agent/instrumentation/resque/prepend.rb +16 -0
- data/lib/new_relic/agent/instrumentation/resque.rb +21 -32
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +6 -1
- data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +55 -0
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +29 -34
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +124 -0
- data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/sinatra.rb +20 -158
- data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +82 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +10 -89
- data/lib/new_relic/agent/javascript_instrumentor.rb +15 -10
- data/lib/new_relic/agent/messaging.rb +10 -24
- data/lib/new_relic/agent/method_tracer.rb +132 -138
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +6 -1
- data/lib/new_relic/agent/new_relic_service.rb +24 -22
- data/lib/new_relic/agent/pipe_channel_manager.rb +10 -6
- data/lib/new_relic/agent/pipe_service.rb +1 -1
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +1 -1
- data/lib/new_relic/agent/span_event_aggregator.rb +2 -2
- data/lib/new_relic/agent/sql_sampler.rb +4 -4
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +1 -1
- data/lib/new_relic/agent/stats_engine.rb +1 -1
- data/lib/new_relic/agent/supported_versions.rb +1 -1
- data/lib/new_relic/agent/threading/backtrace_service.rb +4 -5
- data/lib/new_relic/agent/threading/thread_profile.rb +1 -1
- data/lib/new_relic/agent/tracer.rb +15 -37
- data/lib/new_relic/agent/transaction/abstract_segment.rb +3 -3
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +5 -11
- data/lib/new_relic/agent/transaction.rb +8 -32
- data/lib/new_relic/agent/transaction_time_aggregator.rb +5 -5
- data/lib/new_relic/agent/vm/snapshot.rb +1 -1
- data/lib/new_relic/agent/worker_loop.rb +5 -5
- data/lib/new_relic/agent.rb +10 -13
- data/lib/new_relic/cli/commands/deployments.rb +2 -2
- data/lib/new_relic/constants.rb +0 -4
- data/lib/new_relic/control/frameworks/rails.rb +11 -9
- data/lib/new_relic/control/instance_methods.rb +1 -0
- data/lib/new_relic/dependency_detection.rb +116 -10
- data/lib/new_relic/noticed_error.rb +5 -9
- data/lib/new_relic/supportability_helper.rb +1 -2
- data/lib/new_relic/version.rb +2 -2
- data/lib/newrelic_rpm.rb +10 -34
- data/lib/tasks/all.rb +1 -1
- data/lib/tasks/config.html.erb +14 -25
- data/lib/tasks/config.rake +8 -7
- data/newrelic.yml +593 -3
- data/newrelic_rpm.gemspec +1 -1
- data/test/agent_helper.rb +27 -2
- metadata +56 -14
- data/cert/cacert.pem +0 -1177
- data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +0 -53
- data/lib/new_relic/agent/instrumentation/excon/connection.rb +0 -49
- data/lib/new_relic/agent/instrumentation/http.rb +0 -49
- data/lib/new_relic/agent/instrumentation/merb/controller.rb +0 -44
- data/lib/new_relic/agent/instrumentation/merb/errors.rb +0 -33
- data/lib/new_relic/agent/instrumentation/net.rb +0 -70
- data/lib/new_relic/control/frameworks/merb.rb +0 -29
@@ -2,90 +2,19 @@
|
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
module Agent
|
9
|
-
module Instrumentation
|
10
|
-
module GrapeInstrumentation
|
11
|
-
extend self
|
12
|
-
|
13
|
-
API_ENDPOINT = 'api.endpoint'.freeze
|
14
|
-
API_VERSION = 'api.version'.freeze
|
15
|
-
FORMAT_REGEX = /\(\/?\.[\:\w]*\)/.freeze # either :format (< 0.12.0) or .ext (>= 0.12.0)
|
16
|
-
VERSION_REGEX = /:version(\/|$)/.freeze
|
17
|
-
MIN_VERSION = Gem::Version.new("0.2.0")
|
18
|
-
PIPE_STRING = '|'.freeze
|
19
|
-
|
20
|
-
def handle_transaction(endpoint, class_name, version)
|
21
|
-
return unless endpoint && route = endpoint.route
|
22
|
-
name_transaction(route, class_name, version)
|
23
|
-
capture_params(endpoint)
|
24
|
-
end
|
25
|
-
|
26
|
-
def name_transaction(route, class_name, version)
|
27
|
-
txn_name = name_for_transaction(route, class_name, version)
|
28
|
-
segment_name = "Middleware/Grape/#{class_name}/call"
|
29
|
-
Transaction.set_default_transaction_name(txn_name, :grape)
|
30
|
-
txn = NewRelic::Agent::Transaction.tl_current
|
31
|
-
txn.segments.last.name = segment_name
|
32
|
-
end
|
33
|
-
|
34
|
-
def name_for_transaction(route, class_name, version)
|
35
|
-
action_name = route.path.sub(FORMAT_REGEX, NewRelic::EMPTY_STR)
|
36
|
-
method_name = route.request_method
|
37
|
-
version ||= route.version
|
38
|
-
|
39
|
-
# defaulting does not set rack.env['api.version'] and route.version may return Array
|
40
|
-
#
|
41
|
-
version = version.join(PIPE_STRING) if Array === version
|
42
|
-
|
43
|
-
if version
|
44
|
-
action_name = action_name.sub(VERSION_REGEX, NewRelic::EMPTY_STR)
|
45
|
-
"#{class_name}-#{version}#{action_name} (#{method_name})"
|
46
|
-
else
|
47
|
-
"#{class_name}#{action_name} (#{method_name})"
|
48
|
-
end
|
49
|
-
end
|
50
|
-
|
51
|
-
def name_for_transaction_deprecated(route, class_name, version)
|
52
|
-
action_name = route.route_path.sub(FORMAT_REGEX, NewRelic::EMPTY_STR)
|
53
|
-
method_name = route.route_method
|
54
|
-
version ||= route.route_version
|
55
|
-
|
56
|
-
if version
|
57
|
-
action_name = action_name.sub(VERSION_REGEX, NewRelic::EMPTY_STR)
|
58
|
-
"#{class_name}-#{version}#{action_name} (#{method_name})"
|
59
|
-
else
|
60
|
-
"#{class_name}#{action_name} (#{method_name})"
|
61
|
-
end
|
62
|
-
end
|
63
|
-
|
64
|
-
def capture_params(endpoint)
|
65
|
-
txn = Transaction.tl_current
|
66
|
-
env = endpoint.request.env
|
67
|
-
params = ParameterFiltering::apply_filters(env, endpoint.params)
|
68
|
-
params.delete("route_info")
|
69
|
-
txn.filtered_params = params
|
70
|
-
txn.merge_request_parameters(params)
|
71
|
-
end
|
72
|
-
end
|
73
|
-
end
|
74
|
-
end
|
75
|
-
end
|
5
|
+
require_relative 'grape/instrumentation'
|
6
|
+
require_relative 'grape/chain'
|
7
|
+
require_relative 'grape/prepend'
|
76
8
|
|
77
9
|
DependencyDetection.defer do
|
78
10
|
# Why not just :grape? newrelic-grape used that name already, and while we're
|
79
11
|
# not shipping yet, overloading the name interferes with the plugin.
|
80
12
|
named :grape_instrumentation
|
81
|
-
|
82
|
-
|
83
|
-
::NewRelic::Agent.config[:disable_grape] == false
|
84
|
-
end
|
85
|
-
|
13
|
+
configure_with :grape
|
14
|
+
|
86
15
|
depends_on do
|
87
16
|
defined?(::Grape::VERSION) &&
|
88
|
-
Gem::Version.new(::Grape::VERSION) >= ::NewRelic::Agent::Instrumentation::
|
17
|
+
Gem::Version.new(::Grape::VERSION) >= ::NewRelic::Agent::Instrumentation::Grape::Instrumentation::MIN_VERSION
|
89
18
|
end
|
90
19
|
|
91
20
|
depends_on do
|
@@ -103,43 +32,14 @@ DependencyDetection.defer do
|
|
103
32
|
end
|
104
33
|
|
105
34
|
executes do
|
106
|
-
NewRelic::Agent.
|
107
|
-
instrument_call
|
108
|
-
end
|
35
|
+
::NewRelic::Agent::Instrumentation::Grape::Instrumentation.prepare!
|
109
36
|
|
110
|
-
|
111
|
-
|
112
|
-
::NewRelic::Agent::Instrumentation::
|
113
|
-
else
|
114
|
-
::NewRelic::Agent::Instrumentation::
|
115
|
-
::NewRelic::Agent::Instrumentation::GrapeInstrumentation.send :alias_method, :name_for_transaction, :name_for_transaction_deprecated
|
116
|
-
end
|
117
|
-
|
118
|
-
# Since 1.2.0, the class `Grape::API` no longer refers to an API instance, rather, what used to be `Grape::API` is `Grape::API::Instance`
|
119
|
-
# https://github.com/ruby-grape/grape/blob/c20a73ac1e3f3ba1082005ed61bf69452373ba87/UPGRADING.md#upgrading-to--120
|
120
|
-
grape_api_class = defined?(Grape::API::Instance) ? ::Grape::API::Instance : ::Grape::API
|
121
|
-
|
122
|
-
grape_api_class.class_eval do
|
123
|
-
def call_with_new_relic(env)
|
124
|
-
begin
|
125
|
-
response = call_without_new_relic(env)
|
126
|
-
ensure
|
127
|
-
begin
|
128
|
-
endpoint = env[::NewRelic::Agent::Instrumentation::GrapeInstrumentation::API_ENDPOINT]
|
129
|
-
version = env[::NewRelic::Agent::Instrumentation::GrapeInstrumentation::API_VERSION]
|
130
|
-
|
131
|
-
api_class = (self.class.respond_to?(:base) && self.class.base) || self.class
|
132
|
-
::NewRelic::Agent::Instrumentation::GrapeInstrumentation.handle_transaction(endpoint, api_class.name, version)
|
133
|
-
rescue => e
|
134
|
-
::NewRelic::Agent.logger.warn("Error in Grape instrumentation", e)
|
135
|
-
end
|
136
|
-
end
|
137
|
-
|
138
|
-
response
|
139
|
-
end
|
140
|
-
|
141
|
-
alias_method :call_without_new_relic, :call
|
142
|
-
alias_method :call, :call_with_new_relic
|
37
|
+
if use_prepend?
|
38
|
+
instrumented_class = ::NewRelic::Agent::Instrumentation::Grape::Instrumentation.instrumented_class
|
39
|
+
prepend_instrument instrumented_class, ::NewRelic::Agent::Instrumentation::Grape::Prepend
|
40
|
+
else
|
41
|
+
chain_instrument ::NewRelic::Agent::Instrumentation::Grape::Chain
|
143
42
|
end
|
144
43
|
end
|
44
|
+
|
145
45
|
end
|
@@ -0,0 +1,25 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
|
5
|
+
module NewRelic::Agent::Instrumentation
|
6
|
+
module HTTPClient
|
7
|
+
module Chain
|
8
|
+
def self.instrument!
|
9
|
+
::HTTPClient.class_eval do
|
10
|
+
include NewRelic::Agent::Instrumentation::HTTPClient::Instrumentation
|
11
|
+
|
12
|
+
def do_get_block_with_newrelic(req, proxy, conn, &block)
|
13
|
+
with_tracing(req, conn) do
|
14
|
+
do_get_block_without_newrelic(req, proxy, conn, &block)
|
15
|
+
end
|
16
|
+
end
|
17
|
+
|
18
|
+
alias :do_get_block_without_newrelic :do_get_block
|
19
|
+
alias :do_get_block :do_get_block_with_newrelic
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
25
|
+
|
@@ -0,0 +1,38 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
|
5
|
+
module NewRelic::Agent::Instrumentation
|
6
|
+
module HTTPClient
|
7
|
+
module Instrumentation
|
8
|
+
def with_tracing request, connection
|
9
|
+
wrapped_request = NewRelic::Agent::HTTPClients::HTTPClientRequest.new(request)
|
10
|
+
segment = NewRelic::Agent::Tracer.start_external_request_segment(
|
11
|
+
library: wrapped_request.type,
|
12
|
+
uri: wrapped_request.uri,
|
13
|
+
procedure: wrapped_request.method
|
14
|
+
)
|
15
|
+
|
16
|
+
begin
|
17
|
+
response = nil
|
18
|
+
segment.add_request_headers wrapped_request
|
19
|
+
|
20
|
+
NewRelic::Agent::Tracer.capture_segment_error segment do
|
21
|
+
yield
|
22
|
+
end
|
23
|
+
|
24
|
+
response = connection.pop
|
25
|
+
connection.push response
|
26
|
+
|
27
|
+
wrapped_response = ::NewRelic::Agent::HTTPClients::HTTPClientResponse.new(response)
|
28
|
+
segment.process_response_headers wrapped_response
|
29
|
+
|
30
|
+
response
|
31
|
+
ensure
|
32
|
+
segment.finish if segment
|
33
|
+
end
|
34
|
+
end
|
35
|
+
end
|
36
|
+
end
|
37
|
+
end
|
38
|
+
|
@@ -0,0 +1,17 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
|
5
|
+
|
6
|
+
module NewRelic::Agent::Instrumentation
|
7
|
+
module HTTPClient
|
8
|
+
module Prepend
|
9
|
+
include NewRelic::Agent::Instrumentation::HTTPClient::Instrumentation
|
10
|
+
|
11
|
+
def do_get_block(req, proxy, conn, &block)
|
12
|
+
with_tracing(req, conn) { super }
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
16
|
+
end
|
17
|
+
|
@@ -2,6 +2,10 @@
|
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
|
+
require_relative 'httpclient/instrumentation'
|
6
|
+
require_relative 'httpclient/chain'
|
7
|
+
require_relative 'httpclient/prepend'
|
8
|
+
|
5
9
|
DependencyDetection.defer do
|
6
10
|
named :httpclient
|
7
11
|
|
@@ -25,36 +29,10 @@ DependencyDetection.defer do
|
|
25
29
|
end
|
26
30
|
|
27
31
|
executes do
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
library: wrapped_request.type,
|
33
|
-
uri: wrapped_request.uri,
|
34
|
-
procedure: wrapped_request.method
|
35
|
-
)
|
36
|
-
|
37
|
-
begin
|
38
|
-
response = nil
|
39
|
-
segment.add_request_headers wrapped_request
|
40
|
-
|
41
|
-
NewRelic::Agent::Tracer.capture_segment_error segment do
|
42
|
-
do_get_block_without_newrelic(req, proxy, conn, &block)
|
43
|
-
end
|
44
|
-
response = conn.pop
|
45
|
-
conn.push response
|
46
|
-
|
47
|
-
wrapped_response = ::NewRelic::Agent::HTTPClients::HTTPClientResponse.new(response)
|
48
|
-
segment.process_response_headers wrapped_response
|
49
|
-
|
50
|
-
response
|
51
|
-
ensure
|
52
|
-
segment.finish if segment
|
53
|
-
end
|
54
|
-
end
|
55
|
-
|
56
|
-
alias do_get_block_without_newrelic do_get_block
|
57
|
-
alias do_get_block do_get_block_with_newrelic
|
32
|
+
if use_prepend?
|
33
|
+
prepend_instrument ::HTTPClient, NewRelic::Agent::Instrumentation::HTTPClient::Prepend
|
34
|
+
else
|
35
|
+
chain_instrument NewRelic::Agent::Instrumentation::HTTPClient::Chain
|
58
36
|
end
|
59
37
|
end
|
60
38
|
end
|
@@ -0,0 +1,22 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
|
5
|
+
module NewRelic::Agent::Instrumentation
|
6
|
+
module HTTPrb
|
7
|
+
module Chain
|
8
|
+
def self.instrument!
|
9
|
+
::HTTP::Client.class_eval do
|
10
|
+
include NewRelic::Agent::Instrumentation::HTTPrb
|
11
|
+
|
12
|
+
def perform_with_newrelic_trace(request, options)
|
13
|
+
with_tracing(request) { perform_without_newrelic_trace(request, options) }
|
14
|
+
end
|
15
|
+
|
16
|
+
alias perform_without_newrelic_trace perform
|
17
|
+
alias perform perform_with_newrelic_trace
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
@@ -0,0 +1,30 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
|
5
|
+
module NewRelic::Agent::Instrumentation
|
6
|
+
module HTTPrb
|
7
|
+
def with_tracing(request)
|
8
|
+
wrapped_request = ::NewRelic::Agent::HTTPClients::HTTPRequest.new(request)
|
9
|
+
|
10
|
+
begin
|
11
|
+
segment = NewRelic::Agent::Tracer.start_external_request_segment(
|
12
|
+
library: wrapped_request.type,
|
13
|
+
uri: wrapped_request.uri,
|
14
|
+
procedure: wrapped_request.method
|
15
|
+
)
|
16
|
+
|
17
|
+
segment.add_request_headers wrapped_request
|
18
|
+
|
19
|
+
response = NewRelic::Agent::Tracer.capture_segment_error(segment) { yield }
|
20
|
+
|
21
|
+
wrapped_response = ::NewRelic::Agent::HTTPClients::HTTPResponse.new response
|
22
|
+
segment.process_response_headers wrapped_response
|
23
|
+
|
24
|
+
response
|
25
|
+
ensure
|
26
|
+
segment.finish if segment
|
27
|
+
end
|
28
|
+
end
|
29
|
+
end
|
30
|
+
end
|
@@ -0,0 +1,15 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
|
5
|
+
module NewRelic::Agent::Instrumentation
|
6
|
+
module HTTPrb
|
7
|
+
module Prepend
|
8
|
+
include NewRelic::Agent::Instrumentation::HTTPrb
|
9
|
+
|
10
|
+
def perform(request, options)
|
11
|
+
with_tracing(request) { super }
|
12
|
+
end
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
@@ -0,0 +1,29 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
|
5
|
+
require_relative 'httprb/instrumentation'
|
6
|
+
require_relative 'httprb/chain'
|
7
|
+
require_relative 'httprb/prepend'
|
8
|
+
|
9
|
+
DependencyDetection.defer do
|
10
|
+
named :httprb
|
11
|
+
|
12
|
+
depends_on do
|
13
|
+
defined?(HTTP) && defined?(HTTP::Client)
|
14
|
+
end
|
15
|
+
|
16
|
+
executes do
|
17
|
+
::NewRelic::Agent.logger.info "Installing http.rb Wrappers"
|
18
|
+
require 'new_relic/agent/distributed_tracing/cross_app_tracing'
|
19
|
+
require 'new_relic/agent/http_clients/http_rb_wrappers'
|
20
|
+
end
|
21
|
+
|
22
|
+
executes do
|
23
|
+
if use_prepend?
|
24
|
+
prepend_instrument HTTP::Client, ::NewRelic::Agent::Instrumentation::HTTPrb::Prepend
|
25
|
+
else
|
26
|
+
chain_instrument ::NewRelic::Agent::Instrumentation::HTTPrb::Chain
|
27
|
+
end
|
28
|
+
end
|
29
|
+
end
|
@@ -0,0 +1,16 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
5
|
+
|
6
|
+
module NewRelic::Agent::Instrumentation
|
7
|
+
module Memcache
|
8
|
+
module Chain
|
9
|
+
extend Helper
|
10
|
+
|
11
|
+
def self.instrument! target_class
|
12
|
+
instrument_methods target_class, client_methods
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
16
|
+
end
|
@@ -1,166 +1,83 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
module NewRelic
|
6
7
|
module Agent
|
7
8
|
module Instrumentation
|
8
9
|
module Memcache
|
9
10
|
module Dalli
|
10
|
-
extend
|
11
|
+
extend Helper
|
12
|
+
module_function
|
11
13
|
|
12
|
-
|
13
|
-
METHODS = [:get, :set, :add, :incr, :decr, :delete, :replace, :append, :prepend, :cas]
|
14
|
-
SEND_MULTIGET_METRIC_NAME = "get_multi_request".freeze
|
15
|
-
DATASTORE_INSTANCES_SUPPORTED_VERSION = Gem::Version.new '2.6.4'
|
16
|
-
SLASH = '/'.freeze
|
17
|
-
UNKNOWN = 'unknown'.freeze
|
18
|
-
LOCALHOST = 'localhost'.freeze
|
19
|
-
|
20
|
-
def supports_datastore_instances?
|
21
|
-
DATASTORE_INSTANCES_SUPPORTED_VERSION <= Gem::Version.new(::Dalli::VERSION)
|
22
|
-
end
|
23
|
-
|
24
|
-
def instrument_methods
|
14
|
+
def instrument!
|
25
15
|
if supports_datastore_instances?
|
26
|
-
|
16
|
+
instrument_methods(::Dalli::Client, dalli_methods)
|
27
17
|
instrument_multi_method :get_multi
|
28
18
|
instrument_send_multiget
|
29
19
|
instrument_server_for_key
|
30
20
|
else
|
31
|
-
|
32
|
-
|
21
|
+
instrument_methods(::Dalli::Client, client_methods)
|
22
|
+
end
|
23
|
+
end
|
24
|
+
|
25
|
+
def instrument_multi_method method_name
|
26
|
+
visibility = NewRelic::Helper.instance_method_visibility ::Dalli::Client, method_name
|
27
|
+
method_name_without = :"#{method_name}_without_newrelic_trace"
|
28
|
+
|
29
|
+
::Dalli::Client.class_eval do
|
30
|
+
alias_method method_name_without, method_name
|
31
|
+
|
32
|
+
define_method method_name do |*args, &block|
|
33
|
+
get_multi_with_newrelic_tracing(method_name) { __send__ method_name_without, *args, &block }
|
34
|
+
end
|
35
|
+
|
36
|
+
__send__ visibility, method_name
|
37
|
+
__send__ visibility, method_name_without
|
33
38
|
end
|
34
39
|
end
|
35
40
|
|
36
41
|
def instrument_server_for_key
|
37
42
|
::Dalli::Ring.class_eval do
|
43
|
+
include NewRelic::Agent::Instrumentation::Memcache::Tracer
|
44
|
+
|
38
45
|
alias_method :server_for_key_without_newrelic_trace, :server_for_key
|
39
46
|
|
40
47
|
def server_for_key key
|
41
|
-
|
42
|
-
begin
|
43
|
-
if txn = ::NewRelic::Agent::Tracer.current_transaction
|
44
|
-
segment = txn.current_segment
|
45
|
-
if ::NewRelic::Agent::Transaction::DatastoreSegment === segment
|
46
|
-
::NewRelic::Agent::Instrumentation::Memcache::Dalli.assign_instance_to(segment, server)
|
47
|
-
end
|
48
|
-
end
|
49
|
-
rescue => e
|
50
|
-
::NewRelic::Agent.logger.warn "Unable to set instance info on datastore segment: #{e.message}"
|
51
|
-
end
|
52
|
-
server
|
48
|
+
server_for_key_with_newrelic_tracing { server_for_key_without_newrelic_trace key }
|
53
49
|
end
|
54
50
|
end
|
55
51
|
end
|
56
52
|
|
57
53
|
def instrument_send_multiget
|
58
54
|
::Dalli::Server.class_eval do
|
55
|
+
include NewRelic::Agent::Instrumentation::Memcache::Tracer
|
59
56
|
alias_method :send_multiget_without_newrelic_trace, :send_multiget
|
60
57
|
|
61
|
-
def send_multiget
|
62
|
-
|
63
|
-
product: MEMCACHED,
|
64
|
-
operation: SEND_MULTIGET_METRIC_NAME
|
65
|
-
)
|
66
|
-
::NewRelic::Agent::Instrumentation::Memcache::Dalli.assign_instance_to(segment, self)
|
67
|
-
|
68
|
-
begin
|
69
|
-
NewRelic::Agent::Tracer.capture_segment_error segment do
|
70
|
-
send_multiget_without_newrelic_trace(keys)
|
71
|
-
end
|
72
|
-
ensure
|
73
|
-
if ::NewRelic::Agent.config[:capture_memcache_keys]
|
74
|
-
segment.notice_nosql_statement "#{SEND_MULTIGET_METRIC_NAME} #{keys.inspect}"
|
75
|
-
end
|
76
|
-
segment.finish if segment
|
77
|
-
end
|
58
|
+
def send_multiget keys
|
59
|
+
send_multiget_with_newrelic_tracing(keys) { send_multiget_without_newrelic_trace keys }
|
78
60
|
end
|
79
61
|
end
|
80
62
|
end
|
63
|
+
end
|
81
64
|
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
::Dalli::Client.class_eval do
|
87
|
-
alias_method method_name_without, method_name
|
88
|
-
|
89
|
-
define_method method_name do |*args, &block|
|
90
|
-
segment = NewRelic::Agent::Tracer.start_segment name: "Ruby/Memcached/Dalli/#{method_name}"
|
91
|
-
begin
|
92
|
-
NewRelic::Agent::Tracer.capture_segment_error segment do
|
93
|
-
__send__ method_name_without, *args, &block
|
94
|
-
end
|
95
|
-
ensure
|
96
|
-
segment.finish if segment
|
97
|
-
end
|
98
|
-
end
|
65
|
+
module DalliCAS
|
66
|
+
extend Dalli
|
67
|
+
extend Helper
|
68
|
+
module_function
|
99
69
|
|
100
|
-
|
101
|
-
|
102
|
-
end
|
70
|
+
def should_instrument?
|
71
|
+
supported_methods_for(::Dalli::Client, dalli_cas_methods).any?
|
103
72
|
end
|
104
73
|
|
105
|
-
def
|
106
|
-
|
107
|
-
|
108
|
-
host = LOCALHOST
|
109
|
-
port_path_or_id = server.hostname
|
110
|
-
else
|
111
|
-
host = server.hostname
|
112
|
-
port_path_or_id = server.port
|
113
|
-
end
|
114
|
-
segment.set_instance_info host, port_path_or_id
|
115
|
-
rescue => e
|
116
|
-
::NewRelic::Agent.logger.debug "Failed to retrieve memcached instance info: #{e.message}"
|
117
|
-
segment.set_instance_info UNKNOWN, UNKNOWN
|
74
|
+
def instrument!
|
75
|
+
instrument_methods ::Dalli::Client, dalli_cas_methods
|
76
|
+
instrument_multi_method :get_multi_cas
|
118
77
|
end
|
119
|
-
|
120
78
|
end
|
121
79
|
end
|
122
80
|
end
|
123
81
|
end
|
124
82
|
end
|
125
83
|
|
126
|
-
DependencyDetection.defer do
|
127
|
-
named :dalli
|
128
|
-
|
129
|
-
depends_on do
|
130
|
-
NewRelic::Agent::Instrumentation::Memcache.enabled?
|
131
|
-
end
|
132
|
-
|
133
|
-
depends_on do
|
134
|
-
defined?(::Dalli::Client)
|
135
|
-
end
|
136
|
-
|
137
|
-
executes do
|
138
|
-
::NewRelic::Agent.logger.info 'Installing Memcache instrumentation for dalli gem'
|
139
|
-
::NewRelic::Agent::Instrumentation::Memcache::Dalli.instrument_methods
|
140
|
-
end
|
141
|
-
end
|
142
|
-
|
143
|
-
DependencyDetection.defer do
|
144
|
-
named :dalli_cas_client
|
145
|
-
|
146
|
-
depends_on do
|
147
|
-
NewRelic::Agent::Instrumentation::Memcache.enabled?
|
148
|
-
end
|
149
|
-
|
150
|
-
depends_on do
|
151
|
-
# These CAS client methods are only optionally defined if users require
|
152
|
-
# dalli/cas/client. Use a separate dependency block so it can potentially
|
153
|
-
# re-evaluate after they've done that require.
|
154
|
-
defined?(::Dalli::Client) &&
|
155
|
-
::NewRelic::Agent::Instrumentation::Memcache.supported_methods_for(::Dalli::Client,
|
156
|
-
CAS_CLIENT_METHODS).any?
|
157
|
-
end
|
158
|
-
|
159
|
-
CAS_CLIENT_METHODS = [:get_cas, :set_cas, :replace_cas, :delete_cas]
|
160
|
-
|
161
|
-
executes do
|
162
|
-
::NewRelic::Agent.logger.info 'Installing Dalli CAS Client Memcache instrumentation'
|
163
|
-
::NewRelic::Agent::Instrumentation::Memcache.instrument_methods(::Dalli::Client, CAS_CLIENT_METHODS)
|
164
|
-
::NewRelic::Agent::Instrumentation::Memcache::Dalli.instrument_multi_method(:get_multi_cas)
|
165
|
-
end
|
166
|
-
end
|
@@ -0,0 +1,56 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
5
|
+
|
6
|
+
module NewRelic::Agent::Instrumentation
|
7
|
+
module Memcache
|
8
|
+
module Helper
|
9
|
+
DATASTORE_INSTANCES_SUPPORTED_VERSION = Gem::Version.new '2.6.4'
|
10
|
+
|
11
|
+
def supports_datastore_instances?
|
12
|
+
DATASTORE_INSTANCES_SUPPORTED_VERSION <= Gem::Version.new(::Dalli::VERSION)
|
13
|
+
end
|
14
|
+
|
15
|
+
def client_methods
|
16
|
+
[:get, :get_multi, :set, :add, :incr, :decr, :delete, :replace, :append,
|
17
|
+
:prepend, :cas, :single_get, :multi_get, :single_cas, :multi_cas]
|
18
|
+
end
|
19
|
+
|
20
|
+
def dalli_methods
|
21
|
+
[:get, :set, :add, :incr, :decr, :delete, :replace, :append, :prepend, :cas]
|
22
|
+
end
|
23
|
+
|
24
|
+
def dalli_cas_methods
|
25
|
+
[:get_cas, :set_cas, :replace_cas, :delete_cas]
|
26
|
+
end
|
27
|
+
|
28
|
+
def supported_methods_for(client_class, methods)
|
29
|
+
methods.select do |method_name|
|
30
|
+
client_class.method_defined?(method_name) || client_class.private_method_defined?(method_name)
|
31
|
+
end
|
32
|
+
end
|
33
|
+
|
34
|
+
def instrument_methods(client_class, requested_methods = METHODS)
|
35
|
+
supported_methods_for(client_class, requested_methods).each do |method_name|
|
36
|
+
visibility = NewRelic::Helper.instance_method_visibility client_class, method_name
|
37
|
+
method_name_without = :"#{method_name}_without_newrelic_trace"
|
38
|
+
|
39
|
+
client_class.class_eval do
|
40
|
+
include NewRelic::Agent::Instrumentation::Memcache::Tracer
|
41
|
+
|
42
|
+
alias_method method_name_without, method_name
|
43
|
+
|
44
|
+
define_method method_name do |*args, &block|
|
45
|
+
with_newrelic_tracing(method_name, *args) { __send__ method_name_without, *args, &block }
|
46
|
+
end
|
47
|
+
|
48
|
+
__send__ visibility, method_name
|
49
|
+
__send__ visibility, method_name_without
|
50
|
+
end
|
51
|
+
end
|
52
|
+
end
|
53
|
+
end
|
54
|
+
end
|
55
|
+
end
|
56
|
+
|