newrelic_rpm 5.7.0.350 → 9.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (476) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +15 -1
  3. data/.rubocop.yml +1919 -0
  4. data/.rubocop_todo.yml +100 -0
  5. data/.simplecov +15 -0
  6. data/.snyk +11 -0
  7. data/.yardopts +2 -0
  8. data/Brewfile +12 -0
  9. data/CHANGELOG.md +4056 -2339
  10. data/CONTRIBUTING.md +132 -19
  11. data/DOCKER.md +167 -0
  12. data/Dockerfile +10 -0
  13. data/Gemfile +5 -2
  14. data/Guardfile +22 -4
  15. data/LICENSE +202 -38
  16. data/README.md +87 -87
  17. data/Rakefile +27 -27
  18. data/THIRD_PARTY_NOTICES.md +28 -0
  19. data/Thorfile +5 -0
  20. data/bin/newrelic +3 -2
  21. data/bin/newrelic_cmd +1 -0
  22. data/bin/nrdebug +77 -54
  23. data/config.dot +5 -5
  24. data/docker-compose.yml +107 -0
  25. data/init.rb +5 -7
  26. data/install.rb +3 -3
  27. data/lefthook.yml +9 -0
  28. data/lib/new_relic/agent/adaptive_sampler.rb +14 -10
  29. data/lib/new_relic/agent/agent.rb +125 -969
  30. data/lib/new_relic/agent/agent_helpers/connect.rb +227 -0
  31. data/lib/new_relic/agent/agent_helpers/harvest.rb +153 -0
  32. data/lib/new_relic/agent/agent_helpers/shutdown.rb +72 -0
  33. data/lib/new_relic/agent/agent_helpers/special_startup.rb +74 -0
  34. data/lib/new_relic/agent/agent_helpers/start_worker_thread.rb +167 -0
  35. data/lib/new_relic/agent/agent_helpers/startup.rb +202 -0
  36. data/lib/new_relic/agent/agent_helpers/transmit.rb +76 -0
  37. data/lib/new_relic/agent/agent_logger.rb +26 -18
  38. data/lib/new_relic/agent/attribute_filter.rb +69 -52
  39. data/lib/new_relic/agent/attribute_processing.rb +8 -8
  40. data/lib/new_relic/agent/attributes.rb +153 -0
  41. data/lib/new_relic/agent/audit_logger.rb +19 -4
  42. data/lib/new_relic/agent/autostart.rb +34 -28
  43. data/lib/new_relic/agent/chained_call.rb +2 -2
  44. data/lib/new_relic/agent/commands/agent_command.rb +4 -4
  45. data/lib/new_relic/agent/commands/agent_command_router.rb +15 -33
  46. data/lib/new_relic/agent/commands/thread_profiler_session.rb +13 -11
  47. data/lib/new_relic/agent/configuration/default_source.rb +1480 -1053
  48. data/lib/new_relic/agent/configuration/dotted_hash.rb +7 -6
  49. data/lib/new_relic/agent/configuration/environment_source.rb +15 -11
  50. data/lib/new_relic/agent/configuration/event_harvest_config.rb +68 -0
  51. data/lib/new_relic/agent/configuration/high_security_source.rb +9 -9
  52. data/lib/new_relic/agent/configuration/manager.rb +96 -79
  53. data/lib/new_relic/agent/configuration/manual_source.rb +2 -2
  54. data/lib/new_relic/agent/configuration/mask_defaults.rb +4 -4
  55. data/lib/new_relic/agent/configuration/security_policy_source.rb +83 -86
  56. data/lib/new_relic/agent/configuration/server_source.rb +49 -12
  57. data/lib/new_relic/agent/configuration/yaml_source.rb +42 -13
  58. data/lib/new_relic/agent/configuration.rb +2 -2
  59. data/lib/new_relic/agent/connect/request_builder.rb +61 -0
  60. data/lib/new_relic/agent/connect/response_handler.rb +58 -0
  61. data/lib/new_relic/agent/custom_event_aggregator.rb +15 -15
  62. data/lib/new_relic/agent/database/explain_plan_helpers.rb +5 -6
  63. data/lib/new_relic/agent/database/obfuscation_helpers.rb +16 -15
  64. data/lib/new_relic/agent/database/obfuscator.rb +3 -3
  65. data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +4 -4
  66. data/lib/new_relic/agent/database.rb +44 -53
  67. data/lib/new_relic/agent/database_adapter.rb +35 -0
  68. data/lib/new_relic/agent/datastores/metric_helper.rb +18 -20
  69. data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +9 -8
  70. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +7 -11
  71. data/lib/new_relic/agent/datastores/mongo.rb +7 -12
  72. data/lib/new_relic/agent/datastores/nosql_obfuscator.rb +41 -0
  73. data/lib/new_relic/agent/datastores/redis.rb +6 -12
  74. data/lib/new_relic/agent/datastores.rb +19 -23
  75. data/lib/new_relic/agent/deprecator.rb +2 -2
  76. data/lib/new_relic/agent/{cross_app_payload.rb → distributed_tracing/cross_app_payload.rb} +13 -12
  77. data/lib/new_relic/agent/{cross_app_tracing.rb → distributed_tracing/cross_app_tracing.rb} +87 -66
  78. data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +84 -0
  79. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +75 -0
  80. data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +163 -0
  81. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +38 -0
  82. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +245 -0
  83. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +127 -0
  84. data/lib/new_relic/agent/distributed_tracing.rb +113 -32
  85. data/lib/new_relic/agent/encoding_normalizer.rb +5 -3
  86. data/lib/new_relic/agent/error_collector.rb +99 -63
  87. data/lib/new_relic/agent/error_event_aggregator.rb +10 -8
  88. data/lib/new_relic/agent/error_filter.rb +174 -0
  89. data/lib/new_relic/agent/error_trace_aggregator.rb +6 -4
  90. data/lib/new_relic/agent/event_aggregator.rb +43 -48
  91. data/lib/new_relic/agent/event_buffer.rb +8 -9
  92. data/lib/new_relic/agent/event_listener.rb +2 -3
  93. data/lib/new_relic/agent/event_loop.rb +27 -25
  94. data/lib/new_relic/agent/external.rb +20 -51
  95. data/lib/new_relic/agent/guid_generator.rb +30 -0
  96. data/lib/new_relic/agent/harvester.rb +5 -6
  97. data/lib/new_relic/agent/heap.rb +8 -10
  98. data/lib/new_relic/agent/hostname.rb +26 -5
  99. data/lib/new_relic/agent/http_clients/abstract.rb +81 -0
  100. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +26 -26
  101. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +31 -17
  102. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +18 -23
  103. data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +12 -15
  104. data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +24 -8
  105. data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +9 -12
  106. data/lib/new_relic/agent/http_clients/uri_util.rb +12 -13
  107. data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +22 -52
  108. data/lib/new_relic/agent/instrumentation/action_controller_other_subscriber.rb +39 -0
  109. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +59 -72
  110. data/lib/new_relic/agent/instrumentation/action_dispatch.rb +31 -0
  111. data/lib/new_relic/agent/instrumentation/action_dispatch_subscriber.rb +64 -0
  112. data/lib/new_relic/agent/instrumentation/action_mailbox.rb +30 -0
  113. data/lib/new_relic/agent/instrumentation/action_mailbox_subscriber.rb +33 -0
  114. data/lib/new_relic/agent/instrumentation/action_mailer.rb +30 -0
  115. data/lib/new_relic/agent/instrumentation/action_mailer_subscriber.rb +85 -0
  116. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +86 -62
  117. data/lib/new_relic/agent/instrumentation/active_job.rb +38 -19
  118. data/lib/new_relic/agent/instrumentation/active_job_subscriber.rb +41 -0
  119. data/lib/new_relic/agent/instrumentation/active_merchant.rb +21 -7
  120. data/lib/new_relic/agent/instrumentation/active_record.rb +95 -46
  121. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +82 -61
  122. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +155 -0
  123. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +36 -12
  124. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +69 -64
  125. data/lib/new_relic/agent/instrumentation/active_storage.rb +8 -4
  126. data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +11 -32
  127. data/lib/new_relic/agent/instrumentation/active_support.rb +27 -0
  128. data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +23 -0
  129. data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +20 -0
  130. data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +12 -0
  131. data/lib/new_relic/agent/instrumentation/active_support_logger.rb +24 -0
  132. data/lib/new_relic/agent/instrumentation/active_support_subscriber.rb +41 -0
  133. data/lib/new_relic/agent/instrumentation/bunny/chain.rb +45 -0
  134. data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +150 -0
  135. data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +35 -0
  136. data/lib/new_relic/agent/instrumentation/bunny.rb +14 -134
  137. data/lib/new_relic/agent/instrumentation/concurrent_ruby/chain.rb +36 -0
  138. data/lib/new_relic/agent/instrumentation/concurrent_ruby/instrumentation.rb +21 -0
  139. data/lib/new_relic/agent/instrumentation/concurrent_ruby/prepend.rb +27 -0
  140. data/lib/new_relic/agent/instrumentation/concurrent_ruby.rb +31 -0
  141. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +77 -61
  142. data/lib/new_relic/agent/instrumentation/curb/chain.rb +91 -0
  143. data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +221 -0
  144. data/lib/new_relic/agent/instrumentation/curb/prepend.rb +61 -0
  145. data/lib/new_relic/agent/instrumentation/curb.rb +15 -187
  146. data/lib/new_relic/agent/instrumentation/custom_events.rb +12 -0
  147. data/lib/new_relic/agent/instrumentation/custom_events_subscriber.rb +37 -0
  148. data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +35 -0
  149. data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +48 -0
  150. data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +33 -0
  151. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +30 -52
  152. data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
  153. data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +66 -0
  154. data/lib/new_relic/agent/instrumentation/elasticsearch/prepend.rb +13 -0
  155. data/lib/new_relic/agent/instrumentation/elasticsearch.rb +31 -0
  156. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +8 -7
  157. data/lib/new_relic/agent/instrumentation/excon.rb +29 -31
  158. data/lib/new_relic/agent/instrumentation/fiber/chain.rb +20 -0
  159. data/lib/new_relic/agent/instrumentation/fiber/instrumentation.rb +24 -0
  160. data/lib/new_relic/agent/instrumentation/fiber/prepend.rb +18 -0
  161. data/lib/new_relic/agent/instrumentation/fiber.rb +25 -0
  162. data/lib/new_relic/agent/instrumentation/grape/chain.rb +24 -0
  163. data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +100 -0
  164. data/lib/new_relic/agent/instrumentation/grape/prepend.rb +17 -0
  165. data/lib/new_relic/agent/instrumentation/grape.rb +16 -121
  166. data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +97 -0
  167. data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +89 -0
  168. data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +111 -0
  169. data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +30 -0
  170. data/lib/new_relic/agent/instrumentation/grpc/helper.rb +32 -0
  171. data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +69 -0
  172. data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +134 -0
  173. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +35 -0
  174. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +26 -0
  175. data/lib/new_relic/agent/instrumentation/grpc_client.rb +23 -0
  176. data/lib/new_relic/agent/instrumentation/grpc_server.rb +25 -0
  177. data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +24 -0
  178. data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +37 -0
  179. data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +15 -0
  180. data/lib/new_relic/agent/instrumentation/httpclient.rb +12 -32
  181. data/lib/new_relic/agent/instrumentation/httprb/chain.rb +22 -0
  182. data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +30 -0
  183. data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +15 -0
  184. data/lib/new_relic/agent/instrumentation/httprb.rb +29 -0
  185. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +5 -6
  186. data/lib/new_relic/agent/instrumentation/logger/chain.rb +21 -0
  187. data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +66 -0
  188. data/lib/new_relic/agent/instrumentation/logger/prepend.rb +13 -0
  189. data/lib/new_relic/agent/instrumentation/logger.rb +26 -0
  190. data/lib/new_relic/agent/instrumentation/memcache/chain.rb +15 -0
  191. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +58 -125
  192. data/lib/new_relic/agent/instrumentation/memcache/helper.rb +59 -0
  193. data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +90 -0
  194. data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +101 -0
  195. data/lib/new_relic/agent/instrumentation/memcache.rb +57 -71
  196. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +15 -14
  197. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +21 -14
  198. data/lib/new_relic/agent/instrumentation/mongo.rb +7 -132
  199. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +49 -13
  200. data/lib/new_relic/agent/instrumentation/net_http/chain.rb +24 -0
  201. data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +40 -0
  202. data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +21 -0
  203. data/lib/new_relic/agent/instrumentation/net_http.rb +44 -0
  204. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +142 -0
  205. data/lib/new_relic/agent/instrumentation/padrino/chain.rb +38 -0
  206. data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +28 -0
  207. data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +20 -0
  208. data/lib/new_relic/agent/instrumentation/padrino.rb +22 -58
  209. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +7 -7
  210. data/lib/new_relic/agent/instrumentation/queue_time.rb +9 -10
  211. data/lib/new_relic/agent/instrumentation/rack/chain.rb +66 -0
  212. data/lib/new_relic/agent/instrumentation/rack/helpers.rb +33 -0
  213. data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +75 -0
  214. data/lib/new_relic/agent/instrumentation/rack/prepend.rb +43 -0
  215. data/lib/new_relic/agent/instrumentation/rack.rb +33 -141
  216. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +19 -55
  217. data/lib/new_relic/agent/instrumentation/rails_middleware.rb +5 -5
  218. data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +36 -0
  219. data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +45 -0
  220. data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +30 -0
  221. data/lib/new_relic/agent/instrumentation/rails_notifications/custom_events.rb +30 -0
  222. data/lib/new_relic/agent/instrumentation/rake/chain.rb +20 -0
  223. data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +142 -0
  224. data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
  225. data/lib/new_relic/agent/instrumentation/rake.rb +18 -159
  226. data/lib/new_relic/agent/instrumentation/redis/chain.rb +45 -0
  227. data/lib/new_relic/agent/instrumentation/redis/constants.rb +17 -0
  228. data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +93 -0
  229. data/lib/new_relic/agent/instrumentation/redis/middleware.rb +16 -0
  230. data/lib/new_relic/agent/instrumentation/redis/prepend.rb +29 -0
  231. data/lib/new_relic/agent/instrumentation/redis.rb +20 -103
  232. data/lib/new_relic/agent/instrumentation/resque/chain.rb +21 -0
  233. data/lib/new_relic/agent/instrumentation/resque/helper.rb +19 -0
  234. data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +34 -0
  235. data/lib/new_relic/agent/instrumentation/resque/prepend.rb +15 -0
  236. data/lib/new_relic/agent/instrumentation/resque.rb +33 -41
  237. data/lib/new_relic/agent/instrumentation/sequel.rb +17 -20
  238. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +3 -3
  239. data/lib/new_relic/agent/instrumentation/sidekiq/client.rb +20 -0
  240. data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +30 -0
  241. data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +37 -0
  242. data/lib/new_relic/agent/instrumentation/sidekiq.rb +29 -46
  243. data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +55 -0
  244. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +31 -37
  245. data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +125 -0
  246. data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
  247. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +3 -3
  248. data/lib/new_relic/agent/instrumentation/sinatra.rb +35 -165
  249. data/lib/new_relic/agent/instrumentation/thread/chain.rb +24 -0
  250. data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +28 -0
  251. data/lib/new_relic/agent/instrumentation/thread/prepend.rb +22 -0
  252. data/lib/new_relic/agent/instrumentation/thread.rb +20 -0
  253. data/lib/new_relic/agent/instrumentation/tilt/chain.rb +24 -0
  254. data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +41 -0
  255. data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +13 -0
  256. data/lib/new_relic/agent/instrumentation/tilt.rb +25 -0
  257. data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +22 -0
  258. data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +80 -0
  259. data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +14 -0
  260. data/lib/new_relic/agent/instrumentation/typhoeus.rb +14 -76
  261. data/lib/new_relic/agent/instrumentation.rb +2 -2
  262. data/lib/new_relic/agent/internal_agent_error.rb +3 -3
  263. data/lib/new_relic/agent/javascript_instrumentor.rb +51 -45
  264. data/lib/new_relic/agent/linking_metadata.rb +44 -0
  265. data/lib/new_relic/agent/local_log_decorator.rb +37 -0
  266. data/lib/new_relic/agent/log_event_aggregator.rb +235 -0
  267. data/lib/new_relic/agent/log_once.rb +2 -2
  268. data/lib/new_relic/agent/log_priority.rb +20 -0
  269. data/lib/new_relic/agent/logging.rb +142 -0
  270. data/lib/new_relic/agent/memory_logger.rb +3 -3
  271. data/lib/new_relic/agent/messaging.rb +81 -164
  272. data/lib/new_relic/agent/method_tracer.rb +152 -145
  273. data/lib/new_relic/agent/method_tracer_helpers.rb +90 -13
  274. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +117 -0
  275. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +28 -0
  276. data/lib/new_relic/agent/{inbound_request_monitor.rb → monitors/inbound_request_monitor.rb} +5 -6
  277. data/lib/new_relic/agent/{synthetics_monitor.rb → monitors/synthetics_monitor.rb} +9 -15
  278. data/lib/new_relic/agent/monitors.rb +26 -0
  279. data/lib/new_relic/agent/new_relic_service/encoders.rb +7 -7
  280. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +6 -7
  281. data/lib/new_relic/agent/new_relic_service/marshaller.rb +8 -29
  282. data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +5 -5
  283. data/lib/new_relic/agent/new_relic_service.rb +282 -166
  284. data/lib/new_relic/agent/noticeable_error.rb +19 -0
  285. data/lib/new_relic/agent/null_logger.rb +8 -4
  286. data/lib/new_relic/agent/obfuscator.rb +9 -11
  287. data/lib/new_relic/agent/parameter_filtering.rb +35 -8
  288. data/lib/new_relic/agent/payload_metric_mapping.rb +10 -11
  289. data/lib/new_relic/agent/pipe_channel_manager.rb +28 -18
  290. data/lib/new_relic/agent/pipe_service.rb +9 -6
  291. data/lib/new_relic/agent/prepend_supportability.rb +3 -3
  292. data/lib/new_relic/agent/priority_sampled_buffer.rb +16 -14
  293. data/lib/new_relic/agent/range_extensions.rb +9 -29
  294. data/lib/new_relic/agent/rules_engine/replacement_rule.rb +12 -12
  295. data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +13 -14
  296. data/lib/new_relic/agent/rules_engine.rb +6 -5
  297. data/lib/new_relic/agent/sampler.rb +4 -5
  298. data/lib/new_relic/agent/sampler_collection.rb +4 -5
  299. data/lib/new_relic/agent/samplers/cpu_sampler.rb +4 -3
  300. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +14 -11
  301. data/lib/new_relic/agent/samplers/memory_sampler.rb +26 -15
  302. data/lib/new_relic/agent/samplers/object_sampler.rb +2 -2
  303. data/lib/new_relic/agent/samplers/vm_sampler.rb +22 -20
  304. data/lib/new_relic/agent/span_event_aggregator.rb +14 -16
  305. data/lib/new_relic/agent/span_event_primitive.rb +118 -58
  306. data/lib/new_relic/agent/sql_sampler.rb +25 -25
  307. data/lib/new_relic/agent/stats.rb +79 -42
  308. data/lib/new_relic/agent/stats_engine/gc_profiler.rb +11 -13
  309. data/lib/new_relic/agent/stats_engine/stats_hash.rb +13 -14
  310. data/lib/new_relic/agent/stats_engine.rb +11 -11
  311. data/lib/new_relic/agent/synthetics_event_aggregator.rb +8 -9
  312. data/lib/new_relic/agent/system_info.rb +100 -66
  313. data/lib/new_relic/agent/threading/agent_thread.rb +20 -16
  314. data/lib/new_relic/agent/threading/backtrace_node.rb +13 -14
  315. data/lib/new_relic/agent/threading/backtrace_service.rb +18 -18
  316. data/lib/new_relic/agent/threading/thread_profile.rb +31 -45
  317. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +2 -2
  318. data/lib/new_relic/agent/tracer.rb +513 -0
  319. data/lib/new_relic/agent/transaction/abstract_segment.rb +131 -41
  320. data/lib/new_relic/agent/transaction/datastore_segment.rb +22 -18
  321. data/lib/new_relic/agent/transaction/distributed_tracer.rb +184 -0
  322. data/lib/new_relic/agent/transaction/distributed_tracing.rb +72 -163
  323. data/lib/new_relic/agent/transaction/external_request_segment.rb +66 -63
  324. data/lib/new_relic/agent/transaction/message_broker_segment.rb +34 -46
  325. data/lib/new_relic/agent/transaction/request_attributes.rb +36 -36
  326. data/lib/new_relic/agent/transaction/segment.rb +46 -10
  327. data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +2 -4
  328. data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +2 -2
  329. data/lib/new_relic/agent/transaction/trace.rb +21 -24
  330. data/lib/new_relic/agent/transaction/trace_builder.rb +11 -12
  331. data/lib/new_relic/agent/transaction/trace_context.rb +168 -0
  332. data/lib/new_relic/agent/transaction/trace_node.rb +31 -28
  333. data/lib/new_relic/agent/transaction/tracing.rb +15 -111
  334. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +6 -6
  335. data/lib/new_relic/agent/transaction.rb +252 -259
  336. data/lib/new_relic/agent/transaction_error_primitive.rb +34 -37
  337. data/lib/new_relic/agent/transaction_event_aggregator.rb +13 -13
  338. data/lib/new_relic/agent/transaction_event_primitive.rb +44 -56
  339. data/lib/new_relic/agent/transaction_event_recorder.rb +17 -16
  340. data/lib/new_relic/agent/transaction_metrics.rb +11 -10
  341. data/lib/new_relic/agent/transaction_sampler.rb +7 -12
  342. data/lib/new_relic/agent/transaction_time_aggregator.rb +41 -26
  343. data/lib/new_relic/agent/utilization/aws.rb +34 -4
  344. data/lib/new_relic/agent/utilization/azure.rb +4 -4
  345. data/lib/new_relic/agent/utilization/gcp.rb +8 -8
  346. data/lib/new_relic/agent/utilization/pcf.rb +6 -5
  347. data/lib/new_relic/agent/utilization/vendor.rb +44 -29
  348. data/lib/new_relic/agent/utilization_data.rb +43 -6
  349. data/lib/new_relic/agent/vm/jruby_vm.rb +2 -2
  350. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +3 -3
  351. data/lib/new_relic/agent/vm/mri_vm.rb +46 -19
  352. data/lib/new_relic/agent/vm/snapshot.rb +6 -6
  353. data/lib/new_relic/agent/vm.rb +2 -2
  354. data/lib/new_relic/agent/worker_loop.rb +11 -13
  355. data/lib/new_relic/agent.rb +151 -79
  356. data/lib/new_relic/cli/command.rb +21 -23
  357. data/lib/new_relic/cli/commands/deployments.rb +94 -45
  358. data/lib/new_relic/cli/commands/install.rb +24 -26
  359. data/lib/new_relic/coerce.rb +42 -15
  360. data/lib/new_relic/collection_helper.rb +51 -49
  361. data/lib/new_relic/constants.rb +39 -0
  362. data/lib/new_relic/control/class_methods.rb +11 -5
  363. data/lib/new_relic/control/frameworks/external.rb +3 -3
  364. data/lib/new_relic/control/frameworks/rails.rb +24 -18
  365. data/lib/new_relic/control/frameworks/rails3.rb +4 -5
  366. data/lib/new_relic/control/frameworks/rails4.rb +2 -2
  367. data/lib/new_relic/control/frameworks/rails_notifications.rb +14 -0
  368. data/lib/new_relic/control/frameworks/ruby.rb +4 -4
  369. data/lib/new_relic/control/frameworks/sinatra.rb +8 -2
  370. data/lib/new_relic/control/frameworks.rb +2 -2
  371. data/lib/new_relic/control/instance_methods.rb +33 -42
  372. data/lib/new_relic/control/instrumentation.rb +40 -12
  373. data/lib/new_relic/control/private_instance_methods.rb +48 -0
  374. data/lib/new_relic/control/server_methods.rb +4 -5
  375. data/lib/new_relic/control.rb +2 -3
  376. data/lib/new_relic/delayed_job_injection.rb +2 -2
  377. data/lib/new_relic/dependency_detection.rb +129 -18
  378. data/lib/new_relic/environment_report.rb +41 -35
  379. data/lib/new_relic/helper.rb +49 -8
  380. data/lib/new_relic/language_support.rb +30 -6
  381. data/lib/new_relic/latest_changes.rb +9 -8
  382. data/lib/new_relic/local_environment.rb +23 -27
  383. data/lib/new_relic/metric_data.rb +32 -27
  384. data/lib/new_relic/metric_spec.rb +9 -7
  385. data/lib/new_relic/noticed_error.rb +46 -33
  386. data/lib/new_relic/rack/agent_hooks.rb +2 -2
  387. data/lib/new_relic/rack/agent_middleware.rb +7 -5
  388. data/lib/new_relic/rack/browser_monitoring.rb +134 -117
  389. data/lib/new_relic/rack.rb +2 -2
  390. data/lib/new_relic/recipes/capistrano3.rb +4 -62
  391. data/lib/new_relic/recipes/capistrano_legacy.rb +24 -27
  392. data/lib/new_relic/recipes/helpers/send_deployment.rb +70 -0
  393. data/lib/new_relic/recipes.rb +2 -2
  394. data/lib/new_relic/supportability_helper.rb +21 -7
  395. data/lib/new_relic/traced_thread.rb +39 -0
  396. data/lib/new_relic/version.rb +7 -18
  397. data/lib/newrelic_rpm.rb +20 -33
  398. data/lib/sequel/extensions/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +16 -19
  399. data/lib/sequel/plugins/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +9 -15
  400. data/lib/tasks/all.rb +4 -4
  401. data/lib/tasks/config.rake +22 -118
  402. data/lib/tasks/coverage_report.rake +28 -0
  403. data/lib/tasks/helpers/config.html.erb +21 -0
  404. data/lib/tasks/helpers/format.rb +123 -0
  405. data/lib/tasks/helpers/matches.rb +12 -0
  406. data/lib/tasks/helpers/prompt.rb +24 -0
  407. data/lib/tasks/helpers/removers.rb +33 -0
  408. data/lib/tasks/install.rake +4 -0
  409. data/lib/tasks/instrumentation_generator/README.md +63 -0
  410. data/lib/tasks/instrumentation_generator/TODO.md +33 -0
  411. data/lib/tasks/instrumentation_generator/instrumentation.thor +121 -0
  412. data/lib/tasks/instrumentation_generator/templates/Envfile.tt +9 -0
  413. data/lib/tasks/instrumentation_generator/templates/chain.tt +22 -0
  414. data/lib/tasks/instrumentation_generator/templates/chain_method.tt +8 -0
  415. data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +29 -0
  416. data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +13 -0
  417. data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
  418. data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
  419. data/lib/tasks/instrumentation_generator/templates/prepend.tt +13 -0
  420. data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
  421. data/lib/tasks/instrumentation_generator/templates/test.tt +15 -0
  422. data/lib/tasks/multiverse.rake +4 -0
  423. data/lib/tasks/multiverse.rb +12 -5
  424. data/lib/tasks/newrelic.rb +2 -2
  425. data/lib/tasks/tests.rake +14 -14
  426. data/newrelic.yml +672 -3
  427. data/newrelic_rpm.gemspec +40 -31
  428. data/recipes/newrelic.rb +3 -3
  429. data/test/agent_helper.rb +419 -98
  430. metadata +238 -127
  431. data/.travis.yml +0 -228
  432. data/bin/mongrel_rpm +0 -33
  433. data/cert/cacert.pem +0 -1177
  434. data/lib/new_relic/agent/commands/xray_session.rb +0 -55
  435. data/lib/new_relic/agent/commands/xray_session_collection.rb +0 -161
  436. data/lib/new_relic/agent/cross_app_monitor.rb +0 -110
  437. data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
  438. data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +0 -53
  439. data/lib/new_relic/agent/distributed_trace_monitor.rb +0 -41
  440. data/lib/new_relic/agent/distributed_trace_payload.rb +0 -246
  441. data/lib/new_relic/agent/http_clients/abstract_request.rb +0 -31
  442. data/lib/new_relic/agent/instrumentation/active_record_4.rb +0 -42
  443. data/lib/new_relic/agent/instrumentation/active_record_5.rb +0 -41
  444. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +0 -74
  445. data/lib/new_relic/agent/instrumentation/authlogic.rb +0 -25
  446. data/lib/new_relic/agent/instrumentation/data_mapper.rb +0 -202
  447. data/lib/new_relic/agent/instrumentation/evented_subscriber.rb +0 -104
  448. data/lib/new_relic/agent/instrumentation/excon/connection.rb +0 -46
  449. data/lib/new_relic/agent/instrumentation/http.rb +0 -46
  450. data/lib/new_relic/agent/instrumentation/merb/controller.rb +0 -44
  451. data/lib/new_relic/agent/instrumentation/merb/errors.rb +0 -33
  452. data/lib/new_relic/agent/instrumentation/net.rb +0 -50
  453. data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +0 -125
  454. data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +0 -46
  455. data/lib/new_relic/agent/instrumentation/rails4/action_controller.rb +0 -32
  456. data/lib/new_relic/agent/instrumentation/rails4/action_view.rb +0 -27
  457. data/lib/new_relic/agent/instrumentation/rails5/action_cable.rb +0 -36
  458. data/lib/new_relic/agent/instrumentation/rails5/action_controller.rb +0 -33
  459. data/lib/new_relic/agent/instrumentation/rails5/action_view.rb +0 -27
  460. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +0 -26
  461. data/lib/new_relic/agent/instrumentation/sunspot.rb +0 -33
  462. data/lib/new_relic/agent/supported_versions.rb +0 -275
  463. data/lib/new_relic/agent/transaction/attributes.rb +0 -154
  464. data/lib/new_relic/agent/transaction/xray_sample_buffer.rb +0 -64
  465. data/lib/new_relic/agent/transaction_state.rb +0 -186
  466. data/lib/new_relic/build.rb +0 -2
  467. data/lib/new_relic/control/frameworks/merb.rb +0 -29
  468. data/lib/new_relic/control/frameworks/rails5.rb +0 -14
  469. data/lib/new_relic/metrics.rb +0 -13
  470. data/lib/tasks/config.html.erb +0 -32
  471. data/lib/tasks/versions.html.erb +0 -28
  472. data/lib/tasks/versions.postface.html +0 -8
  473. data/lib/tasks/versions.preface.html +0 -9
  474. data/lib/tasks/versions.rake +0 -65
  475. data/lib/tasks/versions.txt.erb +0 -14
  476. /data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
