newrelic_rpm 6.9.0.363 → 6.12.0.367

Sign up to get free protection for your applications and to get access to all the features.
Files changed (289) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +3 -0
  3. data/.travis.yml +32 -2
  4. data/CHANGELOG.md +172 -10
  5. data/CODE_OF_CONDUCT.md +46 -0
  6. data/CONTRIBUTING.md +56 -12
  7. data/Gemfile +6 -2
  8. data/LICENSE +208 -38
  9. data/README.md +61 -89
  10. data/Rakefile +2 -0
  11. data/THIRD_PARTY_NOTICES.md +213 -0
  12. data/bin/nrdebug +1 -1
  13. data/init.rb +1 -1
  14. data/install.rb +1 -1
  15. data/lib/new_relic/agent.rb +15 -5
  16. data/lib/new_relic/agent/adaptive_sampler.rb +1 -1
  17. data/lib/new_relic/agent/agent.rb +11 -6
  18. data/lib/new_relic/agent/agent_logger.rb +1 -1
  19. data/lib/new_relic/agent/attribute_filter.rb +1 -1
  20. data/lib/new_relic/agent/attribute_processing.rb +1 -1
  21. data/lib/new_relic/agent/attributes.rb +3 -1
  22. data/lib/new_relic/agent/audit_logger.rb +1 -1
  23. data/lib/new_relic/agent/autostart.rb +1 -1
  24. data/lib/new_relic/agent/chained_call.rb +1 -1
  25. data/lib/new_relic/agent/commands/agent_command.rb +1 -1
  26. data/lib/new_relic/agent/commands/agent_command_router.rb +1 -1
  27. data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -1
  28. data/lib/new_relic/agent/configuration.rb +1 -1
  29. data/lib/new_relic/agent/configuration/default_source.rb +28 -1
  30. data/lib/new_relic/agent/configuration/dotted_hash.rb +1 -1
  31. data/lib/new_relic/agent/configuration/environment_source.rb +1 -1
  32. data/lib/new_relic/agent/configuration/event_harvest_config.rb +1 -1
  33. data/lib/new_relic/agent/configuration/high_security_source.rb +1 -1
  34. data/lib/new_relic/agent/configuration/manager.rb +1 -1
  35. data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
  36. data/lib/new_relic/agent/configuration/mask_defaults.rb +1 -1
  37. data/lib/new_relic/agent/configuration/security_policy_source.rb +1 -1
  38. data/lib/new_relic/agent/configuration/server_source.rb +1 -1
  39. data/lib/new_relic/agent/configuration/yaml_source.rb +1 -1
  40. data/lib/new_relic/agent/connect/request_builder.rb +1 -1
  41. data/lib/new_relic/agent/connect/response_handler.rb +1 -1
  42. data/lib/new_relic/agent/custom_event_aggregator.rb +1 -1
  43. data/lib/new_relic/agent/database.rb +1 -1
  44. data/lib/new_relic/agent/database/explain_plan_helpers.rb +1 -1
  45. data/lib/new_relic/agent/database/obfuscation_helpers.rb +2 -2
  46. data/lib/new_relic/agent/database/obfuscator.rb +1 -1
  47. data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +1 -1
  48. data/lib/new_relic/agent/datastores.rb +1 -1
  49. data/lib/new_relic/agent/datastores/metric_helper.rb +1 -1
  50. data/lib/new_relic/agent/datastores/mongo.rb +2 -2
  51. data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +1 -1
  52. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +1 -1
  53. data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +1 -1
  54. data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +1 -1
  55. data/lib/new_relic/agent/datastores/redis.rb +1 -1
  56. data/lib/new_relic/agent/deprecator.rb +1 -1
  57. data/lib/new_relic/agent/distributed_tracing.rb +1 -1
  58. data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +3 -2
  59. data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +1 -1
  60. data/lib/new_relic/agent/distributed_tracing/{distributed_trace_intrinsics.rb → distributed_trace_attributes.rb} +9 -5
  61. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +1 -1
  62. data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +3 -4
  63. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +1 -1
  64. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +1 -1
  65. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +2 -2
  66. data/lib/new_relic/agent/encoding_normalizer.rb +1 -1
  67. data/lib/new_relic/agent/error_collector.rb +31 -12
  68. data/lib/new_relic/agent/error_event_aggregator.rb +5 -5
  69. data/lib/new_relic/agent/error_trace_aggregator.rb +1 -1
  70. data/lib/new_relic/agent/event_aggregator.rb +1 -1
  71. data/lib/new_relic/agent/event_buffer.rb +1 -1
  72. data/lib/new_relic/agent/event_listener.rb +1 -1
  73. data/lib/new_relic/agent/event_loop.rb +1 -1
  74. data/lib/new_relic/agent/external.rb +1 -1
  75. data/lib/new_relic/agent/guid_generator.rb +1 -1
  76. data/lib/new_relic/agent/harvester.rb +1 -1
  77. data/lib/new_relic/agent/heap.rb +1 -1
  78. data/lib/new_relic/agent/hostname.rb +8 -2
  79. data/lib/new_relic/agent/http_clients/abstract.rb +82 -0
  80. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +25 -20
  81. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +29 -14
  82. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +18 -22
  83. data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +11 -12
  84. data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +17 -5
  85. data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +5 -7
  86. data/lib/new_relic/agent/http_clients/uri_util.rb +4 -3
  87. data/lib/new_relic/agent/instrumentation.rb +1 -1
  88. data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +5 -6
  89. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +5 -1
  90. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +12 -3
  91. data/lib/new_relic/agent/instrumentation/active_job.rb +1 -1
  92. data/lib/new_relic/agent/instrumentation/active_merchant.rb +1 -1
  93. data/lib/new_relic/agent/instrumentation/active_record.rb +85 -38
  94. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +82 -24
  95. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +1 -1
  96. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +92 -34
  97. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +8 -3
  98. data/lib/new_relic/agent/instrumentation/active_storage.rb +1 -1
  99. data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +9 -5
  100. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +24 -8
  101. data/lib/new_relic/agent/instrumentation/authlogic.rb +1 -1
  102. data/lib/new_relic/agent/instrumentation/bunny.rb +114 -51
  103. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +1 -1
  104. data/lib/new_relic/agent/instrumentation/curb.rb +92 -27
  105. data/lib/new_relic/agent/instrumentation/data_mapper.rb +4 -2
  106. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +61 -25
  107. data/lib/new_relic/agent/instrumentation/excon.rb +1 -1
  108. data/lib/new_relic/agent/instrumentation/excon/connection.rb +7 -4
  109. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +3 -2
  110. data/lib/new_relic/agent/instrumentation/grape.rb +1 -1
  111. data/lib/new_relic/agent/instrumentation/http.rb +6 -3
  112. data/lib/new_relic/agent/instrumentation/httpclient.rb +5 -3
  113. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +1 -1
  114. data/lib/new_relic/agent/instrumentation/memcache.rb +4 -2
  115. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +7 -3
  116. data/lib/new_relic/agent/instrumentation/merb/controller.rb +1 -1
  117. data/lib/new_relic/agent/instrumentation/merb/errors.rb +1 -1
  118. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +12 -4
  119. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +9 -7
  120. data/lib/new_relic/agent/instrumentation/mongo.rb +10 -4
  121. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +36 -3
  122. data/lib/new_relic/agent/instrumentation/net.rb +59 -22
  123. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +26 -2
  124. data/lib/new_relic/agent/instrumentation/padrino.rb +40 -16
  125. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +1 -1
  126. data/lib/new_relic/agent/instrumentation/queue_time.rb +1 -1
  127. data/lib/new_relic/agent/instrumentation/rack.rb +36 -13
  128. data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +1 -1
  129. data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +1 -1
  130. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +1 -1
  131. data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -1
  132. data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +1 -1
  133. data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +1 -1
  134. data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +1 -1
  135. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +1 -1
  136. data/lib/new_relic/agent/instrumentation/rake.rb +54 -20
  137. data/lib/new_relic/agent/instrumentation/redis.rb +141 -56
  138. data/lib/new_relic/agent/instrumentation/resque.rb +1 -1
  139. data/lib/new_relic/agent/instrumentation/sequel.rb +1 -1
  140. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +1 -1
  141. data/lib/new_relic/agent/instrumentation/sidekiq.rb +48 -24
  142. data/lib/new_relic/agent/instrumentation/sinatra.rb +62 -23
  143. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +1 -1
  144. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +1 -1
  145. data/lib/new_relic/agent/instrumentation/sunspot.rb +1 -1
  146. data/lib/new_relic/agent/instrumentation/typhoeus.rb +23 -6
  147. data/lib/new_relic/agent/internal_agent_error.rb +1 -1
  148. data/lib/new_relic/agent/javascript_instrumentor.rb +1 -1
  149. data/lib/new_relic/agent/log_once.rb +1 -1
  150. data/lib/new_relic/agent/logging.rb +2 -2
  151. data/lib/new_relic/agent/memory_logger.rb +1 -1
  152. data/lib/new_relic/agent/messaging.rb +1 -1
  153. data/lib/new_relic/agent/method_tracer.rb +16 -5
  154. data/lib/new_relic/agent/method_tracer_helpers.rb +2 -2
  155. data/lib/new_relic/agent/monitors.rb +1 -1
  156. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +1 -1
  157. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +1 -1
  158. data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +1 -1
  159. data/lib/new_relic/agent/monitors/synthetics_monitor.rb +1 -1
  160. data/lib/new_relic/agent/new_relic_service.rb +1 -2
  161. data/lib/new_relic/agent/new_relic_service/encoders.rb +1 -1
  162. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +1 -1
  163. data/lib/new_relic/agent/new_relic_service/marshaller.rb +1 -1
  164. data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +1 -1
  165. data/lib/new_relic/agent/noticible_error.rb +22 -0
  166. data/lib/new_relic/agent/null_logger.rb +1 -1
  167. data/lib/new_relic/agent/obfuscator.rb +1 -1
  168. data/lib/new_relic/agent/parameter_filtering.rb +1 -1
  169. data/lib/new_relic/agent/payload_metric_mapping.rb +1 -1
  170. data/lib/new_relic/agent/pipe_channel_manager.rb +1 -1
  171. data/lib/new_relic/agent/pipe_service.rb +1 -1
  172. data/lib/new_relic/agent/prepend_supportability.rb +1 -1
  173. data/lib/new_relic/agent/priority_sampled_buffer.rb +8 -5
  174. data/lib/new_relic/agent/range_extensions.rb +1 -1
  175. data/lib/new_relic/agent/rules_engine.rb +1 -1
  176. data/lib/new_relic/agent/rules_engine/replacement_rule.rb +1 -1
  177. data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +1 -1
  178. data/lib/new_relic/agent/sampler.rb +1 -1
  179. data/lib/new_relic/agent/sampler_collection.rb +1 -1
  180. data/lib/new_relic/agent/samplers/cpu_sampler.rb +1 -1
  181. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +1 -1
  182. data/lib/new_relic/agent/samplers/memory_sampler.rb +1 -1
  183. data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
  184. data/lib/new_relic/agent/samplers/vm_sampler.rb +1 -1
  185. data/lib/new_relic/agent/span_event_aggregator.rb +1 -1
  186. data/lib/new_relic/agent/span_event_primitive.rb +71 -37
  187. data/lib/new_relic/agent/sql_sampler.rb +4 -4
  188. data/lib/new_relic/agent/stats.rb +1 -1
  189. data/lib/new_relic/agent/stats_engine.rb +1 -1
  190. data/lib/new_relic/agent/stats_engine/gc_profiler.rb +1 -1
  191. data/lib/new_relic/agent/stats_engine/stats_hash.rb +1 -1
  192. data/lib/new_relic/agent/supported_versions.rb +1 -1
  193. data/lib/new_relic/agent/synthetics_event_aggregator.rb +1 -1
  194. data/lib/new_relic/agent/system_info.rb +13 -4
  195. data/lib/new_relic/agent/threading/agent_thread.rb +1 -1
  196. data/lib/new_relic/agent/threading/backtrace_node.rb +1 -1
  197. data/lib/new_relic/agent/threading/backtrace_service.rb +1 -1
  198. data/lib/new_relic/agent/threading/thread_profile.rb +1 -1
  199. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
  200. data/lib/new_relic/agent/tracer.rb +31 -16
  201. data/lib/new_relic/agent/transaction.rb +67 -46
  202. data/lib/new_relic/agent/transaction/abstract_segment.rb +29 -2
  203. data/lib/new_relic/agent/transaction/datastore_segment.rb +1 -1
  204. data/lib/new_relic/agent/transaction/distributed_tracer.rb +3 -3
  205. data/lib/new_relic/agent/transaction/distributed_tracing.rb +2 -2
  206. data/lib/new_relic/agent/transaction/external_request_segment.rb +26 -10
  207. data/lib/new_relic/agent/transaction/message_broker_segment.rb +1 -1
  208. data/lib/new_relic/agent/transaction/request_attributes.rb +1 -1
  209. data/lib/new_relic/agent/transaction/segment.rb +18 -2
  210. data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -1
  211. data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
  212. data/lib/new_relic/agent/transaction/trace.rb +1 -1
  213. data/lib/new_relic/agent/transaction/trace_builder.rb +1 -1
  214. data/lib/new_relic/agent/transaction/trace_context.rb +1 -1
  215. data/lib/new_relic/agent/transaction/trace_node.rb +1 -1
  216. data/lib/new_relic/agent/transaction/tracing.rb +1 -1
  217. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -1
  218. data/lib/new_relic/agent/transaction_error_primitive.rb +8 -6
  219. data/lib/new_relic/agent/transaction_event_aggregator.rb +1 -1
  220. data/lib/new_relic/agent/transaction_event_primitive.rb +3 -3
  221. data/lib/new_relic/agent/transaction_event_recorder.rb +1 -1
  222. data/lib/new_relic/agent/transaction_metrics.rb +1 -1
  223. data/lib/new_relic/agent/transaction_sampler.rb +1 -1
  224. data/lib/new_relic/agent/transaction_time_aggregator.rb +1 -1
  225. data/lib/new_relic/agent/utilization/aws.rb +1 -1
  226. data/lib/new_relic/agent/utilization/azure.rb +1 -1
  227. data/lib/new_relic/agent/utilization/gcp.rb +1 -1
  228. data/lib/new_relic/agent/utilization/pcf.rb +1 -1
  229. data/lib/new_relic/agent/utilization/vendor.rb +1 -1
  230. data/lib/new_relic/agent/utilization_data.rb +1 -1
  231. data/lib/new_relic/agent/vm.rb +1 -1
  232. data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
  233. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -1
  234. data/lib/new_relic/agent/vm/mri_vm.rb +1 -1
  235. data/lib/new_relic/agent/vm/snapshot.rb +1 -1
  236. data/lib/new_relic/agent/worker_loop.rb +1 -1
  237. data/lib/new_relic/cli/command.rb +1 -1
  238. data/lib/new_relic/cli/commands/deployments.rb +1 -1
  239. data/lib/new_relic/cli/commands/install.rb +4 -3
  240. data/lib/new_relic/coerce.rb +1 -1
  241. data/lib/new_relic/collection_helper.rb +1 -1
  242. data/lib/new_relic/constants.rb +5 -1
  243. data/lib/new_relic/control.rb +1 -1
  244. data/lib/new_relic/control/class_methods.rb +1 -1
  245. data/lib/new_relic/control/frameworks.rb +1 -1
  246. data/lib/new_relic/control/frameworks/external.rb +1 -1
  247. data/lib/new_relic/control/frameworks/merb.rb +1 -1
  248. data/lib/new_relic/control/frameworks/rails.rb +1 -1
  249. data/lib/new_relic/control/frameworks/rails3.rb +1 -1
  250. data/lib/new_relic/control/frameworks/rails4.rb +1 -1
  251. data/lib/new_relic/control/frameworks/rails_notifications.rb +1 -1
  252. data/lib/new_relic/control/frameworks/ruby.rb +1 -1
  253. data/lib/new_relic/control/frameworks/sinatra.rb +1 -1
  254. data/lib/new_relic/control/instance_methods.rb +1 -1
  255. data/lib/new_relic/control/instrumentation.rb +1 -1
  256. data/lib/new_relic/control/server_methods.rb +1 -1
  257. data/lib/new_relic/delayed_job_injection.rb +1 -1
  258. data/lib/new_relic/dependency_detection.rb +1 -1
  259. data/lib/new_relic/environment_report.rb +6 -2
  260. data/lib/new_relic/helper.rb +1 -1
  261. data/lib/new_relic/language_support.rb +1 -1
  262. data/lib/new_relic/latest_changes.rb +2 -2
  263. data/lib/new_relic/local_environment.rb +1 -1
  264. data/lib/new_relic/metric_data.rb +1 -1
  265. data/lib/new_relic/metric_spec.rb +1 -1
  266. data/lib/new_relic/metrics.rb +1 -1
  267. data/lib/new_relic/noticed_error.rb +29 -10
  268. data/lib/new_relic/rack.rb +1 -1
  269. data/lib/new_relic/rack/agent_hooks.rb +1 -1
  270. data/lib/new_relic/rack/agent_middleware.rb +1 -1
  271. data/lib/new_relic/rack/browser_monitoring.rb +3 -2
  272. data/lib/new_relic/recipes.rb +1 -1
  273. data/lib/new_relic/recipes/capistrano3.rb +1 -1
  274. data/lib/new_relic/recipes/capistrano_legacy.rb +1 -1
  275. data/lib/new_relic/supportability_helper.rb +1 -1
  276. data/lib/new_relic/version.rb +2 -2
  277. data/lib/newrelic_rpm.rb +1 -1
  278. data/lib/sequel/extensions/newrelic_instrumentation.rb +1 -1
  279. data/lib/sequel/plugins/newrelic_instrumentation.rb +1 -1
  280. data/lib/tasks/all.rb +1 -1
  281. data/lib/tasks/multiverse.rb +26 -1
  282. data/lib/tasks/newrelic.rb +1 -1
  283. data/lib/tasks/tests.rake +1 -1
  284. data/newrelic_rpm.gemspec +11 -9
  285. data/recipes/newrelic.rb +1 -1
  286. data/test/agent_helper.rb +231 -70
  287. metadata +18 -15
  288. data/lib/new_relic/agent/http_clients/abstract_request.rb +0 -31
  289. data/true +0 -0
