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,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
  # This module was introduced and largely extracted from the transaction event aggregator
6
6
  # when the synthetics container was extracted from it. Its purpose is to create the data
@@ -8,39 +8,41 @@
8
8
  # the transaction event aggregator and the synthetics container.
9
9
 
10
10
  require 'new_relic/agent/payload_metric_mapping'
11
- require 'new_relic/agent/distributed_trace_payload'
11
+ require 'new_relic/agent/distributed_tracing/distributed_trace_payload'
12
+ require 'new_relic/agent/distributed_tracing/distributed_trace_attributes'
12
13
 
13
14
  module NewRelic
14
15
  module Agent
15
16
  module TransactionErrorPrimitive
16
17
  extend self
17
18
 
18
- SAMPLE_TYPE = 'TransactionError'.freeze
19
- TYPE_KEY = 'type'.freeze
20
- ERROR_CLASS_KEY = 'error.class'.freeze
21
- ERROR_MESSAGE_KEY = 'error.message'.freeze
22
- ERROR_EXPECTED_KEY = 'error.expected'.freeze
23
- TIMESTAMP_KEY = 'timestamp'.freeze
24
- PORT_KEY = 'port'.freeze
25
- NAME_KEY = 'transactionName'.freeze
26
- DURATION_KEY = 'duration'.freeze
27
- SAMPLED_KEY = 'sampled'.freeze
28
- GUID_KEY = 'nr.transactionGuid'.freeze
19
+ SAMPLE_TYPE = 'TransactionError'.freeze
20
+ TYPE_KEY = 'type'.freeze
21
+ ERROR_CLASS_KEY = 'error.class'.freeze
22
+ ERROR_MESSAGE_KEY = 'error.message'.freeze
23
+ ERROR_EXPECTED_KEY = 'error.expected'.freeze
24
+ TIMESTAMP_KEY = 'timestamp'.freeze
25
+ PORT_KEY = 'port'.freeze
26
+ NAME_KEY = 'transactionName'.freeze
27
+ DURATION_KEY = 'duration'.freeze
28
+ SAMPLED_KEY = 'sampled'.freeze
29
+ GUID_KEY = 'nr.transactionGuid'.freeze
29
30
  REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'.freeze
30
- SYNTHETICS_RESOURCE_ID_KEY = "nr.syntheticsResourceId".freeze
31
- SYNTHETICS_JOB_ID_KEY = "nr.syntheticsJobId".freeze
32
- SYNTHETICS_MONITOR_ID_KEY = "nr.syntheticsMonitorId".freeze
33
- PRIORITY_KEY = "priority".freeze
31
+ SYNTHETICS_RESOURCE_ID_KEY = "nr.syntheticsResourceId".freeze
32
+ SYNTHETICS_JOB_ID_KEY = "nr.syntheticsJobId".freeze
33
+ SYNTHETICS_MONITOR_ID_KEY = "nr.syntheticsMonitorId".freeze
34
+ PRIORITY_KEY = "priority".freeze
35
+ SPAN_ID_KEY = "spanId".freeze
34
36
 
35
- def create noticed_error, payload
37
+ def create(noticed_error, payload, span_id)
36
38
  [
37
- intrinsic_attributes_for(noticed_error, payload),
39
+ intrinsic_attributes_for(noticed_error, payload, span_id),
38
40
  noticed_error.custom_attributes,
39
41
  noticed_error.agent_attributes
40
42
  ]
41
43
  end
42
44
 
43
- def intrinsic_attributes_for noticed_error, payload
45
+ def intrinsic_attributes_for(noticed_error, payload, span_id)
44
46
  attrs = {
45
47
  TYPE_KEY => SAMPLE_TYPE,
46
48
  ERROR_CLASS_KEY => noticed_error.exception_class_name,
@@ -49,40 +51,35 @@ module NewRelic
49
51
  TIMESTAMP_KEY => noticed_error.timestamp.to_f
50
52
  }
51
53
 
54
+ attrs[SPAN_ID_KEY] = span_id if span_id
52
55
  attrs[PORT_KEY] = noticed_error.request_port if noticed_error.request_port
53
56
 
54
57
  if payload
55
58
  attrs[NAME_KEY] = payload[:name]
56
59
  attrs[DURATION_KEY] = payload[:duration]
