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,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
@@ -17,27 +16,25 @@ module NewRelic
17
16
  class DistributedTracePayload
18
17
  extend Coerce
19
18
 
20
- VERSION = [0, 1].freeze
19
+ VERSION = [0, 1].freeze
21
20
  PARENT_TYPE = "App"
22
- POUND = '#'
23
21
 
24
22
  # Key names for serialization
25
- VERSION_KEY = 'v'
26
- DATA_KEY = 'd'
27
- PARENT_TYPE_KEY = 'ty'
23
+ VERSION_KEY = 'v'
24
+ DATA_KEY = 'd'
25
+ PARENT_TYPE_KEY = 'ty'
28
26
  PARENT_ACCOUNT_ID_KEY = 'ac'
29
- PARENT_APP_KEY = 'ap'
30
- TRUSTED_ACCOUNT_KEY = 'tk'
31
- ID_KEY = 'id'
32
- TX_KEY = 'tx'
33
- TRACE_ID_KEY = 'tr'
34
- SAMPLED_KEY = 'sa'
35
- TIMESTAMP_KEY = 'ti'
36
- PRIORITY_KEY = 'pr'
27
+ PARENT_APP_KEY = 'ap'
28
+ TRUSTED_ACCOUNT_KEY = 'tk'
29
+ ID_KEY = 'id'
30
+ TX_KEY = 'tx'
31
+ TRACE_ID_KEY = 'tr'
32
+ SAMPLED_KEY = 'sa'
33
+ TIMESTAMP_KEY = 'ti'
34
+ PRIORITY_KEY = 'pr'
37
35
 
38
36
  class << self
39
-
40
- def for_transaction transaction
37
+ def for_transaction(transaction)
41
38
  return nil unless connected?
42
39
 
43
40
  payload = new
@@ -50,7 +47,7 @@ module NewRelic
50
47
 
51
48
  payload.id = current_segment_id(transaction)
52
49
  payload.transaction_id = transaction.guid
53
- payload.timestamp = (Time.now.to_f * 1000).round
50
+ payload.timestamp = Process.clock_gettime(Process::CLOCK_REALTIME, :millisecond)
54
51
  payload.trace_id = transaction.trace_id
55
52
  payload.sampled = transaction.sampled?
56
53
  payload.priority = transaction.priority
@@ -58,30 +55,31 @@ module NewRelic
58
55
  payload
59
56
  end
60
57
 
61
- def from_json serialized_payload
62
- raw_payload = JSON.parse serialized_payload
58
+ def from_json(serialized_payload)
59
+ raw_payload = JSON.parse(serialized_payload)
63
60
  return raw_payload if raw_payload.nil?
61
+
64
62
  payload_data = raw_payload[DATA_KEY]
65
63
 
66
64
  payload = new
67
- payload.version = raw_payload[VERSION_KEY]
68
- payload.parent_type = payload_data[PARENT_TYPE_KEY]
69
- payload.parent_account_id = payload_data[PARENT_ACCOUNT_ID_KEY]
70
- payload.parent_app_id = payload_data[PARENT_APP_KEY]
65
+ payload.version = raw_payload[VERSION_KEY]
66
+ payload.parent_type = payload_data[PARENT_TYPE_KEY]
67
+ payload.parent_account_id = payload_data[PARENT_ACCOUNT_ID_KEY]
68
+ payload.parent_app_id = payload_data[PARENT_APP_KEY]
71
69
  payload.trusted_account_key = payload_data[TRUSTED_ACCOUNT_KEY]
72
- payload.timestamp = payload_data[TIMESTAMP_KEY]
73
- payload.id = payload_data[ID_KEY]
74
- payload.transaction_id = payload_data[TX_KEY]
75
- payload.trace_id = payload_data[TRACE_ID_KEY]
76
- payload.sampled = payload_data[SAMPLED_KEY]
77
- payload.priority = payload_data[PRIORITY_KEY]
70
+ payload.timestamp = payload_data[TIMESTAMP_KEY]
71
+ payload.id = payload_data[ID_KEY]
72
+ payload.transaction_id = payload_data[TX_KEY]
73
+ payload.trace_id = payload_data[TRACE_ID_KEY]
74
+ payload.sampled = payload_data[SAMPLED_KEY]
75
+ payload.priority = payload_data[PRIORITY_KEY]
78
76
 
