newrelic_rpm 6.15.0 → 7.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (102) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +164 -22
  3. data/CONTRIBUTING.md +13 -2
  4. data/README.md +2 -2
  5. data/lib/new_relic/agent.rb +5 -8
  6. data/lib/new_relic/agent/agent.rb +2 -1
  7. data/lib/new_relic/agent/autostart.rb +1 -2
  8. data/lib/new_relic/agent/configuration/default_source.rb +442 -227
  9. data/lib/new_relic/agent/configuration/manager.rb +3 -3
  10. data/lib/new_relic/agent/connect/request_builder.rb +4 -2
  11. data/lib/new_relic/agent/datastores/redis.rb +0 -4
  12. data/lib/new_relic/agent/distributed_tracing.rb +0 -66
  13. data/lib/new_relic/agent/error_collector.rb +52 -37
  14. data/lib/new_relic/agent/error_filter.rb +167 -0
  15. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +0 -16
  16. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +1 -3
  17. data/lib/new_relic/agent/instrumentation/bunny.rb +10 -152
  18. data/lib/new_relic/agent/instrumentation/bunny/chain.rb +45 -0
  19. data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +152 -0
  20. data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +35 -0
  21. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +1 -0
  22. data/lib/new_relic/agent/instrumentation/curb.rb +9 -241
  23. data/lib/new_relic/agent/instrumentation/curb/chain.rb +93 -0
  24. data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +222 -0
  25. data/lib/new_relic/agent/instrumentation/curb/prepend.rb +63 -0
  26. data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +38 -0
  27. data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +53 -0
  28. data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +34 -0
  29. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +8 -50
  30. data/lib/new_relic/agent/instrumentation/excon.rb +2 -1
  31. data/lib/new_relic/agent/instrumentation/grape.rb +13 -113
  32. data/lib/new_relic/agent/instrumentation/grape/chain.rb +25 -0
  33. data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +100 -0
  34. data/lib/new_relic/agent/instrumentation/grape/prepend.rb +17 -0
  35. data/lib/new_relic/agent/instrumentation/httpclient.rb +8 -30
  36. data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +25 -0
  37. data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +38 -0
  38. data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +17 -0
  39. data/lib/new_relic/agent/instrumentation/httprb.rb +29 -0
  40. data/lib/new_relic/agent/instrumentation/httprb/chain.rb +22 -0
  41. data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +30 -0
  42. data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +15 -0
  43. data/lib/new_relic/agent/instrumentation/memcache.rb +54 -69
  44. data/lib/new_relic/agent/instrumentation/memcache/chain.rb +16 -0
  45. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +38 -121
  46. data/lib/new_relic/agent/instrumentation/memcache/helper.rb +56 -0
  47. data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +88 -0
  48. data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +88 -0
  49. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +2 -0
  50. data/lib/new_relic/agent/instrumentation/mongo.rb +7 -0
  51. data/lib/new_relic/agent/instrumentation/net_http.rb +44 -0
  52. data/lib/new_relic/agent/instrumentation/net_http/chain.rb +25 -0
  53. data/lib/new_relic/agent/instrumentation/{net_prepend.rb → net_http/instrumentation.rb} +3 -3
  54. data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +21 -0
  55. data/lib/new_relic/agent/instrumentation/padrino.rb +18 -53
  56. data/lib/new_relic/agent/instrumentation/padrino/chain.rb +34 -0
  57. data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +27 -0
  58. data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +20 -0
  59. data/lib/new_relic/agent/instrumentation/rack.rb +29 -139
  60. data/lib/new_relic/agent/instrumentation/rack/chain.rb +58 -0
  61. data/lib/new_relic/agent/instrumentation/rack/helpers.rb +32 -0
  62. data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +73 -0
  63. data/lib/new_relic/agent/instrumentation/rack/prepend.rb +37 -0
  64. data/lib/new_relic/agent/instrumentation/rake.rb +13 -154
  65. data/lib/new_relic/agent/instrumentation/rake/chain.rb +25 -0
  66. data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +144 -0
  67. data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
  68. data/lib/new_relic/agent/instrumentation/redis.rb +12 -107
  69. data/lib/new_relic/agent/instrumentation/redis/chain.rb +34 -0
  70. data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +65 -0
  71. data/lib/new_relic/agent/instrumentation/redis/prepend.rb +24 -0
  72. data/lib/new_relic/agent/instrumentation/resque.rb +21 -32
  73. data/lib/new_relic/agent/instrumentation/resque/chain.rb +22 -0
  74. data/lib/new_relic/agent/instrumentation/resque/helper.rb +19 -0
  75. data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +35 -0
  76. data/lib/new_relic/agent/instrumentation/resque/prepend.rb +16 -0
  77. data/lib/new_relic/agent/instrumentation/sinatra.rb +20 -158
  78. data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +55 -0
  79. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +29 -34
  80. data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +124 -0
  81. data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
  82. data/lib/new_relic/agent/instrumentation/typhoeus.rb +10 -89
  83. data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +22 -0
  84. data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +82 -0
  85. data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +14 -0
  86. data/lib/new_relic/agent/javascript_instrumentor.rb +12 -7
  87. data/lib/new_relic/agent/new_relic_service.rb +15 -13
  88. data/lib/new_relic/agent/sql_sampler.rb +3 -3
  89. data/lib/new_relic/agent/transaction.rb +1 -4
  90. data/lib/new_relic/control/frameworks/rails.rb +11 -9
  91. data/lib/new_relic/control/instance_methods.rb +1 -0
  92. data/lib/new_relic/dependency_detection.rb +116 -10
  93. data/lib/new_relic/noticed_error.rb +4 -8
  94. data/lib/new_relic/supportability_helper.rb +1 -2
  95. data/lib/new_relic/version.rb +2 -2
  96. data/lib/tasks/config.html.erb +14 -25
  97. data/lib/tasks/config.rake +8 -7
  98. data/newrelic_rpm.gemspec +1 -1
  99. metadata +55 -8
  100. data/cert/cacert.pem +0 -1177
  101. data/lib/new_relic/agent/instrumentation/http.rb +0 -49
  102. data/lib/new_relic/agent/instrumentation/net.rb +0 -70
