newrelic_rpm 5.5.0.348 → 7.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +9 -0
- data/.yardopts +1 -0
- data/CHANGELOG.md +931 -0
- data/CONTRIBUTING.md +117 -19
- data/Gemfile +6 -2
- data/Guardfile +18 -1
- data/LICENSE +208 -38
- data/README.md +80 -84
- data/ROADMAP.md +24 -0
- data/Rakefile +2 -0
- data/THIRD_PARTY_NOTICES.md +213 -0
- data/bin/nrdebug +1 -1
- data/config.dot +1 -0
- data/init.rb +1 -1
- data/install.rb +1 -1
- data/lib/new_relic/agent.rb +111 -20
- data/lib/new_relic/agent/adaptive_sampler.rb +1 -1
- data/lib/new_relic/agent/agent.rb +182 -194
- data/lib/new_relic/agent/agent_logger.rb +5 -1
- data/lib/new_relic/agent/attribute_filter.rb +85 -25
- data/lib/new_relic/agent/attribute_processing.rb +1 -1
- data/lib/new_relic/agent/attributes.rb +152 -0
- data/lib/new_relic/agent/audit_logger.rb +11 -1
- data/lib/new_relic/agent/autostart.rb +19 -15
- data/lib/new_relic/agent/chained_call.rb +1 -1
- data/lib/new_relic/agent/commands/agent_command.rb +1 -1
- data/lib/new_relic/agent/commands/agent_command_router.rb +3 -22
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -1
- data/lib/new_relic/agent/configuration.rb +1 -1
- data/lib/new_relic/agent/configuration/default_source.rb +656 -188
- data/lib/new_relic/agent/configuration/dotted_hash.rb +1 -1
- data/lib/new_relic/agent/configuration/environment_source.rb +5 -3
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +45 -0
- data/lib/new_relic/agent/configuration/high_security_source.rb +2 -1
- data/lib/new_relic/agent/configuration/manager.rb +17 -13
- data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
- data/lib/new_relic/agent/configuration/mask_defaults.rb +1 -1
- data/lib/new_relic/agent/configuration/security_policy_source.rb +15 -1
- data/lib/new_relic/agent/configuration/server_source.rb +39 -4
- data/lib/new_relic/agent/configuration/yaml_source.rb +12 -7
- data/lib/new_relic/agent/connect/request_builder.rb +63 -0
- data/lib/new_relic/agent/connect/response_handler.rb +61 -0
- data/lib/new_relic/agent/custom_event_aggregator.rb +1 -1
- data/lib/new_relic/agent/database.rb +2 -3
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +1 -1
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +2 -2
- data/lib/new_relic/agent/database/obfuscator.rb +1 -1
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +1 -1
- data/lib/new_relic/agent/database_adapter.rb +33 -0
- data/lib/new_relic/agent/datastores.rb +7 -9
- data/lib/new_relic/agent/datastores/metric_helper.rb +2 -3
- data/lib/new_relic/agent/datastores/mongo.rb +2 -2
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +3 -3
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +1 -1
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +9 -9
- data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +1 -1
- data/lib/new_relic/agent/datastores/redis.rb +1 -5
- data/lib/new_relic/agent/deprecator.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing.rb +115 -32
- data/lib/new_relic/agent/{cross_app_payload.rb → distributed_tracing/cross_app_payload.rb} +3 -2
- data/lib/new_relic/agent/{cross_app_tracing.rb → distributed_tracing/cross_app_tracing.rb} +61 -46
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +84 -0
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +75 -0
- data/lib/new_relic/agent/{distributed_trace_payload.rb → distributed_tracing/distributed_trace_payload.rb} +32 -113
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +39 -0
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +246 -0
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +126 -0
- data/lib/new_relic/agent/encoding_normalizer.rb +1 -1
- data/lib/new_relic/agent/error_collector.rb +88 -58
- data/lib/new_relic/agent/error_event_aggregator.rb +10 -7
- data/lib/new_relic/agent/error_filter.rb +167 -0
- data/lib/new_relic/agent/error_trace_aggregator.rb +2 -1
- data/lib/new_relic/agent/event_aggregator.rb +27 -33
- data/lib/new_relic/agent/event_buffer.rb +1 -1
- data/lib/new_relic/agent/event_listener.rb +1 -1
- data/lib/new_relic/agent/event_loop.rb +1 -1
- data/lib/new_relic/agent/external.rb +13 -11
- data/lib/new_relic/agent/guid_generator.rb +28 -0
- data/lib/new_relic/agent/harvester.rb +1 -1
- data/lib/new_relic/agent/heap.rb +1 -1
- data/lib/new_relic/agent/hostname.rb +16 -2
- data/lib/new_relic/agent/http_clients/abstract.rb +82 -0
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +25 -20
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +29 -14
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +18 -22
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +11 -12
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +17 -5
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +5 -7
- data/lib/new_relic/agent/http_clients/uri_util.rb +12 -11
- data/lib/new_relic/agent/instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +26 -43
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +53 -73
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +81 -56
- data/lib/new_relic/agent/instrumentation/active_job.rb +7 -8
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +1 -1
- data/lib/new_relic/agent/instrumentation/active_record.rb +85 -38
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +17 -6
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +152 -0
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +35 -11
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +47 -51
- data/lib/new_relic/agent/instrumentation/active_storage.rb +23 -0
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +63 -0
- data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +10 -9
- data/lib/new_relic/agent/instrumentation/authlogic.rb +1 -1
- data/lib/new_relic/agent/instrumentation/bunny.rb +13 -132
- data/lib/new_relic/agent/instrumentation/bunny/chain.rb +45 -0
- data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +152 -0
- data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +11 -4
- data/lib/new_relic/agent/instrumentation/curb.rb +11 -183
- data/lib/new_relic/agent/instrumentation/curb/chain.rb +93 -0
- data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +222 -0
- data/lib/new_relic/agent/instrumentation/curb/prepend.rb +63 -0
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +5 -3
- data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +38 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +53 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +34 -0
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +9 -49
- data/lib/new_relic/agent/instrumentation/excon.rb +4 -3
- data/lib/new_relic/agent/instrumentation/excon/connection.rb +8 -5
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +3 -2
- data/lib/new_relic/agent/instrumentation/grape.rb +14 -107
- data/lib/new_relic/agent/instrumentation/grape/chain.rb +25 -0
- data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +100 -0
- data/lib/new_relic/agent/instrumentation/grape/prepend.rb +17 -0
- data/lib/new_relic/agent/instrumentation/httpclient.rb +10 -30
- data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +25 -0
- data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +38 -0
- data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +17 -0
- data/lib/new_relic/agent/instrumentation/httprb.rb +29 -0
- data/lib/new_relic/agent/instrumentation/httprb/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +30 -0
- data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +1 -1
- data/lib/new_relic/agent/instrumentation/memcache.rb +55 -68
- data/lib/new_relic/agent/instrumentation/memcache/chain.rb +16 -0
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +39 -118
- data/lib/new_relic/agent/instrumentation/memcache/helper.rb +56 -0
- data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +88 -0
- data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +88 -0
- data/lib/new_relic/agent/instrumentation/merb/controller.rb +1 -1
- data/lib/new_relic/agent/instrumentation/merb/errors.rb +1 -1
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +4 -2
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +20 -11
- data/lib/new_relic/agent/instrumentation/mongo.rb +17 -4
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +36 -3
- data/lib/new_relic/agent/instrumentation/net_http.rb +44 -0
- data/lib/new_relic/agent/instrumentation/net_http/chain.rb +25 -0
- data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +40 -0
- data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +21 -0
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +100 -0
- data/lib/new_relic/agent/instrumentation/padrino.rb +19 -52
- data/lib/new_relic/agent/instrumentation/padrino/chain.rb +34 -0
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +27 -0
- data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +20 -0
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/queue_time.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rack.rb +30 -138
- data/lib/new_relic/agent/instrumentation/rack/chain.rb +58 -0
- data/lib/new_relic/agent/instrumentation/rack/helpers.rb +32 -0
- data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +73 -0
- data/lib/new_relic/agent/instrumentation/rack/prepend.rb +37 -0
- data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -1
- data/lib/new_relic/agent/instrumentation/{rails5 → rails_notifications}/action_cable.rb +6 -7
- data/lib/new_relic/agent/instrumentation/{rails5 → rails_notifications}/action_controller.rb +4 -4
- data/lib/new_relic/agent/instrumentation/{rails4 → rails_notifications}/action_view.rb +4 -4
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rake.rb +14 -155
- data/lib/new_relic/agent/instrumentation/rake/chain.rb +25 -0
- data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +144 -0
- data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/redis.rb +13 -102
- data/lib/new_relic/agent/instrumentation/redis/chain.rb +34 -0
- data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +65 -0
- data/lib/new_relic/agent/instrumentation/redis/prepend.rb +24 -0
- data/lib/new_relic/agent/instrumentation/resque.rb +22 -30
- data/lib/new_relic/agent/instrumentation/resque/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/resque/helper.rb +19 -0
- data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +35 -0
- data/lib/new_relic/agent/instrumentation/resque/prepend.rb +16 -0
- data/lib/new_relic/agent/instrumentation/sequel.rb +2 -2
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +48 -24
- data/lib/new_relic/agent/instrumentation/sinatra.rb +21 -160
- data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +55 -0
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +30 -35
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +124 -0
- data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sunspot.rb +1 -1
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +12 -74
- data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +82 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +14 -0
- data/lib/new_relic/agent/internal_agent_error.rb +1 -1
- data/lib/new_relic/agent/javascript_instrumentor.rb +15 -10
- data/lib/new_relic/agent/log_once.rb +1 -1
- data/lib/new_relic/agent/logging.rb +139 -0
- data/lib/new_relic/agent/memory_logger.rb +1 -1
- data/lib/new_relic/agent/messaging.rb +15 -82
- data/lib/new_relic/agent/method_tracer.rb +10 -8
- data/lib/new_relic/agent/method_tracer_helpers.rb +5 -5
- data/lib/new_relic/agent/monitors.rb +27 -0
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +110 -0
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +27 -0
- data/lib/new_relic/agent/{inbound_request_monitor.rb → monitors/inbound_request_monitor.rb} +4 -4
- data/lib/new_relic/agent/{synthetics_monitor.rb → monitors/synthetics_monitor.rb} +4 -7
- data/lib/new_relic/agent/new_relic_service.rb +106 -40
- data/lib/new_relic/agent/new_relic_service/encoders.rb +1 -1
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +1 -2
- data/lib/new_relic/agent/new_relic_service/marshaller.rb +6 -27
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +1 -1
- data/lib/new_relic/agent/noticible_error.rb +22 -0
- data/lib/new_relic/agent/null_logger.rb +1 -1
- data/lib/new_relic/agent/obfuscator.rb +1 -1
- data/lib/new_relic/agent/parameter_filtering.rb +19 -6
- data/lib/new_relic/agent/payload_metric_mapping.rb +1 -1
- data/lib/new_relic/agent/pipe_channel_manager.rb +1 -1
- data/lib/new_relic/agent/pipe_service.rb +1 -1
- data/lib/new_relic/agent/prepend_supportability.rb +1 -1
- data/lib/new_relic/agent/priority_sampled_buffer.rb +9 -4
- data/lib/new_relic/agent/range_extensions.rb +1 -1
- data/lib/new_relic/agent/rules_engine.rb +1 -1
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +1 -1
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +1 -1
- data/lib/new_relic/agent/sampler.rb +1 -1
- data/lib/new_relic/agent/sampler_collection.rb +1 -1
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/memory_sampler.rb +2 -2
- data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/vm_sampler.rb +1 -1
- data/lib/new_relic/agent/span_event_aggregator.rb +3 -5
- data/lib/new_relic/agent/span_event_primitive.rb +129 -65
- data/lib/new_relic/agent/sql_sampler.rb +12 -12
- data/lib/new_relic/agent/stats.rb +1 -1
- data/lib/new_relic/agent/stats_engine.rb +3 -3
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +2 -2
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +1 -1
- data/lib/new_relic/agent/supported_versions.rb +3 -3
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +1 -1
- data/lib/new_relic/agent/system_info.rb +18 -4
- data/lib/new_relic/agent/threading/agent_thread.rb +2 -2
- data/lib/new_relic/agent/threading/backtrace_node.rb +1 -1
- data/lib/new_relic/agent/threading/backtrace_service.rb +4 -4
- data/lib/new_relic/agent/threading/thread_profile.rb +10 -24
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
- data/lib/new_relic/agent/tracer.rb +509 -0
- data/lib/new_relic/agent/transaction.rb +143 -171
- data/lib/new_relic/agent/transaction/abstract_segment.rb +33 -6
- data/lib/new_relic/agent/transaction/datastore_segment.rb +1 -3
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +177 -0
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +59 -149
- data/lib/new_relic/agent/transaction/external_request_segment.rb +32 -39
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +5 -12
- data/lib/new_relic/agent/transaction/request_attributes.rb +1 -1
- data/lib/new_relic/agent/transaction/segment.rb +28 -2
- data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction/trace.rb +6 -13
- data/lib/new_relic/agent/transaction/trace_builder.rb +1 -2
- data/lib/new_relic/agent/transaction/trace_context.rb +168 -0
- data/lib/new_relic/agent/transaction/trace_node.rb +12 -8
- data/lib/new_relic/agent/transaction/tracing.rb +1 -100
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction_error_primitive.rb +11 -16
- data/lib/new_relic/agent/transaction_event_aggregator.rb +1 -1
- data/lib/new_relic/agent/transaction_event_primitive.rb +29 -40
- data/lib/new_relic/agent/transaction_event_recorder.rb +4 -4
- data/lib/new_relic/agent/transaction_metrics.rb +1 -1
- data/lib/new_relic/agent/transaction_sampler.rb +2 -6
- data/lib/new_relic/agent/transaction_time_aggregator.rb +50 -26
- data/lib/new_relic/agent/utilization/aws.rb +1 -1
- data/lib/new_relic/agent/utilization/azure.rb +1 -1
- data/lib/new_relic/agent/utilization/gcp.rb +1 -1
- data/lib/new_relic/agent/utilization/pcf.rb +1 -1
- data/lib/new_relic/agent/utilization/vendor.rb +1 -1
- data/lib/new_relic/agent/utilization_data.rb +37 -2
- data/lib/new_relic/agent/vm.rb +1 -1
- data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -1
- data/lib/new_relic/agent/vm/mri_vm.rb +7 -5
- data/lib/new_relic/agent/vm/snapshot.rb +1 -1
- data/lib/new_relic/agent/worker_loop.rb +1 -1
- data/lib/new_relic/cli/command.rb +1 -1
- data/lib/new_relic/cli/commands/deployments.rb +2 -3
- data/lib/new_relic/cli/commands/install.rb +4 -3
- data/lib/new_relic/coerce.rb +32 -7
- data/lib/new_relic/collection_helper.rb +1 -1
- data/lib/new_relic/constants.rb +42 -0
- data/lib/new_relic/control.rb +1 -1
- data/lib/new_relic/control/class_methods.rb +8 -2
- data/lib/new_relic/control/frameworks.rb +1 -1
- data/lib/new_relic/control/frameworks/external.rb +1 -1
- data/lib/new_relic/control/frameworks/merb.rb +1 -1
- data/lib/new_relic/control/frameworks/rails.rb +12 -10
- data/lib/new_relic/control/frameworks/rails3.rb +1 -1
- data/lib/new_relic/control/frameworks/rails4.rb +1 -1
- data/lib/new_relic/control/frameworks/{rails5.rb → rails_notifications.rb} +2 -2
- data/lib/new_relic/control/frameworks/ruby.rb +1 -1
- data/lib/new_relic/control/frameworks/sinatra.rb +1 -1
- data/lib/new_relic/control/instance_methods.rb +12 -2
- data/lib/new_relic/control/instrumentation.rb +1 -1
- data/lib/new_relic/control/server_methods.rb +1 -1
- data/lib/new_relic/delayed_job_injection.rb +1 -1
- data/lib/new_relic/dependency_detection.rb +124 -14
- data/lib/new_relic/environment_report.rb +2 -4
- data/lib/new_relic/helper.rb +1 -1
- data/lib/new_relic/language_support.rb +1 -1
- data/lib/new_relic/latest_changes.rb +4 -4
- data/lib/new_relic/local_environment.rb +1 -1
- data/lib/new_relic/metric_data.rb +1 -1
- data/lib/new_relic/metric_spec.rb +1 -1
- data/lib/new_relic/noticed_error.rb +38 -21
- data/lib/new_relic/rack.rb +1 -1
- data/lib/new_relic/rack/agent_hooks.rb +1 -1
- data/lib/new_relic/rack/agent_middleware.rb +2 -2
- data/lib/new_relic/rack/browser_monitoring.rb +16 -9
- data/lib/new_relic/recipes.rb +1 -1
- data/lib/new_relic/recipes/capistrano3.rb +1 -1
- data/lib/new_relic/recipes/capistrano_legacy.rb +1 -1
- data/lib/new_relic/supportability_helper.rb +16 -1
- data/lib/new_relic/version.rb +3 -3
- data/lib/newrelic_rpm.rb +1 -1
- data/lib/sequel/extensions/newrelic_instrumentation.rb +1 -1
- data/lib/sequel/plugins/newrelic_instrumentation.rb +1 -1
- data/lib/tasks/all.rb +1 -1
- data/lib/tasks/config.html.erb +14 -25
- data/lib/tasks/config.rake +9 -9
- data/lib/tasks/multiverse.rb +35 -1
- data/lib/tasks/newrelic.rb +1 -1
- data/lib/tasks/tests.rake +6 -1
- data/newrelic_rpm.gemspec +22 -17
- data/recipes/newrelic.rb +1 -1
- data/test/agent_helper.rb +358 -78
- metadata +151 -66
- data/.travis.yml +0 -201
- data/cert/cacert.pem +0 -1177
- data/lib/new_relic/agent/commands/xray_session.rb +0 -55
- data/lib/new_relic/agent/commands/xray_session_collection.rb +0 -161
- data/lib/new_relic/agent/cross_app_monitor.rb +0 -110
- data/lib/new_relic/agent/distributed_trace_monitor.rb +0 -41
- data/lib/new_relic/agent/http_clients/abstract_request.rb +0 -31
- data/lib/new_relic/agent/instrumentation/active_record_4.rb +0 -42
- data/lib/new_relic/agent/instrumentation/active_record_5.rb +0 -41
- data/lib/new_relic/agent/instrumentation/evented_subscriber.rb +0 -104
- data/lib/new_relic/agent/instrumentation/http.rb +0 -46
- data/lib/new_relic/agent/instrumentation/net.rb +0 -50
- data/lib/new_relic/agent/instrumentation/rails4/action_controller.rb +0 -32
- data/lib/new_relic/agent/instrumentation/rails5/action_view.rb +0 -27
- data/lib/new_relic/agent/transaction/attributes.rb +0 -154
- data/lib/new_relic/agent/transaction/xray_sample_buffer.rb +0 -64
- data/lib/new_relic/agent/transaction_state.rb +0 -186
- data/lib/new_relic/build.rb +0 -2
- data/lib/new_relic/metrics.rb +0 -13
- data/lib/tasks/versions.html.erb +0 -28
- data/lib/tasks/versions.postface.html +0 -8
- data/lib/tasks/versions.preface.html +0 -9
- data/lib/tasks/versions.rake +0 -65
- data/lib/tasks/versions.txt.erb +0 -14
@@ -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
|
+
|
5
|
+
module NewRelic
|
6
|
+
module Agent
|
7
|
+
module Instrumentation
|
8
|
+
module Typhoeus
|
9
|
+
|
10
|
+
HYDRA_SEGMENT_NAME = "External/Multiple/Typhoeus::Hydra/run"
|
11
|
+
NOTICIBLE_ERROR_CLASS = "Typhoeus::Errors::TyphoeusError"
|
12
|
+
|
13
|
+
EARLIEST_VERSION = Gem::Version.new("0.5.3")
|
14
|
+
|
15
|
+
def self.is_supported_version?
|
16
|
+
Gem::Version.new(::Typhoeus::VERSION) >= EARLIEST_VERSION
|
17
|
+
end
|
18
|
+
|
19
|
+
def self.request_is_hydra_enabled?(request)
|
20
|
+
request.respond_to?(:hydra) && request.hydra
|
21
|
+
end
|
22
|
+
|
23
|
+
def self.response_message(response)
|
24
|
+
if response.respond_to?(:response_message)
|
25
|
+
response.response_message
|
26
|
+
elsif response.respond_to?(:return_message)
|
27
|
+
response.return_message
|
28
|
+
else
|
29
|
+
# 0.5.4 seems to have lost xxxx_message methods altogether.
|
30
|
+
"timeout"
|
31
|
+
end
|
32
|
+
end
|
33
|
+
|
34
|
+
def with_tracing
|
35
|
+
segment = NewRelic::Agent::Tracer.start_segment name: HYDRA_SEGMENT_NAME
|
36
|
+
instance_variable_set :@__newrelic_hydra_segment, segment
|
37
|
+
begin
|
38
|
+
yield
|
39
|
+
ensure
|
40
|
+
segment.finish if segment
|
41
|
+
end
|
42
|
+
end
|
43
|
+
|
44
|
+
def self.trace(request)
|
45
|
+
state = NewRelic::Agent::Tracer.state
|
46
|
+
return unless state.is_execution_traced?
|
47
|
+
|
48
|
+
wrapped_request = ::NewRelic::Agent::HTTPClients::TyphoeusHTTPRequest.new(request)
|
49
|
+
|
50
|
+
parent = if request_is_hydra_enabled?(request)
|
51
|
+
request.hydra.instance_variable_get(:@__newrelic_hydra_segment)
|
52
|
+
end
|
53
|
+
|
54
|
+
segment = NewRelic::Agent::Tracer.start_external_request_segment(
|
55
|
+
library: wrapped_request.type,
|
56
|
+
uri: wrapped_request.uri,
|
57
|
+
procedure: wrapped_request.method,
|
58
|
+
parent: parent
|
59
|
+
)
|
60
|
+
|
61
|
+
segment.add_request_headers wrapped_request
|
62
|
+
|
63
|
+
callback = Proc.new do
|
64
|
+
wrapped_response = HTTPClients::TyphoeusHTTPResponse.new(request.response)
|
65
|
+
|
66
|
+
segment.process_response_headers wrapped_response
|
67
|
+
|
68
|
+
if request.response.code == 0
|
69
|
+
segment.notice_error NoticibleError.new NOTICIBLE_ERROR_CLASS, response_message(request.response)
|
70
|
+
end
|
71
|
+
|
72
|
+
segment.finish if segment
|
73
|
+
end
|
74
|
+
request.on_complete.unshift(callback)
|
75
|
+
|
76
|
+
rescue => e
|
77
|
+
NewRelic::Agent.logger.error("Exception during trace setup for Typhoeus request", e)
|
78
|
+
end
|
79
|
+
end
|
80
|
+
end
|
81
|
+
end
|
82
|
+
end
|
@@ -0,0 +1,14 @@
|
|
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
|
+
module NewRelic::Agent::Instrumentation
|
6
|
+
module Typhoeus
|
7
|
+
module Prepend
|
8
|
+
include NewRelic::Agent::Instrumentation::Typhoeus
|
9
|
+
def run(*args)
|
10
|
+
with_tracing { super }
|
11
|
+
end
|
12
|
+
end
|
13
|
+
end
|
14
|
+
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/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
# This is the base class for all errors that we want to record through the
|
6
6
|
# NewRelic::Agent::ErrorCollector#notice_agent_error API. It provides the
|
@@ -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/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
require 'base64'
|
6
6
|
require 'json'
|
@@ -14,7 +14,7 @@ module NewRelic
|
|
14
14
|
RUM_KEY_LENGTH = 13
|
15
15
|
|
16
16
|
def initialize(event_listener)
|
17
|
-
event_listener.subscribe(:
|
17
|
+
event_listener.subscribe(:initial_configuration_complete, &method(:log_configuration))
|
18
18
|
end
|
19
19
|
|
20
20
|
def log_configuration
|
@@ -83,39 +83,44 @@ module NewRelic
|
|
83
83
|
value.nil? || value.empty?
|
84
84
|
end
|
85
85
|
|
86
|
-
def browser_timing_header #THREAD_LOCAL_ACCESS
|
86
|
+
def browser_timing_header(nonce=nil) #THREAD_LOCAL_ACCESS
|
87
87
|
return '' unless js_enabled_and_ready? # fast exit
|
88
88
|
|
89
|
-
state = NewRelic::Agent::
|
89
|
+
state = NewRelic::Agent::Tracer.state
|
90
90
|
|
91
91
|
return '' unless insert_js?(state) # slower exit
|
92
92
|
|
93
|
-
bt_config = browser_timing_config(state)
|
93
|
+
bt_config = browser_timing_config(state, nonce)
|
94
94
|
return '' if bt_config.empty?
|
95
95
|
|
96
|
-
bt_config + browser_timing_loader
|
96
|
+
bt_config + browser_timing_loader(nonce)
|
97
97
|
rescue => e
|
98
98
|
::NewRelic::Agent.logger.debug "Failure during RUM browser_timing_header construction", e
|
99
99
|
''
|
100
100
|
end
|
101
101
|
|
102
|
-
def browser_timing_loader
|
103
|
-
html_safe_if_needed("\n<script>#{Agent.config[:js_agent_loader]}</script>")
|
102
|
+
def browser_timing_loader(nonce=nil)
|
103
|
+
html_safe_if_needed("\n<script type=\"text/javascript\"#{create_nonce(nonce)}>#{Agent.config[:js_agent_loader]}</script>")
|
104
104
|
end
|
105
105
|
|
106
|
-
def browser_timing_config(state)
|
106
|
+
def browser_timing_config(state, nonce=nil)
|
107
107
|
txn = state.current_transaction
|
108
108
|
return '' if txn.nil?
|
109
109
|
|
110
110
|
txn.freeze_name_and_execute_if_not_ignored do
|
111
111
|
data = data_for_js_agent(txn)
|
112
112
|
json = ::JSON.dump(data)
|
113
|
-
return html_safe_if_needed("\n<script>window.NREUM||(NREUM={});NREUM.info=#{json}</script>")
|
113
|
+
return html_safe_if_needed("\n<script type=\"text/javascript\"#{create_nonce(nonce)}>window.NREUM||(NREUM={});NREUM.info=#{json}</script>")
|
114
114
|
end
|
115
115
|
|
116
116
|
''
|
117
117
|
end
|
118
118
|
|
119
|
+
def create_nonce(nonce=nil)
|
120
|
+
return '' unless nonce
|
121
|
+
" nonce=\"#{nonce.to_s}\""
|
122
|
+
end
|
123
|
+
|
119
124
|
BEACON_KEY = "beacon".freeze
|
120
125
|
ERROR_BEACON_KEY = "errorBeacon".freeze
|
121
126
|
LICENSE_KEY_KEY = "licenseKey".freeze
|
@@ -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/
|
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
|
@@ -0,0 +1,139 @@
|
|
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 'json'
|
6
|
+
require 'new_relic/agent/hostname'
|
7
|
+
|
8
|
+
module NewRelic
|
9
|
+
module Agent
|
10
|
+
module Logging
|
11
|
+
|
12
|
+
# This class can be used as the formatter for an existing logger. It
|
13
|
+
# decorates log messages with trace and entity metadata, and formats each
|
14
|
+
# log messages as a JSON object.
|
15
|
+
#
|
16
|
+
# It can be added to a Rails application like this:
|
17
|
+
#
|
18
|
+
# require 'newrelic_rpm'
|
19
|
+
#
|
20
|
+
# Rails.application.configure do
|
21
|
+
# config.log_formatter = ::NewRelic::Agent::Logging::DecoratingFormatter.new
|
22
|
+
# end
|
23
|
+
#
|
24
|
+
# @api public
|
25
|
+
class DecoratingFormatter < ::Logger::Formatter
|
26
|
+
TIMESTAMP_KEY = 'timestamp'.freeze
|
27
|
+
MESSAGE_KEY = 'message'.freeze
|
28
|
+
LOG_LEVEL_KEY = 'log.level'.freeze
|
29
|
+
LOG_NAME_KEY = 'logger.name'.freeze
|
30
|
+
NEWLINE = "\n".freeze
|
31
|
+
|
32
|
+
QUOTE = '"'.freeze
|
33
|
+
COLON = ':'.freeze
|
34
|
+
COMMA = ','.freeze
|
35
|
+
CLOSING_BRACE = '}'.freeze
|
36
|
+
|
37
|
+
def initialize
|
38
|
+
Agent.config.register_callback :app_name do
|
39
|
+
@app_name = nil
|
40
|
+
end
|
41
|
+
end
|
42
|
+
|
43
|
+
def call severity, time, progname, msg
|
44
|
+
message = '{'
|
45
|
+
if app_name
|
46
|
+
add_key_value message, ENTITY_NAME_KEY, app_name
|
47
|
+
message << COMMA
|
48
|
+
end
|
49
|
+
add_key_value message, ENTITY_TYPE_KEY, ENTITY_TYPE
|
50
|
+
message << COMMA
|
51
|
+
add_key_value message, HOSTNAME_KEY, Hostname.get
|
52
|
+
|
53
|
+
if entity_guid = Agent.config[:entity_guid]
|
54
|
+
message << COMMA
|
55
|
+
add_key_value message, ENTITY_GUID_KEY, entity_guid
|
56
|
+
end
|
57
|
+
|
58
|
+
if trace_id = Tracer.trace_id
|
59
|
+
message << COMMA
|
60
|
+
add_key_value message, TRACE_ID_KEY, trace_id
|
61
|
+
end
|
62
|
+
if span_id = Tracer.span_id
|
63
|
+
message << COMMA
|
64
|
+
add_key_value message, SPAN_ID_KEY, span_id
|
65
|
+
end
|
66
|
+
|
67
|
+
message << COMMA
|
68
|
+
message << QUOTE << MESSAGE_KEY << QUOTE << COLON << escape(msg)
|
69
|
+
message << COMMA
|
70
|
+
add_key_value message, LOG_LEVEL_KEY, severity
|
71
|
+
if progname
|
72
|
+
message << COMMA
|
73
|
+
add_key_value message, LOG_NAME_KEY, progname
|
74
|
+
end
|
75
|
+
|
76
|
+
message << COMMA
|
77
|
+
message << QUOTE << TIMESTAMP_KEY << QUOTE << COLON << (time.to_f * 1000).round.to_s
|
78
|
+
message << CLOSING_BRACE << NEWLINE
|
79
|
+
end
|
80
|
+
|
81
|
+
def app_name
|
82
|
+
@app_name ||= Agent.config[:app_name][0]
|
83
|
+
end
|
84
|
+
|
85
|
+
def add_key_value message, key, value
|
86
|
+
message << QUOTE << key << QUOTE << COLON << QUOTE << value << QUOTE
|
87
|
+
end
|
88
|
+
|
89
|
+
def escape message
|
90
|
+
if String === message
|
91
|
+
message.to_json
|
92
|
+
else
|
93
|
+
message.inspect.to_json
|
94
|
+
end
|
95
|
+
end
|
96
|
+
|
97
|
+
def clear_tags!
|
98
|
+
# No-op; just avoiding issues with act-fluent-logger-rails
|
99
|
+
end
|
100
|
+
end
|
101
|
+
|
102
|
+
|
103
|
+
# This logger decorates logs with trace and entity metadata, and emits log
|
104
|
+
# messages formatted as JSON objects. It extends the Logger class from
|
105
|
+
# the Ruby standard library, and accepts the same constructor parameters.
|
106
|
+
#
|
107
|
+
# It aliases the `:info` message to overwrite the `:write` method, so it
|
108
|
+
# can be used in Rack applications that expect the logger to be a file-like
|
109
|
+
# object.
|
110
|
+
#
|
111
|
+
# It can be added to an application like this:
|
112
|
+
#
|
113
|
+
# require 'newrelic_rpm'
|
114
|
+
#
|
115
|
+
# config.logger = NewRelic::Agent::Logging::DecoratingLogger.new "log/application.log"
|
116
|
+
#
|
117
|
+
# @api public
|
118
|
+
class DecoratingLogger < (defined?(::ActiveSupport) && defined?(::ActiveSupport::Logger) ? ::ActiveSupport::Logger : ::Logger)
|
119
|
+
|
120
|
+
alias :write :info
|
121
|
+
|
122
|
+
# Positional and Keyword arguments are separated beginning with Ruby 2.7
|
123
|
+
# Signature of ::Logger constructor changes in Ruby 2.4 to have both positional and keyword args
|
124
|
+
# We pivot on Ruby 2.7 for widest supportability with least amount of hassle.
|
125
|
+
if RUBY_VERSION < "2.7.0"
|
126
|
+
def initialize(*args)
|
127
|
+
super(*args)
|
128
|
+
self.formatter = DecoratingFormatter.new
|
129
|
+
end
|
130
|
+
else
|
131
|
+
def initialize(*args, **kwargs)
|
132
|
+
super(*args, **kwargs)
|
133
|
+
self.formatter = DecoratingFormatter.new
|
134
|
+
end
|
135
|
+
end
|
136
|
+
end
|
137
|
+
end
|
138
|
+
end
|
139
|
+
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/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
# Base class for startup logging and testing in multiverse
|
6
6
|
|
@@ -1,6 +1,8 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
5
|
+
|
4
6
|
require 'new_relic/agent/transaction'
|
5
7
|
|
6
8
|
module NewRelic
|
@@ -13,12 +15,12 @@ module NewRelic
|
|
13
15
|
module Messaging
|
14
16
|
extend self
|
15
17
|
|
18
|
+
RABBITMQ_TRANSPORT_TYPE = "RabbitMQ"
|
19
|
+
|
16
20
|
ATTR_DESTINATION = AttributeFilter::DST_TRANSACTION_EVENTS |
|
17
21
|
AttributeFilter::DST_TRANSACTION_TRACER |
|
18
22
|
AttributeFilter::DST_ERROR_COLLECTOR
|
19
23
|
|
20
|
-
EMPTY_STRING = ''.freeze
|
21
|
-
|
22
24
|
# Start a MessageBroker segment configured to trace a messaging action.
|
23
25
|
# Finishing this segment will handle timing and recording of the proper
|
24
26
|
# metrics for New Relic's messaging features..
|
@@ -58,7 +60,7 @@ module NewRelic
|
|
58
60
|
parameters: nil,
|
59
61
|
start_time: nil)
|
60
62
|
|
61
|
-
|
63
|
+
Tracer.start_message_broker_segment(
|
62
64
|
action: action,
|
63
65
|
library: library,
|
64
66
|
destination_type: destination_type,
|
@@ -123,16 +125,17 @@ module NewRelic
|
|
123
125
|
raise ArgumentError, 'missing required argument: destination_type' if destination_type.nil?
|
124
126
|
raise ArgumentError, 'missing required argument: destination_name' if destination_name.nil?
|
125
127
|
|
126
|
-
state =
|
128
|
+
state = Tracer.state
|
127
129
|
return yield if state.current_transaction
|
128
130
|
txn = nil
|
129
131
|
|
130
132
|
begin
|
131
133
|
txn_name = transaction_name library, destination_type, destination_name
|
132
|
-
|
134
|
+
|
135
|
+
txn = Tracer.start_transaction name: txn_name, category: :message
|
133
136
|
|
134
137
|
if headers
|
135
|
-
consume_message_headers headers,
|
138
|
+
txn.distributed_tracer.consume_message_headers headers, state, RABBITMQ_TRANSPORT_TYPE
|
136
139
|
CrossAppTracing.reject_messaging_cat_headers(headers).each do |k, v|
|
137
140
|
txn.add_agent_attribute :"message.headers.#{k}", v, AttributeFilter::DST_NONE unless v.nil?
|
138
141
|
end
|
@@ -150,7 +153,7 @@ module NewRelic
|
|
150
153
|
yield
|
151
154
|
ensure
|
152
155
|
begin
|
153
|
-
|
156
|
+
txn.finish if txn
|
154
157
|
rescue => e
|
155
158
|
NewRelic::Agent.logger.error "Error stopping Message Broker consume transaction", e
|
156
159
|
end
|
@@ -159,7 +162,7 @@ module NewRelic
|
|
159
162
|
# Start a MessageBroker segment configured to trace an AMQP publish.
|
160
163
|
# Finishing this segment will handle timing and recording of the proper
|
161
164
|
# metrics for New Relic's messaging features. This method is a convenience
|
162
|
-
# wrapper around NewRelic::Agent::
|
165
|
+
# wrapper around NewRelic::Agent::Tracer.start_message_broker_segment.
|
163
166
|
#
|
164
167
|
# @param library [String] The name of the library being instrumented
|
165
168
|
#
|
@@ -197,7 +200,7 @@ module NewRelic
|
|
197
200
|
|
198
201
|
original_headers = headers.nil? ? nil : headers.dup
|
199
202
|
|
200
|
-
segment =
|
203
|
+
segment = Tracer.start_message_broker_segment(
|
201
204
|
action: :produce,
|
202
205
|
library: library,
|
203
206
|
destination_type: :exchange,
|
@@ -219,7 +222,7 @@ module NewRelic
|
|
219
222
|
# Start a MessageBroker segment configured to trace an AMQP consume.
|
220
223
|
# Finishing this segment will handle timing and recording of the proper
|
221
224
|
# metrics for New Relic's messaging features. This method is a convenience
|
222
|
-
# wrapper around NewRelic::Agent::
|
225
|
+
# wrapper around NewRelic::Agent::Tracer.start_message_broker_segment.
|
223
226
|
#
|
224
227
|
# @param library [String] The name of the library being instrumented
|
225
228
|
#
|
@@ -258,7 +261,7 @@ module NewRelic
|
|
258
261
|
raise ArgumentError, 'missing required argument: delivery_info' if delivery_info.nil?
|
259
262
|
raise ArgumentError, 'missing required argument: message_properties' if message_properties.nil?
|
260
263
|
|
261
|
-
segment =
|
264
|
+
segment = Tracer.start_message_broker_segment(
|
262
265
|
action: :consume,
|
263
266
|
library: library,
|
264
267
|
destination_name: destination_name,
|
@@ -364,76 +367,6 @@ module NewRelic
|
|
364
367
|
transaction_name
|
365
368
|
end
|
366
369
|
|
367
|
-
RABBITMQ_TRANSPORT_TYPE = "RabbitMQ".freeze
|
368
|
-
|
369
|
-
def consume_message_headers headers, transaction, state
|
370
|
-
consume_distributed_tracing_headers headers, transaction
|
371
|
-
consume_cross_app_tracing_headers headers, state
|
372
|
-
|
373
|
-
assign_synthetics_header headers[CrossAppTracing::NR_MESSAGE_BROKER_SYNTHETICS_HEADER], transaction
|
374
|
-
rescue => e
|
375
|
-
NewRelic::Agent.logger.error "Error in consume_message_headers", e
|
376
|
-
end
|
377
|
-
|
378
|
-
def decode_txn_info headers, transaction_state
|
379
|
-
encoded_id = headers[CrossAppTracing::NR_MESSAGE_BROKER_ID_HEADER]
|
380
|
-
|
381
|
-
decoded_id = if encoded_id.nil?
|
382
|
-
EMPTY_STRING
|
383
|
-
else
|
384
|
-
CrossAppTracing.obfuscator.deobfuscate(encoded_id)
|
385
|
-
end
|
386
|
-
|
387
|
-
if CrossAppTracing.trusted_valid_cross_app_id?(decoded_id) && transaction_state.current_transaction
|
388
|
-
txn_header = headers[CrossAppTracing::NR_MESSAGE_BROKER_TXN_HEADER]
|
389
|
-
txn = transaction_state.current_transaction
|
390
|
-
txn_info = ::JSON.load(CrossAppTracing.obfuscator.deobfuscate(txn_header))
|
391
|
-
payload = CrossAppPayload.new(decoded_id, txn, txn_info)
|
392
|
-
|
393
|
-
txn.cross_app_payload = payload
|
394
|
-
end
|
395
|
-
rescue => e
|
396
|
-
NewRelic::Agent.logger.debug("Failure deserializing encoded header in #{self.class}, #{e.class}, #{e.message}")
|
397
|
-
nil
|
398
|
-
end
|
399
|
-
|
400
|
-
CANDIDATE_HEADERS = ['newrelic'.freeze, 'NEWRELIC'.freeze, 'Newrelic'.freeze]
|
401
|
-
|
402
|
-
def consume_distributed_tracing_headers headers, transaction
|
403
|
-
if Agent.config[:'distributed_tracing.enabled']
|
404
|
-
return unless newrelic_trace_key = CANDIDATE_HEADERS.detect do |key|
|
405
|
-
headers.has_key?(key)
|
406
|
-
end
|
407
|
-
|
408
|
-
return unless payload = headers[newrelic_trace_key]
|
409
|
-
|
410
|
-
if transaction.accept_distributed_trace_payload payload
|
411
|
-
transaction.distributed_trace_payload.caller_transport_type = RABBITMQ_TRANSPORT_TYPE
|
412
|
-
end
|
413
|
-
end
|
414
|
-
end
|
415
|
-
|
416
|
-
def consume_cross_app_tracing_headers headers, state
|
417
|
-
if CrossAppTracing.cross_app_enabled? && CrossAppTracing.message_has_crossapp_request_header?(headers)
|
418
|
-
decode_txn_info headers, state
|
419
|
-
CrossAppTracing.assign_intrinsic_transaction_attributes state
|
420
|
-
end
|
421
|
-
end
|
422
|
-
|
423
|
-
def assign_synthetics_header synthetics_header, transaction
|
424
|
-
if synthetics_header and
|
425
|
-
incoming_payload = ::JSON.load(CrossAppTracing.obfuscator.deobfuscate(synthetics_header)) and
|
426
|
-
SyntheticsMonitor.is_valid_payload?(incoming_payload) and
|
427
|
-
SyntheticsMonitor.is_supported_version?(incoming_payload) and
|
428
|
-
SyntheticsMonitor.is_trusted?(incoming_payload)
|
429
|
-
|
430
|
-
transaction.raw_synthetics_header = synthetics_header
|
431
|
-
transaction.synthetics_payload = incoming_payload
|
432
|
-
end
|
433
|
-
rescue => e
|
434
|
-
NewRelic::Agent.logger.error "Error in assign_synthetics_header", e
|
435
|
-
end
|
436
|
-
|
437
370
|
end
|
438
371
|
end
|
439
372
|
end
|