newrelic_rpm 4.8.0.341 → 6.13.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (343) hide show
  1. checksums.yaml +5 -5
  2. data/.github/ISSUE_TEMPLATE/bug_report.md +31 -0
  3. data/.github/ISSUE_TEMPLATE/config.yml +5 -0
  4. data/.github/ISSUE_TEMPLATE/feature_request.md +24 -0
  5. data/.github/actions/annotate/README.md +79 -0
  6. data/.github/actions/annotate/action.yml +6 -0
  7. data/.github/actions/annotate/dist/index.js +433 -0
  8. data/.github/actions/annotate/index.js +25 -0
  9. data/.github/actions/annotate/package-lock.json +172 -0
  10. data/.github/actions/annotate/package.json +30 -0
  11. data/.github/actions/annotate/pre-commit +5 -0
  12. data/.github/actions/build-ruby/README.md +79 -0
  13. data/.github/actions/build-ruby/action.yml +15 -0
  14. data/.github/actions/build-ruby/dist/index.js +52683 -0
  15. data/.github/actions/build-ruby/index.js +514 -0
  16. data/.github/actions/build-ruby/package-lock.json +581 -0
  17. data/.github/actions/build-ruby/package.json +32 -0
  18. data/.github/actions/build-ruby/pre-commit +5 -0
  19. data/.github/pull_request_template.md +16 -0
  20. data/.github/workflows/ci.yml +212 -0
  21. data/.github/workflows/pr_review_checklist.yml +22 -0
  22. data/.github/workflows/release.yml +78 -0
  23. data/.github/workflows/scripts/rubygems-authenticate.py +13 -0
  24. data/.github/workflows/scripts/rubygems-publish.rb +32 -0
  25. data/.github/workflows/snyk.yml +27 -0
  26. data/.github/workflows/stale.yml +21 -0
  27. data/.gitignore +9 -0
  28. data/.yardopts +4 -1
  29. data/CHANGELOG.md +868 -3
  30. data/CONTRIBUTING.md +106 -19
  31. data/Gemfile +6 -2
  32. data/Guardfile +18 -1
  33. data/LICENSE +208 -38
  34. data/README.md +81 -88
  35. data/ROADMAP.md +24 -0
  36. data/Rakefile +2 -0
  37. data/THIRD_PARTY_NOTICES.md +213 -0
  38. data/bin/nrdebug +1 -1
  39. data/config.dot +3 -12
  40. data/init.rb +1 -1
  41. data/install.rb +1 -1
  42. data/lib/new_relic/agent.rb +145 -31
  43. data/lib/new_relic/agent/adaptive_sampler.rb +104 -0
  44. data/lib/new_relic/agent/agent.rb +192 -190
  45. data/lib/new_relic/agent/agent_logger.rb +5 -1
  46. data/lib/new_relic/agent/attribute_filter.rb +85 -25
  47. data/lib/new_relic/agent/attribute_processing.rb +1 -1
  48. data/lib/new_relic/agent/attributes.rb +152 -0
  49. data/lib/new_relic/agent/audit_logger.rb +1 -1
  50. data/lib/new_relic/agent/autostart.rb +20 -15
  51. data/lib/new_relic/agent/chained_call.rb +1 -1
  52. data/lib/new_relic/agent/commands/agent_command.rb +1 -1
  53. data/lib/new_relic/agent/commands/agent_command_router.rb +3 -22
  54. data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -1
  55. data/lib/new_relic/agent/configuration.rb +1 -1
  56. data/lib/new_relic/agent/configuration/default_source.rb +375 -67
  57. data/lib/new_relic/agent/configuration/dotted_hash.rb +1 -1
  58. data/lib/new_relic/agent/configuration/environment_source.rb +5 -3
  59. data/lib/new_relic/agent/configuration/event_harvest_config.rb +45 -0
  60. data/lib/new_relic/agent/configuration/high_security_source.rb +2 -3
  61. data/lib/new_relic/agent/configuration/manager.rb +54 -43
  62. data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
  63. data/lib/new_relic/agent/configuration/mask_defaults.rb +1 -1
  64. data/lib/new_relic/agent/configuration/security_policy_source.rb +238 -0
  65. data/lib/new_relic/agent/configuration/server_source.rb +46 -5
  66. data/lib/new_relic/agent/configuration/yaml_source.rb +12 -7
  67. data/lib/new_relic/agent/connect/request_builder.rb +61 -0
  68. data/lib/new_relic/agent/connect/response_handler.rb +61 -0
  69. data/lib/new_relic/agent/custom_event_aggregator.rb +17 -6
  70. data/lib/new_relic/agent/database.rb +21 -3
  71. data/lib/new_relic/agent/database/explain_plan_helpers.rb +12 -1
  72. data/lib/new_relic/agent/database/obfuscation_helpers.rb +2 -2
  73. data/lib/new_relic/agent/database/obfuscator.rb +1 -1
  74. data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +1 -1
  75. data/lib/new_relic/agent/datastores.rb +12 -11
  76. data/lib/new_relic/agent/datastores/metric_helper.rb +2 -3
  77. data/lib/new_relic/agent/datastores/mongo.rb +2 -2
  78. data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +3 -3
  79. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +1 -1
  80. data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +9 -9
  81. data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +1 -1
  82. data/lib/new_relic/agent/datastores/redis.rb +1 -1
  83. data/lib/new_relic/agent/deprecator.rb +1 -1
  84. data/lib/new_relic/agent/distributed_tracing.rb +216 -0
  85. data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +44 -0
  86. data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +248 -0
  87. data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +84 -0
  88. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +75 -0
  89. data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +165 -0
  90. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +39 -0
  91. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +246 -0
  92. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +126 -0
  93. data/lib/new_relic/agent/encoding_normalizer.rb +1 -1
  94. data/lib/new_relic/agent/error_collector.rb +51 -20
  95. data/lib/new_relic/agent/error_event_aggregator.rb +14 -7
  96. data/lib/new_relic/agent/error_trace_aggregator.rb +2 -1
  97. data/lib/new_relic/agent/event_aggregator.rb +34 -15
  98. data/lib/new_relic/agent/event_buffer.rb +1 -1
  99. data/lib/new_relic/agent/event_listener.rb +1 -1
  100. data/lib/new_relic/agent/event_loop.rb +1 -1
  101. data/lib/new_relic/agent/external.rb +31 -29
  102. data/lib/new_relic/agent/guid_generator.rb +28 -0
  103. data/lib/new_relic/agent/harvester.rb +1 -1
  104. data/lib/new_relic/agent/heap.rb +140 -0
  105. data/lib/new_relic/agent/hostname.rb +16 -2
  106. data/lib/new_relic/agent/http_clients/abstract.rb +82 -0
  107. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +25 -20
  108. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +29 -14
  109. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +18 -22
  110. data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +11 -12
  111. data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +17 -5
  112. data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +5 -7
  113. data/lib/new_relic/agent/http_clients/uri_util.rb +12 -11
  114. data/lib/new_relic/agent/instrumentation.rb +1 -1
  115. data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +26 -43
  116. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +56 -74
  117. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +82 -56
  118. data/lib/new_relic/agent/instrumentation/active_job.rb +19 -17
  119. data/lib/new_relic/agent/instrumentation/active_merchant.rb +1 -1
  120. data/lib/new_relic/agent/instrumentation/active_record.rb +85 -38
  121. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +82 -24
  122. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +168 -0
  123. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +102 -31
  124. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +47 -57
  125. data/lib/new_relic/agent/instrumentation/active_storage.rb +23 -0
  126. data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +63 -0
  127. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +24 -8
  128. data/lib/new_relic/agent/instrumentation/authlogic.rb +1 -1
  129. data/lib/new_relic/agent/instrumentation/bunny.rb +115 -44
  130. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +18 -12
  131. data/lib/new_relic/agent/instrumentation/curb.rb +121 -35
  132. data/lib/new_relic/agent/instrumentation/data_mapper.rb +6 -4
  133. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +61 -25
  134. data/lib/new_relic/agent/instrumentation/excon.rb +2 -2
  135. data/lib/new_relic/agent/instrumentation/excon/connection.rb +8 -5
  136. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +4 -3
  137. data/lib/new_relic/agent/instrumentation/grape.rb +46 -35
  138. data/lib/new_relic/agent/instrumentation/http.rb +8 -5
  139. data/lib/new_relic/agent/instrumentation/httpclient.rb +7 -5
  140. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +1 -1
  141. data/lib/new_relic/agent/instrumentation/memcache.rb +5 -3
  142. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +10 -6
  143. data/lib/new_relic/agent/instrumentation/merb/controller.rb +1 -1
  144. data/lib/new_relic/agent/instrumentation/merb/errors.rb +1 -1
  145. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +13 -5
  146. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +20 -11
  147. data/lib/new_relic/agent/instrumentation/mongo.rb +11 -5
  148. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +39 -7
  149. data/lib/new_relic/agent/instrumentation/net.rb +60 -23
  150. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +100 -0
  151. data/lib/new_relic/agent/instrumentation/padrino.rb +40 -16
  152. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +1 -1
  153. data/lib/new_relic/agent/instrumentation/queue_time.rb +1 -1
  154. data/lib/new_relic/agent/instrumentation/rack.rb +36 -13
  155. data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +1 -1
  156. data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +1 -1
  157. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +1 -1
  158. data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -1
  159. data/lib/new_relic/agent/instrumentation/{rails5 → rails_notifications}/action_cable.rb +8 -5
  160. data/lib/new_relic/agent/instrumentation/{rails5 → rails_notifications}/action_controller.rb +4 -4
  161. data/lib/new_relic/agent/instrumentation/{rails4 → rails_notifications}/action_view.rb +4 -4
  162. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +1 -1
  163. data/lib/new_relic/agent/instrumentation/rake.rb +56 -22
  164. data/lib/new_relic/agent/instrumentation/redis.rb +141 -56
  165. data/lib/new_relic/agent/instrumentation/resque.rb +21 -37
  166. data/lib/new_relic/agent/instrumentation/sequel.rb +2 -3
  167. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +1 -1
  168. data/lib/new_relic/agent/instrumentation/sidekiq.rb +48 -24
  169. data/lib/new_relic/agent/instrumentation/sinatra.rb +62 -23
  170. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +1 -1
  171. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +1 -1
  172. data/lib/new_relic/agent/instrumentation/sunspot.rb +1 -1
  173. data/lib/new_relic/agent/instrumentation/typhoeus.rb +27 -10
  174. data/lib/new_relic/agent/internal_agent_error.rb +1 -1
  175. data/lib/new_relic/agent/javascript_instrumentor.rb +19 -16
  176. data/lib/new_relic/agent/log_once.rb +1 -1
  177. data/lib/new_relic/agent/logging.rb +139 -0
  178. data/lib/new_relic/agent/memory_logger.rb +1 -1
  179. data/lib/new_relic/agent/messaging.rb +15 -59
  180. data/lib/new_relic/agent/method_tracer.rb +42 -25
  181. data/lib/new_relic/agent/method_tracer_helpers.rb +5 -5
  182. data/lib/new_relic/agent/monitors.rb +27 -0
  183. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +110 -0
  184. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +27 -0
  185. data/lib/new_relic/agent/{inbound_request_monitor.rb → monitors/inbound_request_monitor.rb} +4 -4
  186. data/lib/new_relic/agent/{synthetics_monitor.rb → monitors/synthetics_monitor.rb} +4 -7
  187. data/lib/new_relic/agent/new_relic_service.rb +174 -63
  188. data/lib/new_relic/agent/new_relic_service/encoders.rb +1 -1
  189. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +1 -2
  190. data/lib/new_relic/agent/new_relic_service/marshaller.rb +6 -27
  191. data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +61 -0
  192. data/lib/new_relic/agent/noticible_error.rb +22 -0
  193. data/lib/new_relic/agent/null_logger.rb +1 -1
  194. data/lib/new_relic/agent/obfuscator.rb +1 -1
  195. data/lib/new_relic/agent/parameter_filtering.rb +19 -6
  196. data/lib/new_relic/agent/payload_metric_mapping.rb +1 -1
  197. data/lib/new_relic/agent/pipe_channel_manager.rb +1 -1
  198. data/lib/new_relic/agent/pipe_service.rb +5 -1
  199. data/lib/new_relic/agent/prepend_supportability.rb +1 -1
  200. data/lib/new_relic/agent/priority_sampled_buffer.rb +95 -0
  201. data/lib/new_relic/agent/range_extensions.rb +1 -1
  202. data/lib/new_relic/agent/rules_engine.rb +1 -1
  203. data/lib/new_relic/agent/rules_engine/replacement_rule.rb +1 -1
  204. data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +1 -1
  205. data/lib/new_relic/agent/sampler.rb +1 -1
  206. data/lib/new_relic/agent/sampler_collection.rb +1 -1
  207. data/lib/new_relic/agent/samplers/cpu_sampler.rb +1 -1
  208. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +1 -1
  209. data/lib/new_relic/agent/samplers/memory_sampler.rb +1 -1
  210. data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
  211. data/lib/new_relic/agent/samplers/vm_sampler.rb +1 -1
  212. data/lib/new_relic/agent/span_event_aggregator.rb +49 -0
  213. data/lib/new_relic/agent/span_event_primitive.rb +206 -0
  214. data/lib/new_relic/agent/sql_sampler.rb +23 -7
  215. data/lib/new_relic/agent/stats.rb +1 -1
  216. data/lib/new_relic/agent/stats_engine.rb +4 -4
  217. data/lib/new_relic/agent/stats_engine/gc_profiler.rb +1 -1
  218. data/lib/new_relic/agent/stats_engine/stats_hash.rb +1 -1
  219. data/lib/new_relic/agent/supported_versions.rb +3 -3
  220. data/lib/new_relic/agent/synthetics_event_aggregator.rb +6 -13
  221. data/lib/new_relic/agent/system_info.rb +18 -8
  222. data/lib/new_relic/agent/threading/agent_thread.rb +6 -4
  223. data/lib/new_relic/agent/threading/backtrace_node.rb +1 -1
  224. data/lib/new_relic/agent/threading/backtrace_service.rb +4 -4
  225. data/lib/new_relic/agent/threading/thread_profile.rb +10 -24
  226. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +19 -0
  227. data/lib/new_relic/agent/tracer.rb +509 -0
  228. data/lib/new_relic/agent/transaction.rb +191 -278
  229. data/lib/new_relic/agent/transaction/abstract_segment.rb +38 -5
  230. data/lib/new_relic/agent/transaction/datastore_segment.rb +30 -5
  231. data/lib/new_relic/agent/transaction/distributed_tracer.rb +171 -0
  232. data/lib/new_relic/agent/transaction/distributed_tracing.rb +123 -71
  233. data/lib/new_relic/agent/transaction/external_request_segment.rb +41 -89
  234. data/lib/new_relic/agent/transaction/message_broker_segment.rb +7 -8
  235. data/lib/new_relic/agent/transaction/request_attributes.rb +1 -1
  236. data/lib/new_relic/agent/transaction/segment.rb +42 -2
  237. data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -1
  238. data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
  239. data/lib/new_relic/agent/transaction/trace.rb +7 -23
  240. data/lib/new_relic/agent/transaction/trace_builder.rb +1 -2
  241. data/lib/new_relic/agent/transaction/trace_context.rb +168 -0
  242. data/lib/new_relic/agent/transaction/trace_node.rb +12 -8
  243. data/lib/new_relic/agent/transaction/tracing.rb +2 -100
  244. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -1
  245. data/lib/new_relic/agent/transaction_error_primitive.rb +13 -22
  246. data/lib/new_relic/agent/transaction_event_aggregator.rb +7 -16
  247. data/lib/new_relic/agent/transaction_event_primitive.rb +31 -42
  248. data/lib/new_relic/agent/transaction_event_recorder.rb +8 -16
  249. data/lib/new_relic/agent/transaction_metrics.rb +1 -1
  250. data/lib/new_relic/agent/transaction_sampler.rb +3 -14
  251. data/lib/new_relic/agent/transaction_time_aggregator.rb +155 -0
  252. data/lib/new_relic/agent/utilization/aws.rb +1 -1
  253. data/lib/new_relic/agent/utilization/azure.rb +1 -1
  254. data/lib/new_relic/agent/utilization/gcp.rb +1 -1
  255. data/lib/new_relic/agent/utilization/pcf.rb +1 -1
  256. data/lib/new_relic/agent/utilization/vendor.rb +1 -1
  257. data/lib/new_relic/agent/utilization_data.rb +37 -2
  258. data/lib/new_relic/agent/vm.rb +1 -1
  259. data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
  260. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -1
  261. data/lib/new_relic/agent/vm/mri_vm.rb +1 -1
  262. data/lib/new_relic/agent/vm/snapshot.rb +1 -1
  263. data/lib/new_relic/agent/worker_loop.rb +1 -1
  264. data/lib/new_relic/cli/command.rb +1 -1
  265. data/lib/new_relic/cli/commands/deployments.rb +2 -2
  266. data/lib/new_relic/cli/commands/install.rb +4 -3
  267. data/lib/new_relic/coerce.rb +32 -7
  268. data/lib/new_relic/collection_helper.rb +1 -1
  269. data/lib/new_relic/constants.rb +38 -0
  270. data/lib/new_relic/control.rb +1 -1
  271. data/lib/new_relic/control/class_methods.rb +8 -2
  272. data/lib/new_relic/control/frameworks.rb +1 -1
  273. data/lib/new_relic/control/frameworks/external.rb +1 -1
  274. data/lib/new_relic/control/frameworks/merb.rb +1 -1
  275. data/lib/new_relic/control/frameworks/rails.rb +1 -1
  276. data/lib/new_relic/control/frameworks/rails3.rb +1 -1
  277. data/lib/new_relic/control/frameworks/rails4.rb +1 -1
  278. data/lib/new_relic/control/frameworks/{rails5.rb → rails_notifications.rb} +2 -2
  279. data/lib/new_relic/control/frameworks/ruby.rb +1 -1
  280. data/lib/new_relic/control/frameworks/sinatra.rb +1 -1
  281. data/lib/new_relic/control/instance_methods.rb +30 -4
  282. data/lib/new_relic/control/instrumentation.rb +1 -1
  283. data/lib/new_relic/control/server_methods.rb +1 -1
  284. data/lib/new_relic/delayed_job_injection.rb +1 -1
  285. data/lib/new_relic/dependency_detection.rb +5 -5
  286. data/lib/new_relic/environment_report.rb +6 -2
  287. data/lib/new_relic/helper.rb +1 -1
  288. data/lib/new_relic/language_support.rb +1 -1
  289. data/lib/new_relic/latest_changes.rb +4 -4
  290. data/lib/new_relic/local_environment.rb +1 -1
  291. data/lib/new_relic/metric_data.rb +1 -1
  292. data/lib/new_relic/metric_spec.rb +1 -1
  293. data/lib/new_relic/noticed_error.rb +39 -18
  294. data/lib/new_relic/rack.rb +1 -1
  295. data/lib/new_relic/rack/agent_hooks.rb +1 -1
  296. data/lib/new_relic/rack/agent_middleware.rb +2 -2
  297. data/lib/new_relic/rack/browser_monitoring.rb +16 -9
  298. data/lib/new_relic/recipes.rb +1 -1
  299. data/lib/new_relic/recipes/capistrano3.rb +6 -3
  300. data/lib/new_relic/recipes/capistrano_legacy.rb +1 -1
  301. data/lib/new_relic/supportability_helper.rb +15 -1
  302. data/lib/new_relic/version.rb +4 -4
  303. data/lib/newrelic_rpm.rb +1 -1
  304. data/lib/sequel/extensions/newrelic_instrumentation.rb +3 -3
  305. data/lib/sequel/plugins/newrelic_instrumentation.rb +2 -2
  306. data/lib/tasks/all.rb +1 -1
  307. data/lib/tasks/config.rake +1 -2
  308. data/lib/tasks/multiverse.rb +35 -1
  309. data/lib/tasks/newrelic.rb +1 -1
  310. data/lib/tasks/tests.rake +6 -1
  311. data/newrelic_rpm.gemspec +23 -17
  312. data/recipes/newrelic.rb +1 -1
  313. data/test/agent_helper.rb +357 -78
  314. metadata +154 -60
  315. data/.travis.yml +0 -173
  316. data/lib/new_relic/agent/busy_calculator.rb +0 -117
  317. data/lib/new_relic/agent/commands/xray_session.rb +0 -55
  318. data/lib/new_relic/agent/commands/xray_session_collection.rb +0 -161
  319. data/lib/new_relic/agent/cross_app_monitor.rb +0 -140
  320. data/lib/new_relic/agent/cross_app_tracing.rb +0 -143
  321. data/lib/new_relic/agent/distributed_trace_monitor.rb +0 -29
  322. data/lib/new_relic/agent/distributed_trace_payload.rb +0 -223
  323. data/lib/new_relic/agent/distributed_trace_priority_sampled_buffer.rb +0 -72
  324. data/lib/new_relic/agent/http_clients/abstract_request.rb +0 -31
  325. data/lib/new_relic/agent/instrumentation/active_record_4.rb +0 -42
  326. data/lib/new_relic/agent/instrumentation/active_record_5.rb +0 -36
  327. data/lib/new_relic/agent/instrumentation/evented_subscriber.rb +0 -104
  328. data/lib/new_relic/agent/instrumentation/rails4/action_controller.rb +0 -32
  329. data/lib/new_relic/agent/instrumentation/rails5/action_view.rb +0 -27
  330. data/lib/new_relic/agent/sampled_buffer.rb +0 -68
  331. data/lib/new_relic/agent/sized_buffer.rb +0 -23
  332. data/lib/new_relic/agent/synthetics_event_buffer.rb +0 -40
  333. data/lib/new_relic/agent/throughput_monitor.rb +0 -59
  334. data/lib/new_relic/agent/transaction/attributes.rb +0 -153
  335. data/lib/new_relic/agent/transaction/xray_sample_buffer.rb +0 -64
  336. data/lib/new_relic/agent/transaction_state.rb +0 -145
  337. data/lib/new_relic/agent/transaction_timings.rb +0 -57
  338. data/lib/new_relic/metrics.rb +0 -13
  339. data/lib/tasks/versions.html.erb +0 -28
  340. data/lib/tasks/versions.postface.html +0 -8
  341. data/lib/tasks/versions.preface.html +0 -9
  342. data/lib/tasks/versions.rake +0 -65
  343. data/lib/tasks/versions.txt.erb +0 -14