79
77
  payload
80
78
  end
81
79
 
82
- def from_http_safe http_safe_payload
83
- decoded_payload = Base64.strict_decode64 http_safe_payload
84
- from_json decoded_payload
80
+ def from_http_safe(http_safe_payload)
81
+ decoded_payload = Base64.strict_decode64(http_safe_payload)
82
+ from_json(decoded_payload)
85
83
  end
86
84
 
87
85
  def major_version_matches?(payload)
@@ -90,7 +88,7 @@ module NewRelic
90
88
 
91
89
  private
92
90
 
93
- def assign_trusted_account_key payload, account_id
91
+ def assign_trusted_account_key(payload, account_id)
94
92
  trusted_account_key = Agent.config[:trusted_account_key]
95
93
 
96
94
  if account_id != trusted_account_key
@@ -110,16 +108,16 @@ module NewRelic
110
108
  end
111
109
 
112
110
  attr_accessor :version,
113
- :parent_type,
114
- :parent_account_id,
115
- :parent_app_id,
116
- :trusted_account_key,
117
- :id,
118
- :transaction_id,
119
- :trace_id,
120
- :sampled,
121
- :priority,
122
- :timestamp
111
+ :parent_type,
112
+ :parent_account_id,
113
+ :parent_app_id,
114
+ :trusted_account_key,
115
+ :id,
116
+ :transaction_id,
117
+ :trace_id,
118
+ :sampled,
119
+ :priority,
120
+ :timestamp
123
121
 
124
122
  alias_method :sampled?, :sampled
125
123
 
@@ -134,17 +132,17 @@ module NewRelic
134
132
  }
135
133
 
136
134
  result[DATA_KEY] = {
137
- PARENT_TYPE_KEY => parent_type,
135
+ PARENT_TYPE_KEY => parent_type,
138
136
  PARENT_ACCOUNT_ID_KEY => parent_account_id,
139
- PARENT_APP_KEY => parent_app_id,
140
- TX_KEY => transaction_id,
141
- TRACE_ID_KEY => trace_id,
142
- SAMPLED_KEY => sampled,
143
- PRIORITY_KEY => priority,
144
- TIMESTAMP_KEY => timestamp,
137
+ PARENT_APP_KEY => parent_app_id,
138
+ TX_KEY => transaction_id,
139
+ TRACE_ID_KEY => trace_id,
140
+ SAMPLED_KEY => sampled,
141
+ PRIORITY_KEY => priority,
142
+ TIMESTAMP_KEY => timestamp
145
143
  }
146
144
 
147
- result[DATA_KEY][ID_KEY] = id if id
145
+ result[DATA_KEY][ID_KEY] = id if id
148
146
  result[DATA_KEY][TRUSTED_ACCOUNT_KEY] = trusted_account_key if trusted_account_key
149
147
 
150
148
  JSON.dump(result)
@@ -158,7 +156,7 @@ module NewRelic
158
156
  #
159
157
  # @api public
160
158
  def http_safe
161
- Base64.strict_encode64 text
159
+ Base64.strict_encode64(text)
162
160
  end
163
161
  end
164
162
  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
@@ -17,21 +16,21 @@ module NewRelic
17
16
  "IronMQ",
18
17
  "AMQP",
19
18
  "Queue",
20
- "Other",
19
+ "Other"
21
20
  ].freeze
22
21
 
23
22
  URL_SCHEMES = {
24
- 'http' => NewRelic::HTTP,
25
- 'https' => NewRelic::HTTPS,
23
+ 'http' => NewRelic::HTTP,
24
+ 'https' => NewRelic::HTTPS
26
25
  }.freeze
