newrelic_rpm 6.7.0.359 → 6.15.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (300) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +8 -0
  3. data/CHANGELOG.md +493 -4
  4. data/CONTRIBUTING.md +106 -19
  5. data/Gemfile +6 -2
  6. data/Guardfile +18 -1
  7. data/LICENSE +208 -38
  8. data/README.md +81 -85
  9. data/ROADMAP.md +24 -0
  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/adaptive_sampler.rb +1 -1
  16. data/lib/new_relic/agent/agent.rb +63 -44
  17. data/lib/new_relic/agent/agent_logger.rb +5 -1
  18. data/lib/new_relic/agent/attribute_filter.rb +8 -8
  19. data/lib/new_relic/agent/attribute_processing.rb +1 -1
  20. data/lib/new_relic/agent/attributes.rb +152 -0
  21. data/lib/new_relic/agent/audit_logger.rb +11 -1
  22. data/lib/new_relic/agent/autostart.rb +20 -15
  23. data/lib/new_relic/agent/chained_call.rb +1 -1
  24. data/lib/new_relic/agent/commands/agent_command.rb +1 -1
  25. data/lib/new_relic/agent/commands/agent_command_router.rb +1 -1
  26. data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -1
  27. data/lib/new_relic/agent/configuration/default_source.rb +138 -17
  28. data/lib/new_relic/agent/configuration/dotted_hash.rb +1 -1
  29. data/lib/new_relic/agent/configuration/environment_source.rb +1 -1
  30. data/lib/new_relic/agent/configuration/event_harvest_config.rb +1 -1
  31. data/lib/new_relic/agent/configuration/high_security_source.rb +1 -1
  32. data/lib/new_relic/agent/configuration/manager.rb +1 -1
  33. data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
  34. data/lib/new_relic/agent/configuration/mask_defaults.rb +1 -1
  35. data/lib/new_relic/agent/configuration/security_policy_source.rb +1 -1
  36. data/lib/new_relic/agent/configuration/server_source.rb +2 -2
  37. data/lib/new_relic/agent/configuration/yaml_source.rb +12 -7
  38. data/lib/new_relic/agent/configuration.rb +1 -1
  39. data/lib/new_relic/agent/connect/request_builder.rb +4 -12
  40. data/lib/new_relic/agent/connect/response_handler.rb +1 -1
  41. data/lib/new_relic/agent/custom_event_aggregator.rb +1 -1
  42. data/lib/new_relic/agent/database/explain_plan_helpers.rb +1 -1
  43. data/lib/new_relic/agent/database/obfuscation_helpers.rb +2 -2
  44. data/lib/new_relic/agent/database/obfuscator.rb +1 -1
  45. data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +1 -1
  46. data/lib/new_relic/agent/database.rb +2 -3
  47. data/lib/new_relic/agent/database_adapter.rb +33 -0
  48. data/lib/new_relic/agent/datastores/metric_helper.rb +1 -1
  49. data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +3 -3
  50. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +1 -1
  51. data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +9 -9
  52. data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +1 -1
  53. data/lib/new_relic/agent/datastores/mongo.rb +2 -2
  54. data/lib/new_relic/agent/datastores/redis.rb +1 -1
  55. data/lib/new_relic/agent/datastores.rb +1 -1
  56. data/lib/new_relic/agent/deprecator.rb +1 -1
  57. data/lib/new_relic/agent/{cross_app_payload.rb → distributed_tracing/cross_app_payload.rb} +3 -2
  58. data/lib/new_relic/agent/{cross_app_tracing.rb → distributed_tracing/cross_app_tracing.rb} +61 -46
  59. data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +84 -0
  60. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +75 -0
  61. data/lib/new_relic/agent/{distributed_trace_payload.rb → distributed_tracing/distributed_trace_payload.rb} +25 -102
  62. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +39 -0
  63. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +246 -0
  64. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +126 -0
  65. data/lib/new_relic/agent/distributed_tracing.rb +156 -7
  66. data/lib/new_relic/agent/encoding_normalizer.rb +1 -1
  67. data/lib/new_relic/agent/error_collector.rb +34 -17
  68. data/lib/new_relic/agent/error_event_aggregator.rb +8 -6
  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 +8 -8
  75. data/lib/new_relic/agent/guid_generator.rb +28 -0
  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 +12 -11
  87. data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +6 -8
  88. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +5 -1
  89. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +12 -4
  90. data/lib/new_relic/agent/instrumentation/active_job.rb +1 -1
  91. data/lib/new_relic/agent/instrumentation/active_merchant.rb +1 -1
  92. data/lib/new_relic/agent/instrumentation/active_record.rb +85 -38
  93. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +17 -6
  94. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +1 -1
  95. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +35 -11
  96. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +8 -3
  97. data/lib/new_relic/agent/instrumentation/active_storage.rb +1 -1
  98. data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +9 -5
  99. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +10 -9
  100. data/lib/new_relic/agent/instrumentation/authlogic.rb +1 -1
  101. data/lib/new_relic/agent/instrumentation/bunny.rb +48 -29
  102. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +1 -1
  103. data/lib/new_relic/agent/instrumentation/curb.rb +66 -19
  104. data/lib/new_relic/agent/instrumentation/data_mapper.rb +4 -2
  105. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +3 -1
  106. data/lib/new_relic/agent/instrumentation/excon/connection.rb +7 -4
  107. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +3 -2
  108. data/lib/new_relic/agent/instrumentation/excon.rb +2 -2
  109. data/lib/new_relic/agent/instrumentation/grape.rb +6 -11
  110. data/lib/new_relic/agent/instrumentation/http.rb +7 -4
  111. data/lib/new_relic/agent/instrumentation/httpclient.rb +6 -4
  112. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +1 -1
  113. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +7 -3
  114. data/lib/new_relic/agent/instrumentation/memcache.rb +4 -2
  115. data/lib/new_relic/agent/instrumentation/merb/controller.rb +1 -1
  116. data/lib/new_relic/agent/instrumentation/merb/errors.rb +1 -1
  117. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +1 -1
  118. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +9 -7
  119. data/lib/new_relic/agent/instrumentation/mongo.rb +10 -4
  120. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +36 -3
  121. data/lib/new_relic/agent/instrumentation/net.rb +48 -28
  122. data/lib/new_relic/agent/instrumentation/net_prepend.rb +40 -0
  123. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +26 -2
  124. data/lib/new_relic/agent/instrumentation/padrino.rb +3 -1
  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 +3 -1
  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 +2 -1
  137. data/lib/new_relic/agent/instrumentation/redis.rb +12 -6
  138. data/lib/new_relic/agent/instrumentation/resque.rb +4 -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/ignorer.rb +1 -1
  143. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +1 -1
  144. data/lib/new_relic/agent/instrumentation/sinatra.rb +1 -2
  145. data/lib/new_relic/agent/instrumentation/sunspot.rb +1 -1
  146. data/lib/new_relic/agent/instrumentation/typhoeus.rb +24 -7
  147. data/lib/new_relic/agent/instrumentation.rb +1 -1
  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 +10 -8
  155. data/lib/new_relic/agent/method_tracer_helpers.rb +3 -3
  156. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +110 -0
  157. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +27 -0
  158. data/lib/new_relic/agent/{inbound_request_monitor.rb → monitors/inbound_request_monitor.rb} +2 -2
  159. data/lib/new_relic/agent/{synthetics_monitor.rb → monitors/synthetics_monitor.rb} +3 -5
  160. data/lib/new_relic/agent/monitors.rb +27 -0
  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/new_relic_service.rb +34 -10
  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/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/rules_engine.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 +2 -2
  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 +108 -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/gc_profiler.rb +2 -2
  191. data/lib/new_relic/agent/stats_engine/stats_hash.rb +1 -1
  192. data/lib/new_relic/agent/stats_engine.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/abstract_segment.rb +32 -5
  203. data/lib/new_relic/agent/transaction/datastore_segment.rb +1 -1
  204. data/lib/new_relic/agent/transaction/distributed_tracer.rb +177 -0
  205. data/lib/new_relic/agent/transaction/distributed_tracing.rb +58 -147
  206. data/lib/new_relic/agent/transaction/external_request_segment.rb +32 -39
  207. data/lib/new_relic/agent/transaction/message_broker_segment.rb +5 -12
  208. data/lib/new_relic/agent/transaction/request_attributes.rb +1 -1
  209. data/lib/new_relic/agent/transaction/segment.rb +28 -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 +3 -5
  213. data/lib/new_relic/agent/transaction/trace_builder.rb +1 -1
  214. data/lib/new_relic/agent/transaction/trace_context.rb +168 -0
  215. data/lib/new_relic/agent/transaction/trace_node.rb +11 -9
  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.rb +104 -82
  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/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 +7 -5
  235. data/lib/new_relic/agent/vm/snapshot.rb +1 -1
  236. data/lib/new_relic/agent/vm.rb +1 -1
  237. data/lib/new_relic/agent/worker_loop.rb +1 -1
  238. data/lib/new_relic/agent.rb +49 -8
  239. data/lib/new_relic/cli/command.rb +1 -1
  240. data/lib/new_relic/cli/commands/deployments.rb +1 -2
  241. data/lib/new_relic/cli/commands/install.rb +4 -3
  242. data/lib/new_relic/coerce.rb +32 -7
  243. data/lib/new_relic/collection_helper.rb +1 -1
  244. data/lib/new_relic/constants.rb +42 -0
  245. data/lib/new_relic/control/class_methods.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/frameworks.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/control.rb +1 -1
  259. data/lib/new_relic/delayed_job_injection.rb +1 -1
  260. data/lib/new_relic/dependency_detection.rb +9 -5
  261. data/lib/new_relic/environment_report.rb +2 -4
  262. data/lib/new_relic/helper.rb +1 -1
  263. data/lib/new_relic/language_support.rb +1 -1
  264. data/lib/new_relic/latest_changes.rb +2 -2
  265. data/lib/new_relic/local_environment.rb +1 -1
  266. data/lib/new_relic/metric_data.rb +1 -1
  267. data/lib/new_relic/metric_spec.rb +1 -1
  268. data/lib/new_relic/noticed_error.rb +39 -18
  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 +6 -1
  272. data/lib/new_relic/rack.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/recipes.rb +1 -1
  276. data/lib/new_relic/supportability_helper.rb +17 -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 +35 -1
  283. data/lib/tasks/newrelic.rb +1 -1
  284. data/lib/tasks/tests.rake +6 -1
  285. data/newrelic_rpm.gemspec +18 -13
  286. data/recipes/newrelic.rb +1 -1
  287. data/test/agent_helper.rb +339 -72
  288. metadata +104 -41
  289. data/.travis.yml +0 -175
  290. data/lib/new_relic/agent/cross_app_monitor.rb +0 -110
  291. data/lib/new_relic/agent/distributed_trace_monitor.rb +0 -40
  292. data/lib/new_relic/agent/http_clients/abstract_request.rb +0 -31
  293. data/lib/new_relic/agent/transaction/attributes.rb +0 -154
  294. data/lib/new_relic/build.rb +0 -2
  295. data/lib/new_relic/metrics.rb +0 -13
  296. data/lib/tasks/versions.html.erb +0 -28
  297. data/lib/tasks/versions.postface.html +0 -8
  298. data/lib/tasks/versions.preface.html +0 -9
  299. data/lib/tasks/versions.rake +0 -65
  300. data/lib/tasks/versions.txt.erb +0 -14
