newrelic_rpm 8.9.0 → 8.10.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (361) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +12 -6
  3. data/.simplecov +1 -0
  4. data/.snyk +11 -0
  5. data/Brewfile +1 -0
  6. data/CHANGELOG.md +56 -0
  7. data/Guardfile +1 -0
  8. data/Rakefile +5 -0
  9. data/bin/mongrel_rpm +7 -6
  10. data/bin/newrelic +2 -1
  11. data/bin/newrelic_cmd +1 -0
  12. data/bin/nrdebug +3 -2
  13. data/init.rb +3 -2
  14. data/install.rb +1 -0
  15. data/lib/new_relic/agent/adaptive_sampler.rb +4 -3
  16. data/lib/new_relic/agent/agent/shutdown.rb +3 -2
  17. data/lib/new_relic/agent/agent/special_startup.rb +3 -2
  18. data/lib/new_relic/agent/agent/start_worker_thread.rb +15 -14
  19. data/lib/new_relic/agent/agent/startup.rb +11 -10
  20. data/lib/new_relic/agent/agent.rb +35 -33
  21. data/lib/new_relic/agent/agent_logger.rb +2 -1
  22. data/lib/new_relic/agent/attribute_filter.rb +1 -0
  23. data/lib/new_relic/agent/attribute_processing.rb +4 -3
  24. data/lib/new_relic/agent/attributes.rb +2 -1
  25. data/lib/new_relic/agent/audit_logger.rb +1 -0
  26. data/lib/new_relic/agent/autostart.rb +1 -0
  27. data/lib/new_relic/agent/chained_call.rb +1 -0
  28. data/lib/new_relic/agent/commands/agent_command.rb +1 -0
  29. data/lib/new_relic/agent/commands/agent_command_router.rb +4 -3
  30. data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -0
  31. data/lib/new_relic/agent/configuration/default_source.rb +35 -7
  32. data/lib/new_relic/agent/configuration/dotted_hash.rb +1 -0
  33. data/lib/new_relic/agent/configuration/environment_source.rb +2 -1
  34. data/lib/new_relic/agent/configuration/event_harvest_config.rb +1 -0
  35. data/lib/new_relic/agent/configuration/high_security_source.rb +1 -0
  36. data/lib/new_relic/agent/configuration/manager.rb +2 -1
  37. data/lib/new_relic/agent/configuration/manual_source.rb +1 -0
  38. data/lib/new_relic/agent/configuration/mask_defaults.rb +1 -0
  39. data/lib/new_relic/agent/configuration/security_policy_source.rb +7 -3
  40. data/lib/new_relic/agent/configuration/server_source.rb +7 -6
  41. data/lib/new_relic/agent/configuration/yaml_source.rb +4 -1
  42. data/lib/new_relic/agent/configuration.rb +1 -0
  43. data/lib/new_relic/agent/connect/request_builder.rb +1 -0
  44. data/lib/new_relic/agent/connect/response_handler.rb +4 -3
  45. data/lib/new_relic/agent/custom_event_aggregator.rb +5 -4
  46. data/lib/new_relic/agent/database/explain_plan_helpers.rb +1 -0
  47. data/lib/new_relic/agent/database/obfuscation_helpers.rb +1 -0
  48. data/lib/new_relic/agent/database/obfuscator.rb +2 -1
  49. data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +1 -0
  50. data/lib/new_relic/agent/database.rb +3 -2
  51. data/lib/new_relic/agent/database_adapter.rb +1 -0
  52. data/lib/new_relic/agent/datastores/metric_helper.rb +9 -8
  53. data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +2 -0
  54. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +1 -0
  55. data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +2 -1
  56. data/lib/new_relic/agent/datastores/mongo.rb +1 -0
  57. data/lib/new_relic/agent/datastores/redis.rb +3 -2
  58. data/lib/new_relic/agent/datastores.rb +4 -3
  59. data/lib/new_relic/agent/deprecator.rb +1 -0
  60. data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +1 -0
  61. data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +16 -16
  62. data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +9 -9
  63. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +18 -18
  64. data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +8 -8
  65. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +2 -2
  66. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +40 -39
  67. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +16 -14
  68. data/lib/new_relic/agent/distributed_tracing.rb +17 -17
  69. data/lib/new_relic/agent/encoding_normalizer.rb +1 -0
  70. data/lib/new_relic/agent/error_collector.rb +6 -4
  71. data/lib/new_relic/agent/error_event_aggregator.rb +3 -3
  72. data/lib/new_relic/agent/error_filter.rb +1 -0
  73. data/lib/new_relic/agent/error_trace_aggregator.rb +2 -1
  74. data/lib/new_relic/agent/event_aggregator.rb +20 -19
  75. data/lib/new_relic/agent/event_buffer.rb +1 -0
  76. data/lib/new_relic/agent/event_listener.rb +1 -0
  77. data/lib/new_relic/agent/event_loop.rb +7 -6
  78. data/lib/new_relic/agent/external.rb +9 -8
  79. data/lib/new_relic/agent/guid_generator.rb +2 -1
  80. data/lib/new_relic/agent/harvester.rb +1 -0
  81. data/lib/new_relic/agent/heap.rb +3 -2
  82. data/lib/new_relic/agent/hostname.rb +4 -2
  83. data/lib/new_relic/agent/http_clients/abstract.rb +1 -1
  84. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +5 -5
  85. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +4 -4
  86. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +1 -1
  87. data/lib/new_relic/agent/http_clients/uri_util.rb +1 -1
  88. data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +6 -4
  89. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +2 -0
  90. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +6 -4
  91. data/lib/new_relic/agent/instrumentation/active_job.rb +2 -1
  92. data/lib/new_relic/agent/instrumentation/active_merchant.rb +2 -1
  93. data/lib/new_relic/agent/instrumentation/active_record.rb +9 -8
  94. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +15 -14
  95. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +3 -2
  96. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +1 -0
  97. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +5 -3
  98. data/lib/new_relic/agent/instrumentation/active_storage.rb +2 -1
  99. data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +16 -14
  100. data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +1 -0
  101. data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +1 -0
  102. data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +1 -0
  103. data/lib/new_relic/agent/instrumentation/active_support_logger.rb +2 -1
  104. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +2 -1
  105. data/lib/new_relic/agent/instrumentation/authlogic.rb +2 -1
  106. data/lib/new_relic/agent/instrumentation/bunny/chain.rb +10 -9
  107. data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +10 -10
  108. data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +4 -3
  109. data/lib/new_relic/agent/instrumentation/bunny.rb +1 -1
  110. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +13 -9
  111. data/lib/new_relic/agent/instrumentation/curb/chain.rb +21 -21
  112. data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +8 -8
  113. data/lib/new_relic/agent/instrumentation/curb/prepend.rb +2 -2
  114. data/lib/new_relic/agent/instrumentation/curb.rb +2 -1
  115. data/lib/new_relic/agent/instrumentation/data_mapper.rb +43 -42
  116. data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +1 -1
  117. data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +2 -2
  118. data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +1 -1
  119. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +3 -2
  120. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +3 -2
  121. data/lib/new_relic/agent/instrumentation/excon.rb +2 -1
  122. data/lib/new_relic/agent/instrumentation/grape/chain.rb +6 -5
  123. data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +5 -4
  124. data/lib/new_relic/agent/instrumentation/grape/prepend.rb +4 -3
  125. data/lib/new_relic/agent/instrumentation/grape.rb +1 -0
  126. data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +106 -0
  127. data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +88 -0
  128. data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +117 -0
  129. data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +31 -0
  130. data/lib/new_relic/agent/instrumentation/grpc/helper.rb +31 -0
  131. data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +70 -0
  132. data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +135 -0
  133. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +36 -0
  134. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +27 -0
  135. data/lib/new_relic/agent/instrumentation/grpc_client.rb +24 -0
  136. data/lib/new_relic/agent/instrumentation/grpc_server.rb +26 -0
  137. data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +1 -0
  138. data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +6 -5
  139. data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +1 -0
  140. data/lib/new_relic/agent/instrumentation/httpclient.rb +2 -1
  141. data/lib/new_relic/agent/instrumentation/httprb/chain.rb +1 -0
  142. data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +4 -3
  143. data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +1 -0
  144. data/lib/new_relic/agent/instrumentation/httprb.rb +2 -1
  145. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +2 -1
  146. data/lib/new_relic/agent/instrumentation/logger/chain.rb +2 -1
  147. data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +5 -0
  148. data/lib/new_relic/agent/instrumentation/logger/prepend.rb +1 -0
  149. data/lib/new_relic/agent/instrumentation/logger.rb +2 -1
  150. data/lib/new_relic/agent/instrumentation/memcache/chain.rb +2 -2
  151. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +19 -19
  152. data/lib/new_relic/agent/instrumentation/memcache/helper.rb +8 -8
  153. data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +17 -14
  154. data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +14 -14
  155. data/lib/new_relic/agent/instrumentation/memcache.rb +1 -1
  156. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +1 -0
  157. data/lib/new_relic/agent/instrumentation/mongo.rb +2 -1
  158. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +14 -12
  159. data/lib/new_relic/agent/instrumentation/net_http/chain.rb +1 -0
  160. data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +5 -4
  161. data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +1 -0
  162. data/lib/new_relic/agent/instrumentation/net_http.rb +2 -1
  163. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +5 -4
  164. data/lib/new_relic/agent/instrumentation/padrino/chain.rb +1 -0
  165. data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +1 -0
  166. data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +1 -0
  167. data/lib/new_relic/agent/instrumentation/padrino.rb +2 -1
  168. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +3 -2
  169. data/lib/new_relic/agent/instrumentation/queue_time.rb +1 -0
  170. data/lib/new_relic/agent/instrumentation/rack/chain.rb +12 -11
  171. data/lib/new_relic/agent/instrumentation/rack/helpers.rb +1 -0
  172. data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +7 -6
  173. data/lib/new_relic/agent/instrumentation/rack/prepend.rb +4 -3
  174. data/lib/new_relic/agent/instrumentation/rack.rb +1 -0
  175. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +6 -5
  176. data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -0
  177. data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +3 -1
  178. data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +3 -1
  179. data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +3 -1
  180. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +3 -2
  181. data/lib/new_relic/agent/instrumentation/rake/chain.rb +2 -1
  182. data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +1 -1
  183. data/lib/new_relic/agent/instrumentation/rake/prepend.rb +1 -0
  184. data/lib/new_relic/agent/instrumentation/rake.rb +3 -2
  185. data/lib/new_relic/agent/instrumentation/redis/chain.rb +3 -3
  186. data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +5 -5
  187. data/lib/new_relic/agent/instrumentation/redis/prepend.rb +3 -3
  188. data/lib/new_relic/agent/instrumentation/redis.rb +2 -1
  189. data/lib/new_relic/agent/instrumentation/resque/chain.rb +2 -1
  190. data/lib/new_relic/agent/instrumentation/resque/helper.rb +1 -0
  191. data/lib/new_relic/agent/instrumentation/resque/prepend.rb +1 -0
  192. data/lib/new_relic/agent/instrumentation/resque.rb +3 -2
  193. data/lib/new_relic/agent/instrumentation/sequel.rb +8 -7
  194. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +1 -0
  195. data/lib/new_relic/agent/instrumentation/sidekiq.rb +6 -4
  196. data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +1 -0
  197. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +2 -1
  198. data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +1 -0
  199. data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +1 -0
  200. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +2 -1
  201. data/lib/new_relic/agent/instrumentation/sinatra.rb +2 -1
  202. data/lib/new_relic/agent/instrumentation/sunspot.rb +2 -1
  203. data/lib/new_relic/agent/instrumentation/thread/chain.rb +2 -1
  204. data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +1 -0
  205. data/lib/new_relic/agent/instrumentation/thread/prepend.rb +1 -0
  206. data/lib/new_relic/agent/instrumentation/thread.rb +2 -1
  207. data/lib/new_relic/agent/instrumentation/tilt/chain.rb +1 -0
  208. data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +1 -0
  209. data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +1 -0
  210. data/lib/new_relic/agent/instrumentation/tilt.rb +1 -0
  211. data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +1 -0
  212. data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +6 -5
  213. data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +1 -0
  214. data/lib/new_relic/agent/instrumentation/typhoeus.rb +2 -1
  215. data/lib/new_relic/agent/instrumentation.rb +1 -0
  216. data/lib/new_relic/agent/internal_agent_error.rb +1 -0
  217. data/lib/new_relic/agent/javascript_instrumentor.rb +7 -6
  218. data/lib/new_relic/agent/linking_metadata.rb +2 -2
  219. data/lib/new_relic/agent/log_event_aggregator.rb +6 -5
  220. data/lib/new_relic/agent/log_once.rb +1 -0
  221. data/lib/new_relic/agent/log_priority.rb +1 -0
  222. data/lib/new_relic/agent/logging.rb +13 -12
  223. data/lib/new_relic/agent/memory_logger.rb +1 -0
  224. data/lib/new_relic/agent/messaging.rb +18 -18
  225. data/lib/new_relic/agent/method_tracer.rb +6 -5
  226. data/lib/new_relic/agent/method_tracer_helpers.rb +8 -5
  227. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +3 -2
  228. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +3 -2
  229. data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +1 -0
  230. data/lib/new_relic/agent/monitors/synthetics_monitor.rb +2 -1
  231. data/lib/new_relic/agent/monitors.rb +5 -4
  232. data/lib/new_relic/agent/new_relic_service/encoders.rb +2 -1
  233. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +4 -3
  234. data/lib/new_relic/agent/new_relic_service/marshaller.rb +1 -0
  235. data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +1 -0
  236. data/lib/new_relic/agent/new_relic_service.rb +11 -11
  237. data/lib/new_relic/agent/noticible_error.rb +1 -1
  238. data/lib/new_relic/agent/null_logger.rb +1 -0
  239. data/lib/new_relic/agent/obfuscator.rb +2 -1
  240. data/lib/new_relic/agent/parameter_filtering.rb +1 -0
  241. data/lib/new_relic/agent/payload_metric_mapping.rb +1 -0
  242. data/lib/new_relic/agent/pipe_channel_manager.rb +6 -5
  243. data/lib/new_relic/agent/pipe_service.rb +1 -0
  244. data/lib/new_relic/agent/prepend_supportability.rb +2 -1
  245. data/lib/new_relic/agent/priority_sampled_buffer.rb +2 -1
  246. data/lib/new_relic/agent/range_extensions.rb +8 -27
  247. data/lib/new_relic/agent/rules_engine/replacement_rule.rb +2 -1
  248. data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +1 -0
  249. data/lib/new_relic/agent/rules_engine.rb +2 -1
  250. data/lib/new_relic/agent/sampler.rb +1 -0
  251. data/lib/new_relic/agent/sampler_collection.rb +1 -0
  252. data/lib/new_relic/agent/samplers/cpu_sampler.rb +1 -0
  253. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +1 -0
  254. data/lib/new_relic/agent/samplers/memory_sampler.rb +5 -4
  255. data/lib/new_relic/agent/samplers/object_sampler.rb +1 -0
  256. data/lib/new_relic/agent/samplers/vm_sampler.rb +1 -0
  257. data/lib/new_relic/agent/span_event_aggregator.rb +2 -1
  258. data/lib/new_relic/agent/span_event_primitive.rb +15 -11
  259. data/lib/new_relic/agent/sql_sampler.rb +7 -6
  260. data/lib/new_relic/agent/stats.rb +3 -1
  261. data/lib/new_relic/agent/stats_engine/gc_profiler.rb +1 -0
  262. data/lib/new_relic/agent/stats_engine/stats_hash.rb +3 -2
  263. data/lib/new_relic/agent/stats_engine.rb +1 -0
  264. data/lib/new_relic/agent/synthetics_event_aggregator.rb +6 -5
  265. data/lib/new_relic/agent/system_info.rb +8 -7
  266. data/lib/new_relic/agent/threading/agent_thread.rb +1 -0
  267. data/lib/new_relic/agent/threading/backtrace_node.rb +6 -3
  268. data/lib/new_relic/agent/threading/backtrace_service.rb +1 -0
  269. data/lib/new_relic/agent/threading/thread_profile.rb +1 -0
  270. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -0
  271. data/lib/new_relic/agent/tracer.rb +12 -11
  272. data/lib/new_relic/agent/transaction/abstract_segment.rb +64 -31
  273. data/lib/new_relic/agent/transaction/datastore_segment.rb +12 -11
  274. data/lib/new_relic/agent/transaction/distributed_tracer.rb +52 -47
  275. data/lib/new_relic/agent/transaction/distributed_tracing.rb +21 -21
  276. data/lib/new_relic/agent/transaction/external_request_segment.rb +36 -27
  277. data/lib/new_relic/agent/transaction/message_broker_segment.rb +6 -5
  278. data/lib/new_relic/agent/transaction/request_attributes.rb +29 -28
  279. data/lib/new_relic/agent/transaction/segment.rb +8 -7
  280. data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -0
  281. data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -0
  282. data/lib/new_relic/agent/transaction/trace.rb +3 -2
  283. data/lib/new_relic/agent/transaction/trace_builder.rb +10 -9
  284. data/lib/new_relic/agent/transaction/trace_context.rb +22 -19
  285. data/lib/new_relic/agent/transaction/trace_node.rb +9 -8
  286. data/lib/new_relic/agent/transaction/tracing.rb +7 -6
  287. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -0
  288. data/lib/new_relic/agent/transaction.rb +22 -21
  289. data/lib/new_relic/agent/transaction_error_primitive.rb +9 -8
  290. data/lib/new_relic/agent/transaction_event_aggregator.rb +5 -4
  291. data/lib/new_relic/agent/transaction_event_primitive.rb +3 -3
  292. data/lib/new_relic/agent/transaction_event_recorder.rb +14 -12
  293. data/lib/new_relic/agent/transaction_metrics.rb +3 -2
  294. data/lib/new_relic/agent/transaction_sampler.rb +4 -3
  295. data/lib/new_relic/agent/transaction_time_aggregator.rb +13 -12
  296. data/lib/new_relic/agent/utilization/aws.rb +4 -3
  297. data/lib/new_relic/agent/utilization/azure.rb +1 -0
  298. data/lib/new_relic/agent/utilization/gcp.rb +6 -5
  299. data/lib/new_relic/agent/utilization/pcf.rb +3 -2
  300. data/lib/new_relic/agent/utilization/vendor.rb +27 -26
  301. data/lib/new_relic/agent/utilization_data.rb +1 -0
  302. data/lib/new_relic/agent/vm/jruby_vm.rb +1 -0
  303. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -0
  304. data/lib/new_relic/agent/vm/mri_vm.rb +1 -0
  305. data/lib/new_relic/agent/vm/snapshot.rb +1 -0
  306. data/lib/new_relic/agent/vm.rb +1 -0
  307. data/lib/new_relic/agent/worker_loop.rb +2 -1
  308. data/lib/new_relic/agent.rb +11 -10
  309. data/lib/new_relic/cli/command.rb +5 -4
  310. data/lib/new_relic/cli/commands/deployments.rb +9 -8
  311. data/lib/new_relic/cli/commands/install.rb +6 -5
  312. data/lib/new_relic/coerce.rb +4 -4
  313. data/lib/new_relic/collection_helper.rb +2 -1
  314. data/lib/new_relic/control/class_methods.rb +1 -0
  315. data/lib/new_relic/control/frameworks/external.rb +1 -0
  316. data/lib/new_relic/control/frameworks/rails.rb +3 -2
  317. data/lib/new_relic/control/frameworks/rails3.rb +1 -0
  318. data/lib/new_relic/control/frameworks/rails4.rb +1 -0
  319. data/lib/new_relic/control/frameworks/rails_notifications.rb +1 -0
  320. data/lib/new_relic/control/frameworks/ruby.rb +1 -0
  321. data/lib/new_relic/control/frameworks/sinatra.rb +1 -0
  322. data/lib/new_relic/control/frameworks.rb +1 -0
  323. data/lib/new_relic/control/instance_methods.rb +5 -4
  324. data/lib/new_relic/control/instrumentation.rb +7 -6
  325. data/lib/new_relic/control/server_methods.rb +2 -1
  326. data/lib/new_relic/control.rb +1 -0
  327. data/lib/new_relic/delayed_job_injection.rb +1 -0
  328. data/lib/new_relic/dependency_detection.rb +18 -16
  329. data/lib/new_relic/environment_report.rb +1 -0
  330. data/lib/new_relic/helper.rb +4 -3
  331. data/lib/new_relic/language_support.rb +1 -0
  332. data/lib/new_relic/latest_changes.rb +1 -0
  333. data/lib/new_relic/local_environment.rb +5 -6
  334. data/lib/new_relic/metric_data.rb +3 -2
  335. data/lib/new_relic/metric_spec.rb +2 -1
  336. data/lib/new_relic/noticed_error.rb +1 -1
  337. data/lib/new_relic/rack/agent_hooks.rb +1 -0
  338. data/lib/new_relic/rack/agent_middleware.rb +1 -0
  339. data/lib/new_relic/rack/browser_monitoring.rb +3 -2
  340. data/lib/new_relic/rack.rb +1 -0
  341. data/lib/new_relic/recipes/capistrano3.rb +7 -6
  342. data/lib/new_relic/recipes/capistrano_legacy.rb +12 -11
  343. data/lib/new_relic/recipes.rb +1 -0
  344. data/lib/new_relic/supportability_helper.rb +5 -4
  345. data/lib/new_relic/version.rb +2 -1
  346. data/lib/newrelic_rpm.rb +1 -0
  347. data/lib/sequel/extensions/newrelic_instrumentation.rb +6 -5
  348. data/lib/sequel/plugins/newrelic_instrumentation.rb +1 -0
  349. data/lib/tasks/all.rb +1 -0
  350. data/lib/tasks/config.rake +2 -1
  351. data/lib/tasks/coverage_report.rake +2 -1
  352. data/lib/tasks/install.rake +1 -0
  353. data/lib/tasks/multiverse.rake +1 -0
  354. data/lib/tasks/multiverse.rb +8 -7
  355. data/lib/tasks/newrelic.rb +1 -0
  356. data/lib/tasks/tests.rake +1 -0
  357. data/newrelic.yml +505 -486
  358. data/newrelic_rpm.gemspec +3 -1
  359. data/recipes/newrelic.rb +1 -0
  360. data/test/agent_helper.rb +113 -103
  361. metadata +28 -2