27
26
 
28
27
  RACK_URL_SCHEME = 'rack.url_scheme'
29
28
 
30
- def from value
29
+ def from(value)
31
30
  ALLOWABLE_TRANSPORT_TYPES.include?(value) ? value : NewRelic::UNKNOWN
32
31
  end
33
32
 
34
- def for_rack_request request
33
+ def for_rack_request(request)
35
34
  URL_SCHEMES[request[RACK_URL_SCHEME]]
36
35
  end
37
36
  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
@@ -11,24 +10,24 @@ module NewRelic
11
10
  class TraceContext
12
11
  VERSION = 0x0
13
12
 
14
- COMMA = ','
15
- EQUALS = '='
16
- INVALID_TRACE_ID = ('0' * 32)
13
+ COMMA = ','
14
+ EQUALS = '='
15
+ INVALID_TRACE_ID = ('0' * 32)
17
16
  INVALID_PARENT_ID = ('0' * 16)
18
- INVALID_VERSION = 'ff'
19
-
20
- TRACE_ID_KEY = 'trace_id'
21
- TRACE_FLAGS_KEY = 'trace_flags'
22
- PARENT_ID_KEY = 'parent_id'
23
- VERSION_KEY = 'version'
24
- UNDEFINED_FIELDS_KEY = 'undefined_fields'
25
-
26
- TP_VERSION = "(?<#{VERSION_KEY}>[a-f\\d]{2})"
27
- TP_TRACE_ID = "(?<#{TRACE_ID_KEY}>[a-f\\d]{32})"
28
- TP_PARENT_ID = "(?<#{PARENT_ID_KEY}>[a-f\\d]{16})"
29
- TP_TRACE_FLAGS = "(?<#{TRACE_FLAGS_KEY}>\\d{2})"
17
+ INVALID_VERSION = 'ff'
18
+
19
+ TRACE_ID_KEY = 'trace_id'
20
+ TRACE_FLAGS_KEY = 'trace_flags'
21
+ PARENT_ID_KEY = 'parent_id'
22
+ VERSION_KEY = 'version'
23
+ UNDEFINED_FIELDS_KEY = 'undefined_fields'
24
+
25
+ TP_VERSION = "(?<#{VERSION_KEY}>[a-f\\d]{2})"
26
+ TP_TRACE_ID = "(?<#{TRACE_ID_KEY}>[a-f\\d]{32})"
27
+ TP_PARENT_ID = "(?<#{PARENT_ID_KEY}>[a-f\\d]{16})"
28
+ TP_TRACE_FLAGS = "(?<#{TRACE_FLAGS_KEY}>\\d{2})"
30
29
  TP_UNDEFINED_FIELDS = "(?<#{UNDEFINED_FIELDS_KEY}>-[a-zA-Z\\d-]*)"
31
- TRACE_PARENT_REGEX = /\A#{TP_VERSION}-#{TP_TRACE_ID}-#{TP_PARENT_ID}-#{TP_TRACE_FLAGS}#{TP_UNDEFINED_FIELDS}?\z/
30
+ TRACE_PARENT_REGEX = /\A#{TP_VERSION}-#{TP_TRACE_ID}-#{TP_PARENT_ID}-#{TP_TRACE_FLAGS}#{TP_UNDEFINED_FIELDS}?\z/
32
31
 
33
32
  TRACE_PARENT_FORMAT_STRING = "%02x-%s-%s-%02x"
34
33
 
@@ -36,33 +35,34 @@ module NewRelic
36
35
  MAX_TRACE_STATE_ENTRY_SIZE = 128 # bytes
37
36
 
38
37
  SUPPORTABILITY_TRACE_PARENT_PARSE_EXCEPTION = "Supportability/TraceContext/TraceParent/Parse/Exception"