@@ -0,0 +1,39 @@
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 DistributedTraceTransportType
9
+ extend self
10
+
11
+ ALLOWABLE_TRANSPORT_TYPES = [
12
+ NewRelic::UNKNOWN,
13
+ NewRelic::HTTP,
14
+ NewRelic::HTTPS,
15
+ "Kafka",
16
+ "JMS",
17
+ "IronMQ",
18
+ "AMQP",
19
+ "Queue",
20
+ "Other",
21
+ ].freeze
22
+
23
+ URL_SCHEMES = {
24
+ 'http' => NewRelic::HTTP,
25
+ 'https' => NewRelic::HTTPS,
26
+ }.freeze
27
+
28
+ RACK_URL_SCHEME = 'rack.url_scheme'
29
+
30
+ def from value
31
+ ALLOWABLE_TRANSPORT_TYPES.include?(value) ? value : NewRelic::UNKNOWN
32
+ end
33
+
34
+ def for_rack_request request
35
+ URL_SCHEMES[request[RACK_URL_SCHEME]]
36
+ end
37
+ end
38
+ end
39
+ end
@@ -0,0 +1,246 @@
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
+ require_relative 'trace_context_payload'
7
+
8
+ module NewRelic
9
+ module Agent
10
+ module DistributedTracing
11
+ class TraceContext
12
+ VERSION = 0x0
13
+
14
+ COMMA = ','
15
+ EQUALS = '='
16
+ INVALID_TRACE_ID = ('0' * 32)
17
+ 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})"
30
+ 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/
32
+
33
+ TRACE_PARENT_FORMAT_STRING = "%02x-%s-%s-%02x"
34
+
35
+ MAX_TRACE_STATE_SIZE = 512 # bytes
36
+ MAX_TRACE_STATE_ENTRY_SIZE = 128 # bytes
37
+
38
+ SUPPORTABILITY_TRACE_PARENT_PARSE_EXCEPTION = "Supportability/TraceContext/TraceParent/Parse/Exception"
39
+ SUPPORTABILITY_TRACE_STATE_PARSE_EXCEPTION = "Supportability/TraceContext/TraceState/Parse/Exception"
40
+ SUPPORTABILITY_TRACE_STATE_INVALID_NR_ENTRY = "Supportability/TraceContext/TraceState/InvalidNrEntry"
41
+
42
+ 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 \
52
+ trace_id: trace_id,
53
+ parent_id: parent_id,
54
+ trace_flags: trace_flags
55
+
56
+ trace_state_header = trace_state_header_for_format format
57
+ carrier[trace_state_header] = trace_state if trace_state && !trace_state.empty?
58
+ end
59
+
60
+ def parse format: NewRelic::FORMAT_NON_RACK,
61
+ carrier: nil,
62
+ trace_state_entry_key: nil
63
+ trace_parent = extract_traceparent(format, carrier)
64
+ unless trace_parent_valid? trace_parent
65
+ NewRelic::Agent.increment_metric SUPPORTABILITY_TRACE_PARENT_PARSE_EXCEPTION
66
+ return nil
67
+ end
68
+
69
+ begin
70
+ if header_data = extract_tracestate(format, carrier, trace_state_entry_key)
71
+ header_data.trace_parent = trace_parent
72
+ header_data
73
+ end
74
+ rescue Exception
75
+ NewRelic::Agent.increment_metric SUPPORTABILITY_TRACE_STATE_PARSE_EXCEPTION
76
+ return nil
77
+ end
78
+ end
79
+
80
+ def create_trace_state_entry entry_key, payload
81
+ "#{entry_key}=#{payload}".dup
82
+ end
83
+
84
+ private
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
94
+ end
95
+
96
+ def extract_traceparent format, carrier
97
+ header_name = trace_parent_header_for_format format
98
+ return unless header = carrier[header_name]
99
+ if matchdata = header.match(TRACE_PARENT_REGEX)
100
+ TRACE_PARENT_REGEX.named_captures.inject({}) do |hash, (name, (index))|
101
+ hash[name] = matchdata[index]
102
+ hash
103
+ end
104
+ end
105
+ end
106
+
107
+ def trace_parent_valid? trace_parent
108
+ return false if trace_parent.nil?
109
+ return false if trace_parent[TRACE_ID_KEY] == INVALID_TRACE_ID
110
+ return false if trace_parent[PARENT_ID_KEY] == INVALID_PARENT_ID
111
+ return false if trace_parent[VERSION_KEY] == INVALID_VERSION
112
+ return false if trace_parent[VERSION_KEY].to_i(16) == VERSION && !trace_parent[UNDEFINED_FIELDS_KEY].nil?
113
+
114
+ true
115
+ end
116
+
117
+ def trace_parent_header_for_format format
118
+ if format == NewRelic::FORMAT_RACK
119
+ NewRelic::HTTP_TRACEPARENT_KEY
120
+ else
121
+ NewRelic::TRACEPARENT_KEY
122
+ end
123
+ end
124
+
125
+ def trace_state_header_for_format format
126
+ if format == NewRelic::FORMAT_RACK
127
+ NewRelic::HTTP_TRACESTATE_KEY
128
+ else
129
+ NewRelic::TRACESTATE_KEY
130
+ end
131
+ end
132
+
133
+ def extract_tracestate format, carrier, trace_state_entry_key
134
+ header_name = trace_state_header_for_format format
135
+ header = carrier[header_name]
136
+ return HeaderData.create if header.nil? || header.empty?
137
+
138
+ payload = nil
139
+ trace_state_size = 0
140
+ trace_state_vendors = String.new
141
+ trace_state = header.split(COMMA).map(&:strip)
142
+ trace_state.reject! do |entry|
143
+ if entry == NewRelic::EMPTY_STR
144
+ false
145
+ else
146
+ vendor_id = entry.slice 0, entry.index(EQUALS)
147
+ if vendor_id == trace_state_entry_key
148
+ payload = entry.slice! trace_state_entry_key.size + 1, entry.size
149
+ true
150
+ else
151
+ trace_state_size += entry.size
152
+ trace_state_vendors << vendor_id << COMMA
153
+ false
154
+ end
155
+ end
156
+ end
157
+
158
+ trace_state_vendors.chomp! COMMA
159
+
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
164
+ end
165
+
166
+ def decode_payload payload
167
+ TraceContextPayload.from_s payload
168
+ rescue
169
+ if payload
170
+ NewRelic::Agent.increment_metric SUPPORTABILITY_TRACE_STATE_INVALID_NR_ENTRY
171
+ end
172
+ return nil
173
+ end
174
+ end
175
+
176
+ class HeaderData
177
+ 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
188
+ end
189
+ end
190
+
191
+ def initialize trace_parent, trace_state_payload, trace_state_entries, trace_state_size, trace_state_vendors
192
+ @trace_parent = trace_parent
193
+ @trace_state = nil
194
+ @trace_state_entries = trace_state_entries
195
+ @trace_state_payload = trace_state_payload
196
+ @trace_state_size = trace_state_size
197
+ @trace_state_vendors = trace_state_vendors
198
+ end
199
+
200
+ attr_accessor :trace_parent, :trace_state_payload, :trace_state_vendors
201
+
202
+ def trace_state trace_state_entry
203
+ @trace_state ||= join_trace_state trace_state_entry.size
204
+ @trace_state_entries = nil
205
+
206
+ trace_state_entry << @trace_state
207
+ end
208
+
209
+ def trace_id
210
+ @trace_parent[TRACE_ID_KEY]
211
+ end
212
+
213
+ def parent_id
214
+ @trace_parent[PARENT_ID_KEY]
215
+ end
216
+
217
+ private
218
+
219
+ def join_trace_state trace_state_entry_size
220
+ return @trace_state || NewRelic::EMPTY_STR if @trace_state_entries.nil? || @trace_state_entries.empty?
221
+
222
+ max_size = MAX_TRACE_STATE_SIZE - trace_state_entry_size
223
+ return @trace_state_entries.join(COMMA).prepend(COMMA) if @trace_state_size < max_size
224
+
225
+ joined_trace_state = ''.dup
226
+
227
+ used_size = 0
228
+
229
+ @trace_state_entries.each do |entry|
230
+ entry_size = entry.size + 1
231
+ break if used_size + entry_size > max_size
232
+ next if entry_size > MAX_TRACE_STATE_ENTRY_SIZE
233
+
234
+ joined_trace_state << COMMA << entry
235
+ used_size += entry_size
236
+ end
237
+
238
+ joined_trace_state
239
+ end
240
+
241
+ end
242
+
243
+ end
244
+ end
245
+ end
246
+ end
@@ -0,0 +1,126 @@
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
+
5
+ require 'new_relic/coerce'
6
+
7
+ module NewRelic
8
+ module Agent
9
+ class TraceContextPayload
10
+ VERSION = 0
11
+ PARENT_TYPE = 0
12
+ DELIMITER = "-".freeze
13
+ SUPPORTABILITY_PARSE_EXCEPTION = "Supportability/TraceContext/Parse/Exception".freeze
14
+
15
+ TRUE_CHAR = '1'.freeze
16
+ FALSE_CHAR = '0'.freeze
17
+
18
+ PARENT_TYPES = %w(App Browser Mobile).map(&:freeze).freeze
19
+
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
33
+ end
34
+
35
+ include NewRelic::Coerce
36
+
37
+ def from_s payload_string
38
+ attrs = payload_string.split(DELIMITER)
39
+
40
+ payload = create \
41
+ version: int!(attrs[0]),
42
+ parent_type: int!(attrs[1]),
43
+ parent_account_id: attrs[2],
44
+ parent_app_id: attrs[3],
45
+ id: value_or_nil(attrs[4]),
46
+ transaction_id: value_or_nil(attrs[5]),
47
+ sampled: value_or_nil(attrs[6]) ? boolean_int!(attrs[6]) == 1 : nil,
48
+ priority: float!(attrs[7]),
49
+ timestamp: int!(attrs[8])
50
+ handle_invalid_payload message: 'payload missing attributes' unless payload.valid?
51
+ payload
52
+ rescue => e
53
+ handle_invalid_payload error: e
54
+ raise
55
+ end
56
+
57
+ private
58
+
59
+ def now_ms
60
+ (Time.now.to_f * 1000).round
61
+ end
62
+
63
+ def handle_invalid_payload error: nil, message: nil
64
+ NewRelic::Agent.increment_metric SUPPORTABILITY_PARSE_EXCEPTION
65
+ if error
66
+ NewRelic::Agent.logger.warn "Error parsing trace context payload", error
67
+ elsif message
68
+ NewRelic::Agent.logger.warn "Error parsing trace context payload: #{message}"
69
+ end
70
+ end
71
+ end
72
+
73
+ 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
82
+
83
+ alias_method :sampled?, :sampled
84
+
85
+ def initialize version, parent_type_id, parent_account_id, parent_app_id,
86
+ id, transaction_id, sampled, priority, timestamp
87
+ @version = version
88
+ @parent_type_id = parent_type_id
89
+ @parent_account_id = parent_account_id
90
+ @parent_app_id = parent_app_id
91
+ @id = id
92
+ @transaction_id = transaction_id
93
+ @sampled = sampled
94
+ @priority = priority
95
+ @timestamp = timestamp
96
+ end
97
+
98
+ def parent_type
99
+ @parent_type_string ||= PARENT_TYPES[@parent_type_id]
100
+ end
101
+
102
+ def valid?
103
+ version \
104
+ && parent_type_id \
105
+ && !parent_account_id.empty? \
106
+ && !parent_app_id.empty? \
107
+ && timestamp
108
+ rescue
109
+ false
110
+ end
111
+
112
+ 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
117
+ result << DELIMITER << (id || NewRelic::EMPTY_STR)
118
+ result << DELIMITER << (transaction_id || NewRelic::EMPTY_STR)
119
+ result << DELIMITER << (sampled ? TRUE_CHAR : FALSE_CHAR)
120
+ result << DELIMITER << sprintf("%.6f", priority)
121
+ result << DELIMITER << timestamp.to_s
122
+ result
123
+ end
124
+ end
125
+ end
126
+ end
@@ -1,8 +1,15 @@
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/distributed_trace_payload'
6
+ require_relative 'distributed_tracing/cross_app_payload'
7
+ require_relative 'distributed_tracing/cross_app_tracing'
8
+
9
+ require_relative 'distributed_tracing/distributed_trace_transport_type'
10
+ require_relative 'distributed_tracing/distributed_trace_payload'
11
+
12
+ require_relative 'distributed_tracing/trace_context'
6
13
 
