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
@@ -1,53 +0,0 @@
|
|
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 'new_relic/agent/datastores/mongo/obfuscator'
|
6
|
-
|
7
|
-
module NewRelic
|
8
|
-
module Agent
|
9
|
-
module Datastores
|
10
|
-
module Mongo
|
11
|
-
module StatementFormatter
|
12
|
-
|
13
|
-
PLAINTEXT_KEYS = [
|
14
|
-
:database,
|
15
|
-
:collection,
|
16
|
-
:operation,
|
17
|
-
:fields,
|
18
|
-
:skip,
|
19
|
-
:limit,
|
20
|
-
:order
|
21
|
-
]
|
22
|
-
|
23
|
-
OBFUSCATE_KEYS = [
|
24
|
-
:selector
|
25
|
-
]
|
26
|
-
|
27
|
-
def self.format(statement, operation)
|
28
|
-
return nil unless NewRelic::Agent.config[:'mongo.capture_queries']
|
29
|
-
|
30
|
-
result = { :operation => operation }
|
31
|
-
|
32
|
-
PLAINTEXT_KEYS.each do |key|
|
33
|
-
result[key] = statement[key] if statement.key?(key)
|
34
|
-
end
|
35
|
-
|
36
|
-
OBFUSCATE_KEYS.each do |key|
|
37
|
-
if statement.key?(key) && statement[key]
|
38
|
-
obfuscated = obfuscate(statement[key])
|
39
|
-
result[key] = obfuscated if obfuscated
|
40
|
-
end
|
41
|
-
end
|
42
|
-
result
|
43
|
-
end
|
44
|
-
|
45
|
-
def self.obfuscate(statement)
|
46
|
-
statement = Obfuscator.obfuscate_statement(statement) if NewRelic::Agent.config[:'mongo.obfuscate_queries']
|
47
|
-
statement
|
48
|
-
end
|
49
|
-
end
|
50
|
-
end
|
51
|
-
end
|
52
|
-
end
|
53
|
-
end
|
@@ -1,49 +0,0 @@
|
|
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 ::Excon
|
6
|
-
class Connection
|
7
|
-
# @connection is deprecated in newer excon versions and replaced with @data
|
8
|
-
def newrelic_connection_params
|
9
|
-
(@data || @connection)
|
10
|
-
end
|
11
|
-
|
12
|
-
def newrelic_resolved_request_params(request_params)
|
13
|
-
resolved = newrelic_connection_params.merge(request_params)
|
14
|
-
resolved[:headers] = resolved[:headers].merge(request_params[:headers] || {})
|
15
|
-
resolved
|
16
|
-
end
|
17
|
-
|
18
|
-
def request_with_newrelic_trace(params, &block)
|
19
|
-
resolved_params = newrelic_resolved_request_params(params)
|
20
|
-
wrapped_request = ::NewRelic::Agent::HTTPClients::ExconHTTPRequest.new(resolved_params)
|
21
|
-
segment = NewRelic::Agent::Tracer.start_external_request_segment(
|
22
|
-
library: wrapped_request.type,
|
23
|
-
uri: wrapped_request.uri,
|
24
|
-
procedure: wrapped_request.method
|
25
|
-
)
|
26
|
-
|
27
|
-
begin
|
28
|
-
response = nil
|
29
|
-
segment.add_request_headers wrapped_request
|
30
|
-
|
31
|
-
response = NewRelic::Agent::Tracer.capture_segment_error segment do
|
32
|
-
request_without_newrelic_trace(resolved_params, &block)
|
33
|
-
end
|
34
|
-
|
35
|
-
wrapped_response = ::NewRelic::Agent::HTTPClients::ExconHTTPResponse.new(response)
|
36
|
-
segment.process_response_headers wrapped_response
|
37
|
-
|
38
|
-
response
|
39
|
-
ensure
|
40
|
-
segment.finish if segment
|
41
|
-
end
|
42
|
-
end
|
43
|
-
|
44
|
-
def self.install_newrelic_instrumentation
|
45
|
-
alias request_without_newrelic_trace request
|
46
|
-
alias request request_with_newrelic_trace
|
47
|
-
end
|
48
|
-
end
|
49
|
-
end
|
@@ -1,49 +0,0 @@
|
|
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
|
-
DependencyDetection.defer do
|
6
|
-
named :httprb
|
7
|
-
|
8
|
-
depends_on do
|
9
|
-
defined?(HTTP) && defined?(HTTP::Client)
|
10
|
-
end
|
11
|
-
|
12
|
-
executes do
|
13
|
-
::NewRelic::Agent.logger.info 'Installing http.rb instrumentation'
|
14
|
-
require 'new_relic/agent/distributed_tracing/cross_app_tracing'
|
15
|
-
require 'new_relic/agent/http_clients/http_rb_wrappers'
|
16
|
-
end
|
17
|
-
|
18
|
-
executes do
|
19
|
-
class HTTP::Client
|
20
|
-
def perform_with_newrelic_trace(request, options)
|
21
|
-
wrapped_request = ::NewRelic::Agent::HTTPClients::HTTPRequest.new(request)
|
22
|
-
|
23
|
-
begin
|
24
|
-
segment = NewRelic::Agent::Tracer.start_external_request_segment(
|
25
|
-
library: wrapped_request.type,
|
26
|
-
uri: wrapped_request.uri,
|
27
|
-
procedure: wrapped_request.method
|
28
|
-
)
|
29
|
-
|
30
|
-
segment.add_request_headers wrapped_request
|
31
|
-
|
32
|
-
response = NewRelic::Agent::Tracer.capture_segment_error segment do
|
33
|
-
perform_without_newrelic_trace(request, options)
|
34
|
-
end
|
35
|
-
|
36
|
-
wrapped_response = ::NewRelic::Agent::HTTPClients::HTTPResponse.new response
|
37
|
-
segment.process_response_headers wrapped_response
|
38
|
-
|
39
|
-
response
|
40
|
-
ensure
|
41
|
-
segment.finish if segment
|
42
|
-
end
|
43
|
-
end
|
44
|
-
|
45
|
-
alias perform_without_newrelic_trace perform
|
46
|
-
alias perform perform_with_newrelic_trace
|
47
|
-
end
|
48
|
-
end
|
49
|
-
end
|
@@ -1,44 +0,0 @@
|
|
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 'set'
|
6
|
-
|
7
|
-
DependencyDetection.defer do
|
8
|
-
@name = :merb_controller
|
9
|
-
|
10
|
-
depends_on do
|
11
|
-
defined?(Merb) && defined?(Merb::Controller)
|
12
|
-
end
|
13
|
-
|
14
|
-
executes do
|
15
|
-
::NewRelic::Agent.logger.info 'Installing Merb Controller instrumentation'
|
16
|
-
end
|
17
|
-
|
18
|
-
executes do
|
19
|
-
require 'merb-core/controller/merb_controller'
|
20
|
-
|
21
|
-
Merb::Controller.class_eval do
|
22
|
-
include NewRelic::Agent::Instrumentation::ControllerInstrumentation
|
23
|
-
|
24
|
-
# determine the path that is used in the metric name for
|
25
|
-
# the called controller action
|
26
|
-
def newrelic_metric_path
|
27
|
-
"#{controller_name}/#{action_name}"
|
28
|
-
end
|
29
|
-
|
30
|
-
protected
|
31
|
-
|
32
|
-
def _dispatch_with_newrelic_trace(*args)
|
33
|
-
options = {}
|
34
|
-
options[:params] = params
|
35
|
-
perform_action_with_newrelic_trace(options) do
|
36
|
-
_dispatch_without_newrelic_trace(*args)
|
37
|
-
end
|
38
|
-
end
|
39
|
-
|
40
|
-
alias_method :_dispatch_without_newrelic_trace, :_dispatch
|
41
|
-
alias_method :_dispatch, :_dispatch_with_newrelic_trace
|
42
|
-
end
|
43
|
-
end
|
44
|
-
end
|
@@ -1,33 +0,0 @@
|
|
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
|
-
DependencyDetection.defer do
|
6
|
-
@name = :merb_error
|
7
|
-
|
8
|
-
depends_on do
|
9
|
-
defined?(Merb) && defined?(Merb::Dispatcher) && defined?(Merb::Dispatcher::DefaultException)
|
10
|
-
end
|
11
|
-
|
12
|
-
depends_on do
|
13
|
-
Merb::Dispatcher::DefaultException.respond_to?(:before)
|
14
|
-
end
|
15
|
-
|
16
|
-
executes do
|
17
|
-
::NewRelic::Agent.logger.info 'Installing Merb Errors instrumentation'
|
18
|
-
end
|
19
|
-
|
20
|
-
executes do
|
21
|
-
|
22
|
-
# Hook in the notification to merb
|
23
|
-
error_notifier = Proc.new {
|
24
|
-
if request.exceptions #check that there's actually an exception
|
25
|
-
# Note, this assumes we have already captured the other information such as uri and params in the Transaction.
|
26
|
-
NewRelic::Agent::Transaction.notice_error(request.exceptions.first)
|
27
|
-
end
|
28
|
-
}
|
29
|
-
Merb::Dispatcher::DefaultException.before error_notifier
|
30
|
-
Exceptions.before error_notifier
|
31
|
-
|
32
|
-
end
|
33
|
-
end
|
@@ -1,70 +0,0 @@
|
|
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
|
-
DependencyDetection.defer do
|
6
|
-
named :net_http
|
7
|
-
|
8
|
-
depends_on do
|
9
|
-
defined?(Net) && defined?(Net::HTTP)
|
10
|
-
end
|
11
|
-
|
12
|
-
executes do
|
13
|
-
::NewRelic::Agent.logger.info 'Installing Net instrumentation'
|
14
|
-
require 'new_relic/agent/distributed_tracing/cross_app_tracing'
|
15
|
-
require 'new_relic/agent/http_clients/net_http_wrappers'
|
16
|
-
end
|
17
|
-
|
18
|
-
def monkey_patched
|
19
|
-
defined?(::Airbrake) ||
|
20
|
-
defined?(::Rack::MiniProfiler) ||
|
21
|
-
source_location_for(Net::HTTP, "request") =~ /airbrake|profiler/i
|
22
|
-
end
|
23
|
-
|
24
|
-
executes do
|
25
|
-
if ::NewRelic::Agent.config[:prepend_net_instrumentation] && !monkey_patched
|
26
|
-
if RUBY_VERSION < "2.1.0"
|
27
|
-
::Net::HTTP.send(:prepend, ::NewRelic::Agent::Instrumentation::NetPrepend)
|
28
|
-
else
|
29
|
-
::Net::HTTP.prepend ::NewRelic::Agent::Instrumentation::NetPrepend
|
30
|
-
end
|
31
|
-
else
|
32
|
-
NewRelic::Agent.record_metric("Supportability/Instrumentation/NetHTTP/MethodChaining", 0.0)
|
33
|
-
|
34
|
-
class Net::HTTP
|
35
|
-
def request_with_newrelic_trace(request, *args, &block)
|
36
|
-
wrapped_request = NewRelic::Agent::HTTPClients::NetHTTPRequest.new(self, request)
|
37
|
-
|
38
|
-
segment = NewRelic::Agent::Tracer.start_external_request_segment(
|
39
|
-
library: wrapped_request.type,
|
40
|
-
uri: wrapped_request.uri,
|
41
|
-
procedure: wrapped_request.method
|
42
|
-
)
|
43
|
-
|
44
|
-
begin
|
45
|
-
response = nil
|
46
|
-
segment.add_request_headers wrapped_request
|
47
|
-
|
48
|
-
# RUBY-1244 Disable further tracing in request to avoid double
|
49
|
-
# counting if connection wasn't started (which calls request again).
|
50
|
-
NewRelic::Agent.disable_all_tracing do
|
51
|
-
response = NewRelic::Agent::Tracer.capture_segment_error segment do
|
52
|
-
request_without_newrelic_trace(request, *args, &block)
|
53
|
-
end
|
54
|
-
end
|
55
|
-
|
56
|
-
wrapped_response = NewRelic::Agent::HTTPClients::NetHTTPResponse.new response
|
57
|
-
segment.process_response_headers wrapped_response
|
58
|
-
response
|
59
|
-
ensure
|
60
|
-
segment.finish
|
61
|
-
end
|
62
|
-
end
|
63
|
-
|
64
|
-
alias request_without_newrelic_trace request
|
65
|
-
alias request request_with_newrelic_trace
|
66
|
-
end
|
67
|
-
end
|
68
|
-
|
69
|
-
end
|
70
|
-
end
|
@@ -1,29 +0,0 @@
|
|
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
|
6
|
-
class Control
|
7
|
-
module Frameworks
|
8
|
-
# Includes limited support for Merb
|
9
|
-
class Merb < NewRelic::Control
|
10
|
-
|
11
|
-
def env
|
12
|
-
@env ||= ::Merb.env
|
13
|
-
end
|
14
|
-
def root
|
15
|
-
::Merb.root
|
16
|
-
end
|
17
|
-
|
18
|
-
def init_config options={}
|
19
|
-
::Merb::Plugins.add_rakefiles File.join(newrelic_root,"lib/tasks/all.rb")
|
20
|
-
|
21
|
-
# Merb gives you a Merb::Plugins.config hash...feel free to put your stuff in your piece of it
|
22
|
-
::Merb::Plugins.config[:newrelic] = {
|
23
|
-
:config => self
|
24
|
-
}
|
25
|
-
end
|
26
|
-
end
|
27
|
-
end
|
28
|
-
end
|
29
|
-
end
|