newrelic_rpm 6.7.0.359 → 6.12.0.367

Sign up to get free protection for your applications and to get access to all the features.
Files changed (297) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +4 -0
  3. data/.travis.yml +72 -7
  4. data/CHANGELOG.md +306 -4
  5. data/CODE_OF_CONDUCT.md +46 -0
  6. data/CONTRIBUTING.md +56 -12
  7. data/Gemfile +6 -2
  8. data/Guardfile +18 -1
  9. data/LICENSE +208 -38
  10. data/README.md +61 -89
  11. data/Rakefile +2 -0
  12. data/THIRD_PARTY_NOTICES.md +213 -0
  13. data/bin/nrdebug +1 -1
  14. data/init.rb +1 -1
  15. data/install.rb +1 -1
  16. data/lib/new_relic/agent.rb +49 -7
  17. data/lib/new_relic/agent/adaptive_sampler.rb +1 -1
  18. data/lib/new_relic/agent/agent.rb +57 -40
  19. data/lib/new_relic/agent/agent_logger.rb +5 -1
  20. data/lib/new_relic/agent/attribute_filter.rb +8 -8
  21. data/lib/new_relic/agent/attribute_processing.rb +1 -1
  22. data/lib/new_relic/agent/attributes.rb +152 -0
  23. data/lib/new_relic/agent/audit_logger.rb +1 -1
  24. data/lib/new_relic/agent/autostart.rb +20 -15
  25. data/lib/new_relic/agent/chained_call.rb +1 -1
  26. data/lib/new_relic/agent/commands/agent_command.rb +1 -1
  27. data/lib/new_relic/agent/commands/agent_command_router.rb +1 -1
  28. data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -1
  29. data/lib/new_relic/agent/configuration.rb +1 -1
  30. data/lib/new_relic/agent/configuration/default_source.rb +111 -16
  31. data/lib/new_relic/agent/configuration/dotted_hash.rb +1 -1
  32. data/lib/new_relic/agent/configuration/environment_source.rb +1 -1
  33. data/lib/new_relic/agent/configuration/event_harvest_config.rb +1 -1
  34. data/lib/new_relic/agent/configuration/high_security_source.rb +1 -1
  35. data/lib/new_relic/agent/configuration/manager.rb +1 -1
  36. data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
  37. data/lib/new_relic/agent/configuration/mask_defaults.rb +1 -1
  38. data/lib/new_relic/agent/configuration/security_policy_source.rb +1 -1
  39. data/lib/new_relic/agent/configuration/server_source.rb +2 -2
  40. data/lib/new_relic/agent/configuration/yaml_source.rb +12 -7
  41. data/lib/new_relic/agent/connect/request_builder.rb +4 -12
  42. data/lib/new_relic/agent/connect/response_handler.rb +1 -1
  43. data/lib/new_relic/agent/custom_event_aggregator.rb +1 -1
  44. data/lib/new_relic/agent/database.rb +2 -3
  45. data/lib/new_relic/agent/database/explain_plan_helpers.rb +1 -1
  46. data/lib/new_relic/agent/database/obfuscation_helpers.rb +2 -2
  47. data/lib/new_relic/agent/database/obfuscator.rb +1 -1
  48. data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +1 -1
  49. data/lib/new_relic/agent/datastores.rb +1 -1
  50. data/lib/new_relic/agent/datastores/metric_helper.rb +1 -1
  51. data/lib/new_relic/agent/datastores/mongo.rb +2 -2
  52. data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +3 -3
  53. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +1 -1
  54. data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +9 -9
  55. data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +1 -1
  56. data/lib/new_relic/agent/datastores/redis.rb +1 -1
  57. data/lib/new_relic/agent/deprecator.rb +1 -1
  58. data/lib/new_relic/agent/distributed_tracing.rb +156 -7
  59. data/lib/new_relic/agent/{cross_app_payload.rb → distributed_tracing/cross_app_payload.rb} +3 -2
  60. data/lib/new_relic/agent/{cross_app_tracing.rb → distributed_tracing/cross_app_tracing.rb} +61 -46
  61. data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +84 -0
  62. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +75 -0
  63. data/lib/new_relic/agent/{distributed_trace_payload.rb → distributed_tracing/distributed_trace_payload.rb} +25 -102
  64. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +39 -0
  65. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +246 -0
  66. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +126 -0
  67. data/lib/new_relic/agent/encoding_normalizer.rb +1 -1
  68. data/lib/new_relic/agent/error_collector.rb +34 -17
  69. data/lib/new_relic/agent/error_event_aggregator.rb +8 -6
  70. data/lib/new_relic/agent/error_trace_aggregator.rb +1 -1
  71. data/lib/new_relic/agent/event_aggregator.rb +1 -1
  72. data/lib/new_relic/agent/event_buffer.rb +1 -1
  73. data/lib/new_relic/agent/event_listener.rb +1 -1
  74. data/lib/new_relic/agent/event_loop.rb +1 -1
  75. data/lib/new_relic/agent/external.rb +8 -8
  76. data/lib/new_relic/agent/guid_generator.rb +28 -0
  77. data/lib/new_relic/agent/harvester.rb +1 -1
  78. data/lib/new_relic/agent/heap.rb +1 -1
  79. data/lib/new_relic/agent/hostname.rb +8 -2
  80. data/lib/new_relic/agent/http_clients/abstract.rb +82 -0
  81. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +25 -20
  82. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +29 -14
  83. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +18 -22
  84. data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +11 -12
  85. data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +17 -5
  86. data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +5 -7
  87. data/lib/new_relic/agent/http_clients/uri_util.rb +4 -3
  88. data/lib/new_relic/agent/instrumentation.rb +1 -1
  89. data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +6 -8
  90. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +5 -1
  91. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +12 -3
  92. data/lib/new_relic/agent/instrumentation/active_job.rb +1 -1
  93. data/lib/new_relic/agent/instrumentation/active_merchant.rb +1 -1
  94. data/lib/new_relic/agent/instrumentation/active_record.rb +85 -38
  95. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +82 -24
  96. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +1 -1
  97. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +92 -34
  98. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +8 -3
  99. data/lib/new_relic/agent/instrumentation/active_storage.rb +1 -1
  100. data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +9 -5
  101. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +24 -8
  102. data/lib/new_relic/agent/instrumentation/authlogic.rb +1 -1
  103. data/lib/new_relic/agent/instrumentation/bunny.rb +115 -52
  104. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +1 -1
  105. data/lib/new_relic/agent/instrumentation/curb.rb +93 -28
  106. data/lib/new_relic/agent/instrumentation/data_mapper.rb +4 -2
  107. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +61 -25
  108. data/lib/new_relic/agent/instrumentation/excon.rb +2 -2
  109. data/lib/new_relic/agent/instrumentation/excon/connection.rb +7 -4
  110. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +3 -2
  111. data/lib/new_relic/agent/instrumentation/grape.rb +6 -11
  112. data/lib/new_relic/agent/instrumentation/http.rb +7 -4
  113. data/lib/new_relic/agent/instrumentation/httpclient.rb +6 -4
  114. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +1 -1
  115. data/lib/new_relic/agent/instrumentation/memcache.rb +4 -2
  116. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +7 -3
  117. data/lib/new_relic/agent/instrumentation/merb/controller.rb +1 -1
  118. data/lib/new_relic/agent/instrumentation/merb/errors.rb +1 -1
  119. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +12 -4
  120. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +9 -7
  121. data/lib/new_relic/agent/instrumentation/mongo.rb +10 -4
  122. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +36 -3
  123. data/lib/new_relic/agent/instrumentation/net.rb +60 -23
  124. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +26 -2
  125. data/lib/new_relic/agent/instrumentation/padrino.rb +40 -16
  126. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +1 -1
  127. data/lib/new_relic/agent/instrumentation/queue_time.rb +1 -1
  128. data/lib/new_relic/agent/instrumentation/rack.rb +36 -13
  129. data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +1 -1
  130. data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +1 -1
  131. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +1 -1
  132. data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -1
  133. data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +1 -1
  134. data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +1 -1
  135. data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +1 -1
  136. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +1 -1
  137. data/lib/new_relic/agent/instrumentation/rake.rb +54 -20
  138. data/lib/new_relic/agent/instrumentation/redis.rb +141 -56
  139. data/lib/new_relic/agent/instrumentation/resque.rb +4 -1
  140. data/lib/new_relic/agent/instrumentation/sequel.rb +1 -1
  141. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +1 -1
  142. data/lib/new_relic/agent/instrumentation/sidekiq.rb +48 -24
  143. data/lib/new_relic/agent/instrumentation/sinatra.rb +62 -23
  144. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +1 -1
  145. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +1 -1
  146. data/lib/new_relic/agent/instrumentation/sunspot.rb +1 -1
  147. data/lib/new_relic/agent/instrumentation/typhoeus.rb +24 -7
  148. data/lib/new_relic/agent/internal_agent_error.rb +1 -1
  149. data/lib/new_relic/agent/javascript_instrumentor.rb +1 -1
  150. data/lib/new_relic/agent/log_once.rb +1 -1
  151. data/lib/new_relic/agent/logging.rb +19 -5
  152. data/lib/new_relic/agent/memory_logger.rb +1 -1
  153. data/lib/new_relic/agent/messaging.rb +6 -74
  154. data/lib/new_relic/agent/method_tracer.rb +19 -7
  155. data/lib/new_relic/agent/method_tracer_helpers.rb +3 -3
  156. data/lib/new_relic/agent/monitors.rb +27 -0
  157. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +110 -0
  158. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +27 -0
  159. data/lib/new_relic/agent/{inbound_request_monitor.rb → monitors/inbound_request_monitor.rb} +2 -2
  160. data/lib/new_relic/agent/{synthetics_monitor.rb → monitors/synthetics_monitor.rb} +3 -5
  161. data/lib/new_relic/agent/new_relic_service.rb +8 -7
  162. data/lib/new_relic/agent/new_relic_service/encoders.rb +1 -1
  163. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +1 -1
  164. data/lib/new_relic/agent/new_relic_service/marshaller.rb +1 -1
  165. data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +1 -1
  166. data/lib/new_relic/agent/noticible_error.rb +22 -0
  167. data/lib/new_relic/agent/null_logger.rb +1 -1
  168. data/lib/new_relic/agent/obfuscator.rb +1 -1
  169. data/lib/new_relic/agent/parameter_filtering.rb +1 -1
  170. data/lib/new_relic/agent/payload_metric_mapping.rb +1 -1
  171. data/lib/new_relic/agent/pipe_channel_manager.rb +1 -1
  172. data/lib/new_relic/agent/pipe_service.rb +1 -1
  173. data/lib/new_relic/agent/prepend_supportability.rb +1 -1
  174. data/lib/new_relic/agent/priority_sampled_buffer.rb +8 -5
  175. data/lib/new_relic/agent/range_extensions.rb +1 -1
  176. data/lib/new_relic/agent/rules_engine.rb +1 -1
  177. data/lib/new_relic/agent/rules_engine/replacement_rule.rb +1 -1
  178. data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +1 -1
  179. data/lib/new_relic/agent/sampler.rb +1 -1
  180. data/lib/new_relic/agent/sampler_collection.rb +1 -1
  181. data/lib/new_relic/agent/samplers/cpu_sampler.rb +1 -1
  182. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +1 -1
  183. data/lib/new_relic/agent/samplers/memory_sampler.rb +1 -1
  184. data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
  185. data/lib/new_relic/agent/samplers/vm_sampler.rb +1 -1
  186. data/lib/new_relic/agent/span_event_aggregator.rb +2 -1
  187. data/lib/new_relic/agent/span_event_primitive.rb +106 -54
  188. data/lib/new_relic/agent/sql_sampler.rb +6 -6
  189. data/lib/new_relic/agent/stats.rb +1 -1
  190. data/lib/new_relic/agent/stats_engine.rb +1 -1
  191. data/lib/new_relic/agent/stats_engine/gc_profiler.rb +1 -1
  192. data/lib/new_relic/agent/stats_engine/stats_hash.rb +1 -1
  193. data/lib/new_relic/agent/supported_versions.rb +3 -3
  194. data/lib/new_relic/agent/synthetics_event_aggregator.rb +1 -1
  195. data/lib/new_relic/agent/system_info.rb +13 -4
  196. data/lib/new_relic/agent/threading/agent_thread.rb +1 -1
  197. data/lib/new_relic/agent/threading/backtrace_node.rb +1 -1
  198. data/lib/new_relic/agent/threading/backtrace_service.rb +1 -1
  199. data/lib/new_relic/agent/threading/thread_profile.rb +1 -1
  200. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
  201. data/lib/new_relic/agent/tracer.rb +34 -19
  202. data/lib/new_relic/agent/transaction.rb +104 -82
  203. data/lib/new_relic/agent/transaction/abstract_segment.rb +31 -4
  204. data/lib/new_relic/agent/transaction/datastore_segment.rb +1 -1
  205. data/lib/new_relic/agent/transaction/distributed_tracer.rb +171 -0
  206. data/lib/new_relic/agent/transaction/distributed_tracing.rb +58 -147
  207. data/lib/new_relic/agent/transaction/external_request_segment.rb +30 -37
  208. data/lib/new_relic/agent/transaction/message_broker_segment.rb +4 -12
  209. data/lib/new_relic/agent/transaction/request_attributes.rb +1 -1
  210. data/lib/new_relic/agent/transaction/segment.rb +24 -2
  211. data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -1
  212. data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
  213. data/lib/new_relic/agent/transaction/trace.rb +3 -5
  214. data/lib/new_relic/agent/transaction/trace_builder.rb +1 -1
  215. data/lib/new_relic/agent/transaction/trace_context.rb +168 -0
  216. data/lib/new_relic/agent/transaction/trace_node.rb +11 -9
  217. data/lib/new_relic/agent/transaction/tracing.rb +1 -1
  218. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -1
  219. data/lib/new_relic/agent/transaction_error_primitive.rb +11 -16
  220. data/lib/new_relic/agent/transaction_event_aggregator.rb +1 -1
  221. data/lib/new_relic/agent/transaction_event_primitive.rb +29 -40
  222. data/lib/new_relic/agent/transaction_event_recorder.rb +1 -1
  223. data/lib/new_relic/agent/transaction_metrics.rb +1 -1
  224. data/lib/new_relic/agent/transaction_sampler.rb +1 -1
  225. data/lib/new_relic/agent/transaction_time_aggregator.rb +1 -1
  226. data/lib/new_relic/agent/utilization/aws.rb +1 -1
  227. data/lib/new_relic/agent/utilization/azure.rb +1 -1
  228. data/lib/new_relic/agent/utilization/gcp.rb +1 -1
  229. data/lib/new_relic/agent/utilization/pcf.rb +1 -1
  230. data/lib/new_relic/agent/utilization/vendor.rb +1 -1
  231. data/lib/new_relic/agent/utilization_data.rb +1 -1
  232. data/lib/new_relic/agent/vm.rb +1 -1
  233. data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
  234. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -1
  235. data/lib/new_relic/agent/vm/mri_vm.rb +1 -1
  236. data/lib/new_relic/agent/vm/snapshot.rb +1 -1
  237. data/lib/new_relic/agent/worker_loop.rb +1 -1
  238. data/lib/new_relic/cli/command.rb +1 -1
  239. data/lib/new_relic/cli/commands/deployments.rb +1 -1
  240. data/lib/new_relic/cli/commands/install.rb +4 -3
  241. data/lib/new_relic/coerce.rb +32 -7
  242. data/lib/new_relic/collection_helper.rb +1 -1
  243. data/lib/new_relic/constants.rb +38 -0
  244. data/lib/new_relic/control.rb +1 -1
  245. data/lib/new_relic/control/class_methods.rb +1 -1
  246. data/lib/new_relic/control/frameworks.rb +1 -1
  247. data/lib/new_relic/control/frameworks/external.rb +1 -1
  248. data/lib/new_relic/control/frameworks/merb.rb +1 -1
  249. data/lib/new_relic/control/frameworks/rails.rb +1 -1
  250. data/lib/new_relic/control/frameworks/rails3.rb +1 -1
  251. data/lib/new_relic/control/frameworks/rails4.rb +1 -1
  252. data/lib/new_relic/control/frameworks/rails_notifications.rb +1 -1
  253. data/lib/new_relic/control/frameworks/ruby.rb +1 -1
  254. data/lib/new_relic/control/frameworks/sinatra.rb +1 -1
  255. data/lib/new_relic/control/instance_methods.rb +11 -2
  256. data/lib/new_relic/control/instrumentation.rb +1 -1
  257. data/lib/new_relic/control/server_methods.rb +1 -1
  258. data/lib/new_relic/delayed_job_injection.rb +1 -1
  259. data/lib/new_relic/dependency_detection.rb +5 -5
  260. data/lib/new_relic/environment_report.rb +6 -2
  261. data/lib/new_relic/helper.rb +1 -1
  262. data/lib/new_relic/language_support.rb +1 -1
  263. data/lib/new_relic/latest_changes.rb +2 -2
  264. data/lib/new_relic/local_environment.rb +1 -1
  265. data/lib/new_relic/metric_data.rb +1 -1
  266. data/lib/new_relic/metric_spec.rb +1 -1
  267. data/lib/new_relic/metrics.rb +1 -1
  268. data/lib/new_relic/noticed_error.rb +39 -18
  269. data/lib/new_relic/rack.rb +1 -1
  270. data/lib/new_relic/rack/agent_hooks.rb +1 -1
  271. data/lib/new_relic/rack/agent_middleware.rb +1 -1
  272. data/lib/new_relic/rack/browser_monitoring.rb +6 -1
  273. data/lib/new_relic/recipes.rb +1 -1
  274. data/lib/new_relic/recipes/capistrano3.rb +1 -1
  275. data/lib/new_relic/recipes/capistrano_legacy.rb +1 -1
  276. data/lib/new_relic/supportability_helper.rb +15 -1
  277. data/lib/new_relic/version.rb +2 -2
  278. data/lib/newrelic_rpm.rb +1 -1
  279. data/lib/sequel/extensions/newrelic_instrumentation.rb +1 -1
  280. data/lib/sequel/plugins/newrelic_instrumentation.rb +1 -1
  281. data/lib/tasks/all.rb +1 -1
  282. data/lib/tasks/multiverse.rb +26 -1
  283. data/lib/tasks/newrelic.rb +1 -1
  284. data/lib/tasks/tests.rake +6 -1
  285. data/newrelic_rpm.gemspec +19 -13
  286. data/recipes/newrelic.rb +1 -1
  287. data/test/agent_helper.rb +332 -72
  288. metadata +103 -38
  289. data/lib/new_relic/agent/cross_app_monitor.rb +0 -110
  290. data/lib/new_relic/agent/distributed_trace_monitor.rb +0 -40
  291. data/lib/new_relic/agent/http_clients/abstract_request.rb +0 -31
  292. data/lib/new_relic/agent/transaction/attributes.rb +0 -154
  293. data/lib/tasks/versions.html.erb +0 -28
  294. data/lib/tasks/versions.postface.html +0 -8
  295. data/lib/tasks/versions.preface.html +0 -9
  296. data/lib/tasks/versions.rake +0 -65
  297. data/lib/tasks/versions.txt.erb +0 -14
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
 