@@ -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
  # frozen_string_literal: true
5
5
 
6
6
  require_relative 'trace_context_payload'
@@ -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/coerce'
6
6
 
@@ -117,7 +117,7 @@ module NewRelic
117
117
  result << DELIMITER << (id || NewRelic::EMPTY_STR)
118
118
  result << DELIMITER << (transaction_id || NewRelic::EMPTY_STR)
119
119
  result << DELIMITER << (sampled ? TRUE_CHAR : FALSE_CHAR)
120
- result << DELIMITER << priority.to_s
120
+ result << DELIMITER << sprintf("%.6f", priority)
121
121
  result << DELIMITER << timestamp.to_s
122
122
  result
123
123
  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
  # This module was extracted from NewRelic::JSONWrapper
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
  require 'new_relic/agent/error_trace_aggregator'
5
5
  require 'new_relic/agent/error_event_aggregator'
6
6
 
@@ -32,7 +32,6 @@ module NewRelic
32
32
  end
33
33
  end
34
34
 
35
-
36
35
  def initialize_ignored_errors(ignore_errors)
37
36
  @ignore.clear
38
37
  ignore_errors = ignore_errors.split(",") if ignore_errors.is_a? String
@@ -117,14 +116,22 @@ module NewRelic
117
116
  NewRelic::LanguageSupport.jruby? && exception.respond_to?(:java_class)
