newrelic_rpm 6.15.0 → 8.13.1

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