@@ -1,28 +1,23 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  module NewRelic
6
6
  module Agent
7
7
  module Datastores
8
8
  module Mongo
9
9
  def self.is_supported_version?
10
- # No version constant in < 2.0 versions of Mongo :(
11
- defined?(::Mongo) && (defined?(::Mongo::MongoClient) || is_monitoring_enabled?)
12
- end
13
-
14
- def self.is_monitoring_enabled?
15
- defined?(::Mongo::Monitoring)
10
+ defined?(::Mongo) && is_monitoring_enabled?
16
11
  end
17
12
 
18
13
  def self.is_unsupported_2x?
19
- defined?(::Mongo::VERSION) && Gem::Version.new(::Mongo::VERSION).segments[0] == 2 &&
14
+ defined?(::Mongo::VERSION) &&
15
+ Gem::Version.new(::Mongo::VERSION).segments[0] == 2 &&
20
16
  !self.is_monitoring_enabled?
21
17
  end
22
18
 
23
- def self.is_version_1_10_or_later?
24
- # Again, no VERSION constant in 1.x, so we have to rely on constant checks
25
- defined?(::Mongo::CollectionOperationWriter)
19
+ def self.is_monitoring_enabled?
20
+ defined?(::Mongo::Monitoring) # @since 2.1.0
26
21
  end