@@ -1,8 +1,9 @@
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/range_extensions'
6
+ require 'new_relic/agent/guid_generator'
6
7
 
7
8
  module NewRelic
8
9
  module Agent
@@ -16,16 +17,19 @@ module NewRelic
16
17
  # a segments children time. The reason for this is that computing
17
18
  # exclusive duration using time ranges is expensive and it's only
18
19
  # necessary if a segment's children run concurrently, or a segment ends
19
- # after it's parent. We will use the optimized exclusive duration
20
+ # after its parent. We will use the optimized exclusive duration
20
21
  # calculation in all other cases.
21
22
  #
22
- attr_reader :start_time, :end_time, :duration, :exclusive_duration
23
- attr_accessor :name, :parent, :children_time, :transaction
23
+ attr_reader :start_time, :end_time, :duration, :exclusive_duration, :guid
24
+ attr_accessor :name, :parent, :children_time, :transaction, :transaction_name
24
25
  attr_writer :record_metrics, :record_scoped_metric, :record_on_finish
26
+ attr_reader :noticed_error
25
27
 
26
28
  def initialize name=nil, start_time=nil
27
29
  @name = name
30
+ @transaction_name = nil
28
31
  @transaction = nil
32
+ @guid = NewRelic::Agent::GuidGenerator.generate_guid
29
33
  @parent = nil