57
- attrs[SAMPLED_KEY] = payload[:'sampled'] if Agent.config[:'distributed_tracing.enabled']
58
- attrs[PRIORITY_KEY] = payload[:'priority']
59
- append_synthetics payload, attrs
60
- append_cat payload, attrs
61
- append_distributed_trace_intrinsics payload, attrs
62
- PayloadMetricMapping.append_mapped_metrics payload[:metrics], attrs
60
+ attrs[SAMPLED_KEY] = payload[:sampled] if payload.key?(:sampled)
61
+ attrs[PRIORITY_KEY] = payload[:priority]
62
+ append_synthetics(payload, attrs)
63
+ append_cat(payload, attrs)
64
+ DistributedTraceAttributes.copy_to_hash(payload, attrs)
65
+ PayloadMetricMapping.append_mapped_metrics(payload[:metrics], attrs)
66
+ else
67
+ attrs[PRIORITY_KEY] = rand.round(NewRelic::PRIORITY_PRECISION)
63
68
  end
64
69
 
65
70
  attrs
66
71
  end
67
72
 
68
- def append_synthetics payload, sample
73
+ def append_synthetics(payload, sample)
69
74
  sample[SYNTHETICS_RESOURCE_ID_KEY] = payload[:synthetics_resource_id] if payload[:synthetics_resource_id]
70
75
  sample[SYNTHETICS_JOB_ID_KEY] = payload[:synthetics_job_id] if payload[:synthetics_job_id]
71
76
  sample[SYNTHETICS_MONITOR_ID_KEY] = payload[:synthetics_monitor_id] if payload[:synthetics_monitor_id]
72
77
  end
73
78
 
74
- def append_cat payload, sample
79
+ def append_cat(payload, sample)
75
80
  sample[GUID_KEY] = payload[:guid] if payload[:guid]
76
81
  sample[REFERRING_TRANSACTION_GUID_KEY] = payload[:referring_transaction_guid] if payload[:referring_transaction_guid]
77
82
  end
78
-
79
- def append_distributed_trace_intrinsics payload, sample
80
- return unless Agent.config[:'distributed_tracing.enabled']
81
- DistributedTracePayload::INTRINSIC_KEYS.each do |key|
82
- value = payload[key]
83
- sample[key] = value unless value.nil?
84
- end
85
- end
86
83
  end
87
84
  end
88
85
  end
@@ -1,43 +1,43 @@
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
- require 'newrelic_rpm' unless defined?( NewRelic )
7
- require 'new_relic/agent' unless defined?( NewRelic::Agent )
6
+ require 'newrelic_rpm' unless defined?(NewRelic)
7
+ require 'new_relic/agent' unless defined?(NewRelic::Agent)
8
8
  require 'new_relic/agent/event_aggregator'
9
9
  require 'new_relic/agent/priority_sampled_buffer'
10
10
 
11
11
  module NewRelic
12
12
  module Agent
13
13
  class TransactionEventAggregator < EventAggregator
14
-
15
14
  named :TransactionEventAggregator
16
- capacity_key :'analytics_events.max_samples_stored'
17
- enabled_key :'analytics_events.enabled'
15
+ capacity_key :'transaction_events.max_samples_stored'
16
+ enabled_key :'transaction_events.enabled'
18
17
  buffer_class PrioritySampledBuffer
19
18
 
20
- def record priority: nil, event:nil, &blk
21
- unless(event || priority && blk)
19
+ def record(priority: nil, event: nil, &blk)
20
+ unless event || priority && blk
22
21
  raise ArgumentError, "Expected priority and block, or event"
23
22
  end
24
23
 
25
24
  return unless enabled?
26
25
 
27
26
  @lock.synchronize do
28
- @buffer.append priority: priority, event: event, &blk
27
+ @buffer.append(priority: priority, event: event, &blk)
29
28
  notify_if_full
30
29
  end
31
30
  end
32
31
 
33
32
  private
34
33
 
35
- def after_harvest metadata
34
+ def after_harvest(metadata)
36
35
  return unless enabled?
37
- record_sampling_rate metadata
36
+
37
+ record_sampling_rate(metadata)
38
38
  end
39
39
 