27
22
  end
28
23
  end
@@ -0,0 +1,41 @@
1
+ # This file is distributed under New Relic's license terms.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
5
+ module NewRelic
6
+ module Agent
7
+ module Datastores
8
+ module NosqlObfuscator
9
+ ALLOWLIST = [:operation].freeze
10
+
11
+ def self.obfuscate_statement(source, allowlist = ALLOWLIST)
12
+ if source.is_a?(Hash)
13
+ obfuscated = {}
14
+ source.each do |key, value|
15
+ if allowlist.include?(key)
16
+ obfuscated[key] = value
17
+ else
18
+ obfuscated[key] = obfuscate_value(value, allowlist)
19
+ end
20
+ end
21
+ obfuscated
22
+ else
23
+ obfuscate_value(source, allowlist)
24
+ end
25
+ end
26
+
27
+ QUESTION_MARK = '?'.freeze
28
+
29
+ def self.obfuscate_value(value, allowlist = ALLOWLIST)
30
+ if value.is_a?(Hash)
31
+ obfuscate_statement(value, allowlist)
32
+ elsif value.is_a?(Array)
33
+ value.map { |v| obfuscate_value(v, allowlist) }
34
+ else
35
+ QUESTION_MARK
36
+ end
37
+ end
38
+ end
39
+ end
40
+ end
41
+ end
@@ -1,20 +1,16 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  module NewRelic
6
6
  module Agent