@@ -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
+
@@ -0,0 +1,88 @@
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 Tracer
9
+ SLASH = '/'
10
+ UNKNOWN = 'unknown'
11
+ LOCALHOST = 'localhost'
12
+ MULTIGET_METRIC_NAME = "get_multi_request"
13
+ MEMCACHED = "Memcached"
14
+
15
+ def with_newrelic_tracing operation, *args
16
+ segment = NewRelic::Agent::Tracer.start_datastore_segment \
17
+ product: MEMCACHED,
18
+ operation: operation
19
+
20
+ begin
21
+ NewRelic::Agent::Tracer.capture_segment_error(segment) { yield }
22
+ ensure
23
+ if NewRelic::Agent.config[:capture_memcache_keys]
24
+ segment.notice_nosql_statement "#{operation} #{args.first.inspect}"
25
+ end
26
+ segment.finish if segment
27
+ end
28
+ end
29
+
30
+ def server_for_key_with_newrelic_tracing
31
+ yield.tap do |server|
32
+ begin
33
+ if txn = ::NewRelic::Agent::Tracer.current_transaction
34
+ segment = txn.current_segment
35
+ if ::NewRelic::Agent::Transaction::DatastoreSegment === segment
36
+ assign_instance_to(segment, server)
37
+ end
38
+ end
39
+ rescue => e
40
+ ::NewRelic::Agent.logger.warn "Unable to set instance info on datastore segment: #{e.message}"
41
+ end
42
+ end
43
+ end
44
+
45
+ def get_multi_with_newrelic_tracing method_name
46
+ segment = NewRelic::Agent::Tracer.start_segment \
47
+ name: "Ruby/Memcached/Dalli/#{method_name}"
48
+
49
+ begin
50
+ NewRelic::Agent::Tracer.capture_segment_error(segment) { yield }
51
+ ensure
52
+ segment.finish if segment
53
+ end
54
+ end
55
+
56
+ def send_multiget_with_newrelic_tracing keys
57
+ segment = ::NewRelic::Agent::Tracer.start_datastore_segment \
58
+ product: MEMCACHED,
59
+ operation: MULTIGET_METRIC_NAME
60
+
61
+ begin
62
+ assign_instance_to(segment, self)
63
+ NewRelic::Agent::Tracer.capture_segment_error(segment) { yield }
64
+ ensure
65
+ if ::NewRelic::Agent.config[:capture_memcache_keys]
66
+ segment.notice_nosql_statement "#{MULTIGET_METRIC_NAME} #{keys.inspect}"
67
+ end
68
+ segment.finish if segment
69
+ end
70
+ end
71
+
72
+ def assign_instance_to segment, server
73
+ host = port_path_or_id = nil
74
+ if server.hostname.start_with? SLASH
75
+ host = LOCALHOST
76
+ port_path_or_id = server.hostname
77
+ else
78
+ host = server.hostname
79
+ port_path_or_id = server.port
80
+ end
81
+ segment.set_instance_info host, port_path_or_id
82
+ rescue => e
83
+ ::NewRelic::Agent.logger.debug "Failed to retrieve memcached instance info: #{e.message}"
84
+ segment.set_instance_info UNKNOWN, UNKNOWN
85
+ end
86
+ end
87
+ end
88
+ end
@@ -0,0 +1,88 @@
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 Prepend
9
+ extend Helper
10
+ module_function
11
+
12
+ def client_prepender client_class
13
+ Module.new do
14
+ extend Helper
15
+ include NewRelic::Agent::Instrumentation::Memcache::Tracer
16
+
17
+ supported_methods_for(client_class, client_methods).each do |method_name|
18
+ define_method method_name do |*args, &block|
19
+ with_newrelic_tracing(method_name, *args) { super(*args, &block) }
20
+ end
21
+ end
22
+ end
23
+ end
24
+
25
+ def dalli_cas_prependers
26
+ yield ::Dalli::Client, dalli_client_prepender(dalli_cas_methods)
27
+ yield ::Dalli::Client, dalli_get_multi_prepender(:get_multi_cas)
28
+ end
29
+
30
+ def dalli_prependers
31
+ if supports_datastore_instances?
32
+ yield ::Dalli::Client, dalli_client_prepender(dalli_methods)
33
+ yield ::Dalli::Client, dalli_get_multi_prepender(:get_multi)
34
+ yield ::Dalli::Server, dalli_server_prepender
35
+ yield ::Dalli::Ring, dalli_ring_prepender
36
+ else
37
+ yield ::Dalli::Client, dalli_client_prepender(client_methods)
38
+ end
39
+ end
40
+
41
+ def dalli_client_prepender supported_methods
42
+ Module.new do
43
+ extend Helper
44
+ include NewRelic::Agent::Instrumentation::Memcache::Tracer
45
+
46
+ supported_methods.each do |method_name|
47
+ define_method method_name do |*args, &block|
48
+ with_newrelic_tracing(method_name, *args) { super(*args, &block) }
49
+ end
50
+ end
51
+ end
52
+ end
53
+
54
+ def dalli_get_multi_prepender method_name
55
+ Module.new do
56
+ extend Helper
57
+ include NewRelic::Agent::Instrumentation::Memcache::Tracer
58
+
59
+ define_method method_name do |*args, &block|
60
+ get_multi_with_newrelic_tracing(method_name) { super(*args, &block) }
61
+ end
62
+ end
63
+ end
64
+
65
+ def dalli_ring_prepender
66
+ Module.new do
67
+ extend Helper
68
+ include NewRelic::Agent::Instrumentation::Memcache::Tracer
69
+
70
+ def server_for_key key
71
+ server_for_key_with_newrelic_tracing { super }
72
+ end
73
+ end
74
+ end
75
+
76
+ def dalli_server_prepender
77
+ Module.new do
78
+ extend Helper
79
+ include NewRelic::Agent::Instrumentation::Memcache::Tracer
80
+
81
+ def send_multiget keys
82
+ send_multiget_with_newrelic_tracing(keys) { super }
83
+ end
84
+ end
85
+ end
86
+ end
87
+ end
88
+ end
@@ -31,6 +31,8 @@ module NewRelic
31
31
  middleware_instance = @middleware_class.new(*args, &blk)