40
- def record_sampling_rate(metadata) #THREAD_LOCAL_ACCESS
40
+ def record_sampling_rate(metadata) # THREAD_LOCAL_ACCESS
41
41
  NewRelic::Agent.logger.debug("Sampled %d / %d (%.1f %%) requests this cycle, %d / %d (%.1f %%) since startup" % [
42
42
  metadata[:captured],
43
43
  metadata[:seen],
@@ -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
  # This module was introduced and largely extracted from the transaction event aggregator
6
6
  # when the synthetics container was extracted from it. Its purpose is to create the data
@@ -8,7 +8,7 @@
8
8
  # the transaction event aggregator and the synthetics container.
9
9
 
10
10
  require 'new_relic/agent/payload_metric_mapping'
11
- require 'new_relic/agent/distributed_trace_payload'
11
+ require 'new_relic/agent/distributed_tracing/distributed_trace_attributes'
12
12
 
13
13
  module NewRelic
14
14
  module Agent
@@ -16,46 +16,44 @@ module NewRelic
16
16
  include NewRelic::Coerce
17
17
  extend self
18
18
 
19
+ COMMA = ','
20
+
19
21
  # The type field of the sample
20
- SAMPLE_TYPE = 'Transaction'.freeze
22
+ SAMPLE_TYPE = 'Transaction'
21
23
 
22
24
  # Strings for static keys of the sample structure
23
- TYPE_KEY = 'type'.freeze
24
- TIMESTAMP_KEY = 'timestamp'.freeze
25
- NAME_KEY = 'name'.freeze
26
- DURATION_KEY = 'duration'.freeze
27
- ERROR_KEY = 'error'.freeze
28
- SAMPLED_KEY = 'sampled'.freeze
29
- PRIORITY_KEY = 'priority'.freeze
30
- GUID_KEY = 'nr.guid'.freeze
31
- REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'.freeze
32
- CAT_PATH_HASH_KEY = 'nr.pathHash'.freeze
33
- CAT_REFERRING_PATH_HASH_KEY = 'nr.referringPathHash'.freeze
34
- CAT_ALTERNATE_PATH_HASHES_KEY = 'nr.alternatePathHashes'.freeze
35
- APDEX_PERF_ZONE_KEY = 'nr.apdexPerfZone'.freeze
36
- SYNTHETICS_RESOURCE_ID_KEY = "nr.syntheticsResourceId".freeze
37
- SYNTHETICS_JOB_ID_KEY = "nr.syntheticsJobId".freeze
38
- SYNTHETICS_MONITOR_ID_KEY = "nr.syntheticsMonitorId".freeze
39
-
40
-
41
- # To avoid allocations when we have empty custom or agent attributes
42
- EMPTY_HASH = {}.freeze
25
+ TYPE_KEY = 'type'
26
+ TIMESTAMP_KEY = 'timestamp'
27
+ NAME_KEY = 'name'
28
+ DURATION_KEY = 'duration'
29
+ ERROR_KEY = 'error'
30
+ SAMPLED_KEY = 'sampled'
31
+ PRIORITY_KEY = 'priority'
32
+ GUID_KEY = 'nr.guid'
33
+ REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'
34
+ CAT_PATH_HASH_KEY = 'nr.pathHash'
35
+ CAT_REFERRING_PATH_HASH_KEY = 'nr.referringPathHash'
36
+ CAT_ALTERNATE_PATH_HASHES_KEY = 'nr.alternatePathHashes'
37
+ APDEX_PERF_ZONE_KEY = 'nr.apdexPerfZone'
38
+ SYNTHETICS_RESOURCE_ID_KEY = "nr.syntheticsResourceId"
39
+ SYNTHETICS_JOB_ID_KEY = "nr.syntheticsJobId"
40
+ SYNTHETICS_MONITOR_ID_KEY = "nr.syntheticsMonitorId"
43
41
 
44
42
  def create(payload)
45
43
  intrinsics = {
46
- TIMESTAMP_KEY => float(payload[:start_timestamp]),
47
- NAME_KEY => string(payload[:name]),
48
- DURATION_KEY => float(payload[:duration]),
49
- TYPE_KEY => SAMPLE_TYPE,
50
- ERROR_KEY => payload[:error],
51
- PRIORITY_KEY => payload[:priority]
44
+ TIMESTAMP_KEY => float(payload[:start_timestamp]),
45
+ NAME_KEY => string(payload[:name]),
46
+ DURATION_KEY => float(payload[:duration]),
47
+ TYPE_KEY => SAMPLE_TYPE,
48
+ ERROR_KEY => payload[:error],
49
+ PRIORITY_KEY => payload[:priority]
52
50
  }
53
51
 
54
- intrinsics[SAMPLED_KEY] = payload[:'sampled'] if Agent.config[:'distributed_tracing.enabled']
52
+ intrinsics[SAMPLED_KEY] = payload[:sampled] if payload.key?(:sampled)
55
53
 
56
- NewRelic::Agent::PayloadMetricMapping.append_mapped_metrics(payload[:metrics], intrinsics)
54
+ PayloadMetricMapping.append_mapped_metrics(payload[:metrics], intrinsics)
57
55
  append_optional_attributes(intrinsics, payload)
58
- append_distributed_trace_intrinsics(intrinsics, payload)
56
+ DistributedTraceAttributes.copy_to_hash(payload, intrinsics)
59
57
 
60
58
  attributes = payload[:attributes]
61
59
 
@@ -65,54 +63,44 @@ module NewRelic
65
63
  private
66
64
 
67
65
  def append_optional_attributes(sample, payload)
68
- optionally_append(GUID_KEY, :guid, sample, payload)
66
+ optionally_append(GUID_KEY, :guid, sample, payload)
69
67
  optionally_append(REFERRING_TRANSACTION_GUID_KEY, :referring_transaction_guid, sample, payload)
70
- optionally_append(CAT_PATH_HASH_KEY, :cat_path_hash, sample, payload)
71
- optionally_append(CAT_REFERRING_PATH_HASH_KEY, :cat_referring_path_hash, sample, payload)
72
- optionally_append(APDEX_PERF_ZONE_KEY, :apdex_perf_zone, sample, payload)
73
- optionally_append(SYNTHETICS_RESOURCE_ID_KEY, :synthetics_resource_id, sample, payload)
74
- optionally_append(SYNTHETICS_JOB_ID_KEY, :synthetics_job_id, sample, payload)
75
- optionally_append(SYNTHETICS_MONITOR_ID_KEY, :synthetics_monitor_id, sample, payload)
68
+ optionally_append(CAT_PATH_HASH_KEY, :cat_path_hash, sample, payload)
69
+ optionally_append(CAT_REFERRING_PATH_HASH_KEY, :cat_referring_path_hash, sample, payload)
70
+ optionally_append(APDEX_PERF_ZONE_KEY, :apdex_perf_zone, sample, payload)
71
+ optionally_append(SYNTHETICS_RESOURCE_ID_KEY, :synthetics_resource_id, sample, payload)
72
+ optionally_append(SYNTHETICS_JOB_ID_KEY, :synthetics_job_id, sample, payload)
73
+ optionally_append(SYNTHETICS_MONITOR_ID_KEY, :synthetics_monitor_id, sample, payload)
76
74
  append_cat_alternate_path_hashes(sample, payload)
77
75
  end
78
76
 
79
- COMMA = ','.freeze
80
-
81
77
  def append_cat_alternate_path_hashes(sample, payload)
82
78
  if payload.include?(:cat_alternate_path_hashes)
83
79
  sample[CAT_ALTERNATE_PATH_HASHES_KEY] = payload[:cat_alternate_path_hashes].sort.join(COMMA)
84
80
  end
85
81
  end
86
82
 
87
- def append_distributed_trace_intrinsics(sample, payload)
88
- return unless Agent.config[:'distributed_tracing.enabled']
89
- DistributedTracePayload::INTRINSIC_KEYS.each do |key|
90
- value = payload[key]
91
- sample[key] = value unless value.nil?
92
- end
93
- end
94
-
95
83
  def optionally_append(sample_key, payload_key, sample, payload)
96
84
  if payload.include?(payload_key)
97
85
  sample[sample_key] = string(payload[payload_key])
98
86
  end
99
87
  end
100
88
 
101
- def custom_attributes attributes
89
+ def custom_attributes(attributes)
102
90
  if attributes
103
- result = attributes.custom_attributes_for(NewRelic::Agent::AttributeFilter::DST_TRANSACTION_EVENTS)
91
+ result = attributes.custom_attributes_for(AttributeFilter::DST_TRANSACTION_EVENTS)
104
92
  result.freeze
105
93
  else
106
- EMPTY_HASH
94
+ NewRelic::EMPTY_HASH
107
95
  end
108
96
  end
109
97
 
110
- def agent_attributes attributes
98
+ def agent_attributes(attributes)
111
99
  if attributes
112
- result = attributes.agent_attributes_for(NewRelic::Agent::AttributeFilter::DST_TRANSACTION_EVENTS)
100
+ result = attributes.agent_attributes_for(AttributeFilter::DST_TRANSACTION_EVENTS)
113
101
  result.freeze
114
102
  else
115
- EMPTY_HASH
103
+ NewRelic::EMPTY_HASH
116
104
  end
117
105
  end
118
106
  end
@@ -1,42 +1,43 @@
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
  require 'new_relic/agent/transaction_event_aggregator'
5
6
  require 'new_relic/agent/synthetics_event_aggregator'
6
7
  require 'new_relic/agent/transaction_event_primitive'
7
8
 
8
9
  module NewRelic
9
10
  module Agent
10
- # This is responsibile for recording transaction events and managing
11
+ # This is responsible for recording transaction events and managing
11
12
  # the relationship between events generated from synthetics requests
12
13
  # vs normal requests.
13
14
  class TransactionEventRecorder
14
15
  attr_reader :transaction_event_aggregator
15
16
  attr_reader :synthetics_event_aggregator
16
17
 
17
- def initialize
18
- @transaction_event_aggregator = NewRelic::Agent::TransactionEventAggregator.new
19
- @synthetics_event_aggregator = NewRelic::Agent::SyntheticsEventAggregator.new
18
+ def initialize(events)
19
+ @transaction_event_aggregator = NewRelic::Agent::TransactionEventAggregator.new(events)
20
+ @synthetics_event_aggregator = NewRelic::Agent::SyntheticsEventAggregator.new(events)
20
21
  end
21
22
 
22
- def record payload
23
- return unless NewRelic::Agent.config[:'analytics_events.enabled']
23
+ def record(payload)
24
+ return unless NewRelic::Agent.config[:'transaction_events.enabled']
24
25
 
25
- if synthetics_event? payload
26
- event = create_event payload
27
- result = synthetics_event_aggregator.record event
28
- transaction_event_aggregator.record event: event if result.nil?
26
+ if synthetics_event?(payload)
27
+ event = create_event(payload)
28
+ result = synthetics_event_aggregator.record(event)
29
+ transaction_event_aggregator.record(event: event) if result.nil?
29
30
  else
30
31
  transaction_event_aggregator.record(priority: payload[:priority]) { create_event(payload) }
31
32
  end
32
33
  end
33
34
 
34
- def create_event payload
35
- TransactionEventPrimitive.create payload
35
+ def create_event(payload)
36
+ TransactionEventPrimitive.create(payload)
36
37
  end
37
38
 
38
- def synthetics_event? payload
39
- payload.key? :synthetics_resource_id
39
+ def synthetics_event?(payload)
40
+ payload.key?(:synthetics_resource_id)
40
41
  end
41
42
 
42
43
  def drop_buffered_data
@@ -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
  # This class represents a set of metrics that were recorded during a single
6
6
  # transaction. Since the name of the transaction is not known until its end, we
@@ -10,11 +10,12 @@
10
10
  module NewRelic
11
11
  module Agent
12
12
  class TransactionMetrics
13
- DEFAULT_PROC = Proc.new { |hash, name| hash[name] = NewRelic::Agent::Stats.new }
13
+ DEFAULT_PROC = proc { |hash, name| hash[name] = NewRelic::Agent::Stats.new }
14
14
 
15
15
  def initialize
16
+ @lock = Mutex.new
16
17
  @unscoped = Hash.new(&DEFAULT_PROC)
17
- @scoped = Hash.new(&DEFAULT_PROC)
18
+ @scoped = Hash.new(&DEFAULT_PROC)
18
19
  end
19
20
 
20
21
  # As a general rule, when recording a scoped metric, the corresponding
@@ -25,11 +26,11 @@ module NewRelic
25
26
  # propagate them into unscoped metrics as well when instances of this
26
27
  # class are merged into the global metric store.
27
28
  #
28
- def record_scoped_and_unscoped(names, value=nil, aux=nil, &blk)
29
+ def record_scoped_and_unscoped(names, value = nil, aux = nil, &blk)
29
30
  _record_metrics(names, value, aux, @scoped, &blk)
30
31
  end
31
32
 
32
- def record_unscoped(names, value=nil, aux=nil, &blk)
33
+ def record_unscoped(names, value = nil, aux = nil, &blk)
33
34
  _record_metrics(names, value, aux, @unscoped, &blk)
34
35
  end
35
36
 
@@ -42,11 +43,11 @@ module NewRelic
42
43
  end
43
44
 
44
45
  def each_unscoped
45
- @unscoped.each { |name, stats| yield name, stats }
46
+ @lock.synchronize { @unscoped.each { |name, stats| yield(name, stats) } }
46
47
  end
47
48
 
48
49
  def each_scoped
49
- @scoped.each { |name, stats| yield name, stats }
50
+ @lock.synchronize { @scoped.each { |name, stats| yield(name, stats) } }
50
51
  end
51
52
 
52
53
  def _record_metrics(names, value, aux, target, &blk)
@@ -54,10 +55,10 @@ module NewRelic
54
55
  case names
55
56
  when Array
56
57
  names.each do |name|
57
- target[name].record(value, aux, &blk)
58
+ @lock.synchronize { target[name].record(value, aux, &blk) }
58
59
  end
59
60
  else
60
- target[names].record(value, aux, &blk)
61
+ @lock.synchronize { target[names].record(value, aux, &blk) }
61
62
  end
62
63
  end
63
64
  end
@@ -1,15 +1,13 @@
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/transaction/slowest_sample_buffer'
6
6
  require 'new_relic/agent/transaction/synthetics_sample_buffer'
7
- require 'new_relic/agent/transaction/xray_sample_buffer'
8
7
  require 'new_relic/agent/transaction/trace_builder'
9
8
 
10
9
  module NewRelic
11
10
  module Agent
12
-
13
11
  # This class contains the logic for recording and storing transaction
14
12
  # traces (sometimes referred to as 'transaction samples').
15
13
  #
@@ -19,13 +17,10 @@ module NewRelic
19
17
  #
20
18
  # @api public
21
19
  class TransactionSampler
22
- attr_reader :last_sample, :xray_sample_buffer
20
+ attr_reader :last_sample
23
21
 
24
22
  def initialize
25
- @xray_sample_buffer = NewRelic::Agent::Transaction::XraySampleBuffer.new
26
-
27
23
  @sample_buffers = []
28
- @sample_buffers << @xray_sample_buffer
29
24
  @sample_buffers << NewRelic::Agent::Transaction::SlowestSampleBuffer.new
30
25
  @sample_buffers << NewRelic::Agent::Transaction::SyntheticsSampleBuffer.new
31
26
 
@@ -37,9 +32,9 @@ module NewRelic
37
32
  Agent.config.register_callback(:'transaction_tracer.enabled') do |enabled|
38
33
  if enabled
39
34
  threshold = Agent.config[:'transaction_tracer.transaction_threshold']
40
- ::NewRelic::Agent.logger.debug "Transaction tracing threshold is #{threshold} seconds."
35
+ ::NewRelic::Agent.logger.debug("Transaction tracing threshold is #{threshold} seconds.")
41
36
  else
42
- ::NewRelic::Agent.logger.debug "Transaction traces will not be sent to the New Relic service."
37
+ ::NewRelic::Agent.logger.debug("Transaction traces will not be sent to the New Relic service.")
43
38
  end
44
39
  end
45
40
 
@@ -72,7 +67,7 @@ module NewRelic
72
67
 
73
68
  # Gather transaction traces that we'd like to transmit to the server.
74
69
  def harvest!
75
- return [] unless enabled?
70
+ return NewRelic::EMPTY_ARRAY unless enabled?
76
71
 
77
72
  samples = @samples_lock.synchronize do
78
73
  @last_sample = nil
@@ -118,7 +113,7 @@ module NewRelic
118
113
  result.uniq!
119
114
  result.map! do |sample|
120
115
  if Transaction === sample
121
- Transaction::TraceBuilder.build_trace sample
116
+ Transaction::TraceBuilder.build_trace(sample)
122
117
  else
123
118
  sample
124
119
  end