118
117
  end
119
118
 
120
- def exception_tagged?(exception)
119
+ def exception_tagged_with?(ivar, exception)
121
120
  return false if exception_is_java_object?(exception)
122
- exception.instance_variable_defined?(EXCEPTION_TAG_IVAR)
121
+ exception.instance_variable_defined?(ivar)
122
+ end
123
+
124
+ def tag_exception_using(ivar, exception)
125
+ return if exception_is_java_object?(exception) || exception.frozen?
126
+ begin
127
+ exception.instance_variable_set(ivar, true)
128
+ rescue => e
129
+ NewRelic::Agent.logger.warn("Failed to tag exception: #{exception}: ", e)
130
+ end
123
131
  end
124
132
 
125
133
  def tag_exception(exception)
126
- return if exception_is_java_object?(exception)
127
- return if exception.frozen?
134
+ return if exception_is_java_object?(exception) || exception.frozen?
128
135
  begin
129
136
  exception.instance_variable_set(EXCEPTION_TAG_IVAR, true)
130
137
  rescue => e
@@ -169,9 +176,9 @@ module NewRelic
169
176
 
170
177
  def skip_notice_error?(exception)
171
178
  disabled? ||
172
- error_is_ignored?(exception) ||
173
- exception.nil? ||
174
- exception_tagged?(exception)
179
+ error_is_ignored?(exception) ||
180
+ exception.nil? ||
181
+ exception_tagged_with?(EXCEPTION_TAG_IVAR, exception)
175
182
  end