7
7
  module Datastores
8
8
  module Redis
9
- MULTI_OPERATION = 'multi'
10
- PIPELINE_OPERATION = 'pipeline'
11
9
  BINARY_DATA_PLACEHOLDER = "<binary data>"
12
- PRODUCT_NAME = 'Redis'
13
- CONNECT = 'connect'
14
10
 
15
11
  MAXIMUM_COMMAND_LENGTH = 1000
16
12
  MAXIMUM_ARGUMENT_LENGTH = 64
17
- CHUNK_SIZE = (MAXIMUM_ARGUMENT_LENGTH - 5) / 2
13
+ CHUNK_SIZE = (MAXIMUM_ARGUMENT_LENGTH - 5) / 2
18
14
  PREFIX_RANGE = (0...CHUNK_SIZE)
19
15
  SUFFIX_RANGE = (-CHUNK_SIZE..-1)
20
16
 
@@ -29,20 +25,18 @@ module NewRelic
29
25
 
30
26
  def self.format_command(command_with_args)
31
27
  if Agent.config[:'transaction_tracer.record_redis_arguments']
32
- result = ""
28
+ result = String.new('')
33
29
 
34
30
  append_command_with_args(result, command_with_args)
35
31
 
36
32
  trim_result(result) if result.length >= MAXIMUM_COMMAND_LENGTH