@@ -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
  DependencyDetection.defer do
6
7
  named :data_mapper
@@ -13,7 +14,7 @@ DependencyDetection.defer do
13
14
  end
14
15
 
15
16
  executes do
16
- ::NewRelic::Agent.logger.info 'Installing DataMapper instrumentation'
17
+ ::NewRelic::Agent.logger.info('Installing DataMapper instrumentation')
17
18
  require 'new_relic/agent/datastores/metric_helper'
18
19
 
19
20
  deprecation_msg = 'The instrumentation for DataMapper is deprecated. ' \
@@ -30,69 +31,69 @@ DependencyDetection.defer do
30
31
  end
31
32
 
32
33
  executes do
33
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :get
34
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :first
35
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :last
36
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :all
37
-
38
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :create
39
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :create!
40
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :update
41
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :update!
42
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :destroy
43
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :destroy!
44
-
45
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :aggregate
46
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :find
47
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :find_by_sql
34
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :get)
35
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :first)
36
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :last)
37
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :all)
38
+
39
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :create)
40
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :create!)
41
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :update)
42
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :update!)
43
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :destroy)
44
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :destroy!)
45
+
46
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :aggregate)
47
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :find)
48
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :find_by_sql)
48
49
  end
49
50
 
50
51
  executes do
51
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Resource, :update
52
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Resource, :update!
53
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Resource, :save
54
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Resource, :save!
55
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Resource, :destroy
56
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Resource, :destroy!
52
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Resource, :update)
53
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Resource, :update!)
54
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Resource, :save)
55
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Resource, :save!)
56
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Resource, :destroy)
57
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Resource, :destroy!)
57
58
  end