32
32
  MiddlewareProxy.wrap(middleware_instance)
33
33
  end
34
+
35
+ ruby2_keywords(:new) if respond_to?(:ruby2_keywords, true)
34
36
  end
35
37
 
36
38
  def self.is_sinatra_app?(target)
@@ -34,7 +34,14 @@ DependencyDetection.defer do
34
34
  )
35
35
  end
36
36
 
37
+ # TODO: Remove in 8.0.0 release
37
38
  def install_mongo_instrumentation
39
+ ::NewRelic::Agent::Deprecator.deprecate "install_mongo_instrumentation", "install_mongo_command_subscriber", "8.0.0"
40
+ ::NewRelic::Agent.logger.warn("Installing deprecated Mongo instrumentation. " \
41
+ "This instrumentation will be removed in a future release. " \
42
+ "Update Mongo version to >= 2.1.0 for updated instrumentation"
43
+ )
44
+
38
45
  require 'new_relic/agent/datastores/mongo/metric_translator'
39
46
  require 'new_relic/agent/datastores/mongo/statement_formatter'
40
47
 
@@ -0,0 +1,44 @@
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 'net_http/chain'
6
+ require_relative 'net_http/prepend'
7
+
8
+ DependencyDetection.defer do
9
+ named :net_http
10
+
11
+ depends_on do
12
+ defined?(Net) && defined?(Net::HTTP)
13
+ end
14
+
15
+ executes do
16
+ ::NewRelic::Agent.logger.info 'Installing Net:HTTP Wrappers'
17
+ require 'new_relic/agent/http_clients/net_http_wrappers'
18
+ end
19
+
20
+ # Airbrake uses method chaining on Net::HTTP in versions < 10.0.2 (10.0.2 updated to prepend for Net:HTTP)
21
+ conflicts_with_prepend do
22
+ defined?(::Airbrake) && defined?(::Airbrake::AIRBRAKE_VERSION) && ::Gem::Version.create(::Airbrake::AIRBRAKE_VERSION) < ::Gem::Version.create('10.0.2')
23
+ end
24
+
25
+ conflicts_with_prepend do
26
+ defined?(::ScoutApm)
27
+ end
28
+
29
+ conflicts_with_prepend do
30
+ defined?(::Rack::MiniProfiler)
31
+ end
32
+
33
+ conflicts_with_prepend do
34
+ source_location_for(Net::HTTP, "request") =~ /airbrake|profiler/i
35
+ end
36
+
37
+ executes do
38
+ if use_prepend?
39
+ prepend_instrument ::Net::HTTP, ::NewRelic::Agent::Instrumentation::NetHTTP::Prepend
40
+ else
41
+ chain_instrument ::NewRelic::Agent::Instrumentation::NetHTTP::Chain
42
+ end
43
+ end
44
+ 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
+ require_relative 'instrumentation'
6
+
7
+
8
+ module NewRelic::Agent::Instrumentation
9
+ module NetHTTP
10
+ module Chain
11
+ def self.instrument!
12
+ Net::HTTP.class_eval do
13
+ include NewRelic::Agent::Instrumentation::NetHTTP
14
+
15
+ def request_with_newrelic_trace(request, *args, &block)
16
+ request_with_tracing(request) { request_without_newrelic_trace(request, *args, &block) }
17
+ end
18
+
19
+ alias request_without_newrelic_trace request
20
+ alias request request_with_newrelic_trace
21
+ end
22
+ end
23
+ end
24
+ end
25
+ end
@@ -5,8 +5,8 @@
5
5
  module NewRelic