37
33
  result.strip!
38
34
  result
39
- else
40
- nil
41
35
  end
42
36
  end
43
37
 
44
38
  def self.format_pipeline_commands(commands_with_args)
45
- result = ""
39
+ result = String.new('')
46
40
 
47
41
  commands_with_args.each do |command|
48
42
  if result.length >= MAXIMUM_COMMAND_LENGTH
@@ -121,7 +115,7 @@ module NewRelic
121
115
  end
122
116
 
123
117
  def self.trim_result(result)
124
- result.slice!((MAXIMUM_COMMAND_LENGTH-ELLIPSES.length)..-1)
118
+ result.slice!((MAXIMUM_COMMAND_LENGTH - ELLIPSES.length)..-1)
125
119
  result.strip!
126
120
  result << ELLIPSES
127
121
  end
@@ -1,6 +1,6 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  require 'new_relic/agent/datastores/metric_helper'
6
6
 
@@ -13,7 +13,6 @@ module NewRelic
13
13
  #
14
14
  # @api public
15
15
  module Datastores
16
-
17
16
  # @!group Tracing query methods
18
17
 
19
18
  # Add Datastore tracing to a method. This properly generates the metrics
@@ -21,7 +20,7 @@ module NewRelic
21
20
  # query content into Transaction Traces. Use wrap if you want to provide
22
21
  # that functionality.
23
22
  #
24
- # @param [Class] clazz the class to instrument
23
+ # @param [Class] klass the class to instrument
25
24
  #
26
25
  # @param [String, Symbol] method_name the name of instance method to
27
26
  # instrument
@@ -33,33 +32,33 @@ module NewRelic
33
32
  #
34
33
  # @api public
35
34
  #
36
- def self.trace(clazz, method_name, product, operation = method_name)
35
+ def self.trace(klass, method_name, product, operation = method_name)
37
36
  NewRelic::Agent.record_api_supportability_metric(:trace)
38
37
 
39
- clazz.class_eval do
38
+ klass.class_eval do
40
39
  method_name_without_newrelic = "#{method_name}_without_newrelic"
41
40
 
42
- if NewRelic::Helper.instance_methods_include?(clazz, method_name) &&
43
- !NewRelic::Helper.instance_methods_include?(clazz, method_name_without_newrelic)
41
+ if NewRelic::Helper.instance_methods_include?(klass, method_name) &&
42
+ !NewRelic::Helper.instance_methods_include?(klass, method_name_without_newrelic)
44
43
 