176
183
 
177
184
  # calls a method on an object, if it responds to it - used for
@@ -191,8 +198,18 @@ module NewRelic
191
198
  sense_method(actual_exception, :backtrace) || '<no stack trace>'
192
199
  end
193
200
 
201
+ def notice_segment_error(segment, exception, options={})
202
+ return if skip_notice_error?(exception)
203
+
204
+ segment.set_noticed_error create_noticed_error(exception, options)
205
+ exception
206
+ rescue => e
207
+ ::NewRelic::Agent.logger.warn("Failure when capturing segment error '#{exception}':", e)
208
+ nil
209
+ end
210
+
194
211
  # See NewRelic::Agent.notice_error for options and commentary
195
- def notice_error(exception, options={}) #THREAD_LOCAL_ACCESS
212
+ def notice_error(exception, options={}, span_id=nil)
196
213
  return if skip_notice_error?(exception)
197
214
 
198
215
  tag_exception(exception)
@@ -205,8 +222,10 @@ module NewRelic
205
222
 
206
223
  noticed_error = create_noticed_error(exception, options)
207
224
  error_trace_aggregator.add_to_error_queue(noticed_error)
208
- payload = state.current_transaction ? state.current_transaction.payload : nil
209
- error_event_aggregator.record(noticed_error, payload)
225
+ transaction = state.current_transaction
226
+ payload = transaction ? transaction.payload : nil
227
+ span_id ||= (transaction && transaction.current_segment) ? transaction.current_segment.guid : nil
228
+ error_event_aggregator.record(noticed_error, payload, span_id)
210
229
  exception
