newrelic_rpm 8.2.0 → 9.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (439) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +5 -2
  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 +1 -0
  8. data/Brewfile +12 -0
  9. data/CHANGELOG.md +3654 -2951
  10. data/CONTRIBUTING.md +21 -6
  11. data/DOCKER.md +167 -0
  12. data/Dockerfile +10 -0
  13. data/Gemfile +0 -1
  14. data/Guardfile +9 -8
  15. data/LICENSE +0 -6
  16. data/README.md +20 -20
  17. data/Rakefile +27 -29
  18. data/THIRD_PARTY_NOTICES.md +14 -199
  19. data/Thorfile +5 -0
  20. data/bin/newrelic +3 -2
  21. data/bin/newrelic_cmd +1 -0
  22. data/bin/nrdebug +76 -53
  23. data/config.dot +5 -5
  24. data/docker-compose.yml +107 -0
  25. data/init.rb +4 -6
  26. data/install.rb +2 -2
  27. data/lefthook.yml +9 -0
  28. data/lib/new_relic/agent/adaptive_sampler.rb +11 -7
  29. data/lib/new_relic/agent/agent.rb +94 -924
  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 +23 -19
  38. data/lib/new_relic/agent/attribute_filter.rb +64 -47
  39. data/lib/new_relic/agent/attribute_processing.rb +7 -7
  40. data/lib/new_relic/agent/attributes.rb +5 -4
  41. data/lib/new_relic/agent/audit_logger.rb +8 -3
  42. data/lib/new_relic/agent/autostart.rb +20 -18
  43. data/lib/new_relic/agent/chained_call.rb +1 -1
  44. data/lib/new_relic/agent/commands/agent_command.rb +3 -3
  45. data/lib/new_relic/agent/commands/agent_command_router.rb +12 -11
  46. data/lib/new_relic/agent/commands/thread_profiler_session.rb +5 -7
  47. data/lib/new_relic/agent/configuration/default_source.rb +1353 -1355
  48. data/lib/new_relic/agent/configuration/dotted_hash.rb +6 -5
  49. data/lib/new_relic/agent/configuration/environment_source.rb +11 -9
  50. data/lib/new_relic/agent/configuration/event_harvest_config.rb +13 -6
  51. data/lib/new_relic/agent/configuration/high_security_source.rb +8 -9
  52. data/lib/new_relic/agent/configuration/manager.rb +82 -68
  53. data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
  54. data/lib/new_relic/agent/configuration/mask_defaults.rb +3 -3
  55. data/lib/new_relic/agent/configuration/security_policy_source.rb +82 -85
  56. data/lib/new_relic/agent/configuration/server_source.rb +19 -18
  57. data/lib/new_relic/agent/configuration/yaml_source.rb +16 -13
  58. data/lib/new_relic/agent/configuration.rb +1 -1
  59. data/lib/new_relic/agent/connect/request_builder.rb +17 -19
  60. data/lib/new_relic/agent/connect/response_handler.rb +5 -8
  61. data/lib/new_relic/agent/custom_event_aggregator.rb +14 -15
  62. data/lib/new_relic/agent/database/explain_plan_helpers.rb +4 -5
  63. data/lib/new_relic/agent/database/obfuscation_helpers.rb +14 -13
  64. data/lib/new_relic/agent/database/obfuscator.rb +2 -2
  65. data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +3 -3
  66. data/lib/new_relic/agent/database.rb +37 -48
  67. data/lib/new_relic/agent/database_adapter.rb +3 -1
  68. data/lib/new_relic/agent/datastores/metric_helper.rb +17 -18
  69. data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +7 -6
  70. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +6 -10
  71. data/lib/new_relic/agent/datastores/mongo.rb +1 -1
  72. data/lib/new_relic/agent/datastores/nosql_obfuscator.rb +41 -0
  73. data/lib/new_relic/agent/datastores/redis.rb +5 -7
  74. data/lib/new_relic/agent/datastores.rb +7 -9
  75. data/lib/new_relic/agent/deprecator.rb +1 -1
  76. data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +6 -6
  77. data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +31 -29
  78. data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +22 -21
  79. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +19 -19
  80. data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +49 -51
  81. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +5 -6
  82. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +76 -77
  83. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +37 -36
  84. data/lib/new_relic/agent/distributed_tracing.rb +33 -35
  85. data/lib/new_relic/agent/encoding_normalizer.rb +4 -2
  86. data/lib/new_relic/agent/error_collector.rb +27 -23
  87. data/lib/new_relic/agent/error_event_aggregator.rb +4 -5
  88. data/lib/new_relic/agent/error_filter.rb +15 -16
  89. data/lib/new_relic/agent/error_trace_aggregator.rb +4 -3
  90. data/lib/new_relic/agent/event_aggregator.rb +22 -21
  91. data/lib/new_relic/agent/event_buffer.rb +7 -8
  92. data/lib/new_relic/agent/event_listener.rb +1 -2
  93. data/lib/new_relic/agent/event_loop.rb +22 -20
  94. data/lib/new_relic/agent/external.rb +11 -12
  95. data/lib/new_relic/agent/guid_generator.rb +13 -11
  96. data/lib/new_relic/agent/harvester.rb +4 -5
  97. data/lib/new_relic/agent/heap.rb +7 -9
  98. data/lib/new_relic/agent/hostname.rb +20 -13
  99. data/lib/new_relic/agent/http_clients/abstract.rb +8 -9
  100. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +6 -11
  101. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +8 -9
  102. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +4 -5
  103. data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +2 -4
  104. data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +2 -4
  105. data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +4 -5
  106. data/lib/new_relic/agent/http_clients/uri_util.rb +1 -3
  107. data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +9 -22
  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 +37 -30
  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 +18 -19
  117. data/lib/new_relic/agent/instrumentation/active_job.rb +33 -13
  118. data/lib/new_relic/agent/instrumentation/active_job_subscriber.rb +41 -0
  119. data/lib/new_relic/agent/instrumentation/active_merchant.rb +19 -5
  120. data/lib/new_relic/agent/instrumentation/active_record.rb +37 -35
  121. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +71 -61
  122. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +49 -46
  123. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +4 -4
  124. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +26 -17
  125. data/lib/new_relic/agent/instrumentation/active_storage.rb +7 -3
  126. data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +8 -33
  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 +11 -11
  134. data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +20 -22
  135. data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +4 -4
  136. data/lib/new_relic/agent/instrumentation/bunny.rb +4 -5
  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 +67 -58
  142. data/lib/new_relic/agent/instrumentation/curb/chain.rb +41 -43
  143. data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +52 -53
  144. data/lib/new_relic/agent/instrumentation/curb/prepend.rb +12 -14
  145. data/lib/new_relic/agent/instrumentation/curb.rb +7 -7
  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 +6 -9
  149. data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +4 -9
  150. data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +1 -2
  151. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +28 -10
  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 +6 -6
  157. data/lib/new_relic/agent/instrumentation/excon.rb +24 -8
  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 +7 -8
  163. data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +12 -12
  164. data/lib/new_relic/agent/instrumentation/grape/prepend.rb +4 -4
  165. data/lib/new_relic/agent/instrumentation/grape.rb +12 -13
  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 +3 -4
  178. data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +7 -8
  179. data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +1 -3
  180. data/lib/new_relic/agent/instrumentation/httpclient.rb +3 -3
  181. data/lib/new_relic/agent/instrumentation/httprb/chain.rb +3 -3
  182. data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +11 -11
  183. data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +2 -2
  184. data/lib/new_relic/agent/instrumentation/httprb.rb +4 -4
  185. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +4 -5
  186. data/lib/new_relic/agent/instrumentation/logger/chain.rb +2 -2
  187. data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +27 -20
  188. data/lib/new_relic/agent/instrumentation/logger/prepend.rb +1 -1
  189. data/lib/new_relic/agent/instrumentation/logger.rb +7 -6
  190. data/lib/new_relic/agent/instrumentation/memcache/chain.rb +2 -3
  191. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +26 -18
  192. data/lib/new_relic/agent/instrumentation/memcache/helper.rb +8 -10
  193. data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +20 -18
  194. data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +22 -15
  195. data/lib/new_relic/agent/instrumentation/memcache.rb +22 -23
  196. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +11 -12
  197. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +5 -7
  198. data/lib/new_relic/agent/instrumentation/mongo.rb +3 -3
  199. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +21 -18
  200. data/lib/new_relic/agent/instrumentation/net_http/chain.rb +4 -5
  201. data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +10 -10
  202. data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +5 -5
  203. data/lib/new_relic/agent/instrumentation/net_http.rb +8 -8
  204. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +51 -9
  205. data/lib/new_relic/agent/instrumentation/padrino/chain.rb +1 -1
  206. data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +4 -3
  207. data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +2 -2
  208. data/lib/new_relic/agent/instrumentation/padrino.rb +4 -9
  209. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +6 -6
  210. data/lib/new_relic/agent/instrumentation/queue_time.rb +5 -6
  211. data/lib/new_relic/agent/instrumentation/rack/chain.rb +27 -19
  212. data/lib/new_relic/agent/instrumentation/rack/helpers.rb +3 -2
  213. data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +14 -12
  214. data/lib/new_relic/agent/instrumentation/rack/prepend.rb +13 -7
  215. data/lib/new_relic/agent/instrumentation/rack.rb +15 -15
  216. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +15 -15
  217. data/lib/new_relic/agent/instrumentation/rails_middleware.rb +4 -4
  218. data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +9 -8
  219. data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +17 -5
  220. data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +8 -5
  221. data/lib/new_relic/agent/instrumentation/rails_notifications/custom_events.rb +30 -0
  222. data/lib/new_relic/agent/instrumentation/rake/chain.rb +2 -7
  223. data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +14 -16
  224. data/lib/new_relic/agent/instrumentation/rake/prepend.rb +1 -1
  225. data/lib/new_relic/agent/instrumentation/rake.rb +9 -9
  226. data/lib/new_relic/agent/instrumentation/redis/chain.rb +25 -14
  227. data/lib/new_relic/agent/instrumentation/redis/constants.rb +17 -0
  228. data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +53 -25
  229. data/lib/new_relic/agent/instrumentation/redis/middleware.rb +16 -0
  230. data/lib/new_relic/agent/instrumentation/redis/prepend.rb +10 -5
  231. data/lib/new_relic/agent/instrumentation/redis.rb +13 -7
  232. data/lib/new_relic/agent/instrumentation/resque/chain.rb +4 -5
  233. data/lib/new_relic/agent/instrumentation/resque/helper.rb +2 -2
  234. data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +4 -5
  235. data/lib/new_relic/agent/instrumentation/resque/prepend.rb +2 -3
  236. data/lib/new_relic/agent/instrumentation/resque.rb +17 -17
  237. data/lib/new_relic/agent/instrumentation/sequel.rb +16 -19
  238. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +2 -2
  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 +24 -70
  243. data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +1 -1
  244. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +2 -3
  245. data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +5 -4
  246. data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +1 -1
  247. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +2 -2
  248. data/lib/new_relic/agent/instrumentation/sinatra.rb +26 -17
  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 +1 -1
  254. data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +2 -2
  255. data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +1 -1
  256. data/lib/new_relic/agent/instrumentation/tilt.rb +4 -4
  257. data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +5 -5
  258. data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +13 -15
  259. data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +2 -2
  260. data/lib/new_relic/agent/instrumentation/typhoeus.rb +2 -2
  261. data/lib/new_relic/agent/instrumentation.rb +1 -1
  262. data/lib/new_relic/agent/internal_agent_error.rb +2 -2
  263. data/lib/new_relic/agent/javascript_instrumentor.rb +38 -37
  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 +1 -1
  268. data/lib/new_relic/agent/log_priority.rb +20 -0
  269. data/lib/new_relic/agent/logging.rb +21 -17
  270. data/lib/new_relic/agent/memory_logger.rb +2 -2
  271. data/lib/new_relic/agent/messaging.rb +61 -63
  272. data/lib/new_relic/agent/method_tracer.rb +28 -22
  273. data/lib/new_relic/agent/method_tracer_helpers.rb +88 -11
  274. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +16 -16
  275. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +5 -4
  276. data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +1 -2
  277. data/lib/new_relic/agent/monitors/synthetics_monitor.rb +6 -9
  278. data/lib/new_relic/agent/monitors.rb +6 -7
  279. data/lib/new_relic/agent/new_relic_service/encoders.rb +6 -6
  280. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +5 -5
  281. data/lib/new_relic/agent/new_relic_service/marshaller.rb +2 -2
  282. data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +4 -4
  283. data/lib/new_relic/agent/new_relic_service.rb +242 -185
  284. data/lib/new_relic/agent/{noticible_error.rb → noticeable_error.rb} +2 -5
  285. data/lib/new_relic/agent/null_logger.rb +7 -3
  286. data/lib/new_relic/agent/obfuscator.rb +8 -10
  287. data/lib/new_relic/agent/parameter_filtering.rb +24 -10
  288. data/lib/new_relic/agent/payload_metric_mapping.rb +9 -10
  289. data/lib/new_relic/agent/pipe_channel_manager.rb +17 -11
  290. data/lib/new_relic/agent/pipe_service.rb +7 -4
  291. data/lib/new_relic/agent/prepend_supportability.rb +2 -2
  292. data/lib/new_relic/agent/priority_sampled_buffer.rb +8 -11
  293. data/lib/new_relic/agent/range_extensions.rb +8 -28
  294. data/lib/new_relic/agent/rules_engine/replacement_rule.rb +11 -11
  295. data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +12 -13
  296. data/lib/new_relic/agent/rules_engine.rb +5 -4
  297. data/lib/new_relic/agent/sampler.rb +3 -4
  298. data/lib/new_relic/agent/sampler_collection.rb +3 -4
  299. data/lib/new_relic/agent/samplers/cpu_sampler.rb +2 -1
  300. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +6 -6
  301. data/lib/new_relic/agent/samplers/memory_sampler.rb +24 -13
  302. data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
  303. data/lib/new_relic/agent/samplers/vm_sampler.rb +21 -19
  304. data/lib/new_relic/agent/span_event_aggregator.rb +10 -10
  305. data/lib/new_relic/agent/span_event_primitive.rb +62 -56
  306. data/lib/new_relic/agent/sql_sampler.rb +17 -17
  307. data/lib/new_relic/agent/stats.rb +78 -41
  308. data/lib/new_relic/agent/stats_engine/gc_profiler.rb +9 -11
  309. data/lib/new_relic/agent/stats_engine/stats_hash.rb +12 -13
  310. data/lib/new_relic/agent/stats_engine.rb +7 -7
  311. data/lib/new_relic/agent/synthetics_event_aggregator.rb +7 -8
  312. data/lib/new_relic/agent/system_info.rb +85 -65
  313. data/lib/new_relic/agent/threading/agent_thread.rb +18 -14
  314. data/lib/new_relic/agent/threading/backtrace_node.rb +12 -13
  315. data/lib/new_relic/agent/threading/backtrace_service.rb +10 -9
  316. data/lib/new_relic/agent/threading/thread_profile.rb +22 -22
  317. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
  318. data/lib/new_relic/agent/tracer.rb +82 -56
  319. data/lib/new_relic/agent/transaction/abstract_segment.rb +100 -37
  320. data/lib/new_relic/agent/transaction/datastore_segment.rb +19 -18
  321. data/lib/new_relic/agent/transaction/distributed_tracer.rb +62 -56
  322. data/lib/new_relic/agent/transaction/distributed_tracing.rb +43 -44
  323. data/lib/new_relic/agent/transaction/external_request_segment.rb +41 -34
  324. data/lib/new_relic/agent/transaction/message_broker_segment.rb +30 -29
  325. data/lib/new_relic/agent/transaction/request_attributes.rb +35 -35
  326. data/lib/new_relic/agent/transaction/segment.rb +17 -10
  327. data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -3
  328. data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
  329. data/lib/new_relic/agent/transaction/trace.rb +15 -11
  330. data/lib/new_relic/agent/transaction/trace_builder.rb +10 -10
  331. data/lib/new_relic/agent/transaction/trace_context.rb +35 -35
  332. data/lib/new_relic/agent/transaction/trace_node.rb +25 -24
  333. data/lib/new_relic/agent/transaction/tracing.rb +14 -11
  334. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +5 -5
  335. data/lib/new_relic/agent/transaction.rb +169 -125
  336. data/lib/new_relic/agent/transaction_error_primitive.rb +27 -25
  337. data/lib/new_relic/agent/transaction_event_aggregator.rb +12 -12
  338. data/lib/new_relic/agent/transaction_event_primitive.rb +32 -33
  339. data/lib/new_relic/agent/transaction_event_recorder.rb +16 -15
  340. data/lib/new_relic/agent/transaction_metrics.rb +10 -9
  341. data/lib/new_relic/agent/transaction_sampler.rb +5 -6
  342. data/lib/new_relic/agent/transaction_time_aggregator.rb +21 -20
  343. data/lib/new_relic/agent/utilization/aws.rb +33 -3
  344. data/lib/new_relic/agent/utilization/azure.rb +3 -3
  345. data/lib/new_relic/agent/utilization/gcp.rb +7 -7
  346. data/lib/new_relic/agent/utilization/pcf.rb +5 -4
  347. data/lib/new_relic/agent/utilization/vendor.rb +43 -28
  348. data/lib/new_relic/agent/utilization_data.rb +7 -5
  349. data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
  350. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +2 -2
  351. data/lib/new_relic/agent/vm/mri_vm.rb +40 -15
  352. data/lib/new_relic/agent/vm/snapshot.rb +4 -4
  353. data/lib/new_relic/agent/vm.rb +1 -1
  354. data/lib/new_relic/agent/worker_loop.rb +5 -7
  355. data/lib/new_relic/agent.rb +62 -81
  356. data/lib/new_relic/cli/command.rb +20 -22
  357. data/lib/new_relic/cli/commands/deployments.rb +91 -41
  358. data/lib/new_relic/cli/commands/install.rb +21 -24
  359. data/lib/new_relic/coerce.rb +15 -13
  360. data/lib/new_relic/collection_helper.rb +50 -48
  361. data/lib/new_relic/constants.rb +2 -1
  362. data/lib/new_relic/control/class_methods.rb +3 -3
  363. data/lib/new_relic/control/frameworks/external.rb +2 -2
  364. data/lib/new_relic/control/frameworks/rails.rb +13 -9
  365. data/lib/new_relic/control/frameworks/rails3.rb +3 -4
  366. data/lib/new_relic/control/frameworks/rails4.rb +1 -1
  367. data/lib/new_relic/control/frameworks/rails_notifications.rb +1 -1
  368. data/lib/new_relic/control/frameworks/ruby.rb +3 -3
  369. data/lib/new_relic/control/frameworks/sinatra.rb +7 -1
  370. data/lib/new_relic/control/frameworks.rb +1 -1
  371. data/lib/new_relic/control/instance_methods.rb +26 -45
  372. data/lib/new_relic/control/instrumentation.rb +39 -11
  373. data/lib/new_relic/control/private_instance_methods.rb +48 -0
  374. data/lib/new_relic/control/server_methods.rb +3 -4
  375. data/lib/new_relic/control.rb +1 -2
  376. data/lib/new_relic/delayed_job_injection.rb +1 -1
  377. data/lib/new_relic/dependency_detection.rb +29 -28
  378. data/lib/new_relic/environment_report.rb +40 -32
  379. data/lib/new_relic/helper.rb +48 -7
  380. data/lib/new_relic/language_support.rb +29 -5
  381. data/lib/new_relic/latest_changes.rb +7 -6
  382. data/lib/new_relic/local_environment.rb +22 -26
  383. data/lib/new_relic/metric_data.rb +31 -26
  384. data/lib/new_relic/metric_spec.rb +8 -6
  385. data/lib/new_relic/noticed_error.rb +17 -21
  386. data/lib/new_relic/rack/agent_hooks.rb +1 -1
  387. data/lib/new_relic/rack/agent_middleware.rb +5 -3
  388. data/lib/new_relic/rack/browser_monitoring.rb +133 -123
  389. data/lib/new_relic/rack.rb +1 -1
  390. data/lib/new_relic/recipes/capistrano3.rb +3 -61
  391. data/lib/new_relic/recipes/capistrano_legacy.rb +23 -26
  392. data/lib/new_relic/recipes/helpers/send_deployment.rb +70 -0
  393. data/lib/new_relic/recipes.rb +1 -1
  394. data/lib/new_relic/supportability_helper.rb +8 -9
  395. data/lib/new_relic/traced_thread.rb +39 -0
  396. data/lib/new_relic/version.rb +6 -17
  397. data/lib/newrelic_rpm.rb +14 -3
  398. data/lib/sequel/extensions/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +15 -18
  399. data/lib/sequel/plugins/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +8 -14
  400. data/lib/tasks/all.rb +2 -2
  401. data/lib/tasks/config.rake +21 -117
  402. data/lib/tasks/coverage_report.rake +28 -0
  403. data/lib/tasks/helpers/format.rb +123 -0
  404. data/lib/tasks/helpers/matches.rb +12 -0
  405. data/lib/tasks/helpers/prompt.rb +24 -0
  406. data/lib/tasks/helpers/removers.rb +33 -0
  407. data/lib/tasks/install.rake +4 -0
  408. data/lib/tasks/instrumentation_generator/README.md +63 -0
  409. data/lib/tasks/instrumentation_generator/TODO.md +33 -0
  410. data/lib/tasks/instrumentation_generator/instrumentation.thor +121 -0
  411. data/lib/tasks/instrumentation_generator/templates/Envfile.tt +9 -0
  412. data/lib/tasks/instrumentation_generator/templates/chain.tt +22 -0
  413. data/lib/tasks/instrumentation_generator/templates/chain_method.tt +8 -0
  414. data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +29 -0
  415. data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +13 -0
  416. data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
  417. data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
  418. data/lib/tasks/instrumentation_generator/templates/prepend.tt +13 -0
  419. data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
  420. data/lib/tasks/instrumentation_generator/templates/test.tt +15 -0
  421. data/lib/tasks/multiverse.rake +4 -0
  422. data/lib/tasks/multiverse.rb +5 -32
  423. data/lib/tasks/newrelic.rb +1 -1
  424. data/lib/tasks/tests.rake +10 -15
  425. data/newrelic.yml +544 -452
  426. data/newrelic_rpm.gemspec +35 -31
  427. data/recipes/newrelic.rb +2 -2
  428. data/test/agent_helper.rb +196 -180
  429. metadata +130 -102
  430. data/ROADMAP.md +0 -24
  431. data/bin/mongrel_rpm +0 -33
  432. data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
  433. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +0 -75
  434. data/lib/new_relic/agent/instrumentation/authlogic.rb +0 -25
  435. data/lib/new_relic/agent/instrumentation/data_mapper.rb +0 -204
  436. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +0 -26
  437. data/lib/new_relic/agent/instrumentation/sunspot.rb +0 -33
  438. /data/lib/tasks/{config.html.erb → helpers/config.html.erb} +0 -0
  439. /data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -26,12 +25,12 @@ module NewRelic