5
5
  DependencyDetection.defer do
6
6
  named :httprb
@@ -11,7 +11,7 @@ DependencyDetection.defer do
11
11
 
12
12
  executes do
13
13
  ::NewRelic::Agent.logger.info 'Installing http.rb instrumentation'
14
- require 'new_relic/agent/cross_app_tracing'
14
+ require 'new_relic/agent/distributed_tracing/cross_app_tracing'
15
15
  require 'new_relic/agent/http_clients/http_rb_wrappers'
16
16
  end
17
17
 
@@ -29,9 +29,12 @@ DependencyDetection.defer do
29
29
 
30
30
  segment.add_request_headers wrapped_request
31
31
 
32
- response = perform_without_newrelic_trace(request, options)
32
+ response = NewRelic::Agent::Tracer.capture_segment_error segment do
33
+ perform_without_newrelic_trace(request, options)
34
+ end
35
+
33
36
  wrapped_response = ::NewRelic::Agent::HTTPClients::HTTPResponse.new response
34
- segment.read_response_headers wrapped_response
37
+ segment.process_response_headers wrapped_response
35
38
 
36
39
  response
37
40
  ensure
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
 
5
5
  DependencyDetection.defer do
6
6
  named :httpclient
@@ -20,7 +20,7 @@ DependencyDetection.defer do
20
20
 