211
230
  rescue => e
212
231
  ::NewRelic::Agent.logger.warn("Failure when capturing error '#{exception}':", e)
@@ -1,7 +1,7 @@
1
1
  # -*- ruby -*-
2
2
  # encoding: utf-8
3
3
  # This file is distributed under New Relic's license terms.
4
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
4
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
5
5
  # frozen_string_literal: true
6
6
 
7
7
  require 'new_relic/agent/event_aggregator'
@@ -19,14 +19,14 @@ module NewRelic
19
19
  :'error_collector.capture_events'
20
20
  buffer_class PrioritySampledBuffer
21
21
 
22
- def record noticed_error, transaction_payload = nil
22
+ def record noticed_error, transaction_payload = nil, span_id = nil
23
23
  return unless enabled?
24
24
 
25
25
  priority = float!((transaction_payload && transaction_payload[:priority]) || rand)
26
26
 
27
27
  @lock.synchronize do
28
28
  @buffer.append(priority: priority) do
29
- create_event(noticed_error, transaction_payload)
29
+ create_event(noticed_error, transaction_payload, span_id)
30
30
  end
31
31
  notify_if_full
32
32
  end
@@ -34,8 +34,8 @@ module NewRelic
34
34
 
35
35
  private
36
36
 
37
- def create_event noticed_error, transaction_payload
38
- TransactionErrorPrimitive.create noticed_error, transaction_payload
37
+ def create_event noticed_error, transaction_payload, span_id
38
+ TransactionErrorPrimitive.create noticed_error, transaction_payload, span_id
39
39
  end