30
34
  @params = nil
31
35
  @start_time = start_time if start_time
@@ -40,6 +44,7 @@ module NewRelic
40
44
  @record_metrics = true
41
45
  @record_scoped_metric = true
42
46
  @record_on_finish = false
47
+ @noticed_error = nil
43
48
  end
44
49
 
45
50
  def start
@@ -113,6 +118,34 @@ module NewRelic
113
118
  sprintf('#<%s:0x%x %s>', self.class.name, object_id, ivars.join(', '))
114
119
  end
115
120
 
121
+ # callback for subclasses to override
122
+ def transaction_assigned
123
+ end
124
+
125
+ def set_noticed_error noticed_error
126
+ if @noticed_error
127
+ NewRelic::Agent.logger.debug \
128
+ "Segment: #{name} overwriting previously noticed " \
129
+ "error: #{@noticed_error.inspect} with: #{noticed_error.inspect}"
130
+ end
131
+ @noticed_error = noticed_error
132
+ end
133
+
134
+ def notice_error exception, options={}
135
+ if Agent.config[:high_security]
136
+ NewRelic::Agent.logger.debug \
137
+ "Segment: #{name} ignores notice_error for " \
138
+ "error: #{exception.inspect} because :high_security is enabled"
139
+ else
140
+ NewRelic::Agent.instance.error_collector.notice_segment_error self, exception, options
141
+ end
142
+ end
143
+
144
+ def noticed_error_attributes
145
+ return unless @noticed_error
146
+ @noticed_error.attributes_from_notice_error
147
+ end
148
+
116
149
  protected