21
21
  executes do
22
22
  ::NewRelic::Agent.logger.info 'Installing HTTPClient instrumentation'
23
- require 'new_relic/agent/cross_app_tracing'
23
+ require 'new_relic/agent/distributed_tracing/cross_app_tracing'
24
24
  require 'new_relic/agent/http_clients/httpclient_wrappers'
25
25
  end
26
26
 
@@ -38,12 +38,14 @@ DependencyDetection.defer do
38
38
  response = nil
39
39
  segment.add_request_headers wrapped_request
40
40
 
41
- do_get_block_without_newrelic(req, proxy, conn, &block)
41
+ NewRelic::Agent::Tracer.capture_segment_error segment do
42
+ do_get_block_without_newrelic(req, proxy, conn, &block)
43
+ end
42
44
  response = conn.pop
43
45
  conn.push response
44
46
 
45
47
  wrapped_response = ::NewRelic::Agent::HTTPClients::HTTPClientResponse.new(response)
46
- segment.read_response_headers wrapped_response
48
+ segment.process_response_headers wrapped_response
47
49
 
48
50
  response
49
51
  ensure
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
 
5
5
  module NewRelic
6
6
  module Agent
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
 
5
5
  # NOTE there are multiple implementations of the MemCache client in Ruby,
6
6
  # each with slightly different API's and semantics.