58
59
 
59
60
  executes do
60
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :get
61
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :first
62
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :last
63
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :all
61
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :get)
62
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :first)
63
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :last)
64
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :all)
64
65
 
65
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :lazy_load
66
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :lazy_load)
66
67
 
67
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :create
68
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :create!
69
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :update
70
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :update!
71
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :destroy
72
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :destroy!
68
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :create)
69
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :create!)
70
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :update)
71
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :update!)
72
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :destroy)
73
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :destroy!)
73
74
 
74
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :aggregate
75
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :aggregate)
75
76
  end
76
77
 
77
78
  executes do
78
79
  # Catch direct SQL calls that bypass CRUD
79
80
  if defined?(::DataMapper::Adapters::DataObjectsAdapter)
80
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Adapters::DataObjectsAdapter, :select, true
81
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Adapters::DataObjectsAdapter, :execute, true
81
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Adapters::DataObjectsAdapter, :select, true)
82
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Adapters::DataObjectsAdapter, :execute, true)
82
83
  end
83
84
  end
84
85
 
85
86
  executes do
86
87
  # DM::Validations overrides Model#create, so we patch it here as well
87
88
  if defined?(::DataMapper::Validations::ClassMethods)
88
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Validations::ClassMethods, :create
89
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Validations::ClassMethods, :create)
89
90
  end