40
40
  end
41
41
  end
@@ -1,7 +1,7 @@
1
1
  # -*- ruby -*-
2
2
  # encoding: utf-8
3
3
  # This file is distributed under New Relic's license terms.
4
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
4
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
5
5
 
6
6
  module NewRelic
7
7
  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
  require 'new_relic/agent/priority_sampled_buffer'
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
  # EventBuffer is intended to be an abstract base class. It should not be
6
6
  # instantiated directly. Subclasses should define an `append_event` method
@@ -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::Agent
6
6
  # Basic mechanism for the agent instance to provide agent-wide eventing.
@@ -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 'thread'
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
  require 'new_relic/agent/transaction/tracing'
6
6
  require 'new_relic/agent/distributed_tracing/cross_app_tracing'
@@ -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
  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
  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
  require 'socket'
5
5
 
6
6
  module NewRelic
@@ -17,8 +17,14 @@ module NewRelic
17
17
  end
18
18
  end
19
19
 
20
+ # calling hostname with -f on some OS's (NetBSD, FreeBSD, Solaris)
21
+ # produces invalid option error, but doesn't raise exception. Instead,
22
+ # we get back empty string. So, solution here is to check for non-zero
23
+ # exit status and retry the command without the -f flag.
20
24
  def self.get_fqdn