@@ -46,7 +46,9 @@ module NewRelic
46
46
  operation: method_name
47
47
  )
48
48
  begin
49
- send method_name_without, *args, &block
49
+ NewRelic::Agent::Tracer.capture_segment_error segment do
50
+ send method_name_without, *args, &block
51
+ end
50
52
  ensure
51
53
  if NewRelic::Agent.config[:capture_memcache_keys]
52
54
  segment.notice_nosql_statement "#{method_name} #{args.first.inspect}"
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
 
5
5
  module NewRelic
6
6
  module Agent
@@ -66,7 +66,9 @@ module NewRelic
66
66
  ::NewRelic::Agent::Instrumentation::Memcache::Dalli.assign_instance_to(segment, self)
67
67
 
68
68
  begin
69
- send_multiget_without_newrelic_trace(keys)
69
+ NewRelic::Agent::Tracer.capture_segment_error segment do
70
+ send_multiget_without_newrelic_trace(keys)
71
+ end
70
72
  ensure
71
73
  if ::NewRelic::Agent.config[:capture_memcache_keys]
72
74
  segment.notice_nosql_statement "#{SEND_MULTIGET_METRIC_NAME} #{keys.inspect}"
@@ -87,7 +89,9 @@ module NewRelic
87
89
  define_method method_name do |*args, &block|