117
150
 
118
151
  attr_writer :range_recorded
@@ -222,7 +255,7 @@ module NewRelic
222
255
  @transaction_state ||= if @transaction
223
256
  transaction.state
224
257
  else
225
- TransactionState.tl_get
258
+ Tracer.state
226
259
  end
227
260
  end
228
261
  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 'new_relic/agent/transaction/segment'
6
6
  require 'new_relic/agent/datastores/metric_helper'
@@ -15,7 +15,7 @@ module NewRelic
15
15
  UNKNOWN = 'unknown'.freeze
16
16
 
17
17
  attr_reader :product, :operation, :collection, :sql_statement, :nosql_statement, :host, :port_path_or_id
18
- attr_accessor :database_name
18
+ attr_accessor :database_name, :record_sql
19
19
 
20
20
 
21
21
  def initialize product, operation, collection = nil, host = nil, port_path_or_id = nil, database_name = nil, start_time = nil
@@ -24,6 +24,7 @@ module NewRelic
24
24
  @collection = collection
25
25
  @sql_statement = nil
26
26
  @nosql_statement = nil
27
+ @record_sql = true
27
28
  set_instance_info host, port_path_or_id
28
29
  @database_name = database_name ? database_name.to_s : nil
29
30
  super Datastores::MetricHelper.scoped_metric_for(product, operation, collection),