90
91
  end
91
92
 
92
93
  executes do
93
94
  # DM::Transaction calls commit() twice, so potentially shows up twice.
94
95
  if defined?(::DataMapper::Transaction)
95
- NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Transaction, :commit, true
96
+ NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Transaction, :commit, true)
96
97
  end
97
98
  end
98
99
 
@@ -114,8 +115,8 @@ module NewRelic
114
115
  define_method("#{method_name}_with_newrelic",
115
116
  NewRelic::Agent::DataMapperTracing.method_body(clazz, method_name, operation_only))
116
117
 
117
- alias_method "#{method_name}_without_newrelic", method_name
118
- alias_method method_name, "#{method_name}_with_newrelic"
118
+ alias_method("#{method_name}_without_newrelic", method_name)
119
+ alias_method(method_name, "#{method_name}_with_newrelic")
119
120
  end
120
121
  end
121
122
  end
@@ -152,7 +153,7 @@ module NewRelic
152
153
  )
153
154
 
154
155
  begin
155
- NewRelic::Agent::Tracer.capture_segment_error segment do
156
+ NewRelic::Agent::Tracer.capture_segment_error(segment) do
156
157
  self.send("#{method_name}_without_newrelic", *args, &blk)
157
158
  end
158
159
  rescue ::DataObjects::ConnectionError => e