88
90
  segment = NewRelic::Agent::Tracer.start_segment name: "Ruby/Memcached/Dalli/#{method_name}"
89
91
  begin
90
- __send__ method_name_without, *args, &block
92
+ NewRelic::Agent::Tracer.capture_segment_error segment do
93
+ __send__ method_name_without, *args, &block
94
+ end
91
95
  ensure
92
96
  segment.finish if segment
93
97
  end
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
 
5
5
  require 'set'
6
6
 
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
 
5
5
  DependencyDetection.defer do
6
6
  @name = :merb_error
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
 
5
5
  require 'new_relic/agent/method_tracer'
6
6
  require 'new_relic/agent/transaction'
@@ -27,10 +27,18 @@ module NewRelic
27
27
  @middleware_class = middleware_class
28
28
  end
29
29
 
30
- def new(*args, &blk)
31
- middleware_instance = @middleware_class.new(*args, &blk)
32
- MiddlewareProxy.wrap(middleware_instance)
30
+ if RUBY_VERSION < "2.7.0"
31
+ def new(*args, &blk)
32
+ middleware_instance = @middleware_class.new(*args, &blk)
33
+ MiddlewareProxy.wrap(middleware_instance)
34
+ end
35
+ else
36
+ def new(*args, **kwargs, &blk)
37
+ middleware_instance = @middleware_class.new(*args, **kwargs, &blk)
38
+ MiddlewareProxy.wrap(middleware_instance)
39
+ end
33
40
  end
