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,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
+
@@ -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,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
@@ -1,6 +1,7 @@
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
  # NOTE there are multiple implementations of the MemCache client in Ruby,
6
7
  # each with slightly different API's and semantics.
@@ -9,95 +10,79 @@
9
10
  # http://seattlerb.rubyforge.org/memcache-client/ (Gem: memcache-client)
10
11
  # https://github.com/mperham/dalli (Gem: dalli)
11
12
 
12
- require 'new_relic/agent/datastores/metric_helper'
13
- require 'new_relic/agent/instrumentation/memcache/dalli'
13
+ require_relative 'memcache/helper'
14
+ require_relative 'memcache/instrumentation'
15
+ require_relative 'memcache/dalli'
16
+ require_relative 'memcache/chain'
17
+ require_relative 'memcache/prepend'
14
18
 
15
- module NewRelic
16
- module Agent
17
- module Instrumentation
18
- module Memcache
19
- module_function
20
-
21
- def enabled?
22
- !::NewRelic::Agent.config[:disable_memcache_instrumentation]
23
- end
24
-
25
- METHODS = [:get, :get_multi, :set, :add, :incr, :decr, :delete, :replace, :append,
26
- :prepend, :cas, :single_get, :multi_get, :single_cas, :multi_cas]
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|
19
+ DependencyDetection.defer do
20
+ named :memcache_client
36
21
 
37
- visibility = NewRelic::Helper.instance_method_visibility client_class, method_name
38
- method_name_without = :"#{method_name}_without_newrelic_trace"
22
+ depends_on { defined? ::MemCache }
39
23
 
40
- client_class.class_eval do
41
- alias_method method_name_without, method_name
24
+ executes do
25
+ if use_prepend?
26
+ prepend_module = ::NewRelic::Agent::Instrumentation::Memcache::Prepend.client_prepender(::MemCache)
27
+ prepend_instrument ::MemCache, prepend_module, "MemcacheClient"
28
+ else
29
+ chain_instrument_target ::MemCache, ::NewRelic::Agent::Instrumentation::Memcache::Chain, "MemcacheClient"
30
+ end
31
+ end
32
+ end
42
33
 
43
- define_method method_name do |*args, &block|
44
- segment = NewRelic::Agent::Tracer.start_datastore_segment(
45
- product: "Memcached",
46
- operation: method_name
47
- )
48
- begin
49
- NewRelic::Agent::Tracer.capture_segment_error segment do
50
- send method_name_without, *args, &block
51
- end
52
- ensure
53
- if NewRelic::Agent.config[:capture_memcache_keys]
54
- segment.notice_nosql_statement "#{method_name} #{args.first.inspect}"
55
- end
56
- segment.finish if segment
57
- end
58
- end
34
+ DependencyDetection.defer do
35
+ named :memcached
59
36
 
60
- send visibility, method_name
61
- send visibility, method_name_without
62
- end
63
- end
64
- end
37
+ depends_on { defined? ::Memcached }
65
38
 
66
- end
39
+ executes do
40
+ if use_prepend?
41
+ prepend_module = ::NewRelic::Agent::Instrumentation::Memcache::Prepend.client_prepender(::Memcached)
42
+ prepend_instrument ::Memcached, prepend_module, "Memcached"
43
+ else
44
+ chain_instrument_target ::Memcached, ::NewRelic::Agent::Instrumentation::Memcache::Chain, "Memcached"
67
45
  end
68
46
  end
69
47
  end
70
48
 
71
49
  DependencyDetection.defer do
72
- named :memcache_client
50
+ named :dalli
51
+ configure_with :memcache
73
52
 
74
- depends_on do
75
- NewRelic::Agent::Instrumentation::Memcache.enabled?
76
- end
77
-
78
- depends_on do
79
- defined?(::MemCache)
80
- end
53
+ depends_on { defined? ::Dalli::Client }
81
54
 
82
55
  executes do
83
- ::NewRelic::Agent.logger.info 'Installing Memcached instrumentation for memcache-client gem'
84
- NewRelic::Agent::Instrumentation::Memcache.instrument_methods(::MemCache)
56
+ if use_prepend?
57
+ prepend_module = ::NewRelic::Agent::Instrumentation::Memcache::Prepend
58
+ prepend_module.dalli_prependers do |client_class, instrumenting_module|
59
+ prepend_instrument client_class, instrumenting_module, "MemecacheDalli"
60
+ end
61
+ else
62
+ chain_instrument ::NewRelic::Agent::Instrumentation::Memcache::Dalli
63
+ end
85
64
  end
86
65
  end
87
66
 
67
+ # These CAS client methods are only optionally defined if users require
68
+ # dalli/cas/client. Use a separate dependency block so it can potentially
69
+ # re-evaluate after they've done that require.
88
70
  DependencyDetection.defer do
89
- named :memcached
90
-
91
- depends_on do
92
- NewRelic::Agent::Instrumentation::Memcache.enabled?
93
- end
71
+ named :dalli_cas_client
72
+ configure_with :memcache
94
73
 
95
- depends_on do
96
- defined?(::Memcached)
97
- end
74
+ depends_on { defined? ::Dalli::Client }
75
+ depends_on { ::NewRelic::Agent::Instrumentation::Memcache::DalliCAS.should_instrument? }
98
76
 
99
77
  executes do
100
- ::NewRelic::Agent.logger.info 'Installing Memcached instrumentation for memcached gem'
101
- ::NewRelic::Agent::Instrumentation::Memcache.instrument_methods(::Memcached)
78
+ ::NewRelic::Agent.logger.info 'Installing Dalli CAS Client Memcache instrumentation'
79
+ if use_prepend?
80
+ prepend_module = ::NewRelic::Agent::Instrumentation::Memcache::Prepend
81
+ prepend_module.dalli_cas_prependers do |client_class, instrumenting_module|
82
+ prepend_instrument client_class, instrumenting_module, "MemecacheDalliCAS"
83
+ end
84
+ else
85
+ chain_instrument ::NewRelic::Agent::Instrumentation::Memcache::DalliCAS
86
+ end
102
87
  end
103
88
  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 self
11
+ extend Helper
12
+ module_function
11
13
 
12
- MEMCACHED = "Memcached".freeze
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
- ::NewRelic::Agent::Instrumentation::Memcache.instrument_methods(::Dalli::Client, METHODS)
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
- ::NewRelic::Agent::Instrumentation::Memcache.instrument_methods(::Dalli::Client,
32
- ::NewRelic::Agent::Instrumentation::Memcache::METHODS)
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
- server = server_for_key_without_newrelic_trace key
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(keys)
62
- segment = ::NewRelic::Agent::Tracer.start_datastore_segment(
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
- def instrument_multi_method method_name
83
- visibility = NewRelic::Helper.instance_method_visibility ::Dalli::Client, method_name
84
- method_name_without = :"#{method_name}_without_newrelic_trace"
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
- __send__ visibility, method_name
101
- __send__ visibility, method_name_without
102
- end
70
+ def should_instrument?
71
+ supported_methods_for(::Dalli::Client, dalli_cas_methods).any?
103
72
  end
104
73
 
105
- def assign_instance_to segment, server
106
- host = port_path_or_id = nil
107
- if server.hostname.start_with? SLASH
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