@@ -67,6 +68,23 @@ module NewRelic
67
68
  @sql_statement = Database::Statement.new sql, config, explainer, binds, name, host, port_path_or_id, database_name
68
69
  end
69
70
 
71
+ # Method for simplifying attaching non-SQL data statements to a
72
+ # transaction. For instance, Mongo or CQL queries, Memcached or Redis
73
+ # keys would all be appropriate data to attach as statements.
74
+ #
75
+ # Data passed to this method is NOT obfuscated by New Relic, so please
76
+ # ensure that user information is obfuscated if the agent setting
77
+ # `transaction_tracer.record_sql` is set to `obfuscated`
78
+ #
79
+ # @param [String] nosql_statement text of the statement to capture.
80
+ #
81
+ # @note THERE ARE SECURITY CONCERNS WHEN CAPTURING STATEMENTS!
82
+ # This method will properly ignore statements when the user has turned
83
+ # off capturing queries, but it is not able to obfuscate arbitrary data!
84
+ # To prevent exposing user information embedded in captured queries,
85
+ # please ensure all data passed to this method is safe to transmit to
86
+ # New Relic.
87
+
70
88
  def notice_nosql_statement nosql_statement
71
89
  return unless record_sql?
72
90
  @nosql_statement = Database.truncate_query(nosql_statement)
@@ -91,13 +109,11 @@ module NewRelic
91
109
  end
92
110
 
93
111
  def add_instance_parameters
94
- return unless NewRelic::Agent.config[:'datastore_tracer.instance_reporting.enabled']
95
112
  params[:host] = host if host
96
113
  params[:port_path_or_id] = port_path_or_id if port_path_or_id
97
114
  end
98
115
 
99
116
  def add_database_name_parameter
100
- return unless NewRelic::Agent.config[:'datastore_tracer.database_name_reporting.enabled']
101
117
  params[:database_name] = database_name if database_name
102
118
  end
103
119
 
@@ -118,7 +134,16 @@ module NewRelic
118
134
  end
119
135
 
120
136
  def record_sql?
121
- transaction_state.is_sql_recorded?
137
+ transaction_state.is_sql_recorded? && @record_sql
138
+ end
139
+
140
+ def record_span_event
141
+ aggregator = ::NewRelic::Agent.agent.span_event_aggregator
142
+ priority = transaction.priority
143
+
144
+ aggregator.record(priority: priority) do
145
+ SpanEventPrimitive.for_datastore_segment(self)
146
+ end
122
147
  end