41
+
34
42
  end
35
43
 
36
44
  def self.is_sinatra_app?(target)
@@ -1,6 +1,7 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
+ # frozen_string_literal: true
4
5
 
5
6
  require 'new_relic/agent/method_tracer'
6
7
  require 'new_relic/agent/transaction'
@@ -26,7 +27,10 @@ module NewRelic
26
27
  module Agent
27
28
  module Instrumentation
28
29
  module MiddlewareTracing
29
- TXN_STARTED_KEY = 'newrelic.transaction_started'.freeze
30
+
31
+ TXN_STARTED_KEY = 'newrelic.transaction_started'
32
+ CONTENT_TYPE = 'Content-Type'
33
+ CONTENT_LENGTH = 'Content-Length'
30
34
 
31
35
  def _nr_has_middleware_tracing
32
36
  true
@@ -56,8 +60,6 @@ module NewRelic
56
60
  end
57
61
  end
58
62
 
59
- CONTENT_TYPE = 'Content-Type'.freeze
60
-
61
63
  def capture_response_content_type(state, result)
62
64
  if result.is_a?(Array) && state.current_transaction
63
65
  _, headers, _ = result
@@ -65,12 +67,12 @@ module NewRelic
65
67
  end
66
68
  end
67
69
 
68
- CONTENT_LENGTH = 'Content-Length'.freeze
69
-
70
70
  def capture_response_content_length(state, result)
71
71
  if result.is_a?(Array) && state.current_transaction
72
72
  _, headers, _ = result
73
- state.current_transaction.response_content_length = headers[CONTENT_LENGTH]
73
+ length = headers[CONTENT_LENGTH]
74
+ length = length.reduce(0){|sum, h| sum + h.to_i} if length.is_a?(Array)
75
+ state.current_transaction.response_content_length = length
74
76
  end
75
77
  end
76
78
 
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
 
5
5
  DependencyDetection.defer do
6
6
  named :mongo
@@ -87,7 +87,9 @@ DependencyDetection.defer do
87
87
 
88
88
  begin
89
89
  result = NewRelic::Agent.disable_all_tracing do
90
- instrument_without_new_relic_trace(name, payload, &block)
90
+ NewRelic::Agent::Tracer.capture_segment_error segment do
91
+ instrument_without_new_relic_trace(name, payload, &block)
92
+ end
91
93
  end
92
94
 
93
95
  new_relic_notice_statement(segment, payload, name) if segment
@@ -109,7 +111,9 @@ DependencyDetection.defer do
109
111
 
110
112
  begin
111
113
  result = NewRelic::Agent.disable_all_tracing do