26
25
  end
27
26
  end
28
27
 
29
- def accept_incoming_request request, transport_type=nil
30
- accept_incoming_transport_type request, transport_type
31
- if trace_parent_header_present? request
32
- accept_trace_context_incoming_request request
28
+ def accept_incoming_request(request, transport_type = nil)
29
+ accept_incoming_transport_type(request, transport_type)
30
+ if trace_parent_header_present?(request)
31
+ accept_trace_context_incoming_request(request)
33
32
  else
34
- accept_distributed_tracing_incoming_request request
33
+ accept_distributed_tracing_incoming_request(request)
35
34
  end
36
35
  end
37
36
 
@@ -39,127 +38,136 @@ module NewRelic
39
38
  @caller_transport_type ||= "Unknown"
40
39
  end
41
40
 
42
- def accept_transport_type_from_api value
43
- @caller_transport_type = DistributedTraceTransportType.from value
41
+ def accept_transport_type_from_api(value)
42
+ @caller_transport_type = DistributedTraceTransportType.from(value)
44
43
  end
45
44
 
46
- def accept_incoming_transport_type request, transport_type
45
+ def accept_incoming_transport_type(request, transport_type)
47
46
  if transport_type.to_s == NewRelic::EMPTY_STR
48
- @caller_transport_type = DistributedTraceTransportType.for_rack_request request
47
+ @caller_transport_type = DistributedTraceTransportType.for_rack_request(request)
49
48
  else