39
- SUPPORTABILITY_TRACE_STATE_PARSE_EXCEPTION = "Supportability/TraceContext/TraceState/Parse/Exception"
38
+ SUPPORTABILITY_TRACE_STATE_PARSE_EXCEPTION = "Supportability/TraceContext/TraceState/Parse/Exception"
40
39
  SUPPORTABILITY_TRACE_STATE_INVALID_NR_ENTRY = "Supportability/TraceContext/TraceState/InvalidNrEntry"
41
40
 
42
41
  class << self
43
- def insert format: NewRelic::FORMAT_NON_RACK,
44
- carrier: nil,
45
- parent_id: nil,
46
- trace_id: nil,
47
- trace_flags: nil,
48
- trace_state: nil
49
-
50
- trace_parent_header = trace_parent_header_for_format format
51
- carrier[trace_parent_header] = format_trace_parent \
42
+ def insert(format: NewRelic::FORMAT_NON_RACK,
43
+ carrier: nil,
44
+ parent_id: nil,
45
+ trace_id: nil,
46
+ trace_flags: nil,
47
+ trace_state: nil)
48
+
49
+ trace_parent_header = trace_parent_header_for_format(format)
50
+ carrier[trace_parent_header] = format_trace_parent( \
52
51
  trace_id: trace_id,
53
52
  parent_id: parent_id,
54
53
  trace_flags: trace_flags
54
+ )
55
55
 
56
- trace_state_header = trace_state_header_for_format format
56
+ trace_state_header = trace_state_header_for_format(format)
57
57
  carrier[trace_state_header] = trace_state if trace_state && !trace_state.empty?
58
58
  end
59
59
 
60
- def parse format: NewRelic::FORMAT_NON_RACK,
61
- carrier: nil,
62
- trace_state_entry_key: nil
60
+ def parse(format: NewRelic::FORMAT_NON_RACK,
61
+ carrier: nil,
62
+ trace_state_entry_key: nil)
63
63
  trace_parent = extract_traceparent(format, carrier)
64
- unless trace_parent_valid? trace_parent
65
- NewRelic::Agent.increment_metric SUPPORTABILITY_TRACE_PARENT_PARSE_EXCEPTION
64
+ unless trace_parent_valid?(trace_parent)
65
+ NewRelic::Agent.increment_metric(SUPPORTABILITY_TRACE_PARENT_PARSE_EXCEPTION)
66
66
  return nil
67
67
  end
68
68
 
@@ -72,30 +72,31 @@ module NewRelic
72
72
  header_data
73
73
  end
74
74
  rescue Exception
75
- NewRelic::Agent.increment_metric SUPPORTABILITY_TRACE_STATE_PARSE_EXCEPTION
75
+ NewRelic::Agent.increment_metric(SUPPORTABILITY_TRACE_STATE_PARSE_EXCEPTION)
76
76
  return nil
77
77
  end
78
78
  end
79
79
 
80
- def create_trace_state_entry entry_key, payload
80
+ def create_trace_state_entry(entry_key, payload)
81
81
  "#{entry_key}=#{payload}".dup
82
82
  end
83
83
 
84
84
  private
85
85
 
86
- def format_trace_parent trace_id: nil,
87
- parent_id: nil,
88
- trace_flags: nil
89
- sprintf TRACE_PARENT_FORMAT_STRING,
90
- VERSION,
91
- trace_id,
92
- parent_id,
93
- trace_flags
86
+ def format_trace_parent(trace_id: nil,
87
+ parent_id: nil,
88
+ trace_flags: nil)
89
+ sprintf(TRACE_PARENT_FORMAT_STRING,
90
+ VERSION,
91
+ trace_id,
92
+ parent_id,
93
+ trace_flags)
94
94
  end
95
95
 
96
- def extract_traceparent format, carrier
97
- header_name = trace_parent_header_for_format format
96
+ def extract_traceparent(format, carrier)
97
+ header_name = trace_parent_header_for_format(format)
98
98
  return unless header = carrier[header_name]
