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,150 +1,167 @@
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 'rack'
6
6
  require 'new_relic/rack/agent_middleware'
7
7
  require 'new_relic/agent/instrumentation/middleware_proxy'
8
8
 
9
- module NewRelic::Rack
10
- # This middleware is used by the agent for the Real user monitoring (RUM)
11
- # feature, and will usually be automatically injected in the middleware chain.
12
- # If automatic injection is not working, you may manually use it in your
13
- # middleware chain instead.
14
- #
15
- # @api public
16
- #
17
- class BrowserMonitoring < AgentMiddleware
18
- # The maximum number of bytes of the response body that we will
19
- # examine in order to look for a RUM insertion point.
20
- SCAN_LIMIT = 50_000
21
-
22
- CONTENT_TYPE = 'Content-Type'.freeze
23
- CONTENT_DISPOSITION = 'Content-Disposition'.freeze
24
- ATTACHMENT = 'attachment'.freeze
25
- TEXT_HTML = 'text/html'.freeze
26
-
27
- BODY_START = "<body".freeze
28
- HEAD_START = "<head".freeze
29
- GT = ">".freeze
30
-
31
- def traced_call(env)
32
- result = @app.call(env) # [status, headers, response]
33
-
34
- js_to_inject = NewRelic::Agent.browser_timing_header
35
- if (js_to_inject != "") && should_instrument?(env, result[0], result[1])
36
- response_string = autoinstrument_source(result[2], result[1], js_to_inject)
37
-
38
- env[ALREADY_INSTRUMENTED_KEY] = true
39
- if response_string
40
- response = Rack::Response.new(response_string, result[0], result[1])
41
- response.finish
9
+ module NewRelic
10
+ module Rack
11
+ # This middleware is used by the agent for the Real user monitoring (RUM)
12
+ # feature, and will usually be automatically injected in the middleware chain.
13
+ # If automatic injection is not working, you may manually use it in your
14
+ # middleware chain instead.
15
+ #
16
+ # @api public
17
+ #
18
+ class BrowserMonitoring < AgentMiddleware
19
+ # The maximum number of bytes of the response body that we will
20
+ # examine in order to look for a RUM insertion point.
21
+ SCAN_LIMIT = 50_000
22
+
23
+ CONTENT_TYPE = 'Content-Type'.freeze
24
+ CONTENT_DISPOSITION = 'Content-Disposition'.freeze
25
+ CONTENT_LENGTH = 'Content-Length'.freeze
26
+ ATTACHMENT = 'attachment'.freeze
27
+ TEXT_HTML = 'text/html'.freeze
28
+
29
+ BODY_START = "<body".freeze
30
+ HEAD_START = "<head".freeze
31
+ GT = ">".freeze
32
+
33
+ ALREADY_INSTRUMENTED_KEY = "newrelic.browser_monitoring_already_instrumented"
34
+ CHARSET_RE = /<\s*meta[^>]+charset\s*=[^>]*>/im.freeze
35
+ X_UA_COMPATIBLE_RE = /<\s*meta[^>]+http-equiv\s*=\s*['"]x-ua-compatible['"][^>]*>/im.freeze
36
+
37
+ def traced_call(env)
38
+ result = @app.call(env)
39
+ (status, headers, response) = result
40
+
41
+ js_to_inject = NewRelic::Agent.browser_timing_header
42
+ if (js_to_inject != NewRelic::EMPTY_STR) && should_instrument?(env, status, headers)
43
+ response_string = autoinstrument_source(response, headers, js_to_inject)
44
+ if headers.key?(CONTENT_LENGTH)
45
+ content_length = response_string ? response_string.bytesize : 0
46
+ headers[CONTENT_LENGTH] = content_length.to_s
47
+ end
48
+
49
+ env[ALREADY_INSTRUMENTED_KEY] = true
50
+ if response_string
51
+ response = ::Rack::Response.new(response_string, status, headers)
52
+ response.finish
53
+ else
54
+ result
55
+ end
42
56
  else
43
57
  result
44
58
  end
45
- else
46
- result
47
59
  end
48
- end
49
-
50
- ALREADY_INSTRUMENTED_KEY = "newrelic.browser_monitoring_already_instrumented"
51
-
52
- def should_instrument?(env, status, headers)
53
- NewRelic::Agent.config[:'browser_monitoring.auto_instrument'] &&
54
- status == 200 &&
55
- !env[ALREADY_INSTRUMENTED_KEY] &&
56
- is_html?(headers) &&
57
- !is_attachment?(headers) &&
58
- !is_streaming?(env)
59
- end
60
60
 
61
- def is_html?(headers)
62
- headers[CONTENT_TYPE] && headers[CONTENT_TYPE].include?(TEXT_HTML)
63
- end
64
-
65
- def is_attachment?(headers)
66
- headers[CONTENT_DISPOSITION] && headers[CONTENT_DISPOSITION].include?(ATTACHMENT)
67
- end
61
+ def should_instrument?(env, status, headers)
62
+ NewRelic::Agent.config[:'browser_monitoring.auto_instrument'] &&
63
+ status == 200 &&
64
+ !env[ALREADY_INSTRUMENTED_KEY] &&
65
+ html?(headers) &&
66
+ !attachment?(headers) &&
67
+ !streaming?(env, headers)
68
+ end
68
69
 
69
- def is_streaming?(env)
70
- return false unless defined?(ActionController::Live)
70
+ private
71
+
72
+ def autoinstrument_source(response, headers, js_to_inject)
73
+ source = gather_source(response)
74
+ close_old_response(response)
75
+ return nil unless source
76
+
77
+ # Only scan the first 50k (roughly) then give up.
78
+ beginning_of_source = source[0..SCAN_LIMIT]
79
+ meta_tag_positions = find_meta_tag_positions(beginning_of_source)
80
+ if body_start = find_body_start(beginning_of_source)
81
+ if insertion_index = find_insertion_index(meta_tag_positions, beginning_of_source, body_start)
82
+ source = source_injection(source, insertion_index, js_to_inject)
83
+ else
84
+ NewRelic::Agent.logger.debug("Skipping RUM instrumentation. Could not properly determine location to inject script.")
85
+ end
86
+ else
87
+ msg = "Skipping RUM instrumentation. Unable to find <body> tag in first #{SCAN_LIMIT} bytes of document."
88
+ NewRelic::Agent.logger.log_once(:warn, :rum_insertion_failure, msg)
89
+ NewRelic::Agent.logger.debug(msg)
90
+ end
71
91
 
72
- env['action_controller.instance'].class.included_modules.include?(ActionController::Live)
73
- end
92
+ source
93
+ rescue => e
94
+ NewRelic::Agent.logger.debug("Skipping RUM instrumentation on exception.", e)
95
+ nil
96
+ end
74
97
 
75
- CHARSET_RE = /<\s*meta[^>]+charset\s*=[^>]*>/im.freeze
76
- X_UA_COMPATIBLE_RE = /<\s*meta[^>]+http-equiv\s*=\s*['"]x-ua-compatible['"][^>]*>/im.freeze
98
+ def html?(headers)
99
+ headers[CONTENT_TYPE] && headers[CONTENT_TYPE].include?(TEXT_HTML)
100
+ end
77
101
 
78
- def autoinstrument_source(response, headers, js_to_inject)
79
- source = gather_source(response)
80
- close_old_response(response)
81
- return nil unless source
102
+ def attachment?(headers)
103
+ headers[CONTENT_DISPOSITION] && headers[CONTENT_DISPOSITION].include?(ATTACHMENT)
104
+ end
82
105
 
83
- # Only scan the first 50k (roughly) then give up.
84
- beginning_of_source = source[0..SCAN_LIMIT]
106
+ def streaming?(env, headers)
107
+ # Chunked transfer encoding is a streaming data transfer mechanism available only in HTTP/1.1
108
+ return true if headers && headers['Transfer-Encoding'] == 'chunked'
85
109
 
86
- if body_start = find_body_start(beginning_of_source)
87
- meta_tag_positions = [
88
- find_x_ua_compatible_position(beginning_of_source),
89
- find_charset_position(beginning_of_source)
90
- ].compact
110
+ defined?(ActionController::Live) &&
111
+ env['action_controller.instance'].class.included_modules.include?(ActionController::Live)
112
+ end
91
113
 
92
- if !meta_tag_positions.empty?
93
- insertion_index = meta_tag_positions.max
94
- else
95
- insertion_index = find_end_of_head_open(beginning_of_source) || body_start
96
- end
114
+ def source_injection(source, insertion_index, js_to_inject)
115
+ source[0...insertion_index] <<
116
+ js_to_inject <<
117
+ source[insertion_index..-1]
118
+ end
97
119
 
98
- if insertion_index
99
- source = source[0...insertion_index] <<
100
- js_to_inject <<
101
- source[insertion_index..-1]
120
+ def find_insertion_index(tag_positions, source_beginning, body_start)
121
+ if !tag_positions.empty?
122
+ tag_positions.max
102
123
  else
103
- NewRelic::Agent.logger.debug "Skipping RUM instrumentation. Could not properly determine location to inject script."
124
+ find_end_of_head_open(source_beginning) || body_start
104
125
  end
105
- else
106
- msg = "Skipping RUM instrumentation. Unable to find <body> tag in first #{SCAN_LIMIT} bytes of document."
107
- NewRelic::Agent.logger.log_once(:warn, :rum_insertion_failure, msg)
108
- NewRelic::Agent.logger.debug(msg)
109
126
  end
110
127
 
111
- source
112
- rescue => e
113
- NewRelic::Agent.logger.debug "Skipping RUM instrumentation on exception.", e
114
- nil
115
- end
128
+ def find_meta_tag_positions(source_beginning)
129
+ [
130
+ find_x_ua_compatible_position(source_beginning),
131
+ find_charset_position(source_beginning)
132
+ ].compact
133
+ end
116
134
 
117
- def gather_source(response)
118
- source = nil
119
- response.each {|fragment| source ? (source << fragment.to_s) : (source = fragment.to_s)}
120
- source
121
- end
135
+ def gather_source(response)
136
+ source = nil
137
+ response.each { |fragment| source ? (source << fragment.to_s) : (source = fragment.to_s) }
138
+ source
139
+ end
122
140
 
123
- # Per "The Response > The Body" section of Rack spec, we should close
124
- # if our response is able. http://rack.rubyforge.org/doc/SPEC.html
125
- def close_old_response(response)
126
- if response.respond_to?(:close)
127
- response.close
141
+ # Per "The Response > The Body" section of Rack spec, we should close
142
+ # if our response is able. http://rack.rubyforge.org/doc/SPEC.html
143
+ def close_old_response(response)
144
+ response.close if response.respond_to?(:close)
128
145
  end
129
- end
130
146
 
131
- def find_body_start(beginning_of_source)
132
- beginning_of_source.index(BODY_START)
133
- end
147
+ def find_body_start(beginning_of_source)
148
+ beginning_of_source.index(BODY_START)
149
+ end
134
150
 
135
- def find_x_ua_compatible_position(beginning_of_source)
136
- match = X_UA_COMPATIBLE_RE.match(beginning_of_source)
137
- match.end(0) if match
138
- end
151
+ def find_x_ua_compatible_position(beginning_of_source)
152
+ match = X_UA_COMPATIBLE_RE.match(beginning_of_source)
153
+ match.end(0) if match
154
+ end
139
155
 
140
- def find_charset_position(beginning_of_source)
141
- match = CHARSET_RE.match(beginning_of_source)
142
- match.end(0) if match
143
- end
156
+ def find_charset_position(beginning_of_source)
157
+ match = CHARSET_RE.match(beginning_of_source)
158
+ match.end(0) if match
159
+ end
144
160
 
145
- def find_end_of_head_open(beginning_of_source)
146
- head_open = beginning_of_source.index(HEAD_START)
147
- beginning_of_source.index(GT, head_open) + 1 if head_open
161
+ def find_end_of_head_open(beginning_of_source)
162
+ head_open = beginning_of_source.index(HEAD_START)
163
+ beginning_of_source.index(GT, head_open) + 1 if head_open
164
+ end
148
165
  end
149
166
  end
150
167
  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
  # @api public
6
6
  module NewRelic
@@ -1,11 +1,12 @@
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 'capistrano/framework'
6
+ require_relative 'helpers/send_deployment'
6
7
 
7
8
  namespace :newrelic do
8
-
9
+ include SendDeployment
9
10
  # notifies New Relic of a deployment
10
11
  desc "Record a deployment in New Relic (newrelic.com)"
11
12
  task :notice_deployment do
@@ -19,63 +20,4 @@ namespace :newrelic do
19
20
  end
20
21
  end
21
22
  end
22
-
23
- def send_deployment_notification_to_newrelic
24
- environment = fetch(:newrelic_rails_env, fetch(:rack_env, fetch(:rails_env, fetch(:stage, "production"))))
25
-
26
- require 'new_relic/cli/command.rb'
27
-
28
- begin
29
- # allow overrides to be defined for revision, description, changelog, appname, and user
30
- rev = fetch(:newrelic_revision)
31
- description = fetch(:newrelic_desc)
32
- changelog = fetch(:newrelic_changelog)
33
- appname = fetch(:newrelic_appname)
34
- user = fetch(:newrelic_user)
35
- license_key = fetch(:newrelic_license_key)
36
-
37
- has_scm_from_plugin = respond_to?(:scm_plugin_installed?) && scm_plugin_installed?
38
- has_scm_from_config = defined?(scm) && !scm.nil? && scm != :none
39
-
40
- if has_scm_from_plugin || has_scm_from_config
41
- changelog ||= lookup_changelog
42
- rev ||= fetch(:current_revision)
43
- end
44
-
45
- new_revision = rev
46
- deploy_options = {
47
- :environment => environment,
48
- :revision => new_revision,
49
- :changelog => changelog,
50
- :description => description,
51
- :appname => appname,
52
- :user => user,
53
- :license_key => license_key
54
- }
55
-
56
- debug "Uploading deployment to New Relic"
57
- deployment = NewRelic::Cli::Deployments.new deploy_options
58
- deployment.run
59
- info "Uploaded deployment information to New Relic"
60
-
61
- rescue NewRelic::Cli::Command::CommandFailure => e
62
- info e.message
63
- rescue => e
64
- info "Error creating New Relic deployment (#{e})\n#{e.backtrace.join("\n")}"
65
- end
66
- end
67
-
68
- def lookup_changelog
69
- previous_revision = fetch(:previous_revision)
70
- current_revision = fetch(:current_revision)
71
- return unless current_revision && previous_revision
72
-
73
- debug "Retrieving changelog for New Relic Deployment details"
74
-
75
- if Rake::Task.task_defined?("git:check")
76
- log_command = "git --no-pager log --no-color --pretty=format:' * %an: %s' " +
77
- "--abbrev-commit --no-merges #{previous_revision}..#{current_revision}"
78
- `#{log_command}`
79
- end
80
- end
81
23
  end
@@ -1,60 +1,57 @@
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.
4
-
5
- make_notify_task = Proc.new do
6
-
7
- namespace :newrelic do
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
8
4
 
5
+ make_notify_task = proc do
6
+ namespace(:newrelic) do
9
7
  # on all deployments, notify New Relic
10
- desc "Record a deployment in New Relic (newrelic.com)"
11
- task :notice_deployment, :roles => :app, :except => {:no_release => true } do
8
+ desc("Record a deployment in New Relic (newrelic.com)")
9
+ task(:notice_deployment, :roles => :app, :except => {:no_release => true}) do
12
10
  rails_env = fetch(:newrelic_rails_env, fetch(:rails_env, "production"))
13
11
 
14
12
  require 'new_relic/cli/command'
15
13
 
16
14
  begin
17
15
  # allow overrides to be defined for revision, description, changelog, appname, and user
18
- rev = fetch(:newrelic_revision) if exists?(:newrelic_revision)
19
- description = fetch(:newrelic_desc) if exists?(:newrelic_desc)
20
- changelog = fetch(:newrelic_changelog) if exists?(:newrelic_changelog)
21
- appname = fetch(:newrelic_appname) if exists?(:newrelic_appname)
22
- user = fetch(:newrelic_user) if exists?(:newrelic_user)
16
+ rev = fetch(:newrelic_revision) if exists?(:newrelic_revision)
17
+ description = fetch(:newrelic_desc) if exists?(:newrelic_desc)
18
+ changelog = fetch(:newrelic_changelog) if exists?(:newrelic_changelog)
19
+ appname = fetch(:newrelic_appname) if exists?(:newrelic_appname)
20
+ user = fetch(:newrelic_user) if exists?(:newrelic_user)
23
21
  license_key = fetch(:newrelic_license_key) if exists?(:newrelic_license_key)
24
22
 
25
23
  unless scm == :none
26
24
  changelog = lookup_changelog(changelog)
27
- rev = lookup_rev(rev)
25
+ rev = lookup_rev(rev)
28
26
  end
29
27
 
30
28
  new_revision = rev
31
29
  deploy_options = {
32
30
  :environment => rails_env,
33
- :revision => new_revision,
34
- :changelog => changelog,
31
+ :revision => new_revision,
32
+ :changelog => changelog,
35
33
  :description => description,
36
- :appname => appname,
37
- :user => user,
34
+ :appname => appname,
35
+ :user => user,
38
36
  :license_key => license_key
39
37
  }
40
38
 
41
- logger.debug "Uploading deployment to New Relic"
42
- deployment = NewRelic::Cli::Deployments.new deploy_options
39
+ logger.debug("Uploading deployment to New Relic")
40
+ deployment = NewRelic::Cli::Deployments.new(deploy_options)
43
41
  deployment.run
44
- logger.info "Uploaded deployment information to New Relic"
45
-
42
+ logger.info("Uploaded deployment information to New Relic")
46
43
  rescue NewRelic::Cli::Command::CommandFailure => e
47
- logger.info e.message
44
+ logger.info(e.message)
48
45
  rescue Capistrano::CommandError
49
- logger.info "Unable to notify New Relic of the deployment... skipping"
46
+ logger.info("Unable to notify New Relic of the deployment... skipping")
50
47
  rescue => e
51
- logger.info "Error creating New Relic deployment (#{e})\n#{e.backtrace.join("\n")}"
48
+ logger.info("Error creating New Relic deployment (#{e})\n#{e.backtrace.join("\n")}")
52
49
  end
53
50
  end
54
51
 
55
52
  def lookup_changelog(changelog)
56
53
  if !changelog
57
- logger.debug "Getting log of changes for New Relic Deployment details"
54
+ logger.debug("Getting log of changes for New Relic Deployment details")
58
55
  from_revision = source.next_revision(current_revision)
59
56
 
60
57
  if scm == :git
@@ -72,7 +69,7 @@ make_notify_task = Proc.new do
72
69
  def lookup_rev(rev)
73
70
  if rev.nil?
74
71
  rev = source.query_revision(source.head()) do |cmd|
75
- logger.debug "executing locally: '#{cmd}'"
72
+ logger.debug("executing locally: '#{cmd}'")
76
73
  `#{cmd}`
77
74
  end
78
75
 
@@ -0,0 +1,70 @@
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 SendDeployment
6
+ def send_deployment_notification_to_newrelic
7
+ require 'new_relic/cli/command'
8
+ debug("Uploading deployment to New Relic")
9
+ NewRelic::Cli::Deployments.new(deploy_options).run
10
+ info("Uploaded deployment information to New Relic")
11
+ rescue NewRelic::Cli::Command::CommandFailure => e
12
+ info(e.message)
13
+ rescue => e
14
+ info("Error creating New Relic deployment (#{e})\n#{e.backtrace.join("\n")}")
15
+ end
16
+
17
+ private
18
+
19
+ def deploy_options
20
+ {
21
+ :environment => fetch_environment,
22
+ :revision => fetch_rev,
23
+ :changelog => fetch_changelog,
24
+ :description => fetch(:newrelic_desc),
25
+ :appname => fetch(:newrelic_appname),
26
+ :user => fetch(:newrelic_user),
27
+ :license_key => fetch(:newrelic_license_key)
28
+ }
29
+ end
30
+
31
+ def fetch_changelog
32
+ newrelic_changelog = fetch(:newrelic_changelog)
33
+ has_scm? && !newrelic_changelog ? lookup_changelog : newrelic_changelog
34
+ end
35
+
36
+ def fetch_environment
37
+ fetch(:newrelic_rails_env, fetch(:rack_env, fetch(:rails_env, fetch(:stage, "production"))))
38
+ end
39
+
40
+ def fetch_rev
41
+ newrelic_rev = fetch(:newrelic_revision)
42
+ has_scm? && !newrelic_rev ? fetch(:current_revision) : newrelic_rev
43
+ end
44
+
45
+ def has_scm?
46
+ has_scm_from_plugin? || has_scm_from_config?
47
+ end
48
+
49
+ def has_scm_from_config?
50
+ defined?(scm) && !scm.nil? && scm != :none
51
+ end
52
+
53
+ def has_scm_from_plugin?
54
+ respond_to?(:scm_plugin_installed?) && scm_plugin_installed?
55
+ end
56
+
57
+ def lookup_changelog
58
+ previous_revision = fetch(:previous_revision)
59
+ current_revision = fetch(:current_revision)
60
+ return unless current_revision && previous_revision
61
+
62
+ debug("Retrieving changelog for New Relic Deployment details")
63
+
64
+ if Rake::Task.task_defined?("git:check")
65
+ log_command = "git --no-pager log --no-color --pretty=format:' * %an: %s' " +
66
+ "--abbrev-commit --no-merges #{previous_revision}..#{current_revision}"
67
+ `#{log_command}`
68
+ end
69
+ end
70
+ 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
  # When installed as a plugin, this is loaded automatically.
6
6
  #
@@ -1,17 +1,19 @@
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 SupportabilityHelper
7
-
8
7
  API_SUPPORTABILITY_PREFIX = 'Supportability/API/'.freeze
9
8
 
10
9
  # pre-instantiate these strings as they may be used multiple times per
11
10
  # transaction, just to eke out a bit less performance hit
12
11
  #
13
12
  API_SUPPORTABILITY_METRICS = [
13
+ :insert_distributed_trace_headers,
14
+ :accept_distributed_trace_headers,
14
15
  :add_custom_attributes,
16
+ :add_custom_span_attributes,
15
17
  :add_instrumentation,
16
18
  :add_method_tracer,
17
19
  :add_transaction_tracer,
@@ -19,7 +21,6 @@ module NewRelic
19
21
  :browser_timing_header,
20
22
  :disable_all_tracing,
21
23
  :disable_sql_recording,
22
- :disable_transaction_tracing,
23
24
  :drop_buffered_data,
24
25
  :get_request_metadata,
25
26
  :get_response_metadata,
@@ -48,10 +49,11 @@ module NewRelic
48
49
  :shutdown,
49
50
  :start_segment,
50
51
  :trace,
52
+ :traced_thread,
51
53
  :trace_execution_scoped,
52
54
  :trace_execution_unscoped,
53
55
  :wrap
54
- ].reduce({}) do |h,o|
56
+ ].reduce({}) do |h, o|
55
57
  h[o] = API_SUPPORTABILITY_PREFIX + o.to_s
56
58
  h
57
59
  end
@@ -59,10 +61,22 @@ module NewRelic
59
61
  def record_api_supportability_metric(method_name)
60
62
  agent = NewRelic::Agent.agent or return
61
63
  if metric = API_SUPPORTABILITY_METRICS[method_name]
62
- agent.stats_engine.tl_record_unscoped_metrics metric, &:increment_count
64
+ agent.stats_engine.tl_record_unscoped_metrics(metric, &:increment_count)
63
65
  else
64
- NewRelic::Agent.logger.debug "API supportability metric not found for :#{method_name}"
66
+ NewRelic::Agent.logger.debug("API supportability metric not found for :#{method_name}")
65
67
  end
66
68
  end
69
+
70
+ def valid_api_argument_class?(arg, name, klass)
71
+ return true if arg.is_a?(klass)
72
+
73
+ caller_location = caller_locations(1..1).first.label
74
+
75
+ message = "Bad argument passed to ##{caller_location}. " \
76
+ "Expected #{klass} for `#{name}` but got #{arg.class}"
77
+
78
+ NewRelic::Agent.logger.warn(message)
79
+ nil
80
+ end
67
81
  end
68
82
  end
@@ -0,0 +1,39 @@
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
+ #
7
+ # This class allows the current transaction to be passed to a Thread so that nested segments can be created from the operations performed within the Thread's block.
8
+ # To have the New Relic Ruby agent automatically trace all of your applications threads,
9
+ # enable the +instrumentation.thread.tracing+ configuration option in your newrelic.yml.
10
+ #
11
+ # Note: disabling the configuration option +instrumentation.thread+ while using this class can cause incorrectly nested spans.
12
+ #
13
+ # @api public
14
+ class TracedThread < Thread
15
+ #
16
+ # Creates a new Thread whose work will be traced by New Relic.
17
+ # Use this class as a replacement for the native Thread class.
18
+ # Example: Instead of using +Thread.new+, use:
19
+ #
20
+ # NewRelic::TracedThread.new { execute_some_code }
21
+ #
22
+ # @api public
23
+ def initialize(*args, &block)
24
+ NewRelic::Agent.record_api_supportability_metric(:traced_thread)
25
+ traced_block = create_traced_block(*args, &block)
26
+ super(*args, &traced_block)
27
+ end
28
+
29
+ def create_traced_block(*args, &block)
30
+ return block if NewRelic::Agent.config[:'instrumentation.thread.tracing'] # if this is on, don't double trace
31
+
32
+ NewRelic::Agent::Tracer.thread_block_with_current_transaction(
33
+ *args,
34
+ segment_name: 'Ruby/TracedThread',
35
+ &block
36
+ )
37
+ end
38
+ end
39
+ end