50
- @caller_transport_type = DistributedTraceTransportType.from transport_type
49
+ @caller_transport_type = DistributedTraceTransportType.from(transport_type)
51
50
  end
52
51
  end
53
52
 
54
- def initialize transaction
53
+ def initialize(transaction)
55
54
  @transaction = transaction
56
55
  end
57
56
 
58
57
  def record_metrics
59
58
  record_cross_app_metrics
60
- DistributedTraceMetrics.record_metrics_for_transaction transaction
59
+ DistributedTraceMetrics.record_metrics_for_transaction(transaction)
61
60
  end
62
61
 
63
- def append_payload payload
64
- append_cat_info payload
65
- DistributedTraceAttributes.copy_from_transaction \
62
+ def append_payload(payload)
63
+ append_cat_info(payload)
64
+ DistributedTraceAttributes.copy_from_transaction( \
66
65
  transaction,
67
66
  trace_state_payload || distributed_trace_payload,
68
67
  payload
68
+ )
69
69
  end
70
70
 
71
- def log_request_headers headers, direction = "OUTGOING"
72
- NewRelic::Agent.logger.debug "#{direction} REQUEST HEADERS: #{headers}"
71
+ def log_request_headers(headers, direction = "OUTGOING")
72
+ NewRelic::Agent.logger.debug("#{direction} REQUEST HEADERS: #{headers}")
73
73
  end
