newrelic_rpm 5.7.0.350 → 7.0.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 +788 -0
- data/CONTRIBUTING.md +106 -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/init.rb +1 -1
- data/install.rb +1 -1
- data/lib/new_relic/agent/adaptive_sampler.rb +1 -1
- data/lib/new_relic/agent/agent.rb +176 -191
- data/lib/new_relic/agent/agent_logger.rb +5 -1
- data/lib/new_relic/agent/attribute_filter.rb +8 -8
- 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/default_source.rb +447 -89
- 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 +16 -12
- 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 +1 -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/configuration.rb +1 -1
- data/lib/new_relic/agent/connect/request_builder.rb +61 -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/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.rb +2 -3
- data/lib/new_relic/agent/database_adapter.rb +33 -0
- data/lib/new_relic/agent/datastores/metric_helper.rb +2 -3
- 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/mongo.rb +2 -2
- data/lib/new_relic/agent/datastores/redis.rb +1 -5
- data/lib/new_relic/agent/datastores.rb +7 -9
- data/lib/new_relic/agent/deprecator.rb +1 -1
- 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/distributed_tracing.rb +115 -32
- data/lib/new_relic/agent/encoding_normalizer.rb +1 -1
- data/lib/new_relic/agent/error_collector.rb +37 -20
- data/lib/new_relic/agent/error_event_aggregator.rb +10 -7
- 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/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 -49
- data/lib/new_relic/agent/instrumentation/active_storage.rb +1 -1
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +13 -9
- 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/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/bunny.rb +13 -132
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +10 -4
- 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/curb.rb +11 -183
- 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/connection.rb +8 -5
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +3 -2
- data/lib/new_relic/agent/instrumentation/excon.rb +4 -3
- 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/grape.rb +14 -118
- 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/httpclient.rb +10 -30
- 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/httprb.rb +29 -0
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +1 -1
- 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/memcache.rb +55 -68
- 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/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/net_http.rb +39 -0
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +100 -0
- 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/padrino.rb +19 -52
- 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/chain.rb +57 -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 +36 -0
- data/lib/new_relic/agent/instrumentation/rack.rb +30 -138
- 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/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/rake.rb +14 -155
- 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/redis.rb +11 -104
- data/lib/new_relic/agent/instrumentation/resque/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +33 -0
- data/lib/new_relic/agent/instrumentation/resque/prepend.rb +16 -0
- data/lib/new_relic/agent/instrumentation/resque.rb +9 -26
- data/lib/new_relic/agent/instrumentation/sequel.rb +1 -1
- 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/chain.rb +55 -0
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +30 -35
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +118 -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/sinatra.rb +21 -160
- data/lib/new_relic/agent/instrumentation/sunspot.rb +1 -1
- 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/instrumentation/typhoeus.rb +12 -74
- data/lib/new_relic/agent/instrumentation.rb +1 -1
- data/lib/new_relic/agent/internal_agent_error.rb +1 -1
- data/lib/new_relic/agent/javascript_instrumentor.rb +3 -3
- 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/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/monitors.rb +27 -0
- 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/new_relic_service.rb +95 -40
- 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/replacement_rule.rb +1 -1
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +1 -1
- data/lib/new_relic/agent/rules_engine.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 +108 -54
- data/lib/new_relic/agent/sql_sampler.rb +10 -10
- data/lib/new_relic/agent/stats.rb +1 -1
- 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/stats_engine.rb +3 -3
- 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/abstract_segment.rb +33 -6
- data/lib/new_relic/agent/transaction/datastore_segment.rb +1 -1
- 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 +11 -9
- 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.rb +140 -170
- 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 +20 -6
- 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/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/vm.rb +1 -1
- data/lib/new_relic/agent/worker_loop.rb +1 -1
- data/lib/new_relic/agent.rb +106 -18
- 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/class_methods.rb +8 -2
- 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/frameworks.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/control.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 +2 -2
- 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 +35 -18
- 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/rack.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/recipes.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.rake +1 -2
- 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 +147 -66
- data/.travis.yml +0 -228
- 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
|
module NewRelic
|
6
6
|
module Agent
|
@@ -9,15 +9,15 @@ module NewRelic
|
|
9
9
|
|
10
10
|
extend self
|
11
11
|
|
12
|
-
def trace_execution_scoped(metric_names, options=
|
13
|
-
state = NewRelic::Agent::
|
12
|
+
def trace_execution_scoped(metric_names, options=NewRelic::EMPTY_HASH) #THREAD_LOCAL_ACCESS
|
13
|
+
state = NewRelic::Agent::Tracer.state
|
14
14
|
return yield unless state.is_execution_traced?
|
15
15
|
|
16
16
|
metric_names = Array(metric_names)
|
17
17
|
first_name = metric_names.shift
|
18
18
|
return yield unless first_name
|
19
19
|
|
20
|
-
segment = NewRelic::Agent::
|
20
|
+
segment = NewRelic::Agent::Tracer.start_segment(
|
21
21
|
name: first_name,
|
22
22
|
unscoped_metrics: metric_names
|
23
23
|
)
|
@@ -27,7 +27,7 @@ module NewRelic
|
|
27
27
|
end
|
28
28
|
|
29
29
|
begin
|
30
|
-
yield
|
30
|
+
Tracer.capture_segment_error(segment) { yield }
|
31
31
|
ensure
|
32
32
|
segment.finish if segment
|
33
33
|
end
|
@@ -0,0 +1,110 @@
|
|
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 'digest'
|
6
|
+
require 'json'
|
7
|
+
|
8
|
+
require 'new_relic/agent/tracer'
|
9
|
+
require 'new_relic/agent/threading/agent_thread'
|
10
|
+
|
11
|
+
module NewRelic
|
12
|
+
module Agent
|
13
|
+
module DistributedTracing
|
14
|
+
class CrossAppMonitor < InboundRequestMonitor
|
15
|
+
|
16
|
+
NEWRELIC_ID_HEADER = 'X-NewRelic-ID'.freeze
|
17
|
+
NEWRELIC_TXN_HEADER = 'X-NewRelic-Transaction'.freeze
|
18
|
+
NEWRELIC_APPDATA_HEADER = 'X-NewRelic-App-Data'.freeze
|
19
|
+
|
20
|
+
NEWRELIC_ID_HEADER_KEY = 'HTTP_X_NEWRELIC_ID'.freeze
|
21
|
+
NEWRELIC_TXN_HEADER_KEY = 'HTTP_X_NEWRELIC_TRANSACTION'.freeze
|
22
|
+
CONTENT_LENGTH_HEADER_KEY = 'HTTP_CONTENT_LENGTH'.freeze
|
23
|
+
|
24
|
+
def on_finished_configuring(events)
|
25
|
+
register_event_listeners(events)
|
26
|
+
end
|
27
|
+
|
28
|
+
def path_hash(txn_name, seed)
|
29
|
+
rotated = ((seed << 1) | (seed >> 31)) & 0xffffffff
|
30
|
+
app_name = NewRelic::Agent.config[:app_name].first
|
31
|
+
identifier = "#{app_name};#{txn_name}"
|
32
|
+
sprintf("%08x", rotated ^ hash_transaction_name(identifier))
|
33
|
+
end
|
34
|
+
|
35
|
+
private
|
36
|
+
|
37
|
+
# Expected sequence of events:
|
38
|
+
# :before_call will save our cross application request id to the thread
|
39
|
+
# :after_call will write our response headers/metrics and clean up the thread
|
40
|
+
def register_event_listeners(events)
|
41
|
+
NewRelic::Agent.logger.
|
42
|
+
debug("Wiring up Cross Application Tracing to events after finished configuring")
|
43
|
+
|
44
|
+
events.subscribe(:before_call) do |env| #THREAD_LOCAL_ACCESS
|
45
|
+
if id = decoded_id(env) and should_process_request?(id)
|
46
|
+
state = NewRelic::Agent::Tracer.state
|
47
|
+
|
48
|
+
if (txn = state.current_transaction)
|
49
|
+
transaction_info = referring_transaction_info(state, env)
|
50
|
+
|
51
|
+
payload = CrossAppPayload.new(id, txn, transaction_info)
|
52
|
+
txn.distributed_tracer.cross_app_payload = payload
|
53
|
+
end
|
54
|
+
|
55
|
+
CrossAppTracing.assign_intrinsic_transaction_attributes state
|
56
|
+
end
|
57
|
+
end
|
58
|
+
|
59
|
+
events.subscribe(:after_call) do |env, (_status_code, headers, _body)| #THREAD_LOCAL_ACCESS
|
60
|
+
state = NewRelic::Agent::Tracer.state
|
61
|
+
|
62
|
+
insert_response_header(state, env, headers)
|
63
|
+
end
|
64
|
+
end
|
65
|
+
|
66
|
+
def referring_transaction_info(state, request_headers)
|
67
|
+
txn_header = request_headers[NEWRELIC_TXN_HEADER_KEY] or return
|
68
|
+
deserialize_header(txn_header, NEWRELIC_TXN_HEADER)
|
69
|
+
end
|
70
|
+
|
71
|
+
def insert_response_header(state, request_headers, response_headers)
|
72
|
+
txn = state.current_transaction
|
73
|
+
unless txn.nil? || txn.distributed_tracer.cross_app_payload.nil?
|
74
|
+
txn.freeze_name_and_execute_if_not_ignored do
|
75
|
+
content_length = content_length_from_request(request_headers)
|
76
|
+
set_response_headers(txn, response_headers, content_length)
|
77
|
+
end
|
78
|
+
end
|
79
|
+
end
|
80
|
+
|
81
|
+
def should_process_request? id
|
82
|
+
CrossAppTracing.cross_app_enabled? && CrossAppTracing.trusts?(id)
|
83
|
+
end
|
84
|
+
|
85
|
+
def set_response_headers(transaction, response_headers, content_length)
|
86
|
+
payload = obfuscator.obfuscate(
|
87
|
+
::JSON.dump(
|
88
|
+
transaction.distributed_tracer.cross_app_payload.as_json_array(content_length)))
|
89
|
+
|
90
|
+
response_headers[NEWRELIC_APPDATA_HEADER] = payload
|
91
|
+
end
|
92
|
+
|
93
|
+
def decoded_id(request)
|
94
|
+
encoded_id = request[NEWRELIC_ID_HEADER_KEY]
|
95
|
+
return "" if encoded_id.nil? || encoded_id.empty?
|
96
|
+
|
97
|
+
obfuscator.deobfuscate(encoded_id)
|
98
|
+
end
|
99
|
+
|
100
|
+
def content_length_from_request(request)
|
101
|
+
request[CONTENT_LENGTH_HEADER_KEY] || -1
|
102
|
+
end
|
103
|
+
|
104
|
+
def hash_transaction_name(identifier)
|
105
|
+
Digest::MD5.digest(identifier).unpack("@12N").first & 0xffffffff
|
106
|
+
end
|
107
|
+
end
|
108
|
+
end
|
109
|
+
end
|
110
|
+
end
|
@@ -0,0 +1,27 @@
|
|
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 DistributedTracing
|
8
|
+
class Monitor < InboundRequestMonitor
|
9
|
+
def on_finished_configuring(events)
|
10
|
+
return unless NewRelic::Agent.config[:'distributed_tracing.enabled']
|
11
|
+
events.subscribe(:before_call, &method(:on_before_call))
|
12
|
+
end
|
13
|
+
|
14
|
+
def on_before_call(request)
|
15
|
+
unless NewRelic::Agent.config[:'distributed_tracing.enabled']
|
16
|
+
NewRelic::Agent.logger.warn "Not configured to accept distributed trace headers"
|
17
|
+
return
|
18
|
+
end
|
19
|
+
|
20
|
+
return unless txn = Tracer.current_transaction
|
21
|
+
|
22
|
+
txn.distributed_tracer.accept_incoming_request request
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
26
|
+
end
|
27
|
+
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 class serves as the base for objects wanting to monitor and respond to
|
6
6
|
# incoming web requests. Examples include cross application tracing and
|
@@ -20,15 +20,15 @@ module NewRelic
|
|
20
20
|
attr_reader :obfuscator
|
21
21
|
|
22
22
|
def initialize(events)
|
23
|
-
events.subscribe(:
|
24
|
-
# This requires :encoding_key, so must wait until :
|
23
|
+
events.subscribe(:initial_configuration_complete) do
|
24
|
+
# This requires :encoding_key, so must wait until :initial_configuration_complete
|
25
25
|
setup_obfuscator
|
26
26
|
on_finished_configuring(events)
|
27
27
|
end
|
28
28
|
end
|
29
29
|
|
30
30
|
def setup_obfuscator
|
31
|
-
@obfuscator =
|
31
|
+
@obfuscator = Obfuscator.new(Agent.config[:encoding_key])
|
32
32
|
end
|
33
33
|
|
34
34
|
def deserialize_header(encoded_header, key)
|
@@ -1,8 +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/
|
4
|
-
|
5
|
-
require 'new_relic/agent/inbound_request_monitor'
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
6
4
|
|
7
5
|
module NewRelic
|
8
6
|
module Agent
|
@@ -27,8 +25,7 @@ module NewRelic
|
|
27
25
|
SyntheticsMonitor.is_supported_version?(incoming_payload) &&
|
28
26
|
SyntheticsMonitor.is_trusted?(incoming_payload)
|
29
27
|
|
30
|
-
|
31
|
-
txn = state.current_transaction
|
28
|
+
txn = Tracer.current_transaction
|
32
29
|
txn.raw_synthetics_header = encoded_header
|
33
30
|
txn.synthetics_payload = incoming_payload
|
34
31
|
end
|
@@ -41,7 +38,7 @@ module NewRelic
|
|
41
38
|
|
42
39
|
def is_trusted?(incoming_payload)
|
43
40
|
account_id = incoming_payload[1]
|
44
|
-
|
41
|
+
Agent.config[:trusted_account_ids].include?(account_id)
|
45
42
|
end
|
46
43
|
|
47
44
|
def is_valid_payload?(incoming_payload)
|
@@ -49,7 +46,7 @@ module NewRelic
|
|
49
46
|
end
|
50
47
|
|
51
48
|
def reject_messaging_synthetics_header headers
|
52
|
-
headers.reject {|k,_| k ==
|
49
|
+
headers.reject {|k,_| k == CrossAppTracing::NR_MESSAGE_BROKER_SYNTHETICS_HEADER}
|
53
50
|
end
|
54
51
|
|
55
52
|
end
|
@@ -0,0 +1,27 @@
|
|
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_relative 'monitors/inbound_request_monitor'
|
6
|
+
|
7
|
+
require_relative 'monitors/synthetics_monitor'
|
8
|
+
|
9
|
+
require_relative 'monitors/cross_app_monitor'
|
10
|
+
require_relative 'monitors/distributed_tracing_monitor'
|
11
|
+
|
12
|
+
module NewRelic
|
13
|
+
module Agent
|
14
|
+
class Monitors
|
15
|
+
attr_reader :cross_app_monitor
|
16
|
+
attr_reader :synthetics_monitor
|
17
|
+
attr_reader :distributed_tracing_monitor
|
18
|
+
|
19
|
+
def initialize events
|
20
|
+
@synthetics_monitor = NewRelic::Agent::SyntheticsMonitor.new events
|
21
|
+
@cross_app_monitor = NewRelic::Agent::DistributedTracing::CrossAppMonitor.new events
|
22
|
+
@distributed_tracing_monitor = NewRelic::Agent::DistributedTracing::Monitor.new events
|
23
|
+
end
|
24
|
+
|
25
|
+
end
|
26
|
+
end
|
27
|
+
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 'base64'
|
6
6
|
require 'json'
|
@@ -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 'json'
|
6
6
|
require 'new_relic/agent/new_relic_service/marshaller'
|
@@ -39,7 +39,6 @@ module NewRelic
|
|
39
39
|
|
40
40
|
def load(data)
|
41
41
|
if data.nil? || data.empty?
|
42
|
-
::NewRelic::Agent.logger.error "Empty JSON response from collector: '#{data.inspect}'"
|
43
42
|
return nil
|
44
43
|
end
|
45
44
|
|
@@ -1,29 +1,11 @@
|
|
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
|
class NewRelicService
|
8
8
|
class Marshaller
|
9
|
-
def parsed_error(error)
|
10
|
-
error_type = error['error_type']
|
11
|
-
error_message = error['message']
|
12
|
-
|
13
|
-
exception = case error_type
|
14
|
-
when 'NewRelic::Agent::LicenseException'
|
15
|
-
LicenseException.new(error_message)
|
16
|
-
when 'NewRelic::Agent::ForceRestartException'
|
17
|
-
ForceRestartException.new(error_message)
|
18
|
-
when 'NewRelic::Agent::ForceDisconnectException'
|
19
|
-
ForceDisconnectException.new(error_message)
|
20
|
-
else
|
21
|
-
CollectorError.new("#{error['error_type']}: #{error['message']}")
|
22
|
-
end
|
23
|
-
|
24
|
-
exception
|
25
|
-
end
|
26
|
-
|
27
9
|
def prepare(data, options={})
|
28
10
|
encoder = options[:encoder] || default_encoder
|
29
11
|
if data.respond_to?(:to_collector_array)
|
@@ -46,15 +28,12 @@ module NewRelic
|
|
46
28
|
protected
|
47
29
|
|
48
30
|
def return_value(data)
|
49
|
-
if data.respond_to?(:has_key?)
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
end
|
31
|
+
if data.respond_to?(:has_key?) && data.has_key?('return_value')
|
32
|
+
data['return_value']
|
33
|
+
else
|
34
|
+
::NewRelic::Agent.logger.debug("Unexpected response from collector: #{data}")
|
35
|
+
nil
|
55
36
|
end
|
56
|
-
::NewRelic::Agent.logger.debug("Unexpected response from collector: #{data}")
|
57
|
-
nil
|
58
37
|
end
|
59
38
|
end
|
60
39
|
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
|
module NewRelic
|
6
6
|
module Agent
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
require 'zlib'
|
6
6
|
require 'timeout'
|
@@ -16,7 +16,7 @@ module NewRelic
|
|
16
16
|
# Specifies the version of the agent's communication protocol with
|
17
17
|
# the NewRelic hosted site.
|
18
18
|
|
19
|
-
PROTOCOL_VERSION =
|
19
|
+
PROTOCOL_VERSION = 17
|
20
20
|
|
21
21
|
# 1f147a42: v10 (tag 3.5.3.17)
|
22
22
|
# cf0d1ff1: v9 (tag 3.5.0)
|
@@ -38,11 +38,13 @@ module NewRelic
|
|
38
38
|
def initialize(license_key=nil, collector=control.server)
|
39
39
|
@license_key = license_key
|
40
40
|
@collector = collector
|
41
|
+
@configured_collector = collector
|
41
42
|
@request_timeout = Agent.config[:timeout]
|
42
43
|
@ssl_cert_store = nil
|
43
44
|
@in_session = nil
|
44
45
|
@agent_id = nil
|
45
46
|
@shared_tcp_connection = nil
|
47
|
+
@request_headers_map = nil
|
46
48
|
reset_remote_method_uris
|
47
49
|
|
48
50
|
@audit_logger = ::NewRelic::Agent::AuditLogger.new
|
@@ -64,11 +66,11 @@ module NewRelic
|
|
64
66
|
# clear out our cached values whenever the run ID changes.
|
65
67
|
#
|
66
68
|
reset_remote_method_uris
|
67
|
-
|
68
69
|
@agent_id = id
|
69
70
|
end
|
70
71
|
|
71
72
|
def connect(settings={})
|
73
|
+
@request_headers_map = nil
|
72
74
|
security_policies = nil
|
73
75
|
if response = preconnect
|
74
76
|
if host = response['redirect_host']
|
@@ -80,6 +82,7 @@ module NewRelic
|
|
80
82
|
end
|
81
83
|
end
|
82
84
|
response = invoke_remote(:connect, [settings])
|
85
|
+
@request_headers_map = response['request_headers_map']
|
83
86
|
self.agent_id = response['agent_run_id']
|
84
87
|
response.merge!(security_policies) if security_policies
|
85
88
|
response
|
@@ -89,14 +92,16 @@ module NewRelic
|
|
89
92
|
token = Agent.config[:security_policies_token]
|
90
93
|
|
91
94
|
if token && !token.empty?
|
92
|
-
response = invoke_remote(:preconnect, [{'security_policies_token' => token}])
|
95
|
+
response = invoke_remote(:preconnect, [{'security_policies_token' => token, 'high_security' => false}])
|
93
96
|
|
94
97
|
validator = SecurityPolicySettings::Validator.new(response)
|
95
98
|
validator.validate_matching_agent_config!
|
96
99
|
|
97
100
|
response
|
101
|
+
elsif Agent.config[:high_security]
|
102
|
+
invoke_remote(:preconnect, [{'high_security' => true}])
|
98
103
|
else
|
99
|
-
invoke_remote(:preconnect, [])
|
104
|
+
invoke_remote(:preconnect, [{'high_security' => false}])
|
100
105
|
end
|
101
106
|
end
|
102
107
|
|
@@ -160,10 +165,6 @@ module NewRelic
|
|
160
165
|
invoke_remote(:agent_command_results, [@agent_id, results])
|
161
166
|
end
|
162
167
|
|
163
|
-
def get_xray_metadata(xray_ids)
|
164
|
-
invoke_remote(:get_xray_metadata, [@agent_id, *xray_ids])
|
165
|
-
end
|
166
|
-
|
167
168
|
def analytic_event_data(data)
|
168
169
|
_, items = data
|
169
170
|
invoke_remote(:analytic_event_data, [@agent_id, *data],
|
@@ -197,10 +198,10 @@ module NewRelic
|
|
197
198
|
encoding = 'identity'
|
198
199
|
if data.size > 64 * 1024
|
199
200
|
encoding = Agent.config[:compressed_content_encoding]
|
200
|
-
data = if encoding == '
|
201
|
-
Encoders::Compressed::Gzip.encode(data)
|
202
|
-
else
|
201
|
+
data = if encoding == 'deflate'
|
203
202
|
Encoders::Compressed::Deflate.encode(data)
|
203
|
+
else
|
204
|
+
Encoders::Compressed::Gzip.encode(data)
|
204
205
|
end
|
205
206
|
end
|
206
207
|
check_post_size(data, endpoint)
|
@@ -290,12 +291,20 @@ module NewRelic
|
|
290
291
|
# installed
|
291
292
|
conn.use_ssl = true
|
292
293
|
conn.verify_mode = OpenSSL::SSL::VERIFY_PEER
|
293
|
-
conn
|
294
|
+
set_cert_store(conn)
|
294
295
|
rescue StandardError, LoadError
|
295
296
|
msg = "SSL is not available in the environment; please install SSL support."
|
296
297
|
raise UnrecoverableAgentException.new(msg)
|
297
298
|
end
|
298
299
|
|
300
|
+
def set_cert_store(conn)
|
301
|
+
if NewRelic::Agent.config[:ca_bundle_path]
|
302
|
+
conn.cert_store = ssl_cert_store
|
303
|
+
else
|
304
|
+
::NewRelic::Agent.logger.debug("Using default security certificates")
|
305
|
+
end
|
306
|
+
end
|
307
|
+
|
299
308
|
def start_connection(conn)
|
300
309
|
NewRelic::Agent.logger.debug("Opening TCP connection to #{conn.address}:#{conn.port}")
|
301
310
|
Timeout.timeout(@request_timeout) { conn.start }
|
@@ -337,6 +346,9 @@ module NewRelic
|
|
337
346
|
conn = create_http_connection
|
338
347
|
start_connection(conn)
|
339
348
|
conn
|
349
|
+
rescue Timeout::Error
|
350
|
+
::NewRelic::Agent.logger.info ("Timeout while attempting to connect. You may need to install system-level CA Certificates, as the ruby agent no longer includes these.")
|
351
|
+
raise
|
340
352
|
end
|
341
353
|
|
342
354
|
# The path to the certificate file used to verify the SSL
|
@@ -345,8 +357,6 @@ module NewRelic
|
|
345
357
|
if path_override = NewRelic::Agent.config[:ca_bundle_path]
|
346
358
|
NewRelic::Agent.logger.warn("Couldn't find CA bundle from configured ca_bundle_path: #{path_override}") unless File.exist? path_override
|
347
359
|
path_override
|
348
|
-
else
|
349
|
-
File.expand_path(File.join(control.newrelic_root, 'cert', 'cacert.pem'))
|
350
360
|
end
|
351
361
|
end
|
352
362
|
|
@@ -404,7 +414,7 @@ module NewRelic
|
|
404
414
|
def invoke_remote(method, payload = [], options = {})
|
405
415
|
start_ts = Time.now
|
406
416
|
|
407
|
-
data, size, serialize_finish_ts = nil
|
417
|
+
data, size, serialize_finish_ts, request_send_ts, response_check_ts = nil
|
408
418
|
begin
|
409
419
|
data = @marshaller.dump(payload, options)
|
410
420
|
rescue StandardError, SystemStackError => e
|
@@ -415,17 +425,23 @@ module NewRelic
|
|
415
425
|
data, encoding = compress_request_if_needed(data, method)
|
416
426
|
size = data.size
|
417
427
|
|
428
|
+
# Preconnect needs to always use the configured collector host, not the redirect host
|
429
|
+
endpoint_specific_collector = (method == :preconnect) ? @configured_collector : @collector
|
430
|
+
|
418
431
|
uri = remote_method_uri(method)
|
419
|
-
full_uri = "#{
|
432
|
+
full_uri = "#{endpoint_specific_collector}#{uri}"
|
420
433
|
|
421
434
|
@audit_logger.log_request(full_uri, payload, @marshaller)
|
435
|
+
request_send_ts = Time.now
|
422
436
|
response = send_request(:data => data,
|
423
437
|
:uri => uri,
|
424
438
|
:encoding => encoding,
|
425
|
-
:collector =>
|
439
|
+
:collector => endpoint_specific_collector,
|
440
|
+
:endpoint => method)
|
441
|
+
response_check_ts = Time.now
|
426
442
|
@marshaller.load(decompress_response(response))
|
427
443
|
ensure
|
428
|
-
record_timing_supportability_metrics(method, start_ts, serialize_finish_ts)
|
444
|
+
record_timing_supportability_metrics(method, start_ts, serialize_finish_ts, request_send_ts, response_check_ts)
|
429
445
|
if size
|
430
446
|
record_size_supportability_metrics(method, size, options[:item_count])
|
431
447
|
end
|
@@ -440,11 +456,12 @@ module NewRelic
|
|
440
456
|
raise error
|
441
457
|
end
|
442
458
|
|
443
|
-
def record_timing_supportability_metrics(method, start_ts, serialize_finish_ts)
|
459
|
+
def record_timing_supportability_metrics(method, start_ts, serialize_finish_ts, request_send_ts, response_check_ts)
|
444
460
|
serialize_time = serialize_finish_ts && (serialize_finish_ts - start_ts)
|
445
|
-
|
446
|
-
|
447
|
-
|
461
|
+
request_duration = response_check_ts && (response_check_ts - request_send_ts).to_f
|
462
|
+
if request_duration
|
463
|
+
NewRelic::Agent.record_metric("Supportability/Agent/Collector/#{method.to_s}/Duration", request_duration)
|
464
|
+
end
|
448
465
|
if serialize_time
|
449
466
|
NewRelic::Agent.record_metric("Supportability/invoke_remote_serialize", serialize_time)
|
450
467
|
NewRelic::Agent.record_metric("Supportability/invoke_remote_serialize/#{method.to_s}", serialize_time)
|
@@ -489,11 +506,18 @@ module NewRelic
|
|
489
506
|
# contact
|
490
507
|
# - :data => the data to send as the body of the request
|
491
508
|
def send_request(opts)
|
509
|
+
headers = {
|
510
|
+
'Content-Encoding' => opts[:encoding],
|
511
|
+
'Host' => opts[:collector].name
|
512
|
+
}
|
513
|
+
headers.merge!(@request_headers_map) if @request_headers_map
|
514
|
+
|
492
515
|
if Agent.config[:put_for_data_send]
|
493
|
-
request = Net::HTTP::Put.new(opts[:uri],
|
516
|
+
request = Net::HTTP::Put.new(opts[:uri], headers)
|
494
517
|
else
|
495
|
-
request = Net::HTTP::Post.new(opts[:uri],
|
518
|
+
request = Net::HTTP::Post.new(opts[:uri], headers)
|
496
519
|
end
|
520
|
+
@audit_logger.log_request_headers(opts[:uri], headers)
|
497
521
|
request['user-agent'] = user_agent
|
498
522
|
request.content_type = "application/octet-stream"
|
499
523
|
request.body = opts[:data]
|
@@ -501,6 +525,7 @@ module NewRelic
|
|
501
525
|
response = nil
|
502
526
|
attempts = 0
|
503
527
|
max_attempts = 2
|
528
|
+
endpoint = opts[:endpoint]
|
504
529
|
|
505
530
|
begin
|
506
531
|
attempts += 1
|
@@ -522,20 +547,43 @@ module NewRelic
|
|
522
547
|
log_response(response)
|
523
548
|
|
524
549
|
case response
|
525
|
-
when Net::HTTPSuccess
|
550
|
+
when Net::HTTPSuccess,
|
551
|
+
Net::HTTPAccepted
|
526
552
|
true # do nothing
|
527
|
-
when Net::
|
528
|
-
|
529
|
-
|
530
|
-
|
531
|
-
|
532
|
-
raise ServerConnectionException, "
|
533
|
-
when Net::
|
534
|
-
|
535
|
-
|
536
|
-
|
553
|
+
when Net::HTTPRequestTimeOut,
|
554
|
+
Net::HTTPTooManyRequests,
|
555
|
+
Net::HTTPInternalServerError,
|
556
|
+
Net::HTTPServiceUnavailable
|
557
|
+
record_endpoint_attempts_supportability_metrics(endpoint)
|
558
|
+
raise ServerConnectionException, "#{response.code}: #{response.message}"
|
559
|
+
when Net::HTTPBadRequest,
|
560
|
+
Net::HTTPForbidden,
|
561
|
+
Net::HTTPNotFound,
|
562
|
+
Net::HTTPMethodNotAllowed,
|
563
|
+
Net::HTTPProxyAuthenticationRequired,
|
564
|
+
Net::HTTPLengthRequired,
|
565
|
+
Net::HTTPRequestEntityTooLarge,
|
566
|
+
Net::HTTPRequestURITooLong,
|
567
|
+
Net::HTTPUnsupportedMediaType,
|
568
|
+
Net::HTTPExpectationFailed,
|
569
|
+
Net::HTTPUnsupportedMediaType,
|
570
|
+
Net::HTTPRequestHeaderFieldsTooLarge
|
571
|
+
record_endpoint_attempts_supportability_metrics(endpoint)
|
572
|
+
record_error_response_supportability_metrics(response.code)
|
573
|
+
raise UnrecoverableServerException, "#{response.code}: #{response.message}"
|
574
|
+
when Net::HTTPConflict,
|
575
|
+
Net::HTTPUnauthorized
|
576
|
+
record_endpoint_attempts_supportability_metrics(endpoint)
|
577
|
+
record_error_response_supportability_metrics(response.code)
|
578
|
+
raise ForceRestartException, "#{response.code}: #{response.message}"
|
579
|
+
when Net::HTTPGone
|
580
|
+
record_endpoint_attempts_supportability_metrics(endpoint)
|
581
|
+
record_error_response_supportability_metrics(response.code)
|
582
|
+
raise ForceDisconnectException, "#{response.code}: #{response.message}"
|
537
583
|
else
|
538
|
-
|
584
|
+
record_endpoint_attempts_supportability_metrics(endpoint)
|
585
|
+
record_error_response_supportability_metrics(response.code)
|
586
|
+
raise UnrecoverableServerException, "#{response.code}: #{response.message}"
|
539
587
|
end
|
540
588
|
response
|
541
589
|
end
|
@@ -544,6 +592,16 @@ module NewRelic
|
|
544
592
|
::NewRelic::Agent.logger.debug "Received response, status: #{response.code}, encoding: '#{response['content-encoding']}'"
|
545
593
|
end
|
546
594
|
|
595
|
+
# Per protocol 17, this metric should be recorded for all error response codes
|
596
|
+
# that cause data to be discarded.
|
597
|
+
def record_error_response_supportability_metrics(response_code)
|
598
|
+
::NewRelic::Agent.increment_metric("Supportability/Agent/Collector/HTTPError/#{response_code}")
|
599
|
+
end
|
600
|
+
|
601
|
+
def record_endpoint_attempts_supportability_metrics(endpoint)
|
602
|
+
::NewRelic::Agent.increment_metric("Supportability/Agent/Collector/#{endpoint}/Attempts")
|
603
|
+
end
|
604
|
+
|
547
605
|
# Decompresses the response from the server, if it is gzip
|
548
606
|
# encoded, otherwise returns it verbatim
|
549
607
|
def decompress_response(response)
|
@@ -566,9 +624,6 @@ module NewRelic
|
|
566
624
|
zlib_version << "zlib/#{Zlib.zlib_version}" if defined?(::Zlib) && Zlib.respond_to?(:zlib_version)
|
567
625
|
"NewRelic-RubyAgent/#{NewRelic::VERSION::STRING} #{ruby_description}#{zlib_version}"
|
568
626
|
end
|
569
|
-
|
570
|
-
# Used to wrap errors reported to agent by the collector
|
571
|
-
class CollectorError < StandardError; end
|
572
627
|
end
|
573
628
|
end
|
574
629
|
end
|
@@ -0,0 +1,22 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
5
|
+
|
6
|
+
module NewRelic
|
7
|
+
module Agent
|
8
|
+
|
9
|
+
# This class is used for instrumentations that have exceptions or error classes
|
10
|
+
# not derived from Ruby's usual Exception or StandardError or in situations
|
11
|
+
# where we do not have such Exception object to work with.
|
12
|
+
class NoticibleError
|
13
|
+
attr_reader :class_name, :message
|
14
|
+
|
15
|
+
def initialize class_name, message
|
16
|
+
@class_name = class_name
|
17
|
+
@message = message
|
18
|
+
end
|
19
|
+
end
|
20
|
+
|
21
|
+
end
|
22
|
+
end
|