@@ -205,7 +206,7 @@ module NewRelic
205
206
  txn = state.current_transaction
206
207
 
207
208
  if txn && txn.current_segment.respond_to?(:notice_sql)
208
- txn.current_segment.notice_sql msg.query
209
+ txn.current_segment.notice_sql(msg.query)
209
210
  end
210
211
  ensure
211
212
  super
@@ -22,7 +22,7 @@ module NewRelic::Agent::Instrumentation
22
22
  Delayed::Job.class_eval do
23
23
  include NewRelic::Agent::Instrumentation::DelayedJobTracer
24
24
 
25
- alias_method :invoke_job_without_new_relic, :invoke_job
25
+ alias_method(:invoke_job_without_new_relic, :invoke_job)
26
26
 
27
27
  def invoke_job(*args, &block)
28
28
  invoke_job_with_tracing { invoke_job_without_new_relic(*args, &block) }
@@ -19,9 +19,9 @@ module NewRelic
19
19
  if defined?(::Delayed::Job) && ::Delayed::Job.method_defined?(:invoke_job) &&
20
20
  !(::Delayed::Job.method_defined?(:invoke_job_without_new_relic))
21
21
 
22
- ::NewRelic::Agent.logger.info 'Installing DelayedJob instrumentation [part 2/2]'
22
+ ::NewRelic::Agent.logger.info('Installing DelayedJob instrumentation [part 2/2]')
23
23
  install_newrelic_job_tracer
