newrelic_rpm 8.10.1 → 8.12.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +1 -1
- data/.rubocop.yml +20 -190
- data/.rubocop_todo.yml +11 -202
- data/.simplecov +6 -4
- data/Brewfile +1 -0
- data/CHANGELOG.md +113 -41
- data/Gemfile +0 -1
- data/README.md +1 -1
- data/Rakefile +3 -20
- data/Thorfile +0 -1
- data/bin/nrdebug +65 -43
- data/config.dot +5 -5
- data/docker-compose.yml +22 -0
- data/init.rb +1 -2
- data/install.rb +1 -2
- data/lib/new_relic/agent/adaptive_sampler.rb +0 -1
- data/lib/new_relic/agent/agent/shutdown.rb +1 -1
- data/lib/new_relic/agent/agent/special_startup.rb +2 -1
- data/lib/new_relic/agent/agent/start_worker_thread.rb +0 -1
- data/lib/new_relic/agent/agent/startup.rb +1 -1
- data/lib/new_relic/agent/agent.rb +100 -73
- data/lib/new_relic/agent/agent_logger.rb +4 -5
- data/lib/new_relic/agent/attribute_filter.rb +39 -21
- data/lib/new_relic/agent/attribute_processing.rb +3 -4
- data/lib/new_relic/agent/attributes.rb +1 -1
- data/lib/new_relic/agent/audit_logger.rb +3 -3
- data/lib/new_relic/agent/autostart.rb +0 -1
- data/lib/new_relic/agent/chained_call.rb +0 -1
- data/lib/new_relic/agent/commands/agent_command.rb +0 -1
- data/lib/new_relic/agent/commands/agent_command_router.rb +3 -4
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -1
- data/lib/new_relic/agent/configuration/default_source.rb +82 -31
- data/lib/new_relic/agent/configuration/dotted_hash.rb +2 -2
- data/lib/new_relic/agent/configuration/environment_source.rb +4 -4
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +0 -1
- data/lib/new_relic/agent/configuration/high_security_source.rb +1 -1
- data/lib/new_relic/agent/configuration/manager.rb +4 -2
- data/lib/new_relic/agent/configuration/manual_source.rb +0 -1
- data/lib/new_relic/agent/configuration/mask_defaults.rb +2 -3
- data/lib/new_relic/agent/configuration/security_policy_source.rb +10 -1
- data/lib/new_relic/agent/configuration/server_source.rb +0 -1
- data/lib/new_relic/agent/configuration/yaml_source.rb +3 -3
- data/lib/new_relic/agent/configuration.rb +0 -1
- data/lib/new_relic/agent/connect/request_builder.rb +2 -2
- data/lib/new_relic/agent/connect/response_handler.rb +1 -2
- data/lib/new_relic/agent/custom_event_aggregator.rb +0 -1
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +0 -1
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +1 -1
- data/lib/new_relic/agent/database/obfuscator.rb +0 -1
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +0 -1
- data/lib/new_relic/agent/database.rb +20 -14
- data/lib/new_relic/agent/database_adapter.rb +2 -1
- data/lib/new_relic/agent/datastores/metric_helper.rb +0 -4
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +5 -5
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +2 -5
- data/lib/new_relic/agent/datastores/mongo.rb +0 -1
- data/lib/new_relic/agent/datastores/nosql_obfuscator.rb +41 -0
- data/lib/new_relic/agent/datastores/redis.rb +0 -1
- data/lib/new_relic/agent/datastores.rb +0 -1
- data/lib/new_relic/agent/deprecator.rb +0 -1
- data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +0 -1
- data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +3 -1
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +3 -1
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +1 -2
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +0 -1
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +0 -1
- data/lib/new_relic/agent/distributed_tracing.rb +0 -1
- data/lib/new_relic/agent/encoding_normalizer.rb +2 -1
- data/lib/new_relic/agent/error_collector.rb +3 -1
- data/lib/new_relic/agent/error_event_aggregator.rb +0 -1
- data/lib/new_relic/agent/error_filter.rb +5 -5
- data/lib/new_relic/agent/error_trace_aggregator.rb +2 -2
- data/lib/new_relic/agent/event_aggregator.rb +1 -1
- data/lib/new_relic/agent/event_buffer.rb +0 -1
- data/lib/new_relic/agent/event_listener.rb +0 -1
- data/lib/new_relic/agent/event_loop.rb +4 -3
- data/lib/new_relic/agent/external.rb +1 -2
- data/lib/new_relic/agent/guid_generator.rb +0 -1
- data/lib/new_relic/agent/harvester.rb +0 -1
- data/lib/new_relic/agent/heap.rb +2 -3
- data/lib/new_relic/agent/hostname.rb +0 -1
- data/lib/new_relic/agent/http_clients/abstract.rb +2 -1
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +0 -1
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +0 -1
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +1 -2
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +1 -2
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +0 -1
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +2 -2
- data/lib/new_relic/agent/http_clients/uri_util.rb +0 -1
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +0 -1
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +0 -1
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +1 -2
- data/lib/new_relic/agent/instrumentation/active_job.rb +0 -1
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +3 -2
- data/lib/new_relic/agent/instrumentation/active_record.rb +0 -1
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +0 -1
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +0 -1
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +0 -1
- data/lib/new_relic/agent/instrumentation/active_storage.rb +0 -1
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +2 -1
- data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/active_support_logger.rb +0 -1
- data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +1 -1
- data/lib/new_relic/agent/instrumentation/authlogic.rb +0 -1
- data/lib/new_relic/agent/instrumentation/bunny/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/bunny.rb +0 -1
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +3 -3
- data/lib/new_relic/agent/instrumentation/curb/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +14 -11
- data/lib/new_relic/agent/instrumentation/curb/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/curb.rb +0 -1
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +1 -2
- data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +66 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch.rb +31 -0
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +0 -1
- data/lib/new_relic/agent/instrumentation/excon.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grape/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/grape/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grape.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grpc/helper.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grpc_client.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grpc_server.rb +0 -1
- data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/httpclient.rb +0 -1
- data/lib/new_relic/agent/instrumentation/httprb/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/httprb.rb +0 -1
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +0 -1
- data/lib/new_relic/agent/instrumentation/logger/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +4 -1
- data/lib/new_relic/agent/instrumentation/logger/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/logger.rb +0 -1
- data/lib/new_relic/agent/instrumentation/memcache/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +1 -2
- data/lib/new_relic/agent/instrumentation/memcache/helper.rb +0 -1
- data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +1 -2
- data/lib/new_relic/agent/instrumentation/memcache.rb +4 -5
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +1 -2
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +0 -1
- data/lib/new_relic/agent/instrumentation/mongo.rb +0 -1
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +3 -2
- data/lib/new_relic/agent/instrumentation/net_http/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/net_http.rb +0 -1
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +4 -3
- data/lib/new_relic/agent/instrumentation/padrino/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/padrino.rb +0 -1
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/queue_time.rb +0 -2
- data/lib/new_relic/agent/instrumentation/rack/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rack/helpers.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +3 -1
- data/lib/new_relic/agent/instrumentation/rack/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rack.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rake/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +6 -1
- data/lib/new_relic/agent/instrumentation/rake/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rake.rb +0 -1
- data/lib/new_relic/agent/instrumentation/redis/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/redis/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/redis.rb +0 -1
- data/lib/new_relic/agent/instrumentation/resque/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/resque/helper.rb +0 -1
- data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/resque/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/resque.rb +0 -1
- data/lib/new_relic/agent/instrumentation/sequel.rb +0 -1
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +0 -1
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +2 -2
- data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +0 -1
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +0 -1
- data/lib/new_relic/agent/instrumentation/sinatra.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sunspot.rb +0 -1
- data/lib/new_relic/agent/instrumentation/thread/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/thread/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/thread.rb +0 -1
- data/lib/new_relic/agent/instrumentation/tilt/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/tilt.rb +0 -1
- data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +3 -4
- data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +0 -1
- data/lib/new_relic/agent/instrumentation.rb +0 -1
- data/lib/new_relic/agent/internal_agent_error.rb +0 -1
- data/lib/new_relic/agent/javascript_instrumentor.rb +2 -2
- data/lib/new_relic/agent/linking_metadata.rb +0 -1
- data/lib/new_relic/agent/local_log_decorator.rb +1 -1
- data/lib/new_relic/agent/log_event_aggregator.rb +1 -1
- data/lib/new_relic/agent/log_once.rb +0 -1
- data/lib/new_relic/agent/log_priority.rb +0 -1
- data/lib/new_relic/agent/logging.rb +0 -1
- data/lib/new_relic/agent/memory_logger.rb +0 -1
- data/lib/new_relic/agent/messaging.rb +2 -2
- data/lib/new_relic/agent/method_tracer.rb +4 -1
- data/lib/new_relic/agent/method_tracer_helpers.rb +1 -2
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +0 -1
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +1 -1
- data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +0 -1
- data/lib/new_relic/agent/monitors/synthetics_monitor.rb +0 -1
- data/lib/new_relic/agent/monitors.rb +0 -1
- data/lib/new_relic/agent/new_relic_service/encoders.rb +0 -1
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +0 -1
- data/lib/new_relic/agent/new_relic_service/marshaller.rb +0 -1
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +0 -1
- data/lib/new_relic/agent/new_relic_service.rb +195 -142
- data/lib/new_relic/agent/{noticible_error.rb → noticeable_error.rb} +1 -2
- data/lib/new_relic/agent/null_logger.rb +0 -1
- data/lib/new_relic/agent/obfuscator.rb +1 -2
- data/lib/new_relic/agent/parameter_filtering.rb +0 -1
- data/lib/new_relic/agent/payload_metric_mapping.rb +0 -1
- data/lib/new_relic/agent/pipe_channel_manager.rb +2 -1
- data/lib/new_relic/agent/pipe_service.rb +0 -1
- data/lib/new_relic/agent/prepend_supportability.rb +0 -1
- data/lib/new_relic/agent/priority_sampled_buffer.rb +2 -3
- data/lib/new_relic/agent/range_extensions.rb +0 -1
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +0 -1
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +0 -1
- data/lib/new_relic/agent/rules_engine.rb +1 -1
- data/lib/new_relic/agent/sampler.rb +0 -1
- data/lib/new_relic/agent/sampler_collection.rb +0 -1
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +0 -1
- data/lib/new_relic/agent/samplers/memory_sampler.rb +10 -6
- data/lib/new_relic/agent/samplers/object_sampler.rb +0 -1
- data/lib/new_relic/agent/samplers/vm_sampler.rb +2 -1
- data/lib/new_relic/agent/span_event_aggregator.rb +0 -1
- data/lib/new_relic/agent/span_event_primitive.rb +1 -2
- data/lib/new_relic/agent/sql_sampler.rb +0 -1
- data/lib/new_relic/agent/stats.rb +13 -3
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +1 -2
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +1 -2
- data/lib/new_relic/agent/stats_engine.rb +0 -1
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +0 -1
- data/lib/new_relic/agent/system_info.rb +4 -2
- data/lib/new_relic/agent/threading/agent_thread.rb +3 -3
- data/lib/new_relic/agent/threading/backtrace_node.rb +0 -1
- data/lib/new_relic/agent/threading/backtrace_service.rb +1 -1
- data/lib/new_relic/agent/threading/thread_profile.rb +4 -2
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +0 -1
- data/lib/new_relic/agent/tracer.rb +6 -3
- data/lib/new_relic/agent/transaction/abstract_segment.rb +5 -3
- data/lib/new_relic/agent/transaction/datastore_segment.rb +3 -1
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +4 -1
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +1 -1
- data/lib/new_relic/agent/transaction/external_request_segment.rb +2 -2
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +1 -1
- data/lib/new_relic/agent/transaction/request_attributes.rb +0 -1
- data/lib/new_relic/agent/transaction/segment.rb +1 -1
- data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +0 -1
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +0 -1
- data/lib/new_relic/agent/transaction/trace.rb +4 -1
- data/lib/new_relic/agent/transaction/trace_builder.rb +0 -1
- data/lib/new_relic/agent/transaction/trace_context.rb +0 -1
- data/lib/new_relic/agent/transaction/trace_node.rb +3 -3
- data/lib/new_relic/agent/transaction/tracing.rb +0 -1
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +2 -2
- data/lib/new_relic/agent/transaction.rb +13 -5
- data/lib/new_relic/agent/transaction_error_primitive.rb +0 -1
- data/lib/new_relic/agent/transaction_event_aggregator.rb +1 -1
- data/lib/new_relic/agent/transaction_event_primitive.rb +0 -1
- data/lib/new_relic/agent/transaction_event_recorder.rb +1 -2
- data/lib/new_relic/agent/transaction_metrics.rb +1 -2
- data/lib/new_relic/agent/transaction_sampler.rb +0 -1
- data/lib/new_relic/agent/transaction_time_aggregator.rb +2 -2
- data/lib/new_relic/agent/utilization/aws.rb +0 -1
- data/lib/new_relic/agent/utilization/azure.rb +1 -2
- data/lib/new_relic/agent/utilization/gcp.rb +1 -2
- data/lib/new_relic/agent/utilization/pcf.rb +2 -2
- data/lib/new_relic/agent/utilization/vendor.rb +3 -2
- data/lib/new_relic/agent/utilization_data.rb +3 -1
- data/lib/new_relic/agent/vm/jruby_vm.rb +0 -1
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +0 -1
- data/lib/new_relic/agent/vm/mri_vm.rb +35 -23
- data/lib/new_relic/agent/vm/snapshot.rb +1 -2
- data/lib/new_relic/agent/vm.rb +0 -1
- data/lib/new_relic/agent/worker_loop.rb +0 -1
- data/lib/new_relic/agent.rb +17 -18
- data/lib/new_relic/cli/command.rb +1 -2
- data/lib/new_relic/cli/commands/deployments.rb +72 -21
- data/lib/new_relic/cli/commands/install.rb +1 -1
- data/lib/new_relic/coerce.rb +6 -1
- data/lib/new_relic/collection_helper.rb +2 -2
- data/lib/new_relic/constants.rb +0 -1
- data/lib/new_relic/control/class_methods.rb +0 -1
- data/lib/new_relic/control/frameworks/external.rb +0 -1
- data/lib/new_relic/control/frameworks/rails.rb +5 -1
- data/lib/new_relic/control/frameworks/rails3.rb +0 -1
- data/lib/new_relic/control/frameworks/rails4.rb +0 -1
- data/lib/new_relic/control/frameworks/rails_notifications.rb +0 -1
- data/lib/new_relic/control/frameworks/ruby.rb +0 -1
- data/lib/new_relic/control/frameworks/sinatra.rb +0 -1
- data/lib/new_relic/control/frameworks.rb +0 -1
- data/lib/new_relic/control/instance_methods.rb +17 -40
- data/lib/new_relic/control/instrumentation.rb +2 -1
- data/lib/new_relic/control/private_instance_methods.rb +48 -0
- data/lib/new_relic/control/server_methods.rb +0 -1
- data/lib/new_relic/control.rb +0 -1
- data/lib/new_relic/delayed_job_injection.rb +0 -1
- data/lib/new_relic/dependency_detection.rb +5 -4
- data/lib/new_relic/environment_report.rb +23 -14
- data/lib/new_relic/helper.rb +2 -2
- data/lib/new_relic/language_support.rb +3 -3
- data/lib/new_relic/latest_changes.rb +4 -4
- data/lib/new_relic/local_environment.rb +9 -4
- data/lib/new_relic/metric_data.rb +27 -22
- data/lib/new_relic/metric_spec.rb +2 -1
- data/lib/new_relic/noticed_error.rb +3 -6
- data/lib/new_relic/rack/agent_hooks.rb +0 -1
- data/lib/new_relic/rack/agent_middleware.rb +2 -1
- data/lib/new_relic/rack/browser_monitoring.rb +131 -123
- data/lib/new_relic/rack.rb +0 -1
- data/lib/new_relic/recipes/capistrano3.rb +2 -59
- data/lib/new_relic/recipes/capistrano_legacy.rb +1 -2
- data/lib/new_relic/recipes/helpers/send_deployment.rb +69 -0
- data/lib/new_relic/recipes.rb +0 -1
- data/lib/new_relic/supportability_helper.rb +1 -2
- data/lib/new_relic/traced_thread.rb +1 -1
- data/lib/new_relic/version.rb +2 -3
- data/lib/newrelic_rpm.rb +0 -1
- data/lib/sequel/extensions/newrelic_instrumentation.rb +2 -3
- data/lib/sequel/plugins/newrelic_instrumentation.rb +0 -1
- data/lib/tasks/all.rb +0 -1
- data/lib/tasks/config.rake +4 -113
- data/lib/tasks/coverage_report.rake +14 -19
- data/lib/tasks/{config.html.erb → helpers/config.html.erb} +0 -0
- data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
- data/lib/tasks/helpers/format.rb +123 -0
- data/lib/tasks/helpers/matches.rb +12 -0
- data/lib/tasks/helpers/prompt.rb +24 -0
- data/lib/tasks/helpers/removers.rb +33 -0
- data/lib/tasks/install.rake +0 -1
- data/lib/tasks/instrumentation_generator/README.md +1 -1
- data/lib/tasks/instrumentation_generator/instrumentation.thor +45 -17
- data/lib/tasks/instrumentation_generator/templates/Envfile.tt +0 -1
- data/lib/tasks/instrumentation_generator/templates/chain.tt +2 -2
- data/lib/tasks/instrumentation_generator/templates/chain_method.tt +3 -2
- data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +0 -1
- data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +2 -2
- data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +1 -1
- data/lib/tasks/instrumentation_generator/templates/prepend.tt +1 -2
- data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +1 -1
- data/lib/tasks/instrumentation_generator/templates/test.tt +1 -2
- data/lib/tasks/multiverse.rake +0 -1
- data/lib/tasks/multiverse.rb +3 -29
- data/lib/tasks/newrelic.rb +0 -1
- data/lib/tasks/tests.rake +3 -8
- data/newrelic.yml +23 -4
- data/newrelic_rpm.gemspec +8 -9
- data/recipes/newrelic.rb +0 -1
- data/test/agent_helper.rb +23 -35
- metadata +20 -80
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
@@ -1,4 +1,3 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
3
|
# frozen_string_literal: true
|
@@ -22,6 +21,9 @@ module NewRelic
|
|
22
21
|
# underlying TCP connection may be in a bad state.
|
23
22
|
CONNECTION_ERRORS = [Timeout::Error, EOFError, SystemCallError, SocketError].freeze
|
24
23
|
|
24
|
+
# The maximum number of times to attempt an HTTP request
|
25
|
+
MAX_ATTEMPTS = 2
|
26
|
+
|
25
27
|
# Don't perform compression on the payload unless its uncompressed size is
|
26
28
|
# greater than or equal to this number of bytes. In testing with
|
27
29
|
# Ruby 2.2 - 3.1, we determined an absolute minimum value for ASCII to be
|
@@ -48,14 +50,22 @@ module NewRelic
|
|
48
50
|
@request_headers_map = nil
|
49
51
|
reset_remote_method_uris
|
50
52
|
|
53
|
+
prep_audit_logger
|
54
|
+
prep_marshaller
|
55
|
+
end
|
56
|
+
|
57
|
+
def prep_audit_logger
|
51
58
|
@audit_logger = ::NewRelic::Agent::AuditLogger.new
|
52
59
|
Agent.config.register_callback(:'audit_log.enabled') do |enabled|
|
53
60
|
@audit_logger.enabled = enabled
|
54
61
|
end
|
62
|
+
end
|
55
63
|
|
64
|
+
def prep_marshaller
|
56
65
|
Agent.config.register_callback(:marshaller) do |marshaller|
|
57
66
|
if marshaller != 'json'
|
58
|
-
::NewRelic::Agent.logger.warn("Non-JSON marshaller '#{marshaller}' requested but not supported, using
|
67
|
+
::NewRelic::Agent.logger.warn("Non-JSON marshaller '#{marshaller}' requested but not supported, using " \
|
68
|
+
"JSON marshaller instead. pruby marshalling has been removed as of version 3.14.0.")
|
59
69
|
end
|
60
70
|
|
61
71
|
@marshaller = JsonMarshaller.new
|
@@ -131,12 +141,11 @@ module NewRelic
|
|
131
141
|
timeslice_start = stats_hash.started_at
|
132
142
|
timeslice_end = stats_hash.harvested_at || Process.clock_gettime(Process::CLOCK_REALTIME)
|
133
143
|
metric_data_array = build_metric_data_array(stats_hash)
|
134
|
-
|
144
|
+
invoke_remote(
|
135
145
|
:metric_data,
|
136
146
|
[@agent_id, timeslice_start, timeslice_end, metric_data_array],
|
137
147
|
:item_count => metric_data_array.size
|
138
148
|
)
|
139
|
-
result
|
140
149
|
end
|
141
150
|
|
142
151
|
def error_data(unsent_errors)
|
@@ -217,7 +226,7 @@ module NewRelic
|
|
217
226
|
# represents 1 tcp connection which may transmit multiple HTTP requests
|
218
227
|
# via keep-alive.
|
219
228
|
def session(&block)
|
220
|
-
raise ArgumentError, "#{self.class}#shared_connection must be passed a block" unless
|
229
|
+
raise ArgumentError, "#{self.class}#shared_connection must be passed a block" unless block
|
221
230
|
|
222
231
|
begin
|
223
232
|
t0 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
|
@@ -237,22 +246,20 @@ module NewRelic
|
|
237
246
|
|
238
247
|
def session_with_keepalive(&block)
|
239
248
|
establish_shared_connection
|
240
|
-
|
249
|
+
yield
|
241
250
|
end
|
242
251
|
|
243
252
|
def session_without_keepalive(&block)
|
244
253
|
begin
|
245
254
|
establish_shared_connection
|
246
|
-
|
255
|
+
yield
|
247
256
|
ensure
|
248
257
|
close_shared_connection
|
249
258
|
end
|
250
259
|
end
|
251
260
|
|
252
261
|
def establish_shared_connection
|
253
|
-
|
254
|
-
@shared_tcp_connection = create_and_start_http_connection
|
255
|
-
end
|
262
|
+
@shared_tcp_connection ||= create_and_start_http_connection
|
256
263
|
@shared_tcp_connection
|
257
264
|
end
|
258
265
|
|
@@ -326,20 +333,7 @@ module NewRelic
|
|
326
333
|
end
|
327
334
|
|
328
335
|
def create_http_connection
|
329
|
-
|
330
|
-
::NewRelic::Agent.logger.debug("Using proxy server #{Agent.config[:proxy_host]}:#{Agent.config[:proxy_port]}")
|
331
|
-
|
332
|
-
proxy = Net::HTTP::Proxy(
|
333
|
-
Agent.config[:proxy_host],
|
334
|
-
Agent.config[:proxy_port],
|
335
|
-
Agent.config[:proxy_user],
|
336
|
-
Agent.config[:proxy_pass]
|
337
|
-
)
|
338
|
-
conn = proxy.new(@collector.name, @collector.port)
|
339
|
-
else
|
340
|
-
conn = Net::HTTP.new(@collector.name, @collector.port)
|
341
|
-
end
|
342
|
-
|
336
|
+
conn = prep_connection
|
343
337
|
setup_connection_for_ssl(conn)
|
344
338
|
setup_connection_timeouts(conn)
|
345
339
|
|
@@ -347,6 +341,23 @@ module NewRelic
|
|
347
341
|
conn
|
348
342
|
end
|
349
343
|
|
344
|
+
def prep_connection
|
345
|
+
return Net::HTTP.new(@collector.name, @collector.port) unless Agent.config[:proxy_host]
|
346
|
+
|
347
|
+
::NewRelic::Agent.logger.debug("Using proxy server #{Agent.config[:proxy_host]}:#{Agent.config[:proxy_port]}")
|
348
|
+
prep_proxy_connection
|
349
|
+
end
|
350
|
+
|
351
|
+
def prep_proxy_connection
|
352
|
+
proxy = Net::HTTP::Proxy(
|
353
|
+
Agent.config[:proxy_host],
|
354
|
+
Agent.config[:proxy_port],
|
355
|
+
Agent.config[:proxy_user],
|
356
|
+
Agent.config[:proxy_pass]
|
357
|
+
)
|
358
|
+
proxy.new(@collector.name, @collector.port)
|
359
|
+
end
|
360
|
+
|
350
361
|
def create_and_start_http_connection
|
351
362
|
conn = create_http_connection
|
352
363
|
start_connection(conn)
|
@@ -380,6 +391,116 @@ module NewRelic
|
|
380
391
|
NewRelic::Control.instance
|
381
392
|
end
|
382
393
|
|
394
|
+
def prep_headers(opts)
|
395
|
+
headers = {
|
396
|
+
'Content-Encoding' => opts[:encoding],
|
397
|
+
'Host' => opts[:collector].name
|
398
|
+
}
|
399
|
+
headers.merge!(@request_headers_map) if @request_headers_map
|
400
|
+
headers
|
401
|
+
end
|
402
|
+
|
403
|
+
def prep_request(opts)
|
404
|
+
headers = prep_headers(opts)
|
405
|
+
if Agent.config[:put_for_data_send]
|
406
|
+
request = Net::HTTP::Put.new(opts[:uri], headers)
|
407
|
+
else
|
408
|
+
request = Net::HTTP::Post.new(opts[:uri], headers)
|
409
|
+
end
|
410
|
+
@audit_logger.log_request_headers(opts[:uri], headers)
|
411
|
+
request['user-agent'] = user_agent
|
412
|
+
request.content_type = "application/octet-stream"
|
413
|
+
request.body = opts[:data]
|
414
|
+
request
|
415
|
+
end
|
416
|
+
|
417
|
+
def relay_request(request, opts)
|
418
|
+
response = nil
|
419
|
+
attempts = 0
|
420
|
+
|
421
|
+
begin
|
422
|
+
attempts += 1
|
423
|
+
response = attempt_request(request, opts)
|
424
|
+
rescue *CONNECTION_ERRORS => e
|
425
|
+
close_shared_connection
|
426
|
+
if attempts < MAX_ATTEMPTS
|
427
|
+
::NewRelic::Agent.logger.debug("Retrying request to #{opts[:collector]}#{opts[:uri]} after #{e}")
|
428
|
+
retry
|
429
|
+
else
|
430
|
+
raise ServerConnectionException, "Recoverable error talking to #{@collector} after #{attempts} attempts: #{e}"
|
431
|
+
end
|
432
|
+
end
|
433
|
+
|
434
|
+
log_response(response)
|
435
|
+
response
|
436
|
+
end
|
437
|
+
|
438
|
+
def attempt_request(request, opts)
|
439
|
+
response = nil
|
440
|
+
conn = http_connection
|
441
|
+
::NewRelic::Agent.logger.debug("Sending request to #{opts[:collector]}#{opts[:uri]} with #{request.method}")
|
442
|
+
Timeout.timeout(@request_timeout) do
|
443
|
+
response = conn.request(request)
|
444
|
+
end
|
445
|
+
response
|
446
|
+
end
|
447
|
+
|
448
|
+
def handle_error_response(response, endpoint)
|
449
|
+
case response
|
450
|
+
when Net::HTTPRequestTimeOut,
|
451
|
+
Net::HTTPTooManyRequests,
|
452
|
+
Net::HTTPInternalServerError,
|
453
|
+
Net::HTTPServiceUnavailable
|
454
|
+
handle_server_connection_exception(response, endpoint)
|
455
|
+
when Net::HTTPBadRequest,
|
456
|
+
Net::HTTPForbidden,
|
457
|
+
Net::HTTPNotFound,
|
458
|
+
Net::HTTPMethodNotAllowed,
|
459
|
+
Net::HTTPProxyAuthenticationRequired,
|
460
|
+
Net::HTTPLengthRequired,
|
461
|
+
Net::HTTPRequestEntityTooLarge,
|
462
|
+
Net::HTTPRequestURITooLong,
|
463
|
+
Net::HTTPUnsupportedMediaType,
|
464
|
+
Net::HTTPExpectationFailed,
|
465
|
+
Net::HTTPUnsupportedMediaType,
|
466
|
+
Net::HTTPRequestHeaderFieldsTooLarge
|
467
|
+
handle_unrecoverable_server_exception(response, endpoint)
|
468
|
+
when Net::HTTPConflict,
|
469
|
+
Net::HTTPUnauthorized
|
470
|
+
handle_unauthorized_error_response(response, endpoint)
|
471
|
+
raise ForceRestartException, "#{response.code}: #{response.message}"
|
472
|
+
when Net::HTTPGone
|
473
|
+
handle_gone_response(response, endpoint)
|
474
|
+
else
|
475
|
+
record_endpoint_attempts_supportability_metrics(endpoint)
|
476
|
+
record_error_response_supportability_metrics(response.code)
|
477
|
+
raise UnrecoverableServerException, "#{response.code}: #{response.message}"
|
478
|
+
end
|
479
|
+
response
|
480
|
+
end
|
481
|
+
|
482
|
+
def handle_server_connection_exception(response, endpoint)
|
483
|
+
record_endpoint_attempts_supportability_metrics(endpoint)
|
484
|
+
raise ServerConnectionException, "#{response.code}: #{response.message}"
|
485
|
+
end
|
486
|
+
|
487
|
+
def handle_unrecoverable_server_exception(response, endpoint)
|
488
|
+
record_endpoint_attempts_supportability_metrics(endpoint)
|
489
|
+
record_error_response_supportability_metrics(response.code)
|
490
|
+
raise UnrecoverableServerException, "#{response.code}: #{response.message}"
|
491
|
+
end
|
492
|
+
|
493
|
+
def handle_unauthorized_error_response(response, endpoint)
|
494
|
+
record_endpoint_attempts_supportability_metrics(endpoint)
|
495
|
+
record_error_response_supportability_metrics(response.code)
|
496
|
+
end
|
497
|
+
|
498
|
+
def handle_gone_response(response, endpoint)
|
499
|
+
record_endpoint_attempts_supportability_metrics(endpoint)
|
500
|
+
record_error_response_supportability_metrics(response.code)
|
501
|
+
raise ForceDisconnectException, "#{response.code}: #{response.message}"
|
502
|
+
end
|
503
|
+
|
383
504
|
def remote_method_uri(method)
|
384
505
|
@remote_method_uris[method]
|
385
506
|
end
|
@@ -403,6 +524,7 @@ module NewRelic
|
|
403
524
|
uri = String.new('/agent_listener/invoke_raw_method?')
|
404
525
|
uri << params.map do |k, v|
|
405
526
|
next unless v
|
527
|
+
|
406
528
|
"#{k}=#{v}"
|
407
529
|
end.compact.join('&')
|
408
530
|
uri
|
@@ -418,42 +540,14 @@ module NewRelic
|
|
418
540
|
# server may return
|
419
541
|
def invoke_remote(method, payload = [], options = {})
|
420
542
|
start_ts = Process.clock_gettime(Process::CLOCK_MONOTONIC)
|
421
|
-
|
422
|
-
data, size, serialize_finish_ts,
|
423
|
-
|
424
|
-
|
425
|
-
rescue StandardError, SystemStackError => e
|
426
|
-
handle_serialization_error(method, e)
|
427
|
-
end
|
428
|
-
serialize_finish_ts = Process.clock_gettime(Process::CLOCK_MONOTONIC)
|
429
|
-
|
430
|
-
size = data.size # only the uncompressed size is reported
|
431
|
-
data, encoding = compress_request_if_needed(data, method)
|
432
|
-
|
433
|
-
# Preconnect needs to always use the configured collector host, not the redirect host
|
434
|
-
# We reset it here so we are always using the configured collector during our creation of the new connection
|
435
|
-
# and we also don't want to keep the previous redirect host around anymore
|
436
|
-
if method == :preconnect
|
437
|
-
@collector = @configured_collector
|
438
|
-
end
|
439
|
-
|
440
|
-
uri = remote_method_uri(method)
|
441
|
-
full_uri = "#{@collector}#{uri}"
|
442
|
-
|
443
|
-
@audit_logger.log_request(full_uri, payload, @marshaller)
|
444
|
-
request_send_ts = Process.clock_gettime(Process::CLOCK_MONOTONIC)
|
445
|
-
response = send_request(:data => data,
|
446
|
-
:uri => uri,
|
447
|
-
:encoding => encoding,
|
448
|
-
:collector => @collector,
|
449
|
-
:endpoint => method)
|
450
|
-
response_check_ts = Process.clock_gettime(Process::CLOCK_MONOTONIC)
|
543
|
+
request_send_ts, response_check_ts = nil
|
544
|
+
data, encoding, size, serialize_finish_ts = marshal_payload(method, payload, options)
|
545
|
+
prep_collector(method)
|
546
|
+
response, request_send_ts, response_check_ts = invoke_remote_send_request(method, payload, data, encoding)
|
451
547
|
@marshaller.load(decompress_response(response))
|
452
548
|
ensure
|
453
549
|
record_timing_supportability_metrics(method, start_ts, serialize_finish_ts, request_send_ts, response_check_ts)
|
454
|
-
if size
|
455
|
-
record_size_supportability_metrics(method, size, options[:item_count])
|
456
|
-
end
|
550
|
+
record_size_supportability_metrics(method, size, options[:item_count]) if size
|
457
551
|
end
|
458
552
|
|
459
553
|
def handle_serialization_error(method, e)
|
@@ -499,6 +593,7 @@ module NewRelic
|
|
499
593
|
# than the limit configured in the control object
|
500
594
|
def check_post_size(post_string, endpoint)
|
501
595
|
return if post_string.size < Agent.config[:max_payload_size_in_bytes]
|
596
|
+
|
502
597
|
::NewRelic::Agent.logger.debug("Tried to send too much data: #{post_string.size} bytes")
|
503
598
|
NewRelic::Agent.increment_metric("Supportability/Agent/Collector/#{endpoint}/MaxPayloadSizeLimit")
|
504
599
|
raise UnrecoverableServerException.new('413 Request Entity Too Large')
|
@@ -515,86 +610,11 @@ module NewRelic
|
|
515
610
|
# contact
|
516
611
|
# - :data => the data to send as the body of the request
|
517
612
|
def send_request(opts)
|
518
|
-
|
519
|
-
|
520
|
-
|
521
|
-
}
|
522
|
-
headers.merge!(@request_headers_map) if @request_headers_map
|
523
|
-
|
524
|
-
if Agent.config[:put_for_data_send]
|
525
|
-
request = Net::HTTP::Put.new(opts[:uri], headers)
|
526
|
-
else
|
527
|
-
request = Net::HTTP::Post.new(opts[:uri], headers)
|
528
|
-
end
|
529
|
-
@audit_logger.log_request_headers(opts[:uri], headers)
|
530
|
-
request['user-agent'] = user_agent
|
531
|
-
request.content_type = "application/octet-stream"
|
532
|
-
request.body = opts[:data]
|
613
|
+
request = prep_request(opts)
|
614
|
+
response = relay_request(request, opts)
|
615
|
+
return response if response.is_a?(Net::HTTPSuccess) || response.is_a?(Net::HTTPAccepted)
|
533
616
|
|
534
|
-
response
|
535
|
-
attempts = 0
|
536
|
-
max_attempts = 2
|
537
|
-
endpoint = opts[:endpoint]
|
538
|
-
|
539
|
-
begin
|
540
|
-
attempts += 1
|
541
|
-
conn = http_connection
|
542
|
-
::NewRelic::Agent.logger.debug("Sending request to #{opts[:collector]}#{opts[:uri]} with #{request.method}")
|
543
|
-
Timeout.timeout(@request_timeout) do
|
544
|
-
response = conn.request(request)
|
545
|
-
end
|
546
|
-
rescue *CONNECTION_ERRORS => e
|
547
|
-
close_shared_connection
|
548
|
-
if attempts < max_attempts
|
549
|
-
::NewRelic::Agent.logger.debug("Retrying request to #{opts[:collector]}#{opts[:uri]} after #{e}")
|
550
|
-
retry
|
551
|
-
else
|
552
|
-
raise ServerConnectionException, "Recoverable error talking to #{@collector} after #{attempts} attempts: #{e}"
|
553
|
-
end
|
554
|
-
end
|
555
|
-
|
556
|
-
log_response(response)
|
557
|
-
|
558
|
-
case response
|
559
|
-
when Net::HTTPSuccess,
|
560
|
-
Net::HTTPAccepted
|
561
|
-
true # do nothing
|
562
|
-
when Net::HTTPRequestTimeOut,
|
563
|
-
Net::HTTPTooManyRequests,
|
564
|
-
Net::HTTPInternalServerError,
|
565
|
-
Net::HTTPServiceUnavailable
|
566
|
-
record_endpoint_attempts_supportability_metrics(endpoint)
|
567
|
-
raise ServerConnectionException, "#{response.code}: #{response.message}"
|
568
|
-
when Net::HTTPBadRequest,
|
569
|
-
Net::HTTPForbidden,
|
570
|
-
Net::HTTPNotFound,
|
571
|
-
Net::HTTPMethodNotAllowed,
|
572
|
-
Net::HTTPProxyAuthenticationRequired,
|
573
|
-
Net::HTTPLengthRequired,
|
574
|
-
Net::HTTPRequestEntityTooLarge,
|
575
|
-
Net::HTTPRequestURITooLong,
|
576
|
-
Net::HTTPUnsupportedMediaType,
|
577
|
-
Net::HTTPExpectationFailed,
|
578
|
-
Net::HTTPUnsupportedMediaType,
|
579
|
-
Net::HTTPRequestHeaderFieldsTooLarge
|
580
|
-
record_endpoint_attempts_supportability_metrics(endpoint)
|
581
|
-
record_error_response_supportability_metrics(response.code)
|
582
|
-
raise UnrecoverableServerException, "#{response.code}: #{response.message}"
|
583
|
-
when Net::HTTPConflict,
|
584
|
-
Net::HTTPUnauthorized
|
585
|
-
record_endpoint_attempts_supportability_metrics(endpoint)
|
586
|
-
record_error_response_supportability_metrics(response.code)
|
587
|
-
raise ForceRestartException, "#{response.code}: #{response.message}"
|
588
|
-
when Net::HTTPGone
|
589
|
-
record_endpoint_attempts_supportability_metrics(endpoint)
|
590
|
-
record_error_response_supportability_metrics(response.code)
|
591
|
-
raise ForceDisconnectException, "#{response.code}: #{response.message}"
|
592
|
-
else
|
593
|
-
record_endpoint_attempts_supportability_metrics(endpoint)
|
594
|
-
record_error_response_supportability_metrics(response.code)
|
595
|
-
raise UnrecoverableServerException, "#{response.code}: #{response.message}"
|
596
|
-
end
|
597
|
-
response
|
617
|
+
handle_error_response(response, opts[:endpoint])
|
598
618
|
end
|
599
619
|
|
600
620
|
def log_response(response)
|
@@ -614,11 +634,9 @@ module NewRelic
|
|
614
634
|
# Decompresses the response from the server, if it is gzip
|
615
635
|
# encoded, otherwise returns it verbatim
|
616
636
|
def decompress_response(response)
|
617
|
-
|
618
|
-
|
619
|
-
|
620
|
-
response.body
|
621
|
-
end
|
637
|
+
return response.body unless response['content-encoding'] == 'gzip'
|
638
|
+
|
639
|
+
Zlib::GzipReader.new(StringIO.new(response.body)).read
|
622
640
|
end
|
623
641
|
|
624
642
|
# Sets the user agent for connections to the server, to
|
@@ -627,11 +645,46 @@ module NewRelic
|
|
627
645
|
# that may cause corrupt compression if there is a problem.
|
628
646
|
def user_agent
|
629
647
|
if defined?(::RUBY_VERSION) && defined?(::RUBY_PLATFORM)
|
630
|
-
ruby_description = "(ruby #{::RUBY_VERSION} #{::RUBY_PLATFORM}) " #
|
648
|
+
ruby_description = "(ruby #{::RUBY_VERSION} #{::RUBY_PLATFORM}) " # NOTE: the trailing space!
|
631
649
|
end
|
632
650
|
zlib_version = "zlib/#{Zlib.zlib_version}" if defined?(::Zlib) && Zlib.respond_to?(:zlib_version)
|
633
651
|
"NewRelic-RubyAgent/#{NewRelic::VERSION::STRING} #{ruby_description}#{zlib_version}"
|
634
652
|
end
|
653
|
+
|
654
|
+
def marshal_payload(method, payload, options)
|
655
|
+
begin
|
656
|
+
data = @marshaller.dump(payload, options)
|
657
|
+
rescue StandardError, SystemStackError => e
|
658
|
+
handle_serialization_error(method, e)
|
659
|
+
end
|
660
|
+
serialize_finish_ts = Process.clock_gettime(Process::CLOCK_MONOTONIC)
|
661
|
+
|
662
|
+
size = data.size # only the uncompressed size is reported
|
663
|
+
data, encoding = compress_request_if_needed(data, method)
|
664
|
+
|
665
|
+
[data, encoding, size, serialize_finish_ts]
|
666
|
+
end
|
667
|
+
|
668
|
+
def prep_collector(method)
|
669
|
+
# Preconnect needs to always use the configured collector host, not the redirect host
|
670
|
+
# We reset it here so we are always using the configured collector during our creation of the new connection
|
671
|
+
# and we also don't want to keep the previous redirect host around anymore
|
672
|
+
@collector = @configured_collector if method == :preconnect
|
673
|
+
end
|
674
|
+
|
675
|
+
def invoke_remote_send_request(method, payload, data, encoding)
|
676
|
+
uri = remote_method_uri(method)
|
677
|
+
full_uri = "#{@collector}#{uri}"
|
678
|
+
|
679
|
+
@audit_logger.log_request(full_uri, payload, @marshaller)
|
680
|
+
request_send_ts = Process.clock_gettime(Process::CLOCK_MONOTONIC)
|
681
|
+
response = send_request(:data => data,
|
682
|
+
:uri => uri,
|
683
|
+
:encoding => encoding,
|
684
|
+
:collector => @collector,
|
685
|
+
:endpoint => method)
|
686
|
+
[response, request_send_ts, Process.clock_gettime(Process::CLOCK_MONOTONIC)]
|
687
|
+
end
|
635
688
|
end
|
636
689
|
end
|
637
690
|
end
|
@@ -1,4 +1,3 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
3
|
# frozen_string_literal: true
|
@@ -8,7 +7,7 @@ module NewRelic
|
|
8
7
|
# This class is used for instrumentations that have exceptions or error classes
|
9
8
|
# not derived from Ruby's usual Exception or StandardError or in situations
|
10
9
|
# where we do not have such Exception object to work with.
|
11
|
-
class
|
10
|
+
class NoticeableError
|
12
11
|
attr_reader :class_name, :message
|
13
12
|
|
14
13
|
def initialize(class_name, message)
|
@@ -1,4 +1,3 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
3
|
# frozen_string_literal: true
|
@@ -24,7 +23,7 @@ module NewRelic
|
|
24
23
|
end
|
25
24
|
|
26
25
|
def obfuscate(text)
|
27
|
-
[encode(text)].pack(PACK_FORMAT).
|
26
|
+
[encode(text)].pack(PACK_FORMAT).delete("\n")
|
28
27
|
end
|
29
28
|
|
30
29
|
def deobfuscate(text)
|
@@ -1,4 +1,3 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
3
|
# frozen_string_literal: true
|
@@ -161,6 +160,7 @@ module NewRelic
|
|
161
160
|
|
162
161
|
def start
|
163
162
|
return if @started == true
|
163
|
+
|
164
164
|
@started = true
|
165
165
|
@thread = NewRelic::Agent::Threading::AgentThread.create('Pipe Channel Manager') do
|
166
166
|
now = nil
|
@@ -208,6 +208,7 @@ module NewRelic
|
|
208
208
|
|
209
209
|
def stop
|
210
210
|
return unless @started == true
|
211
|
+
|
211
212
|
stop_listener_thread
|
212
213
|
close_all_pipes
|
213
214
|
@wake.close
|
@@ -1,4 +1,3 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
3
|
# frozen_string_literal: true
|
@@ -35,13 +34,13 @@ module NewRelic
|
|
35
34
|
priority ||= priority_for(event)
|
36
35
|
if priority_for(@items[0]) < priority
|
37
36
|
heapify_items_array
|
38
|
-
incoming = event ||
|
37
|
+
incoming = event || yield
|
39
38
|
@items[0] = incoming
|
40
39
|
@items.fix(0)
|
41
40
|
incoming
|
42
41
|
end
|
43
42
|
else
|
44
|
-
@items << (event ||
|
43
|
+
@items << (event || yield)
|
45
44
|
@captured_lifetime += 1
|
46
45
|
@items[-1]
|
47
46
|
end
|
@@ -1,4 +1,3 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
3
|
# frozen_string_literal: true
|
@@ -73,6 +72,7 @@ module NewRelic
|
|
73
72
|
def rename(original_string)
|
74
73
|
renamed = apply_rules(@rules, original_string)
|
75
74
|
return nil unless renamed
|
75
|
+
|
76
76
|
renamed = apply_rules(@segment_term_rules, renamed)
|
77
77
|
renamed
|
78
78
|
end
|
@@ -1,4 +1,3 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
3
|
# frozen_string_literal: true
|
@@ -45,6 +44,7 @@ module NewRelic
|
|
45
44
|
if defined?(JRuby)
|
46
45
|
return JRUBY_VERSION >= '1.7.0'
|
47
46
|
end
|
47
|
+
|
48
48
|
true
|
49
49
|
end
|
50
50
|
|