123
148
  end
124
149
  end
@@ -0,0 +1,171 @@
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 'new_relic/agent/transaction/trace_context'
7
+ require 'new_relic/agent/transaction/distributed_tracing'
8
+ require 'new_relic/agent/distributed_tracing/cross_app_tracing'
9
+
10
+ module NewRelic
11
+ module Agent
12
+ class Transaction
13
+ class DistributedTracer
14
+ include NewRelic::Agent::CrossAppTracing
15
+ include DistributedTracing
16
+ include TraceContext
17
+
18
+ attr_reader :transaction
19
+ attr_accessor :parent_transaction_id
20
+
21
+ def parent_guid
22
+ if trace_context_header_data
23
+ trace_context_header_data.parent_id
24
+ elsif distributed_trace_payload
25
+ distributed_trace_payload.id
26
+ end
27
+ end
28
+
29
+ def accept_incoming_request request, transport_type=nil
30
+ accept_incoming_transport_type request, transport_type
31
+ if trace_parent_header_present? request
32
+ accept_trace_context_incoming_request request
33
+ else
34
+ accept_distributed_tracing_incoming_request request
35
+ end
36
+ end
37
+
38
+ def caller_transport_type
39
+ @caller_transport_type ||= "Unknown"
40
+ end
41
+
42
+ def accept_transport_type_from_api value
43
+ @caller_transport_type = DistributedTraceTransportType.from value
44
+ end
45
+
46
+ def accept_incoming_transport_type request, transport_type
47
+ if transport_type.to_s == NewRelic::EMPTY_STR
48
+ @caller_transport_type = DistributedTraceTransportType.for_rack_request request
49
+ else
50
+ @caller_transport_type = DistributedTraceTransportType.from transport_type
51
+ end
52
+ end
53
+
54
+ def initialize transaction
55
+ @transaction = transaction
56
+ end
57
+
58
+ def record_metrics
59
+ record_cross_app_metrics
60
+ DistributedTraceMetrics.record_metrics_for_transaction transaction
61
+ end
62
+
63
+ def append_payload payload
64
+ append_cat_info payload
65
+ DistributedTraceAttributes.copy_from_transaction \
66
+ transaction,
67
+ trace_state_payload || distributed_trace_payload,
68
+ payload
69
+ end
70
+
71
+ def insert_headers request
72
+ insert_trace_context_header request
73
+ insert_distributed_trace_header request
74
+ insert_cross_app_header request
75
+ end
76
+
77
+ def consume_message_headers headers, tracer_state, transport_type
78
+ consume_message_distributed_tracing_headers headers, transport_type
79
+ consume_message_cross_app_tracing_headers headers, tracer_state
80
+ consume_message_synthetics_headers headers
81
+ rescue => e
82
+ NewRelic::Agent.logger.error "Error in consume_message_headers", e
83
+ end
84
+
85
+ def assign_intrinsics
86
+ if Agent.config[:'distributed_tracing.enabled']
87
+ DistributedTraceAttributes.copy_to_attributes transaction.payload, transaction.attributes
88
+ elsif is_cross_app?
89
+ assign_cross_app_intrinsics
90
+ end
91
+ end
92
+
93
+ def insert_distributed_trace_header request
94
+ return unless Agent.config[:'distributed_tracing.enabled']
95
+ return if Agent.config[:'exclude_newrelic_header']
96
+ payload = create_distributed_trace_payload
97
+ request[NewRelic::NEWRELIC_KEY] = payload.http_safe if payload
98
+ end
99
+
100
+ def insert_cat_headers headers
101
+ return unless CrossAppTracing.cross_app_enabled?
102
+ @is_cross_app_caller = true
103
+ insert_message_headers headers,
104
+ transaction.guid,
105
+ cat_trip_id,
106
+ cat_path_hash,
107
+ transaction.raw_synthetics_header
108
+ end
109
+
110
+ private
111
+
112
+ def consume_message_synthetics_headers headers
113
+ synthetics_header = headers[CrossAppTracing::NR_MESSAGE_BROKER_SYNTHETICS_HEADER]
114
+ if synthetics_header and
115
+ incoming_payload = ::JSON.load(deobfuscate(synthetics_header)) and
116
+ SyntheticsMonitor.is_valid_payload?(incoming_payload) and
117
+ SyntheticsMonitor.is_supported_version?(incoming_payload) and
118
+ SyntheticsMonitor.is_trusted?(incoming_payload)
119
+
120
+ transaction.raw_synthetics_header = synthetics_header
121
+ transaction.synthetics_payload = incoming_payload
122
+ end
123
+ rescue => e
124
+ NewRelic::Agent.logger.error "Error in consume_message_synthetics_header", e
125
+ end
126
+
127
+ def consume_message_distributed_tracing_headers headers, transport_type
128
+ return unless Agent.config[:'distributed_tracing.enabled']
129
+
130
+ accept_incoming_transport_type headers, transport_type
131
+
132
+ newrelic_trace_key = NewRelic::CANDIDATE_NEWRELIC_KEYS.detect do |key|
133
+ headers.has_key?(key)
134
+ end
135
+ return unless newrelic_trace_key && (payload = headers[newrelic_trace_key])
136
+
137
+ accept_distributed_trace_payload payload
138
+ end
139
+
140
+ def consume_message_cross_app_tracing_headers headers, tracer_state
141
+ return unless CrossAppTracing.cross_app_enabled?
142
+ return unless CrossAppTracing.message_has_crossapp_request_header?(headers)
143
+
144
+ accept_cross_app_payload headers, tracer_state
145
+ CrossAppTracing.assign_intrinsic_transaction_attributes tracer_state
146
+ end
147
+
148
+ def accept_cross_app_payload headers, tracer_state
149
+ encoded_id = headers[CrossAppTracing::NR_MESSAGE_BROKER_ID_HEADER]
150
+ decoded_id = encoded_id.nil? ? EMPTY_STRING : deobfuscate(encoded_id)
151
+
152
+ return unless CrossAppTracing.trusted_valid_cross_app_id?(decoded_id)
153
+ txn_header = headers[CrossAppTracing::NR_MESSAGE_BROKER_TXN_HEADER]
154
+ txn_info = ::JSON.load(deobfuscate(txn_header))
155
+ payload = CrossAppPayload.new(decoded_id, transaction, txn_info)
156
+
157
+ @cross_app_payload = payload
158
+ rescue => e
159
+ NewRelic::Agent.logger.debug("Failure deserializing encoded header in #{self.class}, #{e.class}, #{e.message}")
160
+ nil
161
+ end
162
+
163
+ def deobfuscate message
164
+ CrossAppTracing.obfuscator.deobfuscate message
165
+ end
166
+
167
+ end
168
+ end
169
+ end
170
+ end
171
+
@@ -1,121 +1,173 @@
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 'new_relic/agent/distributed_tracing/distributed_trace_payload'
7
+ require 'new_relic/agent/distributed_tracing/distributed_trace_attributes'
8
+ require 'new_relic/agent/distributed_tracing/distributed_trace_metrics'
6
9
 