7
14
  module NewRelic
8
15
  module Agent
@@ -14,8 +21,9 @@ module NewRelic
14
21
  #
15
22
  # @api public
16
23
  module DistributedTracing
24
+ extend NewRelic::SupportabilityHelper
17
25
  extend self
18
-
26
+
19
27
  # Create a payload object containing the current transaction's
20
28
  # tracing properties (e.g., duration, priority). You can use
21
29
  # this object to generate headers to inject into a network
@@ -27,10 +35,19 @@ module NewRelic
27
35
  # could not create the payload
28
36
  #
29
37
  # @api public
38
+ #
39
+ # @deprecated See {#create_distributed_trace_headers} instead.
40
+ #
30
41
  def create_distributed_trace_payload
31
- if transaction = Transaction.tl_current
32
- transaction.create_distributed_trace_payload
42
+ Deprecator.deprecate :create_distributed_trace_payload, :create_distributed_trace_headers
43
+
44
+ unless Agent.config[:'distributed_tracing.enabled']
45
+ NewRelic::Agent.logger.warn "Not configured to create New Relic distributed trace payload"
46
+ return nil
33
47
  end
48
+
49
+ return unless transaction = Transaction.tl_current
50
+ transaction.distributed_tracer.create_distributed_trace_payload
34
51
  rescue => e