6
6
  module Agent
7
7
  module Instrumentation
8
- module NetPrepend
9
- def request(request, *args, &block)
8
+ module NetHTTP
9
+ def request_with_tracing(request)
10
10
  wrapped_request = NewRelic::Agent::HTTPClients::NetHTTPRequest.new(self, request)
11
11
 
12
12
  segment = NewRelic::Agent::Tracer.start_external_request_segment(
@@ -23,7 +23,7 @@ module NewRelic
23
23
  # counting if connection wasn't started (which calls request again).
24
24
  NewRelic::Agent.disable_all_tracing do
25
25
  response = NewRelic::Agent::Tracer.capture_segment_error segment do
26
- super
26
+ yield
27
27
  end
28
28
  end
29
29
 
@@ -0,0 +1,21 @@
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 'instrumentation'
6
+
7
+ module NewRelic
8
+ module Agent
9
+ module Instrumentation
10
+ module NetHTTP
11
+ module Prepend
12
+ include NewRelic::Agent::Instrumentation::NetHTTP
13
+
14
+ def request(request, *args, &block)
15
+ request_with_tracing(request) { super }
16
+ end
17
+ end
18
+ end
19
+ end
20
+ end
21
+ end
@@ -2,69 +2,34 @@
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 'new_relic/agent/instrumentation/sinatra'
5
+ # Our Padrino instrumentation relies heavily on the fact that Padrino is
6
+ # built on Sinatra. Although it wires up a lot of its own routing logic,
7
+ # we only need to patch into Padrino's dispatch to get things started.
8
+ #
9
+ # Parts of the Sinatra instrumentation (such as the TransactionNamer) are
10
+ # aware of Padrino as a potential target in areas where both Sinatra and
11
+ # Padrino run through the same code.
12
+
13
+ require_relative 'sinatra'
14
+ require_relative 'padrino/chain'
15
+ require_relative 'padrino/instrumentation'
16
+ require_relative 'padrino/prepend'
6
17
 
7
18
  DependencyDetection.defer do
8
19
  @name = :padrino
20
+ configure_with :sinatra
9
21
 
10
- depends_on do
11
- !NewRelic::Agent.config[:disable_sinatra] &&
12
- defined?(::Padrino) && defined?(::Padrino::Routing::InstanceMethods)
13
- end
22
+ depends_on { defined?(::Padrino) && defined?(::Padrino::Routing::InstanceMethods) }
14
23
 
15
24
  executes do
16
25
  ::NewRelic::Agent.logger.info 'Installing Padrino instrumentation'
17
-
18
- # Our Padrino instrumentation relies heavily on the fact that Padrino is
19
- # built on Sinatra. Although it wires up a lot of its own routing logic,
20
- # we only need to patch into Padrino's dispatch to get things started.
21
- #
22
- # Parts of the Sinatra instrumentation (such as the TransactionNamer) are
23
- # aware of Padrino as a potential target in areas where both Sinatra and
24
- # Padrino run through the same code.
25
- module ::Padrino::Routing::InstanceMethods
26
- include NewRelic::Agent::Instrumentation::Sinatra
27
-
28
- alias dispatch_without_newrelic dispatch!
29
- alias dispatch! dispatch_with_newrelic
30
-
31
- # Padrino 0.13 mustermann routing
32
- if private_method_defined?(:invoke_route)
33
- include NewRelic::Agent::Instrumentation::Padrino
34
-
35
- alias invoke_route_without_newrelic invoke_route
36
- alias invoke_route invoke_route_with_newrelic
37
- end
26
+ if use_prepend?
27
+ prepend_instrument ::Padrino::Routing::InstanceMethods, NewRelic::Agent::Instrumentation::Padrino::Prepend
28
+ else
29
+ chain_instrument NewRelic::Agent::Instrumentation::Padrino::Chain
38
30
  end
39
31
  end
40
32
  end
41
33
 
42
- module NewRelic
43
- module Agent
44
- module Instrumentation
45
- module Padrino
46
34
 
47
- def invoke_route_with_newrelic(*args, &block)
48
- begin
49
- env["newrelic.last_route"] = args[0].original_path
50
- rescue => e
51
- ::NewRelic::Agent.logger.debug("Failed determining last route in Padrino", e)
52
- end
53
35
 
54
- begin
55
- txn_name = ::NewRelic::Agent::Instrumentation::Sinatra::TransactionNamer.transaction_name_for_route(env, request)
56
- unless txn_name.nil?
57
- ::NewRelic::Agent::Transaction.set_default_transaction_name(
58
- "#{self.class.name}/#{txn_name}", :sinatra)
59
- end
60
- rescue => e
61
- ::NewRelic::Agent.logger.debug("Failed during invoke_route to set transaction name", e)
62
- end
63
-
64
- invoke_route_without_newrelic(*args, &block)
65
- end
66
-
67
- end
68
- end
69
- end
70
- end