7
10
  module NewRelic
8
11
  module Agent
9
12
  class Transaction
10
13
  module DistributedTracing
11
14
  attr_accessor :distributed_trace_payload
15
+ attr_writer :distributed_trace_payload_created
12
16
 
13
- def distributed_trace?
14
- !!distributed_trace_payload
15
- end
17
+ SUPPORTABILITY_DISTRIBUTED_TRACE = "Supportability/DistributedTrace"
18
+ CREATE_PREFIX = "#{SUPPORTABILITY_DISTRIBUTED_TRACE}/CreatePayload"
19
+ ACCEPT_PREFIX = "#{SUPPORTABILITY_DISTRIBUTED_TRACE}/AcceptPayload"
20
+ IGNORE_PREFIX = "#{ACCEPT_PREFIX}/Ignored"
21
+
22
+ CREATE_SUCCESS_METRIC = "#{CREATE_PREFIX}/Success"
23
+ CREATE_EXCEPTION_METRIC = "#{CREATE_PREFIX}/Exception"
24
+ ACCEPT_SUCCESS_METRIC = "#{ACCEPT_PREFIX}/Success"
25
+ ACCEPT_EXCEPTION_METRIC = "#{ACCEPT_PREFIX}/Exception"
26
+ ACCEPT_PARSE_EXCEPTION_METRIC = "#{ACCEPT_PREFIX}/ParseException"
27
+
28
+ IGNORE_ACCEPT_AFTER_CREATE_METRIC = "#{IGNORE_PREFIX}/CreateBeforeAccept"
29
+ IGNORE_MULTIPLE_ACCEPT_METRIC = "#{IGNORE_PREFIX}/Multiple"
30
+ IGNORE_ACCEPT_NULL_METRIC = "#{IGNORE_PREFIX}/Null"
31
+ IGNORE_ACCEPT_MAJOR_VERSION_METRIC = "#{IGNORE_PREFIX}/MajorVersion"
32
+ IGNORE_ACCEPT_UNTRUSTED_ACCOUNT_METRIC = "#{IGNORE_PREFIX}/UntrustedAccount"
16
33
 
17
- def create_distributed_trace_payload url = nil
34
+ LBRACE = "{"
35
+ NULL_PAYLOAD = 'null'
36
+
37
+ NEWRELIC_TRACE_KEY = "HTTP_NEWRELIC"
38
+
39
+ def accept_distributed_tracing_incoming_request request
18
40
  return unless Agent.config[:'distributed_tracing.enabled']
19
- self.order += 1
20
- DistributedTracePayload.for_transaction self, url
41
+ return unless payload = request[NEWRELIC_TRACE_KEY]
42
+
43
+ accept_distributed_trace_payload payload
21
44
  end
22
45
 
23
- LBRACE = "{".freeze
46
+ def distributed_trace_payload_created?
47
+ @distributed_trace_payload_created ||= false
48
+ end
24
49
 
25
- def accept_distributed_trace_payload transport_type, payload
50
+ def create_distributed_trace_payload
26
51
  return unless Agent.config[:'distributed_tracing.enabled']
27
- if distributed_trace_payload
28
- NewRelic::Agent.increment_metric "Supportability/DistributedTracing/AcceptFailure/PayloadAlreadyAccepted"
29
- return false
30
- elsif self.order > 0
31
- NewRelic::Agent.increment_metric "Supportability/DistributedTracing/AcceptFailure/CreateDistributedTracePayload-before-AcceptDistributedTracePayload"
32
- return false
33
- elsif name_frozen?
34
- NewRelic::Agent.increment_metric "Supportability/DistributedTracing/AcceptFailure/BrowserAgentInjected"
35
- return false
36
- end
37
52
 
38
- payload = if payload.start_with? LBRACE
39
- DistributedTracePayload.from_json payload
40
- else
41
- DistributedTracePayload.from_http_safe payload
42
- end
53
+ @distributed_trace_payload_created = true
54
+ payload = DistributedTracePayload.for_transaction transaction
55
+ NewRelic::Agent.increment_metric CREATE_SUCCESS_METRIC
56
+ payload
57
+ rescue => e
58
+ NewRelic::Agent.increment_metric CREATE_EXCEPTION_METRIC
59
+ NewRelic::Agent.logger.warn "Failed to create distributed trace payload", e
60
+ nil
61
+ end
62
+
63
+ def accept_distributed_trace_payload payload
64
+ return unless Agent.config[:'distributed_tracing.enabled']
43
65
 
44
- payload.caller_transport_type = transport_type
45
- self.distributed_trace_payload = payload
66
+ return false if check_payload_ignored(payload)
67
+ return false unless check_payload_present(payload)
68
+ return false unless payload = decode_payload(payload)
69
+ return false unless check_required_fields_present(payload)
70
+ return false unless check_valid_version(payload)
71
+ return false unless check_trusted_account(payload)
46
72
 