74
74
 
75
- def insert_headers headers
75
+ def insert_headers(headers)
76
76
  return unless NewRelic::Agent.agent.connected?
77
- insert_trace_context_header headers
78
- insert_distributed_trace_header headers
79
- insert_cross_app_header headers
80
- log_request_headers headers
77
+
78
+ insert_trace_context_header(headers)
79
+ insert_distributed_trace_header(headers)
80
+ insert_cross_app_header(headers)
81
+ log_request_headers(headers)
81
82
  end
82
83
 
83
- def consume_message_headers headers, tracer_state, transport_type
84
- log_request_headers headers, "INCOMING"
85
- consume_message_distributed_tracing_headers headers, transport_type
86
- consume_message_cross_app_tracing_headers headers, tracer_state
87
- consume_message_synthetics_headers headers
84
+ def consume_message_headers(headers, tracer_state, transport_type)
85
+ log_request_headers(headers, "INCOMING")
86
+ consume_message_distributed_tracing_headers(headers, transport_type)
87
+ consume_message_cross_app_tracing_headers(headers, tracer_state)
88
+ consume_message_synthetics_headers(headers)
88
89
  rescue => e
89
- NewRelic::Agent.logger.error "Error in consume_message_headers", e
90
+ NewRelic::Agent.logger.error("Error in consume_message_headers", e)
90
91
  end