21
- %x[hostname -f].chomp!
25
+ fqdn = %x[hostname -f].chomp!
26
+ fqdn = %x[hostname].chomp! unless $?.exitstatus.zero?
27
+ fqdn
22
28
  rescue => e
23
29
  NewRelic::Agent.logger.debug "Unable to determine fqdn #{e}"
24
30
  nil
@@ -0,0 +1,82 @@
1
+ # encoding: utf-8
2
+ # This file is distributed under New Relic's license terms.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
+ # frozen_string_literal: true
5
+
6
+ module NewRelic
7
+ module Agent
8
+ module HTTPClients
9
+ MUST_IMPLEMENT_ERROR = "Subclasses of %s must implement a :%s method"
10
+ WHINY_NIL_ERROR = "%s cannot initialize with a nil wrapped_response object."
11
+
12
+ # This class provides a public interface for wrapping HTTP requests. This
13
+ # may be used to create wrappers that are compatible with New Relic's
14
+ # external request API.
15
+ #
16
+ # @api public
17
+ class AbstractRequest
18
+
19
+ def []
20
+ raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
21
+ end
22
+
23
+ def []=
24
+ raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
25
+ end
26
+
27
+ def type
28
+ raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
29
+ end
30
+
31
+ def host_from_header
32
+ raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
33
+ end
34
+
35
+ def host
36
+ raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
37
+ end
38
+
39
+ def method
40
+ raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
41
+ end
42
+ end
43
+
44
+ # This class implements the adaptor pattern and is used internally provide
45
+ # uniform access to the underlying HTTP Client's response object
46
+ # NOTE: response_object should be non-nil!
47
+ class AbstractResponse # :nodoc:
48
+
49
+ def initialize wrapped_response
50
+ if wrapped_response.nil?
51
+ raise ArgumentError, WHINY_NIL_ERROR % self.class
52
+ end
53
+ @wrapped_response = wrapped_response
54
+ end
55
+
56
+ def has_status_code?
57
+ !!status_code
58
+ end
59
+
60
+ # most HTTP client libraries report the HTTP status code as an integer, so
61
+ # we expect status_code to be set only if a non-zero value is present
62
+ def status_code
63
+ @status_code ||= get_status_code
64
+ end
65
+
66
+ private
67
+
68
+ def get_status_code_using method_name
69
+ return unless @wrapped_response.respond_to?(method_name)
70
+ code = @wrapped_response.send(method_name).to_i
71
+ code == 0 ? nil : code
72
+ end
73
+
74
+ # Override this method to memoize a non-zero Integer representation
75
+ # of HTTP status code from the response object
76
+ def get_status_code
77
+ get_status_code_using :code
78
+ end
79
+ end
80
+ end
81
+ end
82
+ end
@@ -1,19 +1,20 @@
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
- require 'new_relic/agent/http_clients/abstract_request'
6
+ require_relative 'abstract'
6
7
 
7
8
  module NewRelic
8
9
  module Agent
9
10
  module HTTPClients
10
11
 
11
12
  class CurbRequest
12
- CURB = 'Curb'.freeze
13
- LHOST = 'host'.freeze
14
- UHOST = 'Host'.freeze
13
+ CURB = 'Curb'
14
+ LHOST = 'host'
15
+ UHOST = 'Host'
15
16
 
16
- def initialize( curlobj )
17
+ def initialize curlobj
17
18
  @curlobj = curlobj
18
19
  end
19
20
 
@@ -34,41 +35,45 @@ module NewRelic
34
35
  end
35
36
 
36
37
  def []( key )
37
- @curlobj.headers[ key ]
38
+ @curlobj.headers[key]
38
39
  end
