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
@@ -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 'new_relic/agent/event_aggregator'
|
6
6
|
require 'new_relic/agent/attribute_processing'
|
@@ -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 'singleton'
|
6
6
|
require 'new_relic/agent/database/explain_plan_helpers'
|
@@ -133,10 +133,9 @@ module NewRelic
|
|
133
133
|
]
|
134
134
|
|
135
135
|
SQL_COMMENT_REGEX = Regexp.new('/\*.*?\*/', Regexp::MULTILINE).freeze
|
136
|
-
EMPTY_STRING = ''.freeze
|
137
136
|
|
138
137
|
def parse_operation_from_query(sql)
|
139
|
-
sql = Helper.correctly_encoded(sql).gsub(SQL_COMMENT_REGEX,
|
138
|
+
sql = Helper.correctly_encoded(sql).gsub(SQL_COMMENT_REGEX, NewRelic::EMPTY_STR)
|
140
139
|
if sql =~ /(\w+)/
|
141
140
|
op = $1.downcase
|
142
141
|
return op if KNOWN_OPERATIONS.include?(op)
|
@@ -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 'new_relic/agent/database/obfuscator'
|
6
6
|
require 'new_relic/agent/database/postgres_explain_obfuscator'
|
@@ -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
|
@@ -11,7 +11,7 @@ module NewRelic
|
|
11
11
|
:double_quotes => /"(?:[^"]|"")*?(?:\\".*|"(?!"))/,
|
12
12
|
:dollar_quotes => /(\$(?!\d)[^$]*?\$).*?(?:\1|$)/,
|
13
13
|
:uuids => /\{?(?:[0-9a-fA-F]\-*){32}\}?/,
|
14
|
-
:numeric_literals =>
|
14
|
+
:numeric_literals => /-?\b(?:[0-9]+\.)?[0-9]+([eE][+-]?[0-9]+)?\b/,
|
15
15
|
:boolean_literals => /\b(?:true|false|null)\b/i,
|
16
16
|
:hexadecimal_literals => /0x[0-9a-fA-F]+/,
|
17
17
|
:comments => /(?:#|--).*?(?=\r|\n|$)/i,
|
@@ -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 'new_relic/agent/database/obfuscation_helpers'
|
6
6
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
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,33 @@
|
|
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
|
+
class DatabaseAdapter
|
8
|
+
VERSIONS = {
|
9
|
+
'6.1.0' => proc { ActiveRecord::Base.connection_db_config.configuration_hash[:adapter] },
|
10
|
+
'4.0.0' => proc { ActiveRecord::Base.connection_config[:adapter] },
|
11
|
+
'3.0.0' => proc { |env| ActiveRecord::Base.configurations[env]['adapter'] }
|
12
|
+
}
|
13
|
+
|
14
|
+
def self.value
|
15
|
+
return unless defined? ActiveRecord::Base
|
16
|
+
new(::NewRelic::Control.instance.env, ActiveRecord::VERSION::STRING).value
|
17
|
+
end
|
18
|
+
|
19
|
+
attr_reader :env, :version
|
20
|
+
|
21
|
+
def initialize(env, version)
|
22
|
+
@env = env
|
23
|
+
@version = Gem::Version.new(version)
|
24
|
+
end
|
25
|
+
|
26
|
+
def value
|
27
|
+
match = VERSIONS.keys.find { |key| version >= Gem::Version.new(key) }
|
28
|
+
return unless match
|
29
|
+
VERSIONS[match].call(env)
|
30
|
+
end
|
31
|
+
end
|
32
|
+
end
|
33
|
+
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
|
require 'new_relic/agent/datastores/metric_helper'
|
6
6
|
|
@@ -47,7 +47,7 @@ module NewRelic
|
|
47
47
|
alias_method method_name_without_newrelic, method_name
|
48
48
|
|
49
49
|
define_method(method_name) do |*args, &blk|
|
50
|
-
segment = NewRelic::Agent::
|
50
|
+
segment = NewRelic::Agent::Tracer.start_datastore_segment(
|
51
51
|
product: product,
|
52
52
|
operation: operation
|
53
53
|
)
|
@@ -112,7 +112,7 @@ module NewRelic
|
|
112
112
|
|
113
113
|
return yield unless operation
|
114
114
|
|
115
|
-
segment = NewRelic::Agent::
|
115
|
+
segment = NewRelic::Agent::Tracer.start_datastore_segment(
|
116
116
|
product: product,
|
117
117
|
operation: operation,
|
118
118
|
collection: collection
|
@@ -123,8 +123,8 @@ module NewRelic
|
|
123
123
|
ensure
|
124
124
|
begin
|
125
125
|
if callback
|
126
|
-
|
127
|
-
|
126
|
+
elapsed_time = (Time.now - segment.start_time).to_f
|
127
|
+
callback.call(result, segment.name, elapsed_time)
|
128
128
|
end
|
129
129
|
ensure
|
130
130
|
segment.finish if segment
|
@@ -163,8 +163,7 @@ module NewRelic
|
|
163
163
|
def self.notice_sql(query, scoped_metric, elapsed)
|
164
164
|
NewRelic::Agent.record_api_supportability_metric(:notice_sql)
|
165
165
|
|
166
|
-
|
167
|
-
if (txn = state.current_transaction) && (segment = txn.current_segment) && segment.respond_to?(:notice_sql)
|
166
|
+
if (txn = Tracer.current_transaction) && (segment = txn.current_segment) && segment.respond_to?(:notice_sql)
|
168
167
|
segment.notice_sql(query)
|
169
168
|
end
|
170
169
|
nil
|
@@ -198,8 +197,7 @@ module NewRelic
|
|
198
197
|
|
199
198
|
# Settings may change eventually, but for now we follow the same
|
200
199
|
# capture rules as SQL for non-SQL statements.
|
201
|
-
|
202
|
-
if (txn = state.current_transaction) && (segment = txn.current_segment) && segment.respond_to?(:notice_nosql_statement)
|
200
|
+
if (txn = Tracer.current_transaction) && (segment = txn.current_segment) && segment.respond_to?(:notice_nosql_statement)
|
203
201
|
segment.notice_nosql_statement(statement)
|
204
202
|
end
|
205
203
|
nil
|
@@ -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
|
@@ -107,8 +107,7 @@ module NewRelic
|
|
107
107
|
# Allow Transaction#with_database_metric_name to override our
|
108
108
|
# collection and operation
|
109
109
|
def self.overridden_operation_and_collection #THREAD_LOCAL_ACCESS
|
110
|
-
|
111
|
-
txn = state.current_transaction
|
110
|
+
txn = Tracer.current_transaction
|
112
111
|
txn ? txn.instrumentation_state[:datastore_override] : nil
|
113
112
|
end
|
114
113
|
|
@@ -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
|
@@ -12,7 +12,7 @@ module NewRelic
|
|
12
12
|
end
|
13
13
|
|
14
14
|
def self.is_monitoring_enabled?
|
15
|
-
defined?(::Mongo::Monitoring)
|
15
|
+
defined?(::Mongo::Monitoring) # @since 2.1.0
|
16
16
|
end
|
17
17
|
|
18
18
|
def self.is_unsupported_2x?
|
@@ -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
|
require 'new_relic/agent/datastores/mongo/obfuscator'
|
5
5
|
|
6
6
|
module NewRelic
|
@@ -13,7 +13,7 @@ module NewRelic
|
|
13
13
|
OBFUSCATE_KEYS = [ 'filter', 'query', 'pipeline' ].freeze
|
14
14
|
|
15
15
|
# Keys that will get completely removed from the statement.
|
16
|
-
|
16
|
+
DENYLISTED_KEYS = [ 'deletes', 'documents', 'updates' ].freeze
|
17
17
|
|
18
18
|
def self.format(command_name, database_name, command)
|
19
19
|
return nil unless NewRelic::Agent.config[:'mongo.capture_queries']
|
@@ -25,7 +25,7 @@ module NewRelic
|
|
25
25
|
}
|
26
26
|
|
27
27
|
command.each do |key, value|
|
28
|
-
next if
|
28
|
+
next if DENYLISTED_KEYS.include?(key)
|
29
29
|
if OBFUSCATE_KEYS.include?(key)
|
30
30
|
obfuscated = obfuscate(value)
|
31
31
|
result[key] = obfuscated if obfuscated
|
@@ -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 'new_relic/agent/datastores/mongo/obfuscator'
|
6
6
|
require 'new_relic/agent/datastores/metric_helper'
|
@@ -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
|
@@ -8,31 +8,31 @@ module NewRelic
|
|
8
8
|
module Mongo
|
9
9
|
module Obfuscator
|
10
10
|
|
11
|
-
|
11
|
+
ALLOWLIST = [:operation].freeze
|
12
12
|
|
13
|
-
def self.obfuscate_statement(source,
|
13
|
+
def self.obfuscate_statement(source, allowlist = ALLOWLIST)
|
14
14
|
if source.is_a? Hash
|
15
15
|
obfuscated = {}
|
16
16
|
source.each do |key, value|
|
17
|
-
if
|
17
|
+
if allowlist.include?(key)
|
18
18
|
obfuscated[key] = value
|
19
19
|
else
|
20
|
-
obfuscated[key] = obfuscate_value(value,
|
20
|
+
obfuscated[key] = obfuscate_value(value, allowlist)
|
21
21
|
end
|
22
22
|
end
|
23
23
|
obfuscated
|
24
24
|
else
|
25
|
-
obfuscate_value(source,
|
25
|
+
obfuscate_value(source, allowlist)
|
26
26
|
end
|
27
27
|
end
|
28
28
|
|
29
29
|
QUESTION_MARK = '?'.freeze
|
30
30
|
|
31
|
-
def self.obfuscate_value(value,
|
31
|
+
def self.obfuscate_value(value, allowlist = ALLOWLIST)
|
32
32
|
if value.is_a?(Hash)
|
33
|
-
obfuscate_statement(value,
|
33
|
+
obfuscate_statement(value, allowlist)
|
34
34
|
elsif value.is_a?(Array)
|
35
|
-
value.map {|v| obfuscate_value(v,
|
35
|
+
value.map {|v| obfuscate_value(v, allowlist)}
|
36
36
|
else
|
37
37
|
QUESTION_MARK
|
38
38
|
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
|
require 'new_relic/agent/datastores/mongo/obfuscator'
|
6
6
|
|
@@ -1,16 +1,12 @@
|
|
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
|
7
7
|
module Datastores
|
8
8
|
module Redis
|
9
|
-
MULTI_OPERATION = 'multi'
|
10
|
-
PIPELINE_OPERATION = 'pipeline'
|
11
9
|
BINARY_DATA_PLACEHOLDER = "<binary data>"
|
12
|
-
PRODUCT_NAME = 'Redis'
|
13
|
-
CONNECT = 'connect'
|
14
10
|
|
15
11
|
MAXIMUM_COMMAND_LENGTH = 1000
|
16
12
|
MAXIMUM_ARGUMENT_LENGTH = 64
|
@@ -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
|
@@ -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/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
|
-
|
6
|
+
require_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,54 +21,130 @@ module NewRelic
|
|
14
21
|
#
|
15
22
|
# @api public
|
16
23
|
module DistributedTracing
|
24
|
+
extend NewRelic::SupportabilityHelper
|
17
25
|
extend self
|
18
|
-
|
19
|
-
#
|
20
|
-
#
|
21
|
-
#
|
22
|
-
#
|
23
|
-
#
|
26
|
+
|
27
|
+
# Adds the Distributed Trace headers so that the downstream service can participate in a
|
28
|
+
# distributed trace. This method should be called every time an outbound call is made
|
29
|
+
# since the header payload contains a timestamp.
|
30
|
+
#
|
31
|
+
# Distributed Tracing must be enabled to use this method.
|
24
32
|
#
|
25
|
-
#
|
26
|
-
#
|
27
|
-
#
|
33
|
+
# +insert_distributed_trace_headers+ always inserts W3C trace context headers and inserts
|
34
|
+
# New Relic distributed tracing header by default. New Relic headers may be suppressed by
|
35
|
+
# setting +exclude_new_relic_header+ to +true+ in your configuration file.
|
36
|
+
#
|
37
|
+
# @param headers [Hash] Is a Hash to which the distributed trace headers
|
38
|
+
# will be inserted.
|
39
|
+
#
|
40
|
+
# @return {Transaction} The transaction the headers were inserted from,
|
41
|
+
# or +nil+ if headers were not inserted.
|
28
42
|
#
|
29
43
|
# @api public
|
30
|
-
|
31
|
-
|
32
|
-
|
44
|
+
#
|
45
|
+
def insert_distributed_trace_headers headers={}
|
46
|
+
record_api_supportability_metric(:insert_distributed_trace_headers)
|
47
|
+
|
48
|
+
unless Agent.config[:'distributed_tracing.enabled']
|
49
|
+
NewRelic::Agent.logger.warn "Not configured to insert distributed trace headers"
|
50
|
+
return nil
|
33
51
|
end
|
52
|
+
|
53
|
+
return unless valid_api_argument_class? headers, "headers", Hash
|
54
|
+
|
55
|
+
return unless transaction = Transaction.tl_current
|
56
|
+
|
57
|
+
transaction.distributed_tracer.insert_headers headers
|
58
|
+
transaction
|
34
59
|
rescue => e
|
35
|
-
NewRelic::Agent.logger.error 'error during
|
60
|
+
NewRelic::Agent.logger.error 'error during insert_distributed_trace_headers', e
|
36
61
|
nil
|
37
62
|
end
|
38
63
|
|
39
|
-
#
|
40
|
-
#
|
41
|
-
#
|
42
|
-
#
|
43
|
-
#
|
64
|
+
# Accepts distributed tracing headers from any source that has been packaged
|
65
|
+
# as a Ruby Hash, thereby allowing the user to manually inject distributed
|
66
|
+
# tracing headers. It is optimized to process +HTTP_TRACEPARENT+, +HTTP_TRACESTATE+,
|
67
|
+
# and +HTTP_NEWRELIC+ as the given Hash keys. which is the most common scenario
|
68
|
+
# from Rack middleware in most Ruby applications. However, the Hash keys are
|
69
|
+
# case-insensitive and the "HTTP_" prefixes may also be omitted.
|
70
|
+
#
|
71
|
+
# Calling this method is not necessary in a typical HTTP trace as
|
72
|
+
# distributed tracing is already handled by the agent.
|
73
|
+
#
|
74
|
+
# When used, invoke this method as early as possible in a transaction's life-cycle
|
75
|
+
# as calling after the headers are already created will have no effect.
|
76
|
+
#
|
77
|
+
# This method accepts both W3C trace context and New Relic distributed tracing headers.
|
78
|
+
# When both are present, only the W3C headers are utilized. When W3C trace context
|
79
|
+
# headers are present, New Relic headers are ignored regardless if W3C trace context
|
80
|
+
# headers are valid and parsable.
|
44
81
|
#
|
45
|
-
#
|
46
|
-
#
|
82
|
+
# @param headers [Hash] Incoming distributed trace headers as a Ruby
|
83
|
+
# Hash object. Hash keys are expected to be one of
|
84
|
+
# +TRACEPARENT+, +TRACESTATE+, +NEWRELIC+ and are
|
85
|
+
# case-insensitive, with or without "HTTP_" prefixes.
|
47
86
|
#
|
48
|
-
#
|
49
|
-
#
|
50
|
-
#
|
51
|
-
# {DistributedTracePayload#http_safe}
|
87
|
+
# either as a JSON string or as a
|
88
|
+
# header-friendly string returned from
|
89
|
+
# {DistributedTracePayload#http_safe}
|
52
90
|
#
|
53
|
-
# @
|
91
|
+
# @param transport_Type [String] May be one of: +HTTP+, +HTTPS+, +Kafka+, +JMS+,
|
92
|
+
# +IronMQ+, +AMQP+, +Queue+, +Other+. Values are
|
93
|
+
# case sensitive. All other values result in +Unknown+
|
94
|
+
#
|
95
|
+
# @return {Transaction} if successful, +nil+ otherwise
|
54
96
|
#
|
55
97
|
# @api public
|
56
|
-
|
57
|
-
|
58
|
-
|
98
|
+
#
|
99
|
+
def accept_distributed_trace_headers headers, transport_type = NewRelic::HTTP
|
100
|
+
record_api_supportability_metric(:accept_distributed_trace_headers)
|
101
|
+
|
102
|
+
unless Agent.config[:'distributed_tracing.enabled']
|
103
|
+
NewRelic::Agent.logger.warn "Not configured to accept distributed trace headers"
|
104
|
+
return nil
|
59
105
|
end
|
60
|
-
|
106
|
+
|
107
|
+
return unless valid_api_argument_class? headers, "headers", Hash
|
108
|
+
return unless valid_api_argument_class? transport_type, "transport_type", String
|
109
|
+
|
110
|
+
return unless transaction = Transaction.tl_current
|
111
|
+
|
112
|
+
# assume we have Rack conforming keys when transport_type is HTTP(S)
|
113
|
+
# otherwise, fish for key/value pairs regardless of prefix and case-sensitivity.
|
114
|
+
hdr = if transport_type.start_with? NewRelic::HTTP
|
115
|
+
headers
|
116
|
+
else
|
117
|
+
# start with the most common case first
|
118
|
+
hdr = {
|
119
|
+
NewRelic::HTTP_TRACEPARENT_KEY => headers[NewRelic::TRACEPARENT_KEY],
|
120
|
+
NewRelic::HTTP_TRACESTATE_KEY => headers[NewRelic::TRACESTATE_KEY],
|
121
|
+
NewRelic::HTTP_NEWRELIC_KEY => headers[NewRelic::NEWRELIC_KEY]
|
122
|
+
}
|
123
|
+
|
124
|
+
# when not found, search for any casing for trace context headers, ignoring potential prefixes
|
125
|
+
hdr[NewRelic::HTTP_TRACEPARENT_KEY] ||= variant_key_value headers, NewRelic::TRACEPARENT_KEY
|
126
|
+
hdr[NewRelic::HTTP_TRACESTATE_KEY] ||= variant_key_value headers, NewRelic::TRACESTATE_KEY
|
127
|
+
hdr[NewRelic::HTTP_NEWRELIC_KEY] ||= variant_key_value headers, NewRelic::CANDIDATE_NEWRELIC_KEYS
|
128
|
+
hdr
|
129
|
+
end
|
130
|
+
|
131
|
+
transaction.distributed_tracer.accept_incoming_request hdr, transport_type
|
132
|
+
transaction
|
61
133
|
rescue => e
|
62
|
-
NewRelic::Agent.logger.error 'error during
|
134
|
+
NewRelic::Agent.logger.error 'error during accept_distributed_trace_headers', e
|
63
135
|
nil
|
64
136
|
end
|
137
|
+
|
138
|
+
private
|
139
|
+
|
140
|
+
def has_variant_key? key, variants
|
141
|
+
key.to_s.downcase.end_with?(*Array(variants))
|
142
|
+
end
|
143
|
+
|
144
|
+
def variant_key_value headers, variants
|
145
|
+
(headers.detect{|k, v| has_variant_key?(k, variants)} || NewRelic::EMPTY_ARRAY)[1]
|
146
|
+
end
|
147
|
+
|
65
148
|
end
|
66
149
|
end
|
67
150
|
end
|