91
92
 
92
93
  def assign_intrinsics
93
- if Agent.config[:'distributed_tracing.enabled']
94
- DistributedTraceAttributes.copy_to_attributes transaction.payload, transaction.attributes
94
+ if dt_enabled?
95
+ DistributedTraceAttributes.copy_to_attributes(transaction.payload, transaction.attributes)
95
96
  elsif is_cross_app?
96
97
  assign_cross_app_intrinsics
97
98
  end
98
99
  end
99
100
 
100
- def insert_distributed_trace_header headers
101
- return unless Agent.config[:'distributed_tracing.enabled']
101
+ def insert_distributed_trace_header(headers)
102
+ return unless dt_enabled?
102
103
  return if Agent.config[:'exclude_newrelic_header']
104
+
103
105
  payload = create_distributed_trace_payload
104
106
  headers[NewRelic::NEWRELIC_KEY] = payload.http_safe if payload
105
107
  end
106
108
 
107
- def insert_cat_headers headers
109
+ def insert_cat_headers(headers)
108
110
  return unless CrossAppTracing.cross_app_enabled?
111
+
109
112
  @is_cross_app_caller = true
110
- insert_message_headers headers,
113
+ insert_message_headers(headers,
111
114
  transaction.guid,
112
115
  cat_trip_id,
113
116
  cat_path_hash,
114
- transaction.raw_synthetics_header
117
+ transaction.raw_synthetics_header)
115
118
  end
116
119
 
117
120
  private
118
121
 
119
- def consume_message_synthetics_headers headers
122
+ def dt_enabled?
123
+ Agent.config[:'distributed_tracing.enabled']
124
+ end
125
+
126
+ def consume_message_synthetics_headers(headers)
120
127
  synthetics_header = headers[CrossAppTracing::NR_MESSAGE_BROKER_SYNTHETICS_HEADER]
121
128
  if synthetics_header and
122
- incoming_payload = ::JSON.load(deobfuscate(synthetics_header)) and
123
- SyntheticsMonitor.is_valid_payload?(incoming_payload) and
124
- SyntheticsMonitor.is_supported_version?(incoming_payload) and
125
- SyntheticsMonitor.is_trusted?(incoming_payload)
129
+ incoming_payload = ::JSON.load(deobfuscate(synthetics_header)) and
130
+ SyntheticsMonitor.is_valid_payload?(incoming_payload) and
131
+ SyntheticsMonitor.is_supported_version?(incoming_payload) and
132
+ SyntheticsMonitor.is_trusted?(incoming_payload)
126
133
 
127
134
  transaction.raw_synthetics_header = synthetics_header
128
135
  transaction.synthetics_payload = incoming_payload
129
136
  end
130
137
  rescue => e
131
- NewRelic::Agent.logger.error "Error in consume_message_synthetics_header", e
138
+ NewRelic::Agent.logger.error("Error in consume_message_synthetics_header", e)
132
139
  end
133
140
 
134
- def consume_message_distributed_tracing_headers headers, transport_type
135
- return unless Agent.config[:'distributed_tracing.enabled']
141
+ def consume_message_distributed_tracing_headers(headers, transport_type)
142
+ return unless dt_enabled?
136
143
 
137
- accept_incoming_transport_type headers, transport_type
144
+ accept_incoming_transport_type(headers, transport_type)
138
145
 
139
146
  newrelic_trace_key = NewRelic::CANDIDATE_NEWRELIC_KEYS.detect do |key|
140
147
  headers.has_key?(key)
141
148
  end
142
149
  return unless newrelic_trace_key && (payload = headers[newrelic_trace_key])
143
150
 
144
- accept_distributed_trace_payload payload
151
+ accept_distributed_trace_payload(payload)
145
152
  end
146
153
 
147
- def consume_message_cross_app_tracing_headers headers, tracer_state
154
+ def consume_message_cross_app_tracing_headers(headers, tracer_state)
148
155
  return unless CrossAppTracing.cross_app_enabled?
149
156
  return unless CrossAppTracing.message_has_crossapp_request_header?(headers)
150
157
 
151
- accept_cross_app_payload headers, tracer_state
152
- CrossAppTracing.assign_intrinsic_transaction_attributes tracer_state
158
+ accept_cross_app_payload(headers, tracer_state)
159
+ CrossAppTracing.assign_intrinsic_transaction_attributes(tracer_state)
153
160
  end
154
161
 
155
- def accept_cross_app_payload headers, tracer_state
162
+ def accept_cross_app_payload(headers, tracer_state)
156
163
  encoded_id = headers[CrossAppTracing::NR_MESSAGE_BROKER_ID_HEADER]
157
164
  decoded_id = encoded_id.nil? ? EMPTY_STRING : deobfuscate(encoded_id)
158
165
 
159
166
  return unless CrossAppTracing.trusted_valid_cross_app_id?(decoded_id)
167
+
160
168
  txn_header = headers[CrossAppTracing::NR_MESSAGE_BROKER_TXN_HEADER]
161
- txn_info = ::JSON.load(deobfuscate(txn_header))
162
- payload = CrossAppPayload.new(decoded_id, transaction, txn_info)
169
+ txn_info = ::JSON.load(deobfuscate(txn_header))
170
+ payload = CrossAppPayload.new(decoded_id, transaction, txn_info)
163
171
 
164
172
  @cross_app_payload = payload
165
173
  rescue => e
@@ -167,12 +175,10 @@ module NewRelic
167
175
  nil
168
176
  end
169
177
 
170
- def deobfuscate message
171
- CrossAppTracing.obfuscator.deobfuscate message
178
+ def deobfuscate(message)
179
+ CrossAppTracing.obfuscator.deobfuscate(message)
172
180
  end
173
-
174
181
  end
175
182
  end
176
183
  end
177
184
  end
178
-
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -14,21 +13,21 @@ module NewRelic
14
13
  attr_accessor :distributed_trace_payload
15
14
  attr_writer :distributed_trace_payload_created