47
- self.sampled = payload.sampled unless payload.sampled.nil?
73
+ assign_payload_and_sampling_params(payload)
48
74
 
75
+ NewRelic::Agent.increment_metric ACCEPT_SUCCESS_METRIC
49
76
  true
50
77
  rescue => e
51
- NewRelic::Agent.increment_metric "Supportability/DistributedTracing/AcceptFailure/Unknown"
78
+ NewRelic::Agent.increment_metric ACCEPT_EXCEPTION_METRIC
52
79
  NewRelic::Agent.logger.warn "Failed to accept distributed trace payload", e
53
80
  false
54
81
  end
55
82
 
56
- def distributed_tracing_trip_id
83
+ private
84
+
85
+ def check_payload_ignored(payload)
57
86
  if distributed_trace_payload
58
- distributed_trace_payload.trip_id
59
- else
60
- guid
87
+ NewRelic::Agent.increment_metric IGNORE_MULTIPLE_ACCEPT_METRIC
88
+ return true
89
+ elsif distributed_trace_payload_created?
90
+ NewRelic::Agent.increment_metric IGNORE_ACCEPT_AFTER_CREATE_METRIC
91
+ return true
61
92
  end
93
+ false
62
94
  end
63
95
 
64
- def parent_ids
65
- if distributed_trace_payload &&
66
- distributed_trace_payload.parent_ids &&
67
- distributed_trace_payload.parent_ids.last != guid
68
- inbound_ids = distributed_trace_payload.parent_ids.dup
69
- inbound_ids.push guid
70
- if inbound_ids.size > 3
71
- inbound_ids.shift
72
- end
73
- inbound_ids
74
- else
75
- [guid]
96
+ def check_payload_present(payload)
97
+ # We might be passed a Ruby `nil` object _or_ the JSON "null"
98
+ if payload.nil? || payload == NULL_PAYLOAD
99
+ NewRelic::Agent.increment_metric IGNORE_ACCEPT_NULL_METRIC
100
+ return nil
76
101
  end
102
+
103
+ payload
77
104
  end
78
105
 
79
- def depth
80
- if distributed_trace_payload
81
- distributed_trace_payload.depth
106
+ def decode_payload(payload)
107
+ decoded = if payload.start_with? LBRACE
108
+ DistributedTracePayload.from_json payload
82
109
  else
83
- 1
110
+ DistributedTracePayload.from_http_safe payload
84
111
  end
85
- end
86
112
 
87
- def order
88
- @order ||= 0
113
+ return nil unless check_payload_present(decoded)
114
+
115
+ decoded
116
+ rescue => e
117
+ NewRelic::Agent.increment_metric ACCEPT_PARSE_EXCEPTION_METRIC
118
+ NewRelic::Agent.logger.warn "Error parsing distributed trace payload", e
119
+ nil
89
120
  end
90
121
 
91
- attr_writer :order
122
+ def check_required_fields_present(payload)
123
+ if \
124
+ !payload.version.nil? &&
125
+ !payload.parent_account_id.nil? &&
126
+ !payload.parent_app_id.nil? &&
127
+ !payload.parent_type.nil? &&
128
+ (!payload.transaction_id.nil? || !payload.id.nil?) &&
129
+ !payload.trace_id.nil? &&
130
+ !payload.timestamp.nil?
131
+
132
+ true
133
+ else
134
+ NewRelic::Agent.increment_metric ACCEPT_PARSE_EXCEPTION_METRIC
135
+ false
136
+ end
137
+ end
92
138
 
93
- def append_distributed_tracing_info payload
94
- return unless Agent.config[:'distributed_tracing.enabled']
95
- if distributed_trace_payload
96
- distributed_trace_payload.assign_intrinsics self, payload
97
- elsif order > 0
98
- DistributedTracePayload.assign_initial_intrinsics self, payload
139
+ def check_valid_version(payload)
140
+ if DistributedTracePayload.major_version_matches?(payload)
141
+ true
142
+ else
143
+ NewRelic::Agent.increment_metric IGNORE_ACCEPT_MAJOR_VERSION_METRIC
144
+ false
99
145
  end
100
146
  end
101
147
 
102
- def assign_distributed_tracing_intrinsics
103
- return unless Agent.config[:'distributed_tracing.enabled']
104
- DistributedTracePayload::INTRINSIC_KEYS.each do |key|
105
- next unless value = @payload[key]
106
- attributes.add_intrinsic_attribute key, value
148
+ def check_trusted_account(payload)
149
+ compare_key = payload.trusted_account_key || payload.parent_account_id
150
+ unless compare_key == NewRelic::Agent.config[:trusted_account_key]
151
+ NewRelic::Agent.increment_metric IGNORE_ACCEPT_UNTRUSTED_ACCOUNT_METRIC
152
+ return false
107
153
  end
108
- nil
154
+ true
109
155
  end
110
156
 
111
- # This method returns transport_duration in seconds. Transport duration
112
- # is stored in milliseconds on the payload, but it's needed in seconds
113
- # for metrics and intrinsics.
114
- def transport_duration
115
- return unless distributed_trace_payload
116
- (start_time.to_f * 1000 - distributed_trace_payload.timestamp) / 1000
157
+ def assign_payload_and_sampling_params(payload)
158
+ @distributed_trace_payload = payload
159
+ return if transaction.distributed_tracer.trace_context_header_data
160
+ transaction.trace_id = payload.trace_id
161
+ transaction.distributed_tracer.parent_transaction_id = payload.transaction_id
162
+ transaction.parent_span_id = payload.id
163
+
164
+ unless payload.sampled.nil?
165
+ transaction.sampled = payload.sampled
166
+ transaction.priority = payload.priority if payload.priority
167
+ end
117
168
  end
118
169
  end
119
170
  end
120
171
  end
121
172
  end
173
+