99
+
99
100
  if matchdata = header.match(TRACE_PARENT_REGEX)
100
101
  TRACE_PARENT_REGEX.named_captures.inject({}) do |hash, (name, (index))|
101
102
  hash[name] = matchdata[index]
@@ -104,7 +105,7 @@ module NewRelic
104
105
  end
105
106
  end
106
107
 
107
- def trace_parent_valid? trace_parent
108
+ def trace_parent_valid?(trace_parent)
108
109
  return false if trace_parent.nil?
109
110
  return false if trace_parent[TRACE_ID_KEY] == INVALID_TRACE_ID
110
111
  return false if trace_parent[PARENT_ID_KEY] == INVALID_PARENT_ID
@@ -114,7 +115,7 @@ module NewRelic
114
115
  true
115
116
  end
116
117
 
117
- def trace_parent_header_for_format format
118
+ def trace_parent_header_for_format(format)
118
119
  if format == NewRelic::FORMAT_RACK
119
120
  NewRelic::HTTP_TRACEPARENT_KEY
120
121
  else
@@ -122,7 +123,7 @@ module NewRelic
122
123
  end
123
124
  end
124
125
 
125
- def trace_state_header_for_format format
126
+ def trace_state_header_for_format(format)
126
127
  if format == NewRelic::FORMAT_RACK
127
128
  NewRelic::HTTP_TRACESTATE_KEY
128
129
  else
@@ -130,8 +131,8 @@ module NewRelic
130
131
  end
131
132
  end
132
133
 
133
- def extract_tracestate format, carrier, trace_state_entry_key
134
- header_name = trace_state_header_for_format format
134
+ def extract_tracestate(format, carrier, trace_state_entry_key)
135
+ header_name = trace_state_header_for_format(format)
135
136
  header = carrier[header_name]
136
137
  return HeaderData.create if header.nil? || header.empty?
137
138
 
@@ -143,9 +144,9 @@ module NewRelic
143
144
  if entry == NewRelic::EMPTY_STR
144
145
  false
145
146
  else
146
- vendor_id = entry.slice 0, entry.index(EQUALS)
147
+ vendor_id = entry.slice(0, entry.index(EQUALS))
147
148
  if vendor_id == trace_state_entry_key
148
- payload = entry.slice! trace_state_entry_key.size + 1, entry.size
149
+ payload = entry.slice!(trace_state_entry_key.size + 1, entry.size)
149
150
  true
150
151
  else
151
152
  trace_state_size += entry.size
@@ -155,19 +156,19 @@ module NewRelic
155
156
  end
156
157
  end
157
158
 
158
- trace_state_vendors.chomp! COMMA
159
+ trace_state_vendors.chomp!(COMMA)
159
160
 
160
- HeaderData.create trace_state_payload: payload ? decode_payload(payload) : nil,
161
- trace_state_entries: trace_state,
162
- trace_state_size: trace_state_size,
163
- trace_state_vendors: trace_state_vendors
161
+ HeaderData.create(trace_state_payload: payload ? decode_payload(payload) : nil,
162
+ trace_state_entries: trace_state,
163
+ trace_state_size: trace_state_size,
164
+ trace_state_vendors: trace_state_vendors)
164
165
  end
165
166
 
166
- def decode_payload payload
167
- TraceContextPayload.from_s payload
167
+ def decode_payload(payload)
168
+ TraceContextPayload.from_s(payload)
168
169
  rescue
169
170
  if payload
170
- NewRelic::Agent.increment_metric SUPPORTABILITY_TRACE_STATE_INVALID_NR_ENTRY
171
+ NewRelic::Agent.increment_metric(SUPPORTABILITY_TRACE_STATE_INVALID_NR_ENTRY)
171
172
  end
172
173
  return nil
173
174
  end
@@ -175,20 +176,20 @@ module NewRelic
175
176
 
176
177
  class HeaderData
177
178
  class << self