16
15
 
17
- SUPPORTABILITY_DISTRIBUTED_TRACE = "Supportability/DistributedTrace"
18
- CREATE_PREFIX = "#{SUPPORTABILITY_DISTRIBUTED_TRACE}/CreatePayload"
19
- ACCEPT_PREFIX = "#{SUPPORTABILITY_DISTRIBUTED_TRACE}/AcceptPayload"
20
- IGNORE_PREFIX = "#{ACCEPT_PREFIX}/Ignored"
21
-
22
- CREATE_SUCCESS_METRIC = "#{CREATE_PREFIX}/Success"
23
- CREATE_EXCEPTION_METRIC = "#{CREATE_PREFIX}/Exception"
24
- ACCEPT_SUCCESS_METRIC = "#{ACCEPT_PREFIX}/Success"
25
- ACCEPT_EXCEPTION_METRIC = "#{ACCEPT_PREFIX}/Exception"
26
- ACCEPT_PARSE_EXCEPTION_METRIC = "#{ACCEPT_PREFIX}/ParseException"
27
-
28
- IGNORE_ACCEPT_AFTER_CREATE_METRIC = "#{IGNORE_PREFIX}/CreateBeforeAccept"
29
- IGNORE_MULTIPLE_ACCEPT_METRIC = "#{IGNORE_PREFIX}/Multiple"
30
- IGNORE_ACCEPT_NULL_METRIC = "#{IGNORE_PREFIX}/Null"
31
- IGNORE_ACCEPT_MAJOR_VERSION_METRIC = "#{IGNORE_PREFIX}/MajorVersion"
16
+ SUPPORTABILITY_DISTRIBUTED_TRACE = "Supportability/DistributedTrace"
17
+ CREATE_PREFIX = "#{SUPPORTABILITY_DISTRIBUTED_TRACE}/CreatePayload"
18
+ ACCEPT_PREFIX = "#{SUPPORTABILITY_DISTRIBUTED_TRACE}/AcceptPayload"
19
+ IGNORE_PREFIX = "#{ACCEPT_PREFIX}/Ignored"
20
+
21
+ CREATE_SUCCESS_METRIC = "#{CREATE_PREFIX}/Success"
22
+ CREATE_EXCEPTION_METRIC = "#{CREATE_PREFIX}/Exception"
23
+ ACCEPT_SUCCESS_METRIC = "#{ACCEPT_PREFIX}/Success"
24
+ ACCEPT_EXCEPTION_METRIC = "#{ACCEPT_PREFIX}/Exception"
25
+ ACCEPT_PARSE_EXCEPTION_METRIC = "#{ACCEPT_PREFIX}/ParseException"
26
+
27
+ IGNORE_ACCEPT_AFTER_CREATE_METRIC = "#{IGNORE_PREFIX}/CreateBeforeAccept"
28
+ IGNORE_MULTIPLE_ACCEPT_METRIC = "#{IGNORE_PREFIX}/Multiple"
29
+ IGNORE_ACCEPT_NULL_METRIC = "#{IGNORE_PREFIX}/Null"
30
+ IGNORE_ACCEPT_MAJOR_VERSION_METRIC = "#{IGNORE_PREFIX}/MajorVersion"
32
31
  IGNORE_ACCEPT_UNTRUSTED_ACCOUNT_METRIC = "#{IGNORE_PREFIX}/UntrustedAccount"
33
32
 
34
33
  LBRACE = "{"
@@ -36,11 +35,11 @@ module NewRelic
36
35
 
37
36
  NEWRELIC_TRACE_KEY = "HTTP_NEWRELIC"
38
37
 
39
- def accept_distributed_tracing_incoming_request request
38
+ def accept_distributed_tracing_incoming_request(request)
40
39
  return unless Agent.config[:'distributed_tracing.enabled']
41
40
  return unless payload = request[NEWRELIC_TRACE_KEY]
42
41
 
43
- accept_distributed_trace_payload payload
42
+ accept_distributed_trace_payload(payload)
44
43
  end
45
44
 
46
45
  def distributed_trace_payload_created?
@@ -51,16 +50,16 @@ module NewRelic
51
50
  return unless Agent.config[:'distributed_tracing.enabled']
52
51
 
53
52
  @distributed_trace_payload_created = true
54
- payload = DistributedTracePayload.for_transaction transaction
55
- NewRelic::Agent.increment_metric CREATE_SUCCESS_METRIC
53
+ payload = DistributedTracePayload.for_transaction(transaction)
54
+ NewRelic::Agent.increment_metric(CREATE_SUCCESS_METRIC)
56
55
  payload
57
56
  rescue => e
58
- NewRelic::Agent.increment_metric CREATE_EXCEPTION_METRIC
59
- NewRelic::Agent.logger.warn "Failed to create distributed trace payload", e
57
+ NewRelic::Agent.increment_metric(CREATE_EXCEPTION_METRIC)
58
+ NewRelic::Agent.logger.warn("Failed to create distributed trace payload", e)
60
59
  nil
61
60
  end
62
61
 
63
- def accept_distributed_trace_payload payload
62
+ def accept_distributed_trace_payload(payload)
64
63
  return unless Agent.config[:'distributed_tracing.enabled']
65
64
 
66
65
  return false if check_payload_ignored(payload)
@@ -72,11 +71,11 @@ module NewRelic
72
71
 
73
72
  assign_payload_and_sampling_params(payload)
74
73
 
75
- NewRelic::Agent.increment_metric ACCEPT_SUCCESS_METRIC
74
+ NewRelic::Agent.increment_metric(ACCEPT_SUCCESS_METRIC)
76
75
  true
77
76
  rescue => e
78
- NewRelic::Agent.increment_metric ACCEPT_EXCEPTION_METRIC
79
- NewRelic::Agent.logger.warn "Failed to accept distributed trace payload", e
77
+ NewRelic::Agent.increment_metric(ACCEPT_EXCEPTION_METRIC)
78
+ NewRelic::Agent.logger.warn("Failed to accept distributed trace payload", e)
80
79
  false
81
80
  end
82
81
 
@@ -84,10 +83,10 @@ module NewRelic
84
83
 
85
84
  def check_payload_ignored(payload)
86
85
  if distributed_trace_payload
87
- NewRelic::Agent.increment_metric IGNORE_MULTIPLE_ACCEPT_METRIC
86
+ NewRelic::Agent.increment_metric(IGNORE_MULTIPLE_ACCEPT_METRIC)
88
87
  return true
89
88
  elsif distributed_trace_payload_created?
90
- NewRelic::Agent.increment_metric IGNORE_ACCEPT_AFTER_CREATE_METRIC
89
+ NewRelic::Agent.increment_metric(IGNORE_ACCEPT_AFTER_CREATE_METRIC)
91
90
  return true