35
52
  NewRelic::Agent.logger.error 'error during create_distributed_trace_payload', e
36
53
  nil
@@ -53,15 +70,147 @@ module NewRelic
53
70
  # @return nil
54
71
  #
55
72
  # @api public
73
+ #
74
+ # @deprecated See {#accept_distributed_trace_headers} instead
75
+ #
56
76
  def accept_distributed_trace_payload payload
57
- if transaction = Transaction.tl_current
58
- transaction.accept_distributed_trace_payload(payload)
77
+ Deprecator.deprecate :accept_distributed_trace_payload, :accept_distributed_trace_headers
78
+
79
+ unless Agent.config[:'distributed_tracing.enabled']
80
+ NewRelic::Agent.logger.warn "Not configured to accept New Relic distributed trace payload"
81
+ return nil
59
82
  end
83
+
84
+ return unless transaction = Transaction.tl_current
85
+ transaction.distributed_tracer.accept_distributed_trace_payload(payload)
60
86
  nil
61
87
  rescue => e
62
88
  NewRelic::Agent.logger.error 'error during accept_distributed_trace_payload', e
63
89
  nil
64
90
  end
91
+
92
+
93
+ # Adds the Distributed Trace headers so that the downstream service can participate in a
94
+ # distributed trace. This method should be called every time an outbound call is made
95
+ # since the header payload contains a timestamp.
96
+ #
97
+ # Distributed Tracing must be enabled to use this method.
98
+ #
99
+ # +insert_distributed_trace_headers+ always inserts W3C trace context headers and inserts
100
+ # New Relic distributed tracing header by default. New Relic headers may be suppressed by
101
+ # setting +exclude_new_relic_header+ to +true+ in your configuration file.
102
+ #
103
+ # @param headers [Hash] Is a Hash to which the distributed trace headers
104
+ # will be inserted.
105
+ #
106
+ # @return {Transaction} The transaction the headers were inserted from,
107
+ # or +nil+ if headers were not inserted.
108
+ #
109
+ # @api public
110
+ #
111
+ def insert_distributed_trace_headers headers={}
112
+ record_api_supportability_metric(:insert_distributed_trace_headers)
113
+
114
+ unless Agent.config[:'distributed_tracing.enabled']
115
+ NewRelic::Agent.logger.warn "Not configured to insert distributed trace headers"
116
+ return nil
117
+ end
118
+
119
+ return unless valid_api_argument_class? headers, "headers", Hash
120
+
121
+ return unless transaction = Transaction.tl_current
122
+
123
+ transaction.distributed_tracer.insert_headers headers
124
+ transaction
125
+ rescue => e
126
+ NewRelic::Agent.logger.error 'error during insert_distributed_trace_headers', e
127
+ nil
128
+ end
129
+
130
+ # Accepts distributed tracing headers from any source that has been packaged
131
+ # as a Ruby Hash, thereby allowing the user to manually inject distributed
132
+ # tracing headers. It is optimized to process +HTTP_TRACEPARENT+, +HTTP_TRACESTATE+,
133
+ # and +HTTP_NEWRELIC+ as the given Hash keys. which is the most common scenario
134
+ # from Rack middleware in most Ruby applications. However, the Hash keys are
135
+ # case-insensitive and the "HTTP_" prefixes may also be omitted.
136
+ #
137
+ # Calling this method is not necessary in a typical HTTP trace as
138
+ # distributed tracing is already handled by the agent.
139
+ #
140
+ # When used, invoke this method as early as possible in a transaction's life-cycle
141
+ # as calling after the headers are already created will have no effect.
142
+ #
143
+ # This method accepts both W3C trace context and New Relic distributed tracing headers.
144
+ # When both are present, only the W3C headers are utilized. When W3C trace context
145
+ # headers are present, New Relic headers are ignored regardless if W3C trace context
146
+ # headers are valid and parsable.
147
+ #
148
+ # @param headers [Hash] Incoming distributed trace headers as a Ruby
149
+ # Hash object. Hash keys are expected to be one of
150
+ # +TRACEPARENT+, +TRACESTATE+, +NEWRELIC+ and are
151
+ # case-insensitive, with or without "HTTP_" prefixes.
152
+ #
153
+ # either as a JSON string or as a
154
+ # header-friendly string returned from
155
+ # {DistributedTracePayload#http_safe}
156
+ #
157
+ # @param transport_Type [String] May be one of: +HTTP+, +HTTPS+, +Kafka+, +JMS+,
158
+ # +IronMQ+, +AMQP+, +Queue+, +Other+. Values are
159
+ # case sensitive. All other values result in +Unknown+
160
+ #
161
+ # @return {Transaction} if successful, +nil+ otherwise
162
+ #
163
+ # @api public
164
+ #
165
+ def accept_distributed_trace_headers headers, transport_type = NewRelic::HTTP
166
+ record_api_supportability_metric(:accept_distributed_trace_headers)
167
+
168
+ unless Agent.config[:'distributed_tracing.enabled']
169
+ NewRelic::Agent.logger.warn "Not configured to accept distributed trace headers"
170
+ return nil
171
+ end
172
+
173
+ return unless valid_api_argument_class? headers, "headers", Hash
174
+ return unless valid_api_argument_class? transport_type, "transport_type", String
175
+
176
+ return unless transaction = Transaction.tl_current
177
+
178
+ # assume we have Rack conforming keys when transport_type is HTTP(S)
179
+ # otherwise, fish for key/value pairs regardless of prefix and case-sensitivity.
180
+ hdr = if transport_type.start_with? NewRelic::HTTP
181
+ headers
182
+ else
183
+ # start with the most common case first
184
+ hdr = {
185
+ NewRelic::HTTP_TRACEPARENT_KEY => headers[NewRelic::TRACEPARENT_KEY],
186
+ NewRelic::HTTP_TRACESTATE_KEY => headers[NewRelic::TRACESTATE_KEY],
187
+ NewRelic::HTTP_NEWRELIC_KEY => headers[NewRelic::NEWRELIC_KEY]
188
+ }
189
+
190
+ # when not found, search for any casing for trace context headers, ignoring potential prefixes
191
+ hdr[NewRelic::HTTP_TRACEPARENT_KEY] ||= variant_key_value headers, NewRelic::TRACEPARENT_KEY
192
+ hdr[NewRelic::HTTP_TRACESTATE_KEY] ||= variant_key_value headers, NewRelic::TRACESTATE_KEY
193
+ hdr[NewRelic::HTTP_NEWRELIC_KEY] ||= variant_key_value headers, NewRelic::CANDIDATE_NEWRELIC_KEYS
194
+ hdr
195
+ end
196
+
197
+ transaction.distributed_tracer.accept_incoming_request hdr, transport_type
198
+ transaction
199
+ rescue => e
200
+ NewRelic::Agent.logger.error 'error during accept_distributed_trace_headers', e
201
+ nil
202
+ end
203
+
204
+ private
205
+
206
+ def has_variant_key? key, variants
207
+ key.to_s.downcase.end_with?(*Array(variants))
208
+ end
209
+
210
+ def variant_key_value headers, variants
211
+ (headers.detect{|k, v| has_variant_key?(k, variants)} || NewRelic::EMPTY_ARRAY)[1]
212
+ end
213
+
65
214
  end
66
215
  end
67
216
  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