178
- def create trace_parent: nil,
179
- trace_state_payload: nil,
180
- trace_state_entries: nil,
181
- trace_state_size: 0,
182
- trace_state_vendors: nil
183
- new trace_parent, \
184
- trace_state_payload, \
185
- trace_state_entries, \
186
- trace_state_size, \
187
- trace_state_vendors
179
+ def create(trace_parent: nil,
180
+ trace_state_payload: nil,
181
+ trace_state_entries: nil,
182
+ trace_state_size: 0,
183
+ trace_state_vendors: nil)
184
+ new(trace_parent, \
185
+ trace_state_payload, \
186
+ trace_state_entries, \
187
+ trace_state_size, \
188
+ trace_state_vendors)
188
189
  end
189
190
  end
190
191
 
191
- def initialize trace_parent, trace_state_payload, trace_state_entries, trace_state_size, trace_state_vendors
192
+ def initialize(trace_parent, trace_state_payload, trace_state_entries, trace_state_size, trace_state_vendors)
192
193
  @trace_parent = trace_parent
193
194
  @trace_state = nil
194
195
  @trace_state_entries = trace_state_entries
@@ -199,11 +200,11 @@ module NewRelic
199
200
 
200
201
  attr_accessor :trace_parent, :trace_state_payload, :trace_state_vendors
201
202
 
202
- def trace_state trace_state_entry
203
- @trace_state ||= join_trace_state trace_state_entry.size
203
+ def trace_state(trace_state_entry)
204
+ @trace_state ||= join_trace_state(trace_state_entry.size)
204
205
  @trace_state_entries = nil
205
206
 
206
- trace_state_entry << @trace_state
207
+ trace_state_entry = "#{trace_state_entry}#{@trace_state}"
207
208
  end
208
209
 
209
210
  def trace_id
@@ -216,7 +217,7 @@ module NewRelic
216
217
 
217
218
  private
218
219
 
219
- def join_trace_state trace_state_entry_size
220
+ def join_trace_state(trace_state_entry_size)
220
221
  return @trace_state || NewRelic::EMPTY_STR if @trace_state_entries.nil? || @trace_state_entries.empty?
221
222
 
222
223
  max_size = MAX_TRACE_STATE_SIZE - trace_state_entry_size
@@ -237,9 +238,7 @@ module NewRelic
237
238
 
238
239
  joined_trace_state
239
240
  end
240
-
241
241
  end
242
-
243
242
  end
244
243
  end
245
244
  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/coerce'
6
6
 
@@ -15,29 +15,29 @@ module NewRelic
15
15
  TRUE_CHAR = '1'.freeze
16
16
  FALSE_CHAR = '0'.freeze
17
17
 
18
- PARENT_TYPES = %w(App Browser Mobile).map(&:freeze).freeze
18
+ PARENT_TYPES = %w[App Browser Mobile].map(&:freeze).freeze
19
19
 
20
20
  class << self
21
- def create version: VERSION,
22
- parent_type: PARENT_TYPE,
23
- parent_account_id: nil,
24
- parent_app_id: nil,
25
- id: nil,
26
- transaction_id: nil,
27
- sampled: nil,
28
- priority: nil,
29
- timestamp: now_ms
30
-
31
- new version, parent_type, parent_account_id, parent_app_id, id,
32
- transaction_id, sampled, priority, timestamp
21
+ def create(version: VERSION,
22
+ parent_type: PARENT_TYPE,
23
+ parent_account_id: nil,
24
+ parent_app_id: nil,
25
+ id: nil,
26
+ transaction_id: nil,
27
+ sampled: nil,
28
+ priority: nil,
29
+ timestamp: now_ms)
30
+
31
+ new(version, parent_type, parent_account_id, parent_app_id, id,
32
+ transaction_id, sampled, priority, timestamp)
33
33
  end
34
34
 
35
35
  include NewRelic::Coerce
36
36
 
37
- def from_s payload_string
37
+ def from_s(payload_string)
38
38
  attrs = payload_string.split(DELIMITER)