92
91
  end
93
92
  false
@@ -96,7 +95,7 @@ module NewRelic
96
95
  def check_payload_present(payload)
97
96
  # We might be passed a Ruby `nil` object _or_ the JSON "null"
98
97
  if payload.nil? || payload == NULL_PAYLOAD
99
- NewRelic::Agent.increment_metric IGNORE_ACCEPT_NULL_METRIC
98
+ NewRelic::Agent.increment_metric(IGNORE_ACCEPT_NULL_METRIC)
100
99
  return nil
101
100
  end
102
101
 
@@ -104,34 +103,34 @@ module NewRelic
104
103
  end
105
104
 
106
105
  def decode_payload(payload)
107
- decoded = if payload.start_with? LBRACE
108
- DistributedTracePayload.from_json payload
106
+ decoded = if payload.start_with?(LBRACE)
107
+ DistributedTracePayload.from_json(payload)
109
108
  else
110
- DistributedTracePayload.from_http_safe payload
109
+ DistributedTracePayload.from_http_safe(payload)
111
110
  end
112
111
 
113
112
  return nil unless check_payload_present(decoded)
114
113
 
115
114
  decoded
116
115
  rescue => e
117
- NewRelic::Agent.increment_metric ACCEPT_PARSE_EXCEPTION_METRIC
118
- NewRelic::Agent.logger.warn "Error parsing distributed trace payload", e
116
+ NewRelic::Agent.increment_metric(ACCEPT_PARSE_EXCEPTION_METRIC)
117
+ NewRelic::Agent.logger.warn("Error parsing distributed trace payload", e)
119
118
  nil
120
119
  end
121
120
 
122
121
  def check_required_fields_present(payload)
123
122
  if \
124
123
  !payload.version.nil? &&
125
- !payload.parent_account_id.nil? &&
126
- !payload.parent_app_id.nil? &&
127
- !payload.parent_type.nil? &&
128
- (!payload.transaction_id.nil? || !payload.id.nil?) &&
129
- !payload.trace_id.nil? &&
130
- !payload.timestamp.nil?
124
+ !payload.parent_account_id.nil? &&
125
+ !payload.parent_app_id.nil? &&
126
+ !payload.parent_type.nil? &&
127
+ (!payload.transaction_id.nil? || !payload.id.nil?) &&
128
+ !payload.trace_id.nil? &&
129
+ !payload.timestamp.nil?
131
130
 
132
131
  true
133
132
  else
134
- NewRelic::Agent.increment_metric ACCEPT_PARSE_EXCEPTION_METRIC
133
+ NewRelic::Agent.increment_metric(ACCEPT_PARSE_EXCEPTION_METRIC)
135
134
  false
136
135
  end
137
136
  end
@@ -140,7 +139,7 @@ module NewRelic
140
139
  if DistributedTracePayload.major_version_matches?(payload)
141
140
  true
142
141
  else
143
- NewRelic::Agent.increment_metric IGNORE_ACCEPT_MAJOR_VERSION_METRIC
142
+ NewRelic::Agent.increment_metric(IGNORE_ACCEPT_MAJOR_VERSION_METRIC)
144
143
  false
145
144
  end
146
145
  end
@@ -148,7 +147,7 @@ module NewRelic
148
147
  def check_trusted_account(payload)
149
148
  compare_key = payload.trusted_account_key || payload.parent_account_id
150
149
  unless compare_key == NewRelic::Agent.config[:trusted_account_key]
151
- NewRelic::Agent.increment_metric IGNORE_ACCEPT_UNTRUSTED_ACCOUNT_METRIC
150
+ NewRelic::Agent.increment_metric(IGNORE_ACCEPT_UNTRUSTED_ACCOUNT_METRIC)
152
151
  return false
153
152
  end
154
153
  true
@@ -157,6 +156,7 @@ module NewRelic
157
156
  def assign_payload_and_sampling_params(payload)
158
157
  @distributed_trace_payload = payload
159
158
  return if transaction.distributed_tracer.trace_context_header_data
159
+
160
160
  transaction.trace_id = payload.trace_id
161
161
  transaction.distributed_tracer.parent_transaction_id = payload.transaction_id
162
162
  transaction.parent_span_id = payload.id
@@ -170,4 +170,3 @@ module NewRelic
170
170
  end
171
171
  end
172
172
  end
173
-
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -9,7 +8,6 @@ require 'new_relic/agent/http_clients/uri_util'
9
8
  module NewRelic
10
9
  module Agent
11
10
  class Transaction
12
-
13
11
  #
14
12
  # This class represents an external segment in a transaction trace.
15
13
  #
@@ -23,16 +21,17 @@ module NewRelic
23
21
  EXTERNAL_ALL_OTHER = "External/allOther"
24
22
  MISSING_STATUS_CODE = "MissingHTTPStatusCode"
25
23
 
26
- attr_reader :library, :uri, :procedure
27
- attr_reader :http_status_code
24
+ attr_reader :library, :uri, :procedure, :http_status_code
25
+ attr_writer :record_agent_attributes
28
26
 
29
- def initialize library, uri, procedure, start_time = nil # :nodoc:
27
+ def initialize(library, uri, procedure, start_time = nil) # :nodoc:
30
28
  @library = library
31
29
  @uri = HTTPClients::URIUtil.obfuscated_uri(uri)
32
30
  @procedure = procedure
33
31
  @host_header = nil
34
32
  @app_data = nil
35
33
  @http_status_code = nil
34
+ @record_agent_attributes = false
36
35
  super(nil, nil, start_time)
37
36
  end
38
37
 
@@ -44,6 +43,14 @@ module NewRelic
44
43
  @host_header || uri.host
45
44
  end
46
45
 
46
+ # By default external request segments only have errors and the http
47
+ # url recorded as agent attributes. To have all the agent attributes
48
+ # recorded, use the attr_writer like so `segment.record_agent_attributes = true`
49
+ # See: SpanEventPrimitive#for_external_request_segment
50
+ def record_agent_attributes?
51
+ @record_agent_attributes
52
+ end
53
+
47
54
  # This method adds New Relic request headers to a given request made to an
48
55
  # external API and checks to see if a host header is used for the request.
49
56
  # If a host header is used, it updates the segment name to match the host
@@ -53,16 +60,16 @@ module NewRelic
53
60
  # object (must belong to a subclass of NewRelic::Agent::HTTPClients::AbstractRequest)
54
61
  #
55
62
  # @api public
56
- def add_request_headers request
57
- process_host_header request
63
+ def add_request_headers(request)
64
+ process_host_header(request)
58
65
  synthetics_header = transaction && transaction.raw_synthetics_header