45
- visibility = NewRelic::Helper.instance_method_visibility(clazz, method_name)
44
+ visibility = NewRelic::Helper.instance_method_visibility(klass, method_name)
46
45
 
47
- alias_method method_name_without_newrelic, method_name
46
+ alias_method(method_name_without_newrelic, method_name)
48
47
 
49
48
  define_method(method_name) do |*args, &blk|
50
- segment = NewRelic::Agent::Transaction.start_datastore_segment(
49
+ segment = NewRelic::Agent::Tracer.start_datastore_segment(
51
50
  product: product,
52
51
  operation: operation
53
52
  )
54
53
  begin
55
54
  send(method_name_without_newrelic, *args, &blk)
56
55
  ensure
57
- segment.finish if segment
56
+ ::NewRelic::Agent::Transaction::Segment.finish(segment)
58
57
  end
59
58
  end
60
59
 
61
- send visibility, method_name
62
- send visibility, method_name_without_newrelic
60
+ send(visibility, method_name)
61
+ send(visibility, method_name_without_newrelic)
63
62
  end
64
63
  end
65
64
  end
@@ -112,7 +111,7 @@ module NewRelic
112
111
 
113
112
  return yield unless operation
114
113
 
115
- segment = NewRelic::Agent::Transaction.start_datastore_segment(
114
+ segment = NewRelic::Agent::Tracer.start_datastore_segment(
116
115
  product: product,
117
116
  operation: operation,
118
117
  collection: collection
@@ -123,11 +122,11 @@ module NewRelic
123
122
  ensure
124
123
  begin
125
124
  if callback
126
- elapsed_time = (Time.now - segment.start_time).to_f
127
- callback.call(result, segment.name, elapsed_time)
125
+ elapsed_time = Process.clock_gettime(Process::CLOCK_REALTIME) - segment.start_time
126
+ callback.call(result, segment.name, elapsed_time)
128
127
  end
129
128
  ensure
130
- segment.finish if segment
129
+ ::NewRelic::Agent::Transaction::Segment.finish(segment)
131
130
  end
132
131
  end
133
132
  end
@@ -163,8 +162,7 @@ module NewRelic
163
162
  def self.notice_sql(query, scoped_metric, elapsed)
164
163
  NewRelic::Agent.record_api_supportability_metric(:notice_sql)
165
164
 
166
- state = TransactionState.tl_get
167
- if (txn = state.current_transaction) && (segment = txn.current_segment) && segment.respond_to?(:notice_sql)
165
+ if (txn = Tracer.current_transaction) && (segment = txn.current_segment) && segment.respond_to?(:notice_sql)
168
166
  segment.notice_sql(query)
169
167
  end
170
168
  nil
@@ -198,13 +196,11 @@ module NewRelic
198
196
 
199
197
  # Settings may change eventually, but for now we follow the same
200
198
  # capture rules as SQL for non-SQL statements.
201
- state = TransactionState.tl_get
202
- if (txn = state.current_transaction) && (segment = txn.current_segment) && segment.respond_to?(:notice_nosql_statement)
199
+ if (txn = Tracer.current_transaction) && (segment = txn.current_segment) && segment.respond_to?(:notice_nosql_statement)
203
200
  segment.notice_nosql_statement(statement)
204
201
  end
205
202
  nil
206
203
  end
207
-
208
204
  end
209
205
  end
210
206
  end
@@ -1,6 +1,6 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  module NewRelic
6
6
  module Agent
@@ -1,6 +1,6 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
4
 
5
5
  module NewRelic
6
6
  module Agent
@@ -8,28 +8,29 @@ module NewRelic
8
8
  attr_reader :id, :transaction, :referring_guid, :referring_trip_id, :referring_path_hash
9
9
 
10
10
  def initialize(id, transaction, transaction_info)
11
- @id = id
12
- @transaction = transaction
11
+ @id = id
12
+ @transaction = transaction
13
13
 
14
14
  transaction_info ||= []
15
- @referring_guid = transaction_info[0]
15
+ @referring_guid = transaction_info[0]
16
16
  # unused_flag = transaction_info[1]
17
- @referring_trip_id = string_or_false_for(transaction_info[2])
17
+ @referring_trip_id = string_or_false_for(transaction_info[2])
18
18
  @referring_path_hash = string_or_false_for(transaction_info[3])
19
19
  end
20
20
 
21
21
  def as_json_array(content_length)
22
- queue_time_in_seconds = [transaction.queue_time.to_f, 0.0].max
23
- start_time_in_seconds = [transaction.start_time.to_f, 0.0].max
24
- app_time_in_seconds = Time.now.to_f - start_time_in_seconds
22
+ queue_time_in_seconds = [transaction.queue_time, 0.0].max
23
+ start_time_in_seconds = [transaction.start_time, 0.0].max
24
+ app_time_in_seconds = Process.clock_gettime(Process::CLOCK_REALTIME) - start_time_in_seconds
25
25
 
26
26
  [
27
27
  NewRelic::Agent.config[:cross_process_id],
28
28
  transaction.best_name,
29
- queue_time_in_seconds.to_f,
30
- app_time_in_seconds.to_f,
29
+ queue_time_in_seconds,
30
+ app_time_in_seconds,
31
31
  content_length,
32
- transaction.guid
32
+ transaction.guid,
33
+ false
33
34
  ]
34
35
  end
35
36
 
@@ -1,7 +1,7 @@
1
1
  # -*- ruby -*-
2
- # encoding: utf-8
3
2
  # This file is distributed under New Relic's license terms.
4
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
+ # frozen_string_literal: true
5
5
 
6
6
  require 'json'
7
7
 
@@ -9,23 +9,22 @@ module NewRelic
9
9
  module Agent
10
10
  module CrossAppTracing
11
11
  # The cross app response header for "outgoing" calls
12
- NR_APPDATA_HEADER = 'X-NewRelic-App-Data'.freeze
12
+ NR_APPDATA_HEADER = 'X-NewRelic-App-Data'
13
13
 
14
14
  # The cross app id header for "outgoing" calls
15
- NR_ID_HEADER = 'X-NewRelic-ID'.freeze
15
+ NR_ID_HEADER = 'X-NewRelic-ID'
16
16
 
17
17
  # The cross app transaction header for "outgoing" calls
18
- NR_TXN_HEADER = 'X-NewRelic-Transaction'.freeze
18
+ NR_TXN_HEADER = 'X-NewRelic-Transaction'
19
19
 
20
- NR_MESSAGE_BROKER_ID_HEADER = 'NewRelicID'.freeze
21
- NR_MESSAGE_BROKER_TXN_HEADER = 'NewRelicTransaction'.freeze
22
- NR_MESSAGE_BROKER_SYNTHETICS_HEADER = 'NewRelicSynthetics'.freeze
20
+ NR_MESSAGE_BROKER_ID_HEADER = 'NewRelicID'
21
+ NR_MESSAGE_BROKER_TXN_HEADER = 'NewRelicTransaction'
22
+ NR_MESSAGE_BROKER_SYNTHETICS_HEADER = 'NewRelicSynthetics'
23
23
 
24
24
  attr_accessor :is_cross_app_caller, :cross_app_payload, :cat_path_hashes
25
25
 
26
26
  def is_cross_app_caller?
27
- @is_cross_app_caller = false unless defined? @is_cross_app_caller
28
- @is_cross_app_caller
27
+ @is_cross_app_caller ||= false
29
28
  end
30
29
 
31
30
  def is_cross_app_callee?
@@ -37,28 +36,66 @@ module NewRelic
37
36
  end
38
37
 
39
38
  def cat_trip_id
40
- cross_app_payload && cross_app_payload.referring_trip_id || guid
39
+ cross_app_payload && cross_app_payload.referring_trip_id || transaction.guid
40
+ end
41
+
42
+ def cross_app_monitor
43
+ NewRelic::Agent.instance.monitors.cross_app_monitor
41
44
  end
42
45
 
43
46
  def cat_path_hash
44
47
  referring_path_hash = cat_referring_path_hash || '0'
45
48
  seed = referring_path_hash.to_i(16)
46
- result = NewRelic::Agent.instance.cross_app_monitor.path_hash(best_name, seed)
49
+ result = cross_app_monitor.path_hash(transaction.best_name, seed)
47
50
  record_cat_path_hash(result)
48
51
  result
49
52
  end
50
53
 
51
- def add_message_cat_headers headers
52
- self.is_cross_app_caller = true
53
- CrossAppTracing.insert_message_headers headers,
54
- guid,
55
- cat_trip_id,
56
- cat_path_hash,
57
- raw_synthetics_header
54
+ def insert_cross_app_header(headers)
55
+ return unless CrossAppTracing.cross_app_enabled?
56
+
57
+ @is_cross_app_caller = true
58
+ txn_guid = transaction.guid
59
+ trip_id = cat_trip_id
60
+ path_hash = cat_path_hash
61
+
62
+ insert_request_headers(headers, txn_guid, trip_id, path_hash)
63
+ end
64
+
65
+ def add_message_cat_headers(headers)
66
+ return unless CrossAppTracing.cross_app_enabled?
67
+
68
+ @is_cross_app_caller = true
69
+ insert_message_headers(headers,
70
+ transaction.guid,
71
+ cat_trip_id,
72
+ cat_path_hash,
73
+ transaction.raw_synthetics_header)
74
+ end
75
+
76
+ def record_cross_app_metrics
77
+ if (id = cross_app_payload && cross_app_payload.id)
78
+ app_time_in_seconds = [
79
+ Process.clock_gettime(Process::CLOCK_REALTIME) - transaction.start_time,
80
+ 0.0
81
+ ].max
82
+ NewRelic::Agent.record_metric("ClientApplication/#{id}/all", app_time_in_seconds)
83
+ end
84
+ end
85
+
86
+ def assign_cross_app_intrinsics
87
+ transaction.attributes.add_intrinsic_attribute(:trip_id, cat_trip_id)
88
+ transaction.attributes.add_intrinsic_attribute(:path_hash, cat_path_hash)
58
89
  end
59
90
 
60
91
  private
61
92
 
93
+ def insert_message_headers(headers, txn_guid, trip_id, path_hash, synthetics_header)
94
+ headers[NR_MESSAGE_BROKER_ID_HEADER] = obfuscator.obfuscate(Agent.config[:cross_process_id])
95
+ headers[NR_MESSAGE_BROKER_TXN_HEADER] = obfuscator.obfuscate(::JSON.dump([txn_guid, false, trip_id, path_hash]))
96
+ headers[NR_MESSAGE_BROKER_SYNTHETICS_HEADER] = synthetics_header if synthetics_header
97
+ end
98
+
62
99
  def record_cat_path_hash(hash)
63
100
  @cat_path_hashes ||= []
64
101
  if @cat_path_hashes.size < 10 && !@cat_path_hashes.include?(hash)
@@ -75,15 +112,17 @@ module NewRelic
75
112
  payload[:referring_transaction_guid] = referring_guid
76
113
  end
77
114
 
78
- return unless include_guid?
79
- payload[:guid] = guid
115
+ return unless transaction.include_guid?
116
+
117
+ payload[:guid] = transaction.guid
80
118
 
81
119
  return unless is_cross_app?
82
- trip_id = cat_trip_id
83
- path_hash = cat_path_hash
120
+
121
+ trip_id = cat_trip_id
122
+ path_hash = cat_path_hash
84
123
  referring_path_hash = cat_referring_path_hash
85
124
 
86
- payload[:cat_trip_id] = trip_id if trip_id
125
+ payload[:cat_trip_id] = trip_id if trip_id
87
126
  payload[:cat_referring_path_hash] = referring_path_hash if referring_path_hash
88
127
 
89
128
  if path_hash
@@ -96,20 +135,9 @@ module NewRelic
96
135
  end
97
136
  end
98
137
 
99
- def assign_cross_app_intrinsics
100
- attributes.add_intrinsic_attribute(:trip_id, cat_trip_id)
101
- attributes.add_intrinsic_attribute(:path_hash, cat_path_hash)
102
- end
103
-
104
- def record_cross_app_metrics
105
- if (id = cross_app_payload && cross_app_payload.id)
106
- app_time_in_seconds = [Time.now.to_f - @start_time.to_f, 0.0].max
107
- NewRelic::Agent.record_metric "ClientApplication/#{id}/all", app_time_in_seconds
108
- end
109
- end
110
-
111
138
  ###############
112
139
  module_function
140
+
113
141
  ###############
114
142
 
115
143
  def cross_app_enabled?
@@ -119,38 +147,37 @@ module NewRelic
119
147
  end
120
148
 
121
149
  def valid_cross_process_id?
122
- if NewRelic::Agent.config[:cross_process_id] && NewRelic::Agent.config[:cross_process_id].length > 0
150
+ if Agent.config[:cross_process_id] && Agent.config[:cross_process_id].length > 0
123
151
  true
124
152
  else
125
- NewRelic::Agent.logger.debug "No cross_process_id configured"
153
+ NewRelic::Agent.logger.debug("No cross_process_id configured")
126
154
  false
127
155
  end
128
156
  end
129
157
 
130
158
  def valid_encoding_key?
131
- if NewRelic::Agent.config[:encoding_key] && NewRelic::Agent.config[:encoding_key].length > 0
159
+ if Agent.config[:encoding_key] && Agent.config[:encoding_key].length > 0
132
160
  true
133
161
  else
134
- NewRelic::Agent.logger.debug "No encoding_key set"
162
+ NewRelic::Agent.logger.debug("No encoding_key set")
135
163
  false
136
164
  end
137
165
  end
138
166
 
139
167
  def cross_application_tracer_enabled?
140
168
  !NewRelic::Agent.config[:"distributed_tracing.enabled"] &&
141
- (NewRelic::Agent.config[:"cross_application_tracer.enabled"] ||
142
- NewRelic::Agent.config[:cross_application_tracing])
169
+ NewRelic::Agent.config[:"cross_application_tracer.enabled"]
143
170
  end
144
171
 
145
172
  def obfuscator
146
- @obfuscator ||= NewRelic::Agent::Obfuscator.new(NewRelic::Agent.config[:encoding_key])
173
+ @obfuscator ||= NewRelic::Agent::Obfuscator.new(Agent.config[:encoding_key])
147
174
  end
148
175
 
149
- def insert_request_headers request, txn_guid, trip_id, path_hash
176
+ def insert_request_headers(request, txn_guid, trip_id, path_hash)
150
177
  cross_app_id = NewRelic::Agent.config[:cross_process_id]
151
- txn_data = ::JSON.dump([txn_guid, false, trip_id, path_hash])
178
+ txn_data = ::JSON.dump([txn_guid, false, trip_id, path_hash])
152
179
 
153
- request[NR_ID_HEADER] = obfuscator.obfuscate(cross_app_id)
180
+ request[NR_ID_HEADER] = obfuscator.obfuscate(cross_app_id)
154
181
  request[NR_TXN_HEADER] = obfuscator.obfuscate(txn_data)
155
182
  end
156
183
 
@@ -158,7 +185,7 @@ module NewRelic
158
185
  if !!response[NR_APPDATA_HEADER]
159
186
  true
160
187
  else
161
- NewRelic::Agent.logger.debug "No #{NR_APPDATA_HEADER} header"
188
+ NewRelic::Agent.logger.debug("No #{NR_APPDATA_HEADER} header")
162
189
  false
163
190
  end
164
191
  end
@@ -188,44 +215,38 @@ module NewRelic
188
215
  !!(xp_id =~ /\A\d+#\d+\z/)
189
216
  end
190
217
 
191
- def insert_message_headers headers, txn_guid, trip_id, path_hash, synthetics_header
192
- headers[NR_MESSAGE_BROKER_ID_HEADER] = obfuscator.obfuscate(NewRelic::Agent.config[:cross_process_id])
193
- headers[NR_MESSAGE_BROKER_TXN_HEADER] = obfuscator.obfuscate(::JSON.dump([txn_guid, false, trip_id, path_hash]))
194
- headers[NR_MESSAGE_BROKER_SYNTHETICS_HEADER] = synthetics_header if synthetics_header
195
- end
196
-
197
- def message_has_crossapp_request_header? headers
218
+ def message_has_crossapp_request_header?(headers)
198
219
  !!headers[NR_MESSAGE_BROKER_ID_HEADER]
199
220
  end
200
221
 
201
- def reject_messaging_cat_headers headers
202
- headers.reject {|k,_| k == NR_MESSAGE_BROKER_ID_HEADER || k == NR_MESSAGE_BROKER_TXN_HEADER}
222
+ def reject_messaging_cat_headers(headers)
223
+ headers.reject { |k, _| k == NR_MESSAGE_BROKER_ID_HEADER || k == NR_MESSAGE_BROKER_TXN_HEADER }
203
224
  end
204
225
 
205
- def trusts? id
226
+ def trusts?(id)
206
227
  split_id = id.match(/(\d+)#\d+/)
207
228
  return false if split_id.nil?
208
229
 
209
- NewRelic::Agent.config[:trusted_account_ids].include? split_id.captures.first.to_i
230
+ NewRelic::Agent.config[:trusted_account_ids].include?(split_id.captures.first.to_i)
210
231
  end
211
232
 
212
- def trusted_valid_cross_app_id? id
233
+ def trusted_valid_cross_app_id?(id)
213
234
  valid_cross_app_id?(id) && trusts?(id)
214
235
  end
215
236
 
216
237
  # From inbound request headers
217
- def assign_intrinsic_transaction_attributes state
238
+ def assign_intrinsic_transaction_attributes(state)
218
239
  # We expect to get the before call to set the id (if we have it) before
219
240
  # this, and then write our custom parameter when the transaction starts
220
- return unless (transaction = state.current_transaction)
221
- return unless (cross_app_payload = transaction.cross_app_payload)
241
+ return unless (txn = state.current_transaction)
242
+ return unless (payload = txn.distributed_tracer.cross_app_payload)
222
243
 
223
- if (cross_app_id = cross_app_payload.id)
224
- transaction.attributes.add_intrinsic_attribute(:client_cross_process_id, cross_app_id)
244
+ if (cross_app_id = payload.id)
245
+ txn.attributes.add_intrinsic_attribute(:client_cross_process_id, cross_app_id)
225
246
  end
226
247
 
227
- if (referring_guid = cross_app_payload.referring_guid)
228
- transaction.attributes.add_intrinsic_attribute(:referring_transaction_guid, referring_guid)
248
+ if (referring_guid = payload.referring_guid)
249
+ txn.attributes.add_intrinsic_attribute(:referring_transaction_guid, referring_guid)
229
250
  end
230
251
  end
231
252
  end
@@ -0,0 +1,84 @@
1
+ # This file is distributed under New Relic's license terms.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
5
+ module NewRelic
6
+ module Agent
7
+ module DistributedTraceAttributes
8
+ extend self
9
+
10
+ # Intrinsic Keys
11
+ INTRINSIC_KEYS = [
12
+ PARENT_TYPE_KEY = "parent.type",
13
+ PARENT_APP_KEY = "parent.app",
14
+ PARENT_ACCOUNT_ID_KEY = "parent.account",
15
+ PARENT_TRANSPORT_TYPE_KEY = "parent.transportType",
16
+ PARENT_TRANSPORT_DURATION_KEY = "parent.transportDuration",
17
+ GUID_KEY = "guid",
18
+ TRACE_ID_KEY = "traceId",
19
+ PARENT_TRANSACTION_ID_KEY = "parentId",
20
+ PARENT_SPAN_ID_KEY = "parentSpanId",
21
+ SAMPLED_KEY = "sampled"
22
+ ].freeze
23
+
24
+ # This method extracts intrinsics from the transaction_payload and
25
+ # inserts them into the specified destination.
26
+ def copy_to_hash(transaction_payload, destination)
27
+ return unless enabled?
28
+
29
+ INTRINSIC_KEYS.each do |key|
30
+ value = transaction_payload[key]
31
+ destination[key] = value unless value.nil?
32
+ end
33
+ end
34
+
35
+ # This method extracts intrinsics from the transaction_payload and
36
+ # inserts them as intrinsics in the specified transaction_attributes
37
+ def copy_to_attributes(transaction_payload, destination)
38
+ return unless enabled?
39
+
40
+ INTRINSIC_KEYS.each do |key|
41
+ next unless transaction_payload.key?(key)
42
+
43
+ destination.add_intrinsic_attribute(key, transaction_payload[key])
44
+ end
45
+ end
46
+
47
+ # This method takes all distributed tracing intrinsics from the transaction
48
+ # and the trace_payload, and populates them into the destination
49
+ def copy_from_transaction(transaction, trace_payload, destination)
50
+ destination[GUID_KEY] = transaction.guid
51
+ destination[SAMPLED_KEY] = transaction.sampled?
52
+ destination[TRACE_ID_KEY] = transaction.trace_id
53
+
54
+ if transaction.parent_span_id
55
+ destination[PARENT_SPAN_ID_KEY] = transaction.parent_span_id
56
+ end
57
+
58
+ copy_parent_attributes(transaction, trace_payload, destination)
59
+ end
60
+
61
+ def copy_parent_attributes(transaction, trace_payload, destination)
62
+ transport_type = transaction.distributed_tracer.caller_transport_type
63
+ destination[PARENT_TRANSPORT_TYPE_KEY] = DistributedTraceTransportType.from(transport_type)
64
+
65
+ if trace_payload
66
+ destination[PARENT_TYPE_KEY] = trace_payload.parent_type
67
+ destination[PARENT_APP_KEY] = trace_payload.parent_app_id
68
+ destination[PARENT_ACCOUNT_ID_KEY] = trace_payload.parent_account_id
69
+ destination[PARENT_TRANSPORT_DURATION_KEY] = transaction.calculate_transport_duration(trace_payload)
70
+
71
+ if parent_transaction_id = transaction.distributed_tracer.parent_transaction_id
72
+ destination[PARENT_TRANSACTION_ID_KEY] = parent_transaction_id
73
+ end
74
+ end
75
+ end
76
+
77
+ private
78
+
79
+ def enabled?
80
+ return Agent.config[:'distributed_tracing.enabled']
81
+ end
82
+ end
83
+ end
84
+ end