112
- save_without_new_relic_trace(doc, opts, &block)
114
+ NewRelic::Agent::Tracer.capture_segment_error segment do
115
+ save_without_new_relic_trace(doc, opts, &block)
116
+ end
113
117
  end
114
118
 
115
119
  new_relic_notice_statement(segment, doc, :save) if segment
@@ -131,7 +135,9 @@ DependencyDetection.defer do
131
135
 
132
136
  begin
133
137
  result = NewRelic::Agent.disable_all_tracing do
134
- ensure_index_without_new_relic_trace(spec, opts, &block)
138
+ NewRelic::Agent::Tracer.capture_segment_error segment do
139
+ ensure_index_without_new_relic_trace(spec, opts, &block)
140
+ end
135
141
  end
136
142
 
137
143
  spec = case spec
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
  require 'new_relic/agent/datastores/mongo/event_formatter'
5
5
 
6
6
  module NewRelic
@@ -19,11 +19,35 @@ module NewRelic
19
19
  end
20
20
  end
21
21
 
22
+ ERROR_KEYS = %w{ writeErrors writeConcernError writeConcernErrors }.freeze
23
+
24
+ def error_key_present?(event)
25
+ if reply = event.reply
26
+ ERROR_KEYS.detect{ |key| reply[key] }
27
+ end
28
+ rescue
29
+ false
30
+ end
31
+
22
32
  def completed(event)
23
33
  begin
24
34
  return unless NewRelic::Agent::Tracer.tracing_enabled?
25
35
  segment = segments.delete(event.operation_id)
26
- segment.finish if segment
36
+ return unless segment
37
+
38
+ # operations that succeed but have errors return CommandSucceeded
39
+ # with an error_key that is populated with error specfics
40
+ if error_key = error_key_present?(event)
41
+ # taking the last error as there can potentially be many
42
+ attributes = event.reply[error_key][-1]
43
+ segment.notice_error Mongo::Error.new("%s (%s)" % [attributes["errmsg"], attributes["code"]])
44
+
45
+ # failing commands return a CommandFailed event with an error message
46
+ # in the form of "% (%s)" for the message and code
47
+ elsif event.is_a? Mongo::Monitoring::Event::CommandFailed
48
+ segment.notice_error Mongo::Error.new(event.message)
49
+ end
50
+ segment.finish
27
51
  rescue Exception => e
28
52
  log_notification_error('completed', e)
29
53
  end
@@ -39,7 +63,7 @@ module NewRelic
39
63
  port_path_or_id = port_path_or_id_from_address event.address