59
- insert_synthetics_header request, synthetics_header if synthetics_header
66
+ insert_synthetics_header(request, synthetics_header) if synthetics_header
60
67
 
61
68
  return unless record_metrics?
62
69
 
63
- transaction.distributed_tracer.insert_headers request
70
+ transaction.distributed_tracer.insert_headers(request)
64
71
  rescue => e
65
- NewRelic::Agent.logger.error "Error in add_request_headers", e
72
+ NewRelic::Agent.logger.error("Error in add_request_headers", e)
66
73
  end
67
74
 
68
75
  # This method extracts app data from an external response if present. If
@@ -72,11 +79,12 @@ module NewRelic
72
79
  # @param [Hash] response a hash of response headers
73
80
  #
74
81
  # @api public
75
- def read_response_headers response
82
+ def read_response_headers(response)
76
83
  return unless record_metrics? && CrossAppTracing.cross_app_enabled?
77
84
  return unless CrossAppTracing.response_has_crossapp_header?(response)
85
+
78
86
  unless data = CrossAppTracing.extract_appdata(response)
79
- NewRelic::Agent.logger.debug "Couldn't extract_appdata from external segment response"
87
+ NewRelic::Agent.logger.debug("Couldn't extract_appdata from external segment response")
80
88
  return
81
89
  end
82
90
 
@@ -84,10 +92,10 @@ module NewRelic
84
92
  @app_data = data
85
93
  update_segment_name
86
94
  else
87
- NewRelic::Agent.logger.debug "External segment response has invalid cross_app_id"
95
+ NewRelic::Agent.logger.debug("External segment response has invalid cross_app_id")
88
96
  end
89
97
  rescue => e
90
- NewRelic::Agent.logger.error "Error in read_response_headers", e
98
+ NewRelic::Agent.logger.error("Error in read_response_headers", e)
91
99
  end
92
100
 
93
101
  def cross_app_request? # :nodoc:
@@ -132,7 +140,7 @@ module NewRelic
132
140
  ]
133
141
  }
134
142
 
135
- # flag cross app in the state so transaction knows to add bits to paylaod
143
+ # flag cross app in the state so transaction knows to add bits to payload
136
144
  #
137
145
  transaction.distributed_tracer.is_cross_app_caller = true
138
146
 
@@ -142,11 +150,11 @@ module NewRelic
142
150
 
143
151
  # obfuscate the generated request metadata JSON
144
152
  #
145
- obfuscator.obfuscate ::JSON.dump(rmd)
153
+ obfuscator.obfuscate(::JSON.dump(rmd))
146
154
 
147
155
  end
148
156
  rescue => e
149
- NewRelic::Agent.logger.error "error during get_request_metadata", e
157
+ NewRelic::Agent.logger.error("error during get_request_metadata", e)
150
158
  end
151
159
 
152
160
  # Process obfuscated +String+ sent from a called application that is also running a New Relic agent and
@@ -157,24 +165,24 @@ module NewRelic
157
165
  #
158
166
  # @api public
159
167
  #
160
- def process_response_metadata response_metadata
168
+ def process_response_metadata(response_metadata)
161
169
  NewRelic::Agent.record_api_supportability_metric(:process_response_metadata)
162
170
  if transaction
163
171
  app_data = ::JSON.parse(obfuscator.deobfuscate(response_metadata))[APP_DATA_KEY]
164
172
 
165
173
  # validate cross app id
166
174
  #
167
- if Array === app_data and CrossAppTracing.trusted_valid_cross_app_id? app_data[0]
175
+ if Array === app_data and CrossAppTracing.trusted_valid_cross_app_id?(app_data[0])
168
176
  @app_data = app_data
169
177
  update_segment_name
170
178
  else
171
- NewRelic::Agent.logger.error "error processing response metadata: invalid/non-trusted ID"
179
+ NewRelic::Agent.logger.error("error processing response metadata: invalid/non-trusted ID")
172
180
  end
173
181
  end
174
182
 
175
183
  nil
176
184
  rescue => e
177
- NewRelic::Agent.logger.error "error during process_response_metadata", e
185
+ NewRelic::Agent.logger.error("error during process_response_metadata", e)
178
186
  end
179
187
 
180
188
  def record_metrics
@@ -182,24 +190,24 @@ module NewRelic
182
190
  super
183
191
  end
184
192
 
185
- def process_response_headers response # :nodoc:
186
- set_http_status_code response
187
- read_response_headers response
193
+ def process_response_headers(response) # :nodoc:
194
+ set_http_status_code(response)
195
+ read_response_headers(response)
188
196
  end
189
197
 
190
198
  private
191
199
 
192
200
  # Only sets the http_status_code if response.status_code is non-empty value
193
- def set_http_status_code response
194
- if response.respond_to? :status_code
201
+ def set_http_status_code(response)
202
+ if response.respond_to?(:status_code)
195
203
  @http_status_code = response.status_code if response.has_status_code?
196
204
  else
197
- NewRelic::Agent.logger.warn "Cannot extract HTTP Status Code from response #{response.class.to_s}"
198
- NewRelic::Agent.record_metric "#{name}/#{MISSING_STATUS_CODE}", 1
205
+ NewRelic::Agent.logger.warn("Cannot extract HTTP Status Code from response #{response.class.to_s}")
206
+ NewRelic::Agent.record_metric("#{name}/#{MISSING_STATUS_CODE}", 1)
199
207
  end
200
208
  end
201
209
 
202
- def insert_synthetics_header request, header
210
+ def insert_synthetics_header(request, header)
203
211
  request[NR_SYNTHETICS_HEADER] = header
204
212
  end
205
213
 
@@ -212,17 +220,16 @@ module NewRelic
212
220
  super
213
221
  end
214
222
 
215
- def process_host_header request
223
+ def process_host_header(request)
216
224
  if @host_header = request.host_from_header
217
225
  update_segment_name
218
226
  end
219
227
  end
220
228
 
221
229
  def add_unscoped_metrics
222
- @unscoped_metrics = [ EXTERNAL_ALL,
230
+ @unscoped_metrics = [EXTERNAL_ALL,
223
231
  "External/#{host}/all",
224
- suffixed_rollup_metric
225
- ]
232
+ suffixed_rollup_metric]
226
233
 
227
234
  if cross_app_request?
228
235
  @unscoped_metrics << "ExternalApp/#{host}/#{cross_process_id}/all"
@@ -254,7 +261,7 @@ module NewRelic
254
261
  return if transaction.ignore?
255
262
 
256
263
  aggregator = ::NewRelic::Agent.agent.span_event_aggregator
257
- priority = transaction.priority
264
+ priority = transaction.priority
258
265
  aggregator.record(priority: priority) do
259
266
  SpanEventPrimitive.for_external_request_segment(self)
260
267
  end