39
40
 
40
- def []=( key, value )
41
- @curlobj.headers[ key ] = value
41
+ def []=(key, value)
42
+ @curlobj.headers[key] = value
42
43
  end
43
44
 
44
45
  def uri
45
- @uri ||= NewRelic::Agent::HTTPClients::URIUtil.parse_and_normalize_url(@curlobj.url)
46
+ @uri ||= URIUtil.parse_and_normalize_url(@curlobj.url)
46
47
  end
47
48
  end
48
49
 
50
+ class CurbResponse < AbstractResponse
49
51
 
50
- class CurbResponse < AbstractRequest
51
-
52
- def initialize(curlobj)
52
+ def initialize wrapped_response
53
+ super wrapped_response
53
54
  @headers = {}
54
- @curlobj = curlobj
55
55
  end
56
56
 
57
57
  def [](key)
58
- @headers[ key.downcase ]
58
+ @headers[key.downcase]
59
59
  end
60
60
 
61
61
  def to_hash
62
62
  @headers.dup
63
63
  end
64
64
 
65
- def append_header_data( data )
66
- key, value = data.split( /:\s*/, 2 )
67
- @headers[ key.downcase ] = value
68
- @curlobj._nr_header_str ||= ''
69
- @curlobj._nr_header_str << data
65
+ def append_header_data data
66
+ key, value = data.split(/:\s*/, 2)
67
+ @headers[key.downcase] = value
68
+ @wrapped_response._nr_header_str ||= String.new
69
+ @wrapped_response._nr_header_str << data
70
70
  end
71
71
 
72
+ private
73
+
74
+ def get_status_code
75
+ get_status_code_using :response_code
76
+ end
72
77
  end
73
78
 
74
79
  end
@@ -1,20 +1,21 @@
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
- require 'new_relic/agent/http_clients/abstract_request'
6
+ require_relative 'abstract'
6
7
 
7
8
  module NewRelic
8
9
  module Agent
9
10
  module HTTPClients
10
- class ExconHTTPResponse
11
- def initialize(response)
12
- @response = response
11
+ class ExconHTTPResponse < AbstractResponse
12
+ def initialize wrapped_response
13
+ super wrapped_response
14
+
13
15
  # Since HTTP headers are case-insensitive, we normalize all of them to
14
16
  # upper case here, and then also in our [](key) implementation.
15
17
  @normalized_headers = {}
16
- headers = response.respond_to?(:headers) ? response.headers : response[:headers]
17
- (headers || {}).each do |key, val|
18
+ (get_attribute(:headers) || {}).each do |key, val|
18
19
  @normalized_headers[key.upcase] = val
19
20
  end
20
21
  end
@@ -26,15 +27,30 @@ module NewRelic
26
27
  def to_hash
27
28
  @normalized_headers.dup
28
29
  end
30
+
31
+ private
32
+
33
+ def get_attribute name
34
+ if @wrapped_response.respond_to?(name)
35
+ @wrapped_response.send(name)
36
+ else
37
+ @wrapped_response[name]
38
+ end
39
+ end
40
+
41
+ def get_status_code
42
+ code = get_attribute(:status).to_i
43
+ code == 0 ? nil : code
44
+ end
29
45
  end
30
46
 
31
47
  class ExconHTTPRequest < AbstractRequest
32
48
  attr_reader :method
33
49
 
34
- EXCON = "Excon".freeze
35
- LHOST = 'host'.freeze
36
- UHOST = 'Host'.freeze
37
- COLON = ':'.freeze
50
+ EXCON = "Excon"
51
+ LHOST = 'host'
52
+ UHOST = 'Host'
53
+ COLON = ':'
38
54
 
39
55
  def initialize(datum)
40
56
  @datum = datum
@@ -70,9 +86,8 @@ module NewRelic
70
86
  end
71
87
 
72
88
  def uri
73
- ::NewRelic::Agent::HTTPClients::URIUtil.parse_and_normalize_url(
74
- "#{@scheme}://#{host}:#{@port}#{@path}"
75
- )
89
+ url = "#{@scheme}://#{host}:#{@port}#{@path}"
90
+ URIUtil.parse_and_normalize_url url
76
91
  end
77
92
  end
78
93
  end