40
64
  segment = NewRelic::Agent::Tracer.start_datastore_segment(
41
65
  product: MONGODB,
42
- operation: event.command_name,
66
+ operation: operation(event.command_name),
43
67
  collection: collection(event),
44
68
  host: host,
45
69
  port_path_or_id: port_path_or_id,
@@ -49,6 +73,15 @@ module NewRelic
49
73
  segment
50
74
  end
51
75
 
76
+ def operation(command_name)
77
+ # from 2.0 to 2.5, :findandmodify was the command_name
78
+ if command_name == :findandmodify
79
+ :findAndModify
80
+ else
81
+ command_name
82
+ end
83
+ end
84
+
52
85
  def collection(event)
53
86
  event.command[COLLECTION] || event.command[:collection] || event.command.values.first
54
87
  end
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
 
5
5
  DependencyDetection.defer do
6
6
  named :net_http
@@ -11,38 +11,75 @@ DependencyDetection.defer do
11
11
 
12
12
  executes do
13
13
  ::NewRelic::Agent.logger.info 'Installing Net instrumentation'
14
- require 'new_relic/agent/cross_app_tracing'
14
+ require 'new_relic/agent/distributed_tracing/cross_app_tracing'
15
15
  require 'new_relic/agent/http_clients/net_http_wrappers'
16
16
  end
17
17
 
18
18
  executes do
19
19
  class Net::HTTP
20
- def request_with_newrelic_trace(request, *args, &block)
21
- wrapped_request = NewRelic::Agent::HTTPClients::NetHTTPRequest.new(self, request)
22
20
 
23
- segment = NewRelic::Agent::Tracer.start_external_request_segment(
24
- library: wrapped_request.type,
25
- uri: wrapped_request.uri,
26
- procedure: wrapped_request.method
27
- )
28
-
29
- begin
30
- response = nil
31
- segment.add_request_headers wrapped_request
32
-
33
- # RUBY-1244 Disable further tracing in request to avoid double
34
- # counting if connection wasn't started (which calls request again).
35
- NewRelic::Agent.disable_all_tracing do
36
- response = request_without_newrelic_trace( request, *args, &block )
21
+ if RUBY_VERSION < "2.7.0"
22
+ def request_with_newrelic_trace(request, *args, &block)
23
+ wrapped_request = NewRelic::Agent::HTTPClients::NetHTTPRequest.new(self, request)
24
+
25
+ segment = NewRelic::Agent::Tracer.start_external_request_segment(
26
+ library: wrapped_request.type,
27
+ uri: wrapped_request.uri,
28
+ procedure: wrapped_request.method
29
+ )
30
+
31
+ begin
32
+ response = nil
33
+ segment.add_request_headers wrapped_request
34
+
35
+ # RUBY-1244 Disable further tracing in request to avoid double
36
+ # counting if connection wasn't started (which calls request again).
37
+ NewRelic::Agent.disable_all_tracing do
38
+ response = NewRelic::Agent::Tracer.capture_segment_error segment do
39
+ request_without_newrelic_trace(request, *args, &block)
40
+ end
41
+ end
42
+
43
+ wrapped_response = NewRelic::Agent::HTTPClients::NetHTTPResponse.new response
44
+ segment.process_response_headers wrapped_response
45
+ response
46
+ ensure
47
+ segment.finish
48
+ end
49
+ end
50
+ else
51
+ def request_with_newrelic_trace(request, *args, **kwargs, &block)
52
+ wrapped_request = NewRelic::Agent::HTTPClients::NetHTTPRequest.new(self, request)
53
+
54
+ segment = NewRelic::Agent::Tracer.start_external_request_segment(
55
+ library: wrapped_request.type,
56
+ uri: wrapped_request.uri,
57
+ procedure: wrapped_request.method
58
+ )
59
+
60
+ begin
61
+ response = nil
62
+ segment.add_request_headers wrapped_request
63
+
64
+ # RUBY-1244 Disable further tracing in request to avoid double
65
+ # counting if connection wasn't started (which calls request again).
66
+ NewRelic::Agent.disable_all_tracing do
67
+ response = NewRelic::Agent::Tracer.capture_segment_error segment do
68
+ request_without_newrelic_trace(request, *args, **kwargs, &block)
69
+ end
70
+ end
71
+
72
+ wrapped_response = NewRelic::Agent::HTTPClients::NetHTTPResponse.new response
73
+ segment.process_response_headers wrapped_response
74
+ response
75
+ ensure
76
+ segment.finish
37
77
  end
38
-
39
- segment.read_response_headers response
40
- response
41
- ensure
42
- segment.finish
43
78
  end
79
+
44
80
  end
45
81
 
82
+
46
83
  alias request_without_newrelic_trace request
47
84
  alias request request_with_newrelic_trace
48
85
  end
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
 
5
5
  module NewRelic
6
6
  module Agent
@@ -8,6 +8,7 @@ module NewRelic
8
8
  class NotificationsSubscriber
9
9
  def initialize
10
10
  @queue_key = ['NewRelic', self.class.name, object_id].join('-')
11
+ define_exception_method
11
12
  end
12
13
 
13
14
  def self.subscribed?
@@ -22,7 +23,7 @@ module NewRelic
22
23
 
23
24
  notifier = ActiveSupport::Notifications.notifier
24
25
 
25
- instance_variable_names.each do |name|
26
+ instance_variable_names.each do |name|
26
27
  if notifier.instance_variable_defined?(name)
27
28
  subscribers = notifier.instance_variable_get(name)
28
29
  if subscribers.is_a? Array
@@ -69,6 +70,29 @@ module NewRelic
69
70
  def state
70
71
  NewRelic::Agent::Tracer.state
71
72
  end
73
+
74
+ def define_exception_method
75
+ # we don't expect this to be called more than once, but we're being
76
+ # defensive.
77
+ return if defined?(exception_object)
78
+ return unless defined?(::ActiveSupport)
79
+ if ::ActiveSupport::VERSION::STRING < "5.0.0"
80
+ # Earlier versions of Rails did not add the exception itself to the
81
+ # payload asssessible via :exception_object, so we create a stand-in
82
+ # error object from the given class name and message.
83
+ # NOTE: no backtrace available this way, but we can notice the error
84
+ # well enough to send the necessary info the UI requires to present it.
85
+ def exception_object(payload)
86
+ exception_class, message = payload[:exception]
87
+ return nil unless exception_class
88
+ NewRelic::Agent::NoticibleError.new exception_class, message
89
+ end
90
+ else
91
+ def exception_object(payload)
92
+ payload[:exception_object]
93
+ end
94
+ end
95
+ end
72
96
  end
73
97
 
74
98
  end