39
39
 
40
- payload = create \
40
+ payload = create( \
41
41
  version: int!(attrs[0]),
42
42
  parent_type: int!(attrs[1]),
43
43
  parent_account_id: attrs[2],
@@ -47,43 +47,44 @@ module NewRelic
47
47
  sampled: value_or_nil(attrs[6]) ? boolean_int!(attrs[6]) == 1 : nil,
48
48
  priority: float!(attrs[7]),
49
49
  timestamp: int!(attrs[8])
50
- handle_invalid_payload message: 'payload missing attributes' unless payload.valid?
50
+ )
51
+ handle_invalid_payload(message: 'payload missing attributes') unless payload.valid?
51
52
  payload
52
53
  rescue => e
53
- handle_invalid_payload error: e
54
+ handle_invalid_payload(error: e)
54
55
  raise
55
56
  end
56
57
 
57
58
  private
58
59
 
59
60
  def now_ms
60
- (Time.now.to_f * 1000).round
61
+ Process.clock_gettime(Process::CLOCK_REALTIME, :millisecond)
61
62
  end
62
63
 
63
- def handle_invalid_payload error: nil, message: nil
64
- NewRelic::Agent.increment_metric SUPPORTABILITY_PARSE_EXCEPTION
64
+ def handle_invalid_payload(error: nil, message: nil)
65
+ NewRelic::Agent.increment_metric(SUPPORTABILITY_PARSE_EXCEPTION)
65
66
  if error
66
- NewRelic::Agent.logger.warn "Error parsing trace context payload", error
67
+ NewRelic::Agent.logger.warn("Error parsing trace context payload", error)
67
68
  elsif message
68
- NewRelic::Agent.logger.warn "Error parsing trace context payload: #{message}"
69
+ NewRelic::Agent.logger.warn("Error parsing trace context payload: #{message}")
69
70
  end
70
71
  end
71
72
  end
72
73
 
73
74
  attr_accessor :version,
74
- :parent_type_id,
75
- :parent_account_id,
76
- :parent_app_id,
77
- :id,
78
- :transaction_id,
79
- :sampled,
80
- :priority,
81
- :timestamp
75
+ :parent_type_id,
76
+ :parent_account_id,
77
+ :parent_app_id,
78
+ :id,
79
+ :transaction_id,
80
+ :sampled,
81
+ :priority,
82
+ :timestamp
82
83
 
83
84
  alias_method :sampled?, :sampled
84
85
 
85
- def initialize version, parent_type_id, parent_account_id, parent_app_id,
86
- id, transaction_id, sampled, priority, timestamp
86
+ def initialize(version, parent_type_id, parent_account_id, parent_app_id,
87
+ id, transaction_id, sampled, priority, timestamp)
87
88
  @version = version
88
89
  @parent_type_id = parent_type_id
89
90
  @parent_account_id = parent_account_id
@@ -110,15 +111,15 @@ module NewRelic
110
111
  end
111
112
 
112
113
  def to_s
113
- result = version.to_s
114
- result << DELIMITER << parent_type_id.to_s
115
- result << DELIMITER << parent_account_id
116
- result << DELIMITER << parent_app_id
114
+ result = version.to_s # required
115
+ result << DELIMITER << parent_type_id.to_s # required
116
+ result << DELIMITER << parent_account_id # required
117
+ result << DELIMITER << parent_app_id # required
117
118
  result << DELIMITER << (id || NewRelic::EMPTY_STR)
118
119
  result << DELIMITER << (transaction_id || NewRelic::EMPTY_STR)
119
120
  result << DELIMITER << (sampled ? TRUE_CHAR : FALSE_CHAR)
120
121
  result << DELIMITER << sprintf("%.6f", priority)
121
- result << DELIMITER << timestamp.to_s
122
+ result << DELIMITER << timestamp.to_s # required
122
123
  result
123
124
  end
124
125
  end