24
- NewRelic::Control.instance.init_plugin :dispatcher => :delayed_job
24
+ NewRelic::Control.instance.init_plugin(:dispatcher => :delayed_job)
25
25
  else
26
26
  NewRelic::Agent.logger.warn("Did not find a Delayed::Job class responding to invoke_job, aborting DJ instrumentation")
27
27
  end
@@ -17,7 +17,7 @@ module NewRelic
17
17
  end
18
18
 
19
19
  def install_newrelic_job_tracer
20
- Delayed::Job.send :prepend, ::NewRelic::Agent::Instrumentation::DelayedJobTracerPrepend
20
+ Delayed::Job.send(:prepend, ::NewRelic::Agent::Instrumentation::DelayedJobTracerPrepend)
21
21
  end
22
22
  end
23
23
  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
  require_relative 'delayed_job/chain'
6
7
  require_relative 'delayed_job/prepend'
@@ -21,7 +22,7 @@ module NewRelic
21
22
  LEGACY_DJ_DEFAULT_CLASS = '(unknown class)'.freeze
22
23
 
23
24
  def name_from_payload(payload_object)
24
- if payload_object.is_a? ::Delayed::PerformableMethod
25
+ if payload_object.is_a?(::Delayed::PerformableMethod)
25
26
  # payload_object contains a reference to an object
26
27
  # that received an asynchronous method call via .delay or .handle_asynchronously
27
28
  "#{object_name(payload_object)}#{delimiter(payload_object)}#{method_name(payload_object)}"
@@ -83,7 +84,7 @@ DependencyDetection.defer do
83
84
  end
84
85
 
85
86
  executes do
86
- ::NewRelic::Agent.logger.info 'Installing DelayedJob instrumentation [part 1/2]'
87
+ ::NewRelic::Agent.logger.info('Installing DelayedJob instrumentation [part 1/2]')
87
88
  end
88
89
 
89
90
  executes do
@@ -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
  module ::Excon
6
7
  module Middleware
@@ -25,7 +26,7 @@ module ::Excon
25
26
  procedure: wrapped_request.method
26
27
  )
27
28
 
28
- segment.add_request_headers wrapped_request
29
+ segment.add_request_headers(wrapped_request)
29
30
 
30
31
  datum[:connection].instance_variable_set(TRACE_DATA_IVAR, segment)
31
32
  end
@@ -54,7 +55,7 @@ module ::Excon
54
55
 
55
56
  if datum[:response]
56
57
  wrapped_response = ::NewRelic::Agent::HTTPClients::ExconHTTPResponse.new(datum[:response])
57
- segment.process_response_headers wrapped_response
58
+ segment.process_response_headers(wrapped_response)
58
59
  end
59
60
  ensure
60
61
  segment.finish if segment
@@ -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
  DependencyDetection.defer do
6
7
  named :excon
@@ -40,7 +41,7 @@ DependencyDetection.defer do
40
41
  end
41
42
 
42
43
  def install_middleware_excon_instrumentation
43
- ::NewRelic::Agent.logger.info 'Installing middleware-based Excon instrumentation'
44
+ ::NewRelic::Agent.logger.info('Installing middleware-based Excon instrumentation')
44
45
  require 'new_relic/agent/instrumentation/excon/middleware'
45
46
  defaults = Excon.defaults
46
47
 
@@ -1,22 +1,23 @@
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::Agent::Instrumentation
6
7
  module Grape
7
8
  module Chain
8
9
  def self.instrument!
9
10
  Grape::Instrumentation.instrumented_class.class_eval do
10
- def call_with_new_relic env
11
+ def call_with_new_relic(env)
11
12
  begin
12
- call_without_new_relic env
13
+ call_without_new_relic(env)
13
14
  ensure
14
- Grape::Instrumentation.capture_transaction env, self
15
+ Grape::Instrumentation.capture_transaction(env, self)
15
16
  end
16
17
  end
17
18
 
18
- alias_method :call_without_new_relic, :call
19
- alias_method :call, :call_with_new_relic
19
+ alias_method(:call_without_new_relic, :call)
20
+ alias_method(:call, :call_with_new_relic)
20
21
  end
21
22
  end
22
23
  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
  require 'new_relic/agent/parameter_filtering'
6
7
 
@@ -15,7 +16,7 @@ module NewRelic::Agent::Instrumentation
15
16
  defined?(::Grape::API::Instance) ? ::Grape::API::Instance : ::Grape::API
16
17
  end
17
18
 
18
- def capture_transaction env, context
19
+ def capture_transaction(env, context)
19
20
  begin
20
21
  endpoint = env[API_ENDPOINT]
21
22
  version = env[API_VERSION]
@@ -29,10 +30,10 @@ module NewRelic::Agent::Instrumentation
29
30
 
30
31
  def prepare!
31
32
  if defined?(::Grape::VERSION) && Gem::Version.new(::Grape::VERSION) >= Gem::Version.new("0.16.0")
32
- send :remove_method, :name_for_transaction_deprecated
33
+ send(:remove_method, :name_for_transaction_deprecated)
33
34
  else
34
- send :remove_method, :name_for_transaction
35
- send :alias_method, :name_for_transaction, :name_for_transaction_deprecated
35
+ send(:remove_method, :name_for_transaction)
36
+ send(:alias_method, :name_for_transaction, :name_for_transaction_deprecated)
36
37
  end
37
38
  end
38
39
 
@@ -1,15 +1,16 @@
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::Agent::Instrumentation
6
7
  module Grape
7
8
  module Prepend
8
- def call env
9
+ def call(env)
9
10
  begin
10
- super env
11
+ super(env)
11
12
  ensure
12
- Grape::Instrumentation.capture_transaction env, self
13
+ Grape::Instrumentation.capture_transaction(env, self)
13
14
  end
14
15
  end
15
16
  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
  require_relative 'grape/instrumentation'
6
7
  require_relative 'grape/chain'
@@ -0,0 +1,106 @@
1
+ # encoding: utf-8
2
+ # frozen_string_literal: true
3
+ # This file is distributed under New Relic's license terms.
4
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
5
+
6
+ require_relative 'instrumentation'
7
+
8
+ module NewRelic::Agent::Instrumentation
9
+ module GRPC
10
+ module Client
11
+ module Chain
12
+ def self.instrument!
13
+ ::GRPC::ClientStub.class_eval do
14
+ include NewRelic::Agent::Instrumentation::GRPC::Client
15
+
16
+ def initialize_with_newrelic_trace(*args)
17
+ @trace_with_newrelic = trace_with_newrelic?(args.first)
18
+ initialize_without_newrelic_trace(*args)
19
+ end
20
+
21
+ alias initialize_without_newrelic_trace initialize
22
+ alias initialize initialize_with_newrelic_trace
23
+
24
+ def bidi_streamer_with_new_relic_trace(method, requests, marshal, unmarshal,
25
+ deadline: nil,
26
+ return_op: false,
27
+ parent: nil,
28
+ credentials: nil,
29
+ metadata: {},
30
+ &blk)
31
+
32
+ issue_request_with_tracing(:bidi_streamer, method, requests, marshal, unmarshal,
33
+ deadline: deadline,
34
+ return_op: return_op,
35
+ parent: parent,
36
+ credentials: credentials,
37
+ metadata: metadata)
38
+
39
+ # TODO: gRPC - confirm that &blk is being invoked correctly
40
+ end
41
+
42
+ alias bidi_streamer_without_newrelic_trace bidi_streamer
43
+ alias bidi_streamer bidi_streamer_with_newrelic_trace
44
+
45
+ def client_streamer_with_newrelic_trace(method, requests, marshal, unmarshal,
46
+ deadline: nil,
47
+ return_op: false,
48
+ parent: nil,
49
+ credentials: nil,
50
+ metadata: {})
51
+
52
+ issue_request_with_tracing(:client_streamer, method, requests, marshal, unmarshal,
53
+ deadline: deadline,
54
+ return_op: return_op,
55
+ parent: parent,
56
+ credentials: credentials,
57
+ metadata: metadata)
58
+ end
59
+
60
+ alias client_streamer_without_newrelic_trace client_streamer
61
+ alias client_streamer client_streamer_with_newrelic_trace
62
+
63
+ def request_response_with_newrelic_trace(method, req, marshal, unmarshal,
64
+ deadline: nil,
65
+ return_op: false,
66
+ parent: nil,
67
+ credentials: nil,
68
+ metadata: {})
69
+
70
+ issue_request_with_tracing(:request_response, method, req, marshal, unmarshal,
71
+ deadline: deadline,
72
+ return_op: return_op,
73
+ parent: parent,
74
+ credentials: credentials,
75
+ metadata: metadata)
76
+ end
77
+
78
+ alias request_response_without_newrelic_trace request_response
79
+ alias request_response request_response_with_newrelic_trace
80
+
81
+ def server_streamer_with_newrelic_trace(method, req, marshal, unmarshal,
82
+ deadline: nil,
83
+ return_op: false,
84
+ parent: nil,
85
+ credentials: nil,
86
+ metadata: {},
87
+ &blk)
88
+
89
+ issue_request_with_tracing(:server_streamer, method, req, marshal, unmarshal,
90
+ deadline: deadline,
91
+ return_op: return_op,
92
+ parent: parent,
93
+ credentials: credentials,
94
+ metadata: metadata)
95
+
96
+ # TODO: gRPC - confirm that &blk is being invoked correctly
97
+ end
98
+
99
+ alias server_streamer_without_newrelic_trace server_streamer
100
+ alias server_streamer server_streamer_with_newrelic_trace
101
+ end
102
+ end
103
+ end
104
+ end
105
+ end
106
+ end
@@ -0,0 +1,88 @@
1
+ # encoding: utf-8
2
+ # frozen_string_literal: true
3
+ # This file is distributed under New Relic's license terms.
4
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
5
+
6
+ require_relative 'request_wrapper'
7
+ require_relative '../helper'
8
+
9
+ module NewRelic
10
+ module Agent
11
+ module Instrumentation
12
+ module GRPC
13
+ module Client
14
+ include NewRelic::Agent::Instrumentation::GRPC::Helper
15
+
16
+ def issue_request_with_tracing(grpc_type, method, requests, marshal, unmarshal,
17
+ deadline:, return_op:, parent:, credentials:, metadata:)
18
+ return yield unless trace_with_newrelic?
19
+
20
+ segment = request_segment(method)
21
+ request_wrapper = NewRelic::Agent::Instrumentation::GRPC::Client::RequestWrapper.new(@host)
22
+ segment.add_request_headers(request_wrapper)
23
+ metadata.merge!(request_wrapper.instance_variable_get(:@newrelic_metadata))
24
+ grpc_message = nil
25
+ grpc_status = 0
26
+
27
+ NewRelic::Agent.disable_all_tracing do
28
+ begin
29
+ yield
30
+ rescue => e
31
+ NewRelic::Agent.notice_error(e)
32
+ grpc_status, grpc_message = grpc_status_and_message_from_exception(e)
33
+ raise
34
+ end
35
+ end
36
+ ensure
37
+ add_attributes(segment, grpc_message: grpc_message, grpc_status: grpc_status, grpc_type: grpc_type)
38
+ segment.finish if segment
39
+ end
40
+
41
+ private
42
+
43
+ def add_attributes(segment, attributes_hash)
44
+ return unless segment
45
+
46
+ attributes_hash.each do |attr, value|
47
+ segment.add_agent_attribute(attr, value)
48
+ end
49
+ segment.record_agent_attributes = true
50
+ end
51
+
52
+ def grpc_status_and_message_from_exception(exception)
53
+ return unless exception.message =~ /^(\d+):(\w+)\./
54
+
55
+ [Regexp.last_match(1).to_i, Regexp.last_match(2)]
56
+ end
57
+
58
+ def request_segment(method)
59
+ cleaned = cleaned_method(method)
60
+ NewRelic::Agent::Tracer.start_external_request_segment(
61
+ library: 'gRPC',
62
+ uri: method_uri(cleaned),
63
+ procedure: cleaned
64
+ )
65
+ end
66
+
67
+ def method_uri(method)
68
+ return unless @host && method
69
+
70
+ "grpc://#{@host}/#{method}"
71
+ end
72
+
73
+ def trace_with_newrelic?(host = nil)
74
+ return false if self.class.name.eql?('GRPC::InterceptorRegistry')
75
+
76
+ do_trace = instance_variable_get(:@trace_with_newrelic)
77
+ return do_trace unless do_trace.nil? # check for nil, not falsey
78
+
79
+ host ||= @host
80
+ return false unless host && !host_denylisted?(host)
81
+
82
+ true
83
+ end
84
+ end
85
+ end
86
+ end
87
+ end
88
+ end
@@ -0,0 +1,117 @@
1
+ # encoding: utf-8
2
+ # frozen_string_literal: true
3
+ # This file is distributed under New Relic's license terms.
4
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
5
+
6
+ require_relative 'instrumentation'
7
+
8
+ module NewRelic
9
+ module Agent
10
+ module Instrumentation
11
+ module GRPC
12
+ module Client
13
+ module Prepend
14
+ include NewRelic::Agent::Instrumentation::GRPC::Client
15
+
16
+ def initialize(*args)
17
+ @trace_with_newrelic = trace_with_newrelic?(args.first)
18
+ super(*args)
19
+ end
20
+
21
+ def bidi_streamer(method, requests, marshal, unmarshal,
22
+ deadline: nil,
23
+ return_op: false,
24
+ parent: nil,
25
+ credentials: nil,
26
+ metadata: {},
27
+ &blk)
28
+
29
+ issue_request_with_tracing(:bidi_streamer, method, requests, marshal, unmarshal,
30
+ deadline: deadline,
31
+ return_op: return_op,
32
+ parent: parent,
33
+ credentials: credentials,
34
+ metadata: metadata) do
35
+ super(method, requests, marshal, unmarshal,
36
+ deadline: deadline,
37
+ return_op: return_op,
38
+ parent: parent,
39
+ credentials: credentials,
40
+ metadata: metadata,
41
+ &blk)
42
+ end
43
+ end
44
+
45
+ def client_streamer(method, requests, marshal, unmarshal,
46
+ deadline: nil,
47
+ return_op: false,
48
+ parent: nil,
49
+ credentials: nil,
50
+ metadata: {})
51
+
52
+ issue_request_with_tracing(:client_streamer, method, requests, marshal, unmarshal,
53
+ deadline: deadline,
54
+ return_op: return_op,
55
+ parent: parent,
56
+ credentials: credentials,
57
+ metadata: metadata) do
58
+ super(method, requests, marshal, unmarshal,
59
+ deadline: deadline,
60
+ return_op: return_op,
61
+ parent: parent,
62
+ credentials: credentials,
63
+ metadata: metadata)
64
+ end
65
+ end
66
+
67
+ def request_response(method, req, marshal, unmarshal,
68
+ deadline: nil,
69
+ return_op: false,
70
+ parent: nil,
71
+ credentials: nil,
72
+ metadata: {})
73
+
74
+ issue_request_with_tracing(:request_response, method, req, marshal, unmarshal,
75
+ deadline: deadline,
76
+ return_op: return_op,
77
+ parent: parent,
78
+ credentials: credentials,
79
+ metadata: metadata) do
80
+ super(method, req, marshal, unmarshal,
81
+ deadline: deadline,
82
+ return_op: return_op,
83
+ parent: parent,
84
+ credentials: credentials,
85
+ metadata: metadata)
86
+ end
87
+ end
88
+
89
+ def server_streamer(method, req, marshal, unmarshal,
90
+ deadline: nil,
91
+ return_op: false,
92
+ parent: nil,
93
+ credentials: nil,
94
+ metadata: {},
95
+ &blk)
96
+
97
+ issue_request_with_tracing(:server_streamer, method, req, marshal, unmarshal,
98
+ deadline: deadline,
99
+ return_op: return_op,
100
+ parent: parent,
101
+ credentials: credentials,
102
+ metadata: metadata) do
103
+ super(method, req, marshal, unmarshal,
104
+ deadline: deadline,
105
+ return_op: return_op,
106
+ parent: parent,
107
+ credentials: credentials,
108
+ metadata: metadata,
109
+ &blk)
110
+ end
111
+ end
112
+ end
113
+ end
114
+ end
115
+ end
116
+ end
117
+ end