newrelic_rpm 8.9.0 → 8.10.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rubocop.yml +12 -6
- data/.simplecov +1 -0
- data/.snyk +11 -0
- data/Brewfile +1 -0
- data/CHANGELOG.md +56 -0
- data/Guardfile +1 -0
- data/Rakefile +5 -0
- data/bin/mongrel_rpm +7 -6
- data/bin/newrelic +2 -1
- data/bin/newrelic_cmd +1 -0
- data/bin/nrdebug +3 -2
- data/init.rb +3 -2
- data/install.rb +1 -0
- data/lib/new_relic/agent/adaptive_sampler.rb +4 -3
- data/lib/new_relic/agent/agent/shutdown.rb +3 -2
- data/lib/new_relic/agent/agent/special_startup.rb +3 -2
- data/lib/new_relic/agent/agent/start_worker_thread.rb +15 -14
- data/lib/new_relic/agent/agent/startup.rb +11 -10
- data/lib/new_relic/agent/agent.rb +35 -33
- data/lib/new_relic/agent/agent_logger.rb +2 -1
- data/lib/new_relic/agent/attribute_filter.rb +1 -0
- data/lib/new_relic/agent/attribute_processing.rb +4 -3
- data/lib/new_relic/agent/attributes.rb +2 -1
- data/lib/new_relic/agent/audit_logger.rb +1 -0
- data/lib/new_relic/agent/autostart.rb +1 -0
- data/lib/new_relic/agent/chained_call.rb +1 -0
- data/lib/new_relic/agent/commands/agent_command.rb +1 -0
- data/lib/new_relic/agent/commands/agent_command_router.rb +4 -3
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -0
- data/lib/new_relic/agent/configuration/default_source.rb +35 -7
- data/lib/new_relic/agent/configuration/dotted_hash.rb +1 -0
- data/lib/new_relic/agent/configuration/environment_source.rb +2 -1
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +1 -0
- data/lib/new_relic/agent/configuration/high_security_source.rb +1 -0
- data/lib/new_relic/agent/configuration/manager.rb +2 -1
- data/lib/new_relic/agent/configuration/manual_source.rb +1 -0
- data/lib/new_relic/agent/configuration/mask_defaults.rb +1 -0
- data/lib/new_relic/agent/configuration/security_policy_source.rb +7 -3
- data/lib/new_relic/agent/configuration/server_source.rb +7 -6
- data/lib/new_relic/agent/configuration/yaml_source.rb +4 -1
- data/lib/new_relic/agent/configuration.rb +1 -0
- data/lib/new_relic/agent/connect/request_builder.rb +1 -0
- data/lib/new_relic/agent/connect/response_handler.rb +4 -3
- data/lib/new_relic/agent/custom_event_aggregator.rb +5 -4
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +1 -0
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +1 -0
- data/lib/new_relic/agent/database/obfuscator.rb +2 -1
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +1 -0
- data/lib/new_relic/agent/database.rb +3 -2
- data/lib/new_relic/agent/database_adapter.rb +1 -0
- data/lib/new_relic/agent/datastores/metric_helper.rb +9 -8
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +2 -0
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +1 -0
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +2 -1
- data/lib/new_relic/agent/datastores/mongo.rb +1 -0
- data/lib/new_relic/agent/datastores/redis.rb +3 -2
- data/lib/new_relic/agent/datastores.rb +4 -3
- data/lib/new_relic/agent/deprecator.rb +1 -0
- data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +1 -0
- data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +16 -16
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +9 -9
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +18 -18
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +8 -8
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +2 -2
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +40 -39
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +16 -14
- data/lib/new_relic/agent/distributed_tracing.rb +17 -17
- data/lib/new_relic/agent/encoding_normalizer.rb +1 -0
- data/lib/new_relic/agent/error_collector.rb +6 -4
- data/lib/new_relic/agent/error_event_aggregator.rb +3 -3
- data/lib/new_relic/agent/error_filter.rb +1 -0
- data/lib/new_relic/agent/error_trace_aggregator.rb +2 -1
- data/lib/new_relic/agent/event_aggregator.rb +20 -19
- data/lib/new_relic/agent/event_buffer.rb +1 -0
- data/lib/new_relic/agent/event_listener.rb +1 -0
- data/lib/new_relic/agent/event_loop.rb +7 -6
- data/lib/new_relic/agent/external.rb +9 -8
- data/lib/new_relic/agent/guid_generator.rb +2 -1
- data/lib/new_relic/agent/harvester.rb +1 -0
- data/lib/new_relic/agent/heap.rb +3 -2
- data/lib/new_relic/agent/hostname.rb +4 -2
- data/lib/new_relic/agent/http_clients/abstract.rb +1 -1
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +5 -5
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +4 -4
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +1 -1
- data/lib/new_relic/agent/http_clients/uri_util.rb +1 -1
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +6 -4
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +2 -0
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +6 -4
- data/lib/new_relic/agent/instrumentation/active_job.rb +2 -1
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +2 -1
- data/lib/new_relic/agent/instrumentation/active_record.rb +9 -8
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +15 -14
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +3 -2
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +5 -3
- data/lib/new_relic/agent/instrumentation/active_storage.rb +2 -1
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +16 -14
- data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +1 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger.rb +2 -1
- data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +2 -1
- data/lib/new_relic/agent/instrumentation/authlogic.rb +2 -1
- data/lib/new_relic/agent/instrumentation/bunny/chain.rb +10 -9
- data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +10 -10
- data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +4 -3
- data/lib/new_relic/agent/instrumentation/bunny.rb +1 -1
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +13 -9
- data/lib/new_relic/agent/instrumentation/curb/chain.rb +21 -21
- data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +8 -8
- data/lib/new_relic/agent/instrumentation/curb/prepend.rb +2 -2
- data/lib/new_relic/agent/instrumentation/curb.rb +2 -1
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +43 -42
- data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +2 -2
- data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +3 -2
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +3 -2
- data/lib/new_relic/agent/instrumentation/excon.rb +2 -1
- data/lib/new_relic/agent/instrumentation/grape/chain.rb +6 -5
- data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +5 -4
- data/lib/new_relic/agent/instrumentation/grape/prepend.rb +4 -3
- data/lib/new_relic/agent/instrumentation/grape.rb +1 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +106 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +88 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +117 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +31 -0
- data/lib/new_relic/agent/instrumentation/grpc/helper.rb +31 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +70 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +135 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +36 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +27 -0
- data/lib/new_relic/agent/instrumentation/grpc_client.rb +24 -0
- data/lib/new_relic/agent/instrumentation/grpc_server.rb +26 -0
- data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +6 -5
- data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/httpclient.rb +2 -1
- data/lib/new_relic/agent/instrumentation/httprb/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +4 -3
- data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/httprb.rb +2 -1
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +2 -1
- data/lib/new_relic/agent/instrumentation/logger/chain.rb +2 -1
- data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +5 -0
- data/lib/new_relic/agent/instrumentation/logger/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/logger.rb +2 -1
- data/lib/new_relic/agent/instrumentation/memcache/chain.rb +2 -2
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +19 -19
- data/lib/new_relic/agent/instrumentation/memcache/helper.rb +8 -8
- data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +17 -14
- data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +14 -14
- data/lib/new_relic/agent/instrumentation/memcache.rb +1 -1
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +1 -0
- data/lib/new_relic/agent/instrumentation/mongo.rb +2 -1
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +14 -12
- data/lib/new_relic/agent/instrumentation/net_http/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +5 -4
- data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/net_http.rb +2 -1
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +5 -4
- data/lib/new_relic/agent/instrumentation/padrino/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +1 -0
- data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/padrino.rb +2 -1
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +3 -2
- data/lib/new_relic/agent/instrumentation/queue_time.rb +1 -0
- data/lib/new_relic/agent/instrumentation/rack/chain.rb +12 -11
- data/lib/new_relic/agent/instrumentation/rack/helpers.rb +1 -0
- data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +7 -6
- data/lib/new_relic/agent/instrumentation/rack/prepend.rb +4 -3
- data/lib/new_relic/agent/instrumentation/rack.rb +1 -0
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +6 -5
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -0
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +3 -1
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +3 -1
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +3 -1
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +3 -2
- data/lib/new_relic/agent/instrumentation/rake/chain.rb +2 -1
- data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rake/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/rake.rb +3 -2
- data/lib/new_relic/agent/instrumentation/redis/chain.rb +3 -3
- data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +5 -5
- data/lib/new_relic/agent/instrumentation/redis/prepend.rb +3 -3
- data/lib/new_relic/agent/instrumentation/redis.rb +2 -1
- data/lib/new_relic/agent/instrumentation/resque/chain.rb +2 -1
- data/lib/new_relic/agent/instrumentation/resque/helper.rb +1 -0
- data/lib/new_relic/agent/instrumentation/resque/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/resque.rb +3 -2
- data/lib/new_relic/agent/instrumentation/sequel.rb +8 -7
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +1 -0
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +6 -4
- data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +2 -1
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +1 -0
- data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +2 -1
- data/lib/new_relic/agent/instrumentation/sinatra.rb +2 -1
- data/lib/new_relic/agent/instrumentation/sunspot.rb +2 -1
- data/lib/new_relic/agent/instrumentation/thread/chain.rb +2 -1
- data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +1 -0
- data/lib/new_relic/agent/instrumentation/thread/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/thread.rb +2 -1
- data/lib/new_relic/agent/instrumentation/tilt/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +1 -0
- data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/tilt.rb +1 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +6 -5
- data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +2 -1
- data/lib/new_relic/agent/instrumentation.rb +1 -0
- data/lib/new_relic/agent/internal_agent_error.rb +1 -0
- data/lib/new_relic/agent/javascript_instrumentor.rb +7 -6
- data/lib/new_relic/agent/linking_metadata.rb +2 -2
- data/lib/new_relic/agent/log_event_aggregator.rb +6 -5
- data/lib/new_relic/agent/log_once.rb +1 -0
- data/lib/new_relic/agent/log_priority.rb +1 -0
- data/lib/new_relic/agent/logging.rb +13 -12
- data/lib/new_relic/agent/memory_logger.rb +1 -0
- data/lib/new_relic/agent/messaging.rb +18 -18
- data/lib/new_relic/agent/method_tracer.rb +6 -5
- data/lib/new_relic/agent/method_tracer_helpers.rb +8 -5
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +3 -2
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +3 -2
- data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +1 -0
- data/lib/new_relic/agent/monitors/synthetics_monitor.rb +2 -1
- data/lib/new_relic/agent/monitors.rb +5 -4
- data/lib/new_relic/agent/new_relic_service/encoders.rb +2 -1
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +4 -3
- data/lib/new_relic/agent/new_relic_service/marshaller.rb +1 -0
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +1 -0
- data/lib/new_relic/agent/new_relic_service.rb +11 -11
- data/lib/new_relic/agent/noticible_error.rb +1 -1
- data/lib/new_relic/agent/null_logger.rb +1 -0
- data/lib/new_relic/agent/obfuscator.rb +2 -1
- data/lib/new_relic/agent/parameter_filtering.rb +1 -0
- data/lib/new_relic/agent/payload_metric_mapping.rb +1 -0
- data/lib/new_relic/agent/pipe_channel_manager.rb +6 -5
- data/lib/new_relic/agent/pipe_service.rb +1 -0
- data/lib/new_relic/agent/prepend_supportability.rb +2 -1
- data/lib/new_relic/agent/priority_sampled_buffer.rb +2 -1
- data/lib/new_relic/agent/range_extensions.rb +8 -27
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +2 -1
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +1 -0
- data/lib/new_relic/agent/rules_engine.rb +2 -1
- data/lib/new_relic/agent/sampler.rb +1 -0
- data/lib/new_relic/agent/sampler_collection.rb +1 -0
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +1 -0
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +1 -0
- data/lib/new_relic/agent/samplers/memory_sampler.rb +5 -4
- data/lib/new_relic/agent/samplers/object_sampler.rb +1 -0
- data/lib/new_relic/agent/samplers/vm_sampler.rb +1 -0
- data/lib/new_relic/agent/span_event_aggregator.rb +2 -1
- data/lib/new_relic/agent/span_event_primitive.rb +15 -11
- data/lib/new_relic/agent/sql_sampler.rb +7 -6
- data/lib/new_relic/agent/stats.rb +3 -1
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +1 -0
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +3 -2
- data/lib/new_relic/agent/stats_engine.rb +1 -0
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +6 -5
- data/lib/new_relic/agent/system_info.rb +8 -7
- data/lib/new_relic/agent/threading/agent_thread.rb +1 -0
- data/lib/new_relic/agent/threading/backtrace_node.rb +6 -3
- data/lib/new_relic/agent/threading/backtrace_service.rb +1 -0
- data/lib/new_relic/agent/threading/thread_profile.rb +1 -0
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -0
- data/lib/new_relic/agent/tracer.rb +12 -11
- data/lib/new_relic/agent/transaction/abstract_segment.rb +64 -31
- data/lib/new_relic/agent/transaction/datastore_segment.rb +12 -11
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +52 -47
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +21 -21
- data/lib/new_relic/agent/transaction/external_request_segment.rb +36 -27
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +6 -5
- data/lib/new_relic/agent/transaction/request_attributes.rb +29 -28
- data/lib/new_relic/agent/transaction/segment.rb +8 -7
- data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -0
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -0
- data/lib/new_relic/agent/transaction/trace.rb +3 -2
- data/lib/new_relic/agent/transaction/trace_builder.rb +10 -9
- data/lib/new_relic/agent/transaction/trace_context.rb +22 -19
- data/lib/new_relic/agent/transaction/trace_node.rb +9 -8
- data/lib/new_relic/agent/transaction/tracing.rb +7 -6
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -0
- data/lib/new_relic/agent/transaction.rb +22 -21
- data/lib/new_relic/agent/transaction_error_primitive.rb +9 -8
- data/lib/new_relic/agent/transaction_event_aggregator.rb +5 -4
- data/lib/new_relic/agent/transaction_event_primitive.rb +3 -3
- data/lib/new_relic/agent/transaction_event_recorder.rb +14 -12
- data/lib/new_relic/agent/transaction_metrics.rb +3 -2
- data/lib/new_relic/agent/transaction_sampler.rb +4 -3
- data/lib/new_relic/agent/transaction_time_aggregator.rb +13 -12
- data/lib/new_relic/agent/utilization/aws.rb +4 -3
- data/lib/new_relic/agent/utilization/azure.rb +1 -0
- data/lib/new_relic/agent/utilization/gcp.rb +6 -5
- data/lib/new_relic/agent/utilization/pcf.rb +3 -2
- data/lib/new_relic/agent/utilization/vendor.rb +27 -26
- data/lib/new_relic/agent/utilization_data.rb +1 -0
- data/lib/new_relic/agent/vm/jruby_vm.rb +1 -0
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -0
- data/lib/new_relic/agent/vm/mri_vm.rb +1 -0
- data/lib/new_relic/agent/vm/snapshot.rb +1 -0
- data/lib/new_relic/agent/vm.rb +1 -0
- data/lib/new_relic/agent/worker_loop.rb +2 -1
- data/lib/new_relic/agent.rb +11 -10
- data/lib/new_relic/cli/command.rb +5 -4
- data/lib/new_relic/cli/commands/deployments.rb +9 -8
- data/lib/new_relic/cli/commands/install.rb +6 -5
- data/lib/new_relic/coerce.rb +4 -4
- data/lib/new_relic/collection_helper.rb +2 -1
- data/lib/new_relic/control/class_methods.rb +1 -0
- data/lib/new_relic/control/frameworks/external.rb +1 -0
- data/lib/new_relic/control/frameworks/rails.rb +3 -2
- data/lib/new_relic/control/frameworks/rails3.rb +1 -0
- data/lib/new_relic/control/frameworks/rails4.rb +1 -0
- data/lib/new_relic/control/frameworks/rails_notifications.rb +1 -0
- data/lib/new_relic/control/frameworks/ruby.rb +1 -0
- data/lib/new_relic/control/frameworks/sinatra.rb +1 -0
- data/lib/new_relic/control/frameworks.rb +1 -0
- data/lib/new_relic/control/instance_methods.rb +5 -4
- data/lib/new_relic/control/instrumentation.rb +7 -6
- data/lib/new_relic/control/server_methods.rb +2 -1
- data/lib/new_relic/control.rb +1 -0
- data/lib/new_relic/delayed_job_injection.rb +1 -0
- data/lib/new_relic/dependency_detection.rb +18 -16
- data/lib/new_relic/environment_report.rb +1 -0
- data/lib/new_relic/helper.rb +4 -3
- data/lib/new_relic/language_support.rb +1 -0
- data/lib/new_relic/latest_changes.rb +1 -0
- data/lib/new_relic/local_environment.rb +5 -6
- data/lib/new_relic/metric_data.rb +3 -2
- data/lib/new_relic/metric_spec.rb +2 -1
- data/lib/new_relic/noticed_error.rb +1 -1
- data/lib/new_relic/rack/agent_hooks.rb +1 -0
- data/lib/new_relic/rack/agent_middleware.rb +1 -0
- data/lib/new_relic/rack/browser_monitoring.rb +3 -2
- data/lib/new_relic/rack.rb +1 -0
- data/lib/new_relic/recipes/capistrano3.rb +7 -6
- data/lib/new_relic/recipes/capistrano_legacy.rb +12 -11
- data/lib/new_relic/recipes.rb +1 -0
- data/lib/new_relic/supportability_helper.rb +5 -4
- data/lib/new_relic/version.rb +2 -1
- data/lib/newrelic_rpm.rb +1 -0
- data/lib/sequel/extensions/newrelic_instrumentation.rb +6 -5
- data/lib/sequel/plugins/newrelic_instrumentation.rb +1 -0
- data/lib/tasks/all.rb +1 -0
- data/lib/tasks/config.rake +2 -1
- data/lib/tasks/coverage_report.rake +2 -1
- data/lib/tasks/install.rake +1 -0
- data/lib/tasks/multiverse.rake +1 -0
- data/lib/tasks/multiverse.rb +8 -7
- data/lib/tasks/newrelic.rb +1 -0
- data/lib/tasks/tests.rake +1 -0
- data/newrelic.yml +505 -486
- data/newrelic_rpm.gemspec +3 -1
- data/recipes/newrelic.rb +1 -0
- data/test/agent_helper.rb +113 -103
- metadata +28 -2
@@ -15,7 +15,7 @@ module NewRelic
|
|
15
15
|
def instrument!
|
16
16
|
if supports_datastore_instances?
|
17
17
|
instrument_methods(::Dalli::Client, dalli_methods)
|
18
|
-
instrument_multi_method
|
18
|
+
instrument_multi_method(:get_multi)
|
19
19
|
instrument_send_multiget
|
20
20
|
instrument_server_for_key
|
21
21
|
else
|
@@ -23,19 +23,19 @@ module NewRelic
|
|
23
23
|
end
|
24
24
|
end
|
25
25
|
|
26
|
-
def instrument_multi_method
|
27
|
-
visibility = NewRelic::Helper.instance_method_visibility
|
26
|
+
def instrument_multi_method(method_name)
|
27
|
+
visibility = NewRelic::Helper.instance_method_visibility(::Dalli::Client, method_name)
|
28
28
|
method_name_without = :"#{method_name}_without_newrelic_trace"
|
29
29
|
|
30
30
|
::Dalli::Client.class_eval do
|
31
|
-
alias_method
|
31
|
+
alias_method(method_name_without, method_name)
|
32
32
|
|
33
|
-
define_method
|
34
|
-
get_multi_with_newrelic_tracing(method_name) { __send__
|
33
|
+
define_method(method_name) do |*args, &block|
|
34
|
+
get_multi_with_newrelic_tracing(method_name) { __send__(method_name_without, *args, &block) }
|
35
35
|
end
|
36
36
|
|
37
|
-
__send__
|
38
|
-
__send__
|
37
|
+
__send__(visibility, method_name)
|
38
|
+
__send__(visibility, method_name_without)
|
39
39
|
end
|
40
40
|
end
|
41
41
|
|
@@ -43,10 +43,10 @@ module NewRelic
|
|
43
43
|
::Dalli::Ring.class_eval do
|
44
44
|
include NewRelic::Agent::Instrumentation::Memcache::Tracer
|
45
45
|
|
46
|
-
alias_method
|
46
|
+
alias_method(:server_for_key_without_newrelic_trace, :server_for_key)
|
47
47
|
|
48
|
-
def server_for_key
|
49
|
-
server_for_key_with_newrelic_tracing { server_for_key_without_newrelic_trace
|
48
|
+
def server_for_key(key)
|
49
|
+
server_for_key_with_newrelic_tracing { server_for_key_without_newrelic_trace(key) }
|
50
50
|
end
|
51
51
|
end
|
52
52
|
end
|
@@ -61,14 +61,14 @@ module NewRelic
|
|
61
61
|
|
62
62
|
# TODO: Dalli - 3.1.0 renamed send_multiget to piplined_get, but the method is otherwise the same
|
63
63
|
if Gem::Version.new(::Dalli::VERSION) >= Gem::Version.new('3.1.0')
|
64
|
-
alias_method
|
65
|
-
def pipelined_get
|
66
|
-
send_multiget_with_newrelic_tracing(keys) { pipelined_get_without_newrelic_trace
|
64
|
+
alias_method(:pipelined_get_without_newrelic_trace, :pipelined_get)
|
65
|
+
def pipelined_get(keys)
|
66
|
+
send_multiget_with_newrelic_tracing(keys) { pipelined_get_without_newrelic_trace(keys) }
|
67
67
|
end
|
68
68
|
else
|
69
|
-
alias_method
|
70
|
-
def send_multiget
|
71
|
-
send_multiget_with_newrelic_tracing(keys) { send_multiget_without_newrelic_trace
|
69
|
+
alias_method(:send_multiget_without_newrelic_trace, :send_multiget)
|
70
|
+
def send_multiget(keys)
|
71
|
+
send_multiget_with_newrelic_tracing(keys) { send_multiget_without_newrelic_trace(keys) }
|
72
72
|
end
|
73
73
|
end
|
74
74
|
end
|
@@ -86,8 +86,8 @@ module NewRelic
|
|
86
86
|
end
|
87
87
|
|
88
88
|
def instrument!
|
89
|
-
instrument_methods
|
90
|
-
instrument_multi_method
|
89
|
+
instrument_methods(::Dalli::Client, dalli_cas_methods)
|
90
|
+
instrument_multi_method(:get_multi_cas)
|
91
91
|
end
|
92
92
|
end
|
93
93
|
end
|
@@ -6,8 +6,8 @@
|
|
6
6
|
module NewRelic::Agent::Instrumentation
|
7
7
|
module Memcache
|
8
8
|
module Helper
|
9
|
-
DATASTORE_INSTANCES_SUPPORTED_VERSION = Gem::Version.new
|
10
|
-
BINARY_PROTOCOL_SUPPORTED_VERSION = Gem::Version.new
|
9
|
+
DATASTORE_INSTANCES_SUPPORTED_VERSION = Gem::Version.new('2.6.4')
|
10
|
+
BINARY_PROTOCOL_SUPPORTED_VERSION = Gem::Version.new('3.0.2')
|
11
11
|
|
12
12
|
def supports_datastore_instances?
|
13
13
|
DATASTORE_INSTANCES_SUPPORTED_VERSION <= Gem::Version.new(::Dalli::VERSION)
|
@@ -38,20 +38,20 @@ module NewRelic::Agent::Instrumentation
|
|
38
38
|
|
39
39
|
def instrument_methods(client_class, requested_methods = METHODS)
|
40
40
|
supported_methods_for(client_class, requested_methods).each do |method_name|
|
41
|
-
visibility = NewRelic::Helper.instance_method_visibility
|
41
|
+
visibility = NewRelic::Helper.instance_method_visibility(client_class, method_name)
|
42
42
|
method_name_without = :"#{method_name}_without_newrelic_trace"
|
43
43
|
|
44
44
|
client_class.class_eval do
|
45
45
|
include NewRelic::Agent::Instrumentation::Memcache::Tracer
|
46
46
|
|
47
|
-
alias_method
|
47
|
+
alias_method(method_name_without, method_name)
|
48
48
|
|
49
|
-
define_method
|
50
|
-
with_newrelic_tracing(method_name, *args) { __send__
|
49
|
+
define_method(method_name) do |*args, &block|
|
50
|
+
with_newrelic_tracing(method_name, *args) { __send__(method_name_without, *args, &block) }
|
51
51
|
end
|
52
52
|
|
53
|
-
__send__
|
54
|
-
__send__
|
53
|
+
__send__(visibility, method_name)
|
54
|
+
__send__(visibility, method_name_without)
|
55
55
|
end
|
56
56
|
end
|
57
57
|
end
|
@@ -12,16 +12,17 @@ module NewRelic::Agent::Instrumentation
|
|
12
12
|
MULTIGET_METRIC_NAME = "get_multi_request"
|
13
13
|
MEMCACHED = "Memcached"
|
14
14
|
|
15
|
-
def with_newrelic_tracing
|
16
|
-
segment = NewRelic::Agent::Tracer.start_datastore_segment \
|
15
|
+
def with_newrelic_tracing(operation, *args)
|
16
|
+
segment = NewRelic::Agent::Tracer.start_datastore_segment( \
|
17
17
|
product: MEMCACHED,
|
18
18
|
operation: operation
|
19
|
+
)
|
19
20
|
|
20
21
|
begin
|
21
22
|
NewRelic::Agent::Tracer.capture_segment_error(segment) { yield }
|
22
23
|
ensure
|
23
24
|
if NewRelic::Agent.config[:capture_memcache_keys]
|
24
|
-
segment.notice_nosql_statement
|
25
|
+
segment.notice_nosql_statement("#{operation} #{args.first.inspect}")
|
25
26
|
end
|
26
27
|
segment.finish if segment
|
27
28
|
end
|
@@ -37,14 +38,15 @@ module NewRelic::Agent::Instrumentation
|
|
37
38
|
end
|
38
39
|
end
|
39
40
|
rescue => e
|
40
|
-
::NewRelic::Agent.logger.warn
|
41
|
+
::NewRelic::Agent.logger.warn("Unable to set instance info on datastore segment: #{e.message}")
|
41
42
|
end
|
42
43
|
end
|
43
44
|
end
|
44
45
|
|
45
|
-
def get_multi_with_newrelic_tracing
|
46
|
-
segment = NewRelic::Agent::Tracer.start_segment \
|
46
|
+
def get_multi_with_newrelic_tracing(method_name)
|
47
|
+
segment = NewRelic::Agent::Tracer.start_segment( \
|
47
48
|
name: "Ruby/Memcached/Dalli/#{method_name}"
|
49
|
+
)
|
48
50
|
|
49
51
|
begin
|
50
52
|
NewRelic::Agent::Tracer.capture_segment_error(segment) { yield }
|
@@ -53,35 +55,36 @@ module NewRelic::Agent::Instrumentation
|
|
53
55
|
end
|
54
56
|
end
|
55
57
|
|
56
|
-
def send_multiget_with_newrelic_tracing
|
57
|
-
segment = ::NewRelic::Agent::Tracer.start_datastore_segment \
|
58
|
+
def send_multiget_with_newrelic_tracing(keys)
|
59
|
+
segment = ::NewRelic::Agent::Tracer.start_datastore_segment( \
|
58
60
|
product: MEMCACHED,
|
59
61
|
operation: MULTIGET_METRIC_NAME
|
62
|
+
)
|
60
63
|
|
61
64
|
begin
|
62
65
|
assign_instance_to(segment, self)
|
63
66
|
NewRelic::Agent::Tracer.capture_segment_error(segment) { yield }
|
64
67
|
ensure
|
65
68
|
if ::NewRelic::Agent.config[:capture_memcache_keys]
|
66
|
-
segment.notice_nosql_statement
|
69
|
+
segment.notice_nosql_statement("#{MULTIGET_METRIC_NAME} #{keys.inspect}")
|
67
70
|
end
|
68
71
|
segment.finish if segment
|
69
72
|
end
|
70
73
|
end
|
71
74
|
|
72
|
-
def assign_instance_to
|
75
|
+
def assign_instance_to(segment, server)
|
73
76
|
host = port_path_or_id = nil
|
74
|
-
if server.hostname.start_with?
|
77
|
+
if server.hostname.start_with?(SLASH)
|
75
78
|
host = LOCALHOST
|
76
79
|
port_path_or_id = server.hostname
|
77
80
|
else
|
78
81
|
host = server.hostname
|
79
82
|
port_path_or_id = server.port
|
80
83
|
end
|
81
|
-
segment.set_instance_info
|
84
|
+
segment.set_instance_info(host, port_path_or_id)
|
82
85
|
rescue => e
|
83
|
-
::NewRelic::Agent.logger.debug
|
84
|
-
segment.set_instance_info
|
86
|
+
::NewRelic::Agent.logger.debug("Failed to retrieve memcached instance info: #{e.message}")
|
87
|
+
segment.set_instance_info(UNKNOWN, UNKNOWN)
|
85
88
|
end
|
86
89
|
end
|
87
90
|
end
|
@@ -10,7 +10,7 @@ module NewRelic::Agent::Instrumentation
|
|
10
10
|
|
11
11
|
module_function
|
12
12
|
|
13
|
-
def client_prepender
|
13
|
+
def client_prepender(client_class)
|
14
14
|
Module.new do
|
15
15
|
extend Helper
|
16
16
|
include NewRelic::Agent::Instrumentation::Memcache::Tracer
|
@@ -24,28 +24,28 @@ module NewRelic::Agent::Instrumentation
|
|
24
24
|
end
|
25
25
|
|
26
26
|
def dalli_cas_prependers
|
27
|
-
yield
|
28
|
-
yield
|
27
|
+
yield(::Dalli::Client, dalli_client_prepender(dalli_cas_methods))
|
28
|
+
yield(::Dalli::Client, dalli_get_multi_prepender(:get_multi_cas))
|
29
29
|
end
|
30
30
|
|
31
31
|
def dalli_prependers
|
32
32
|
if supports_datastore_instances?
|
33
|
-
yield
|
34
|
-
yield
|
33
|
+
yield(::Dalli::Client, dalli_client_prepender(dalli_methods))
|
34
|
+
yield(::Dalli::Client, dalli_get_multi_prepender(:get_multi))
|
35
35
|
|
36
36
|
if supports_binary_protocol?
|
37
|
-
yield
|
37
|
+
yield(::Dalli::Protocol::Binary, dalli_server_prepender)
|
38
38
|
else
|
39
|
-
yield
|
39
|
+
yield(::Dalli::Server, dalli_server_prepender)
|
40
40
|
end
|
41
41
|
|
42
|
-
yield
|
42
|
+
yield(::Dalli::Ring, dalli_ring_prepender)
|
43
43
|
else
|
44
|
-
yield
|
44
|
+
yield(::Dalli::Client, dalli_client_prepender(client_methods))
|
45
45
|
end
|
46
46
|
end
|
47
47
|
|
48
|
-
def dalli_client_prepender
|
48
|
+
def dalli_client_prepender(supported_methods)
|
49
49
|
Module.new do
|
50
50
|
extend Helper
|
51
51
|
include NewRelic::Agent::Instrumentation::Memcache::Tracer
|
@@ -58,7 +58,7 @@ module NewRelic::Agent::Instrumentation
|
|
58
58
|
end
|
59
59
|
end
|
60
60
|
|
61
|
-
def dalli_get_multi_prepender
|
61
|
+
def dalli_get_multi_prepender(method_name)
|
62
62
|
Module.new do
|
63
63
|
extend Helper
|
64
64
|
include NewRelic::Agent::Instrumentation::Memcache::Tracer
|
@@ -74,7 +74,7 @@ module NewRelic::Agent::Instrumentation
|
|
74
74
|
extend Helper
|
75
75
|
include NewRelic::Agent::Instrumentation::Memcache::Tracer
|
76
76
|
|
77
|
-
def server_for_key
|
77
|
+
def server_for_key(key)
|
78
78
|
server_for_key_with_newrelic_tracing { super }
|
79
79
|
end
|
80
80
|
end
|
@@ -87,11 +87,11 @@ module NewRelic::Agent::Instrumentation
|
|
87
87
|
|
88
88
|
# TODO: Dalli - 3.1.0 renamed send_multiget to piplined_get, but the method is otherwise the same
|
89
89
|
if Gem::Version.new(::Dalli::VERSION) >= Gem::Version.new('3.1.0')
|
90
|
-
def pipelined_get
|
90
|
+
def pipelined_get(keys)
|
91
91
|
send_multiget_with_newrelic_tracing(keys) { super }
|
92
92
|
end
|
93
93
|
else
|
94
|
-
def send_multiget
|
94
|
+
def send_multiget(keys)
|
95
95
|
send_multiget_with_newrelic_tracing(keys) { super }
|
96
96
|
end
|
97
97
|
end
|
@@ -75,7 +75,7 @@ DependencyDetection.defer do
|
|
75
75
|
depends_on { ::NewRelic::Agent::Instrumentation::Memcache::DalliCAS.should_instrument? }
|
76
76
|
|
77
77
|
executes do
|
78
|
-
::NewRelic::Agent.logger.info
|
78
|
+
::NewRelic::Agent.logger.info('Installing Dalli CAS Client Memcache instrumentation')
|
79
79
|
if use_prepend?
|
80
80
|
prepend_module = ::NewRelic::Agent::Instrumentation::Memcache::Prepend
|
81
81
|
prepend_module.dalli_cas_prependers do |client_class, instrumenting_module|
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
require 'new_relic/agent/method_tracer'
|
6
7
|
require 'new_relic/agent/transaction'
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
DependencyDetection.defer do
|
6
7
|
named :mongo
|
@@ -18,7 +19,7 @@ DependencyDetection.defer do
|
|
18
19
|
end
|
19
20
|
|
20
21
|
executes do
|
21
|
-
NewRelic::Agent.logger.info
|
22
|
+
NewRelic::Agent.logger.info('Installing Mongo instrumentation')
|
22
23
|
install_mongo_command_subscriber
|
23
24
|
end
|
24
25
|
|
@@ -1,6 +1,8 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
5
|
+
|
4
6
|
require 'new_relic/agent/datastores/mongo/event_formatter'
|
5
7
|
|
6
8
|
module NewRelic
|
@@ -13,7 +15,7 @@ module NewRelic
|
|
13
15
|
def started(event)
|
14
16
|
begin
|
15
17
|
return unless NewRelic::Agent::Tracer.tracing_enabled?
|
16
|
-
segments[event.operation_id] = start_segment
|
18
|
+
segments[event.operation_id] = start_segment(event)
|
17
19
|
rescue Exception => e
|
18
20
|
log_notification_error('started', e)
|
19
21
|
end
|
@@ -40,12 +42,12 @@ module NewRelic
|
|
40
42
|
if error_key = error_key_present?(event)
|
41
43
|
# taking the last error as there can potentially be many
|
42
44
|
attributes = event.reply[error_key][-1]
|
43
|
-
segment.notice_error
|
45
|
+
segment.notice_error(Mongo::Error.new("%s (%s)" % [attributes["errmsg"], attributes["code"]]))
|
44
46
|
|
45
47
|
# failing commands return a CommandFailed event with an error message
|
46
48
|
# in the form of "% (%s)" for the message and code
|
47
|
-
elsif event.is_a?
|
48
|
-
segment.notice_error
|
49
|
+
elsif event.is_a?(Mongo::Monitoring::Event::CommandFailed)
|
50
|
+
segment.notice_error(Mongo::Error.new(event.message))
|
49
51
|
end
|
50
52
|
segment.finish
|
51
53
|
rescue Exception => e
|
@@ -58,9 +60,9 @@ module NewRelic
|
|
58
60
|
|
59
61
|
private
|
60
62
|
|
61
|
-
def start_segment
|
62
|
-
host = host_from_address
|
63
|
-
port_path_or_id = port_path_or_id_from_address
|
63
|
+
def start_segment(event)
|
64
|
+
host = host_from_address(event.address)
|
65
|
+
port_path_or_id = port_path_or_id_from_address(event.address)
|
64
66
|
segment = NewRelic::Agent::Tracer.start_datastore_segment(
|
65
67
|
product: MONGODB,
|
66
68
|
operation: operation(event.command_name),
|
@@ -107,31 +109,31 @@ module NewRelic
|
|
107
109
|
LOCALHOST = "localhost".freeze
|
108
110
|
|
109
111
|
def host_from_address(address)
|
110
|
-
if unix_domain_socket?
|
112
|
+
if unix_domain_socket?(address.host)
|
111
113
|
LOCALHOST
|
112
114
|
else
|
113
115
|
address.host
|
114
116
|
end
|
115
117
|
rescue => e
|
116
|
-
NewRelic::Agent.logger.debug
|
118
|
+
NewRelic::Agent.logger.debug("Failed to retrieve Mongo host: #{e}")
|
117
119
|
UNKNOWN
|
118
120
|
end
|
119
121
|
|
120
122
|
def port_path_or_id_from_address(address)
|
121
|
-
if unix_domain_socket?
|
123
|
+
if unix_domain_socket?(address.host)
|
122
124
|
address.host
|
123
125
|
else
|
124
126
|
address.port
|
125
127
|
end
|
126
128
|
rescue => e
|
127
|
-
NewRelic::Agent.logger.debug
|
129
|
+
NewRelic::Agent.logger.debug("Failed to retrieve Mongo port_path_or_id: #{e}")
|
128
130
|
UNKNOWN
|
129
131
|
end
|
130
132
|
|
131
133
|
SLASH = "/".freeze
|
132
134
|
|
133
135
|
def unix_domain_socket?(host)
|
134
|
-
host.start_with?
|
136
|
+
host.start_with?(SLASH)
|
135
137
|
end
|
136
138
|
end
|
137
139
|
end
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
module NewRelic
|
6
7
|
module Agent
|
@@ -17,18 +18,18 @@ module NewRelic
|
|
17
18
|
|
18
19
|
begin
|
19
20
|
response = nil
|
20
|
-
segment.add_request_headers
|
21
|
+
segment.add_request_headers(wrapped_request)
|
21
22
|
|
22
23
|
# RUBY-1244 Disable further tracing in request to avoid double
|
23
24
|
# counting if connection wasn't started (which calls request again).
|
24
25
|
NewRelic::Agent.disable_all_tracing do
|
25
|
-
response = NewRelic::Agent::Tracer.capture_segment_error
|
26
|
+
response = NewRelic::Agent::Tracer.capture_segment_error(segment) do
|
26
27
|
yield
|
27
28
|
end
|
28
29
|
end
|
29
30
|
|
30
|
-
wrapped_response = NewRelic::Agent::HTTPClients::NetHTTPResponse.new
|
31
|
-
segment.process_response_headers
|
31
|
+
wrapped_response = NewRelic::Agent::HTTPClients::NetHTTPResponse.new(response)
|
32
|
+
segment.process_response_headers(wrapped_response)
|
32
33
|
response
|
33
34
|
ensure
|
34
35
|
segment.finish
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
require_relative 'net_http/chain'
|
6
7
|
require_relative 'net_http/prepend'
|
@@ -13,7 +14,7 @@ DependencyDetection.defer do
|
|
13
14
|
end
|
14
15
|
|
15
16
|
executes do
|
16
|
-
::NewRelic::Agent.logger.info
|
17
|
+
::NewRelic::Agent.logger.info('Installing Net:HTTP Wrappers')
|
17
18
|
require 'new_relic/agent/http_clients/net_http_wrappers'
|
18
19
|
end
|
19
20
|
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
module NewRelic
|
6
7
|
module Agent
|
@@ -26,11 +27,11 @@ module NewRelic
|
|
26
27
|
instance_variable_names.each do |name|
|
27
28
|
if notifier.instance_variable_defined?(name)
|
28
29
|
subscribers = notifier.instance_variable_get(name)
|
29
|
-
if subscribers.is_a?
|
30
|
+
if subscribers.is_a?(Array)
|
30
31
|
# Rails 5 @subscribers, and Rails 6 @other_subscribers is a
|
31
32
|
# plain array of subscriber objects
|
32
33
|
all_subscribers += subscribers
|
33
|
-
elsif subscribers.is_a?
|
34
|
+
elsif subscribers.is_a?(Hash)
|
34
35
|
# Rails 6 @string_subscribers is a Hash mapping the pattern
|
35
36
|
# string of a subscriber to an array of subscriber objects
|
36
37
|
subscribers.values.each { |array| all_subscribers += array }
|
@@ -55,7 +56,7 @@ module NewRelic
|
|
55
56
|
end
|
56
57
|
|
57
58
|
def push_segment(id, segment)
|
58
|
-
segment_stack[id].push
|
59
|
+
segment_stack[id].push(segment)
|
59
60
|
end
|
60
61
|
|
61
62
|
def pop_segment(id)
|
@@ -85,7 +86,7 @@ module NewRelic
|
|
85
86
|
def exception_object(payload)
|
86
87
|
exception_class, message = payload[:exception]
|
87
88
|
return nil unless exception_class
|
88
|
-
NewRelic::Agent::NoticibleError.new
|
89
|
+
NewRelic::Agent::NoticibleError.new(exception_class, message)
|
89
90
|
end
|
90
91
|
else
|
91
92
|
def exception_object(payload)
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
module NewRelic::Agent::Instrumentation
|
6
7
|
module Padrino
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
module NewRelic::Agent::Instrumentation
|
6
7
|
module PadrinoTracer
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
# Our Padrino instrumentation relies heavily on the fact that Padrino is
|
6
7
|
# built on Sinatra. Although it wires up a lot of its own routing logic,
|
@@ -22,7 +23,7 @@ DependencyDetection.defer do
|
|
22
23
|
depends_on { defined?(::Padrino) && defined?(::Padrino::Routing::InstanceMethods) }
|
23
24
|
|
24
25
|
executes do
|
25
|
-
::NewRelic::Agent.logger.info
|
26
|
+
::NewRelic::Agent.logger.info('Installing Padrino instrumentation')
|
26
27
|
if use_prepend?
|
27
28
|
prepend_instrument ::Padrino::Application, NewRelic::Agent::Instrumentation::PadrinoTracer::Prepend
|
28
29
|
else
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
DependencyDetection.defer do
|
6
7
|
@name = :passenger
|
@@ -10,10 +11,10 @@ DependencyDetection.defer do
|
|
10
11
|
end
|
11
12
|
|
12
13
|
executes do
|
13
|
-
::NewRelic::Agent.logger.debug
|
14
|
+
::NewRelic::Agent.logger.debug("Installing Passenger event hooks.")
|
14
15
|
|
15
16
|
::PhusionPassenger.on_event(:stopping_worker_process) do
|
16
|
-
::NewRelic::Agent.logger.debug
|
17
|
+
::NewRelic::Agent.logger.debug("Passenger stopping this process, shutdown the agent.")
|
17
18
|
NewRelic::Agent.instance.shutdown
|
18
19
|
end
|
19
20
|
|
@@ -1,12 +1,13 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
module NewRelic::Agent::Instrumentation
|
6
7
|
module Rack
|
7
8
|
module Chain
|
8
|
-
def self.instrument!
|
9
|
-
NewRelic::Agent::Instrumentation::RackBuilder.track_deferred_detection
|
9
|
+
def self.instrument!(builder_class)
|
10
|
+
NewRelic::Agent::Instrumentation::RackBuilder.track_deferred_detection(builder_class)
|
10
11
|
|
11
12
|
builder_class.class_eval do
|
12
13
|
include ::NewRelic::Agent::Instrumentation::RackBuilder
|
@@ -15,26 +16,26 @@ module NewRelic::Agent::Instrumentation
|
|
15
16
|
with_deferred_dependency_detection { to_app_without_newrelic }
|
16
17
|
end
|
17
18
|
|
18
|
-
alias_method
|
19
|
-
alias_method
|
19
|
+
alias_method(:to_app_without_newrelic, :to_app)
|
20
|
+
alias_method(:to_app, :to_app_with_newrelic_deferred_dependency_detection)
|
20
21
|
|
21
22
|
if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
|
22
|
-
::NewRelic::Agent.logger.info
|
23
|
+
::NewRelic::Agent.logger.info("Installing #{builder_class} middleware instrumentation")
|
23
24
|
|
24
25
|
def run_with_newrelic(app, *args)
|
25
26
|
run_with_tracing(app) { |wrapped_app| run_without_newrelic(wrapped_app, *args) }
|
26
27
|
end
|
27
28
|
|
28
|
-
alias_method
|
29
|
-
alias_method
|
29
|
+
alias_method(:run_without_newrelic, :run)
|
30
|
+
alias_method(:run, :run_with_newrelic)
|
30
31
|
|
31
32
|
def use_with_newrelic(middleware_class, *args, &block)
|
32
33
|
use_with_tracing(middleware_class) { |wrapped_class| use_without_newrelic(wrapped_class, *args, &block) }
|
33
34
|
end
|
34
35
|
ruby2_keywords(:use_with_newrelic) if respond_to?(:ruby2_keywords, true)
|
35
36
|
|
36
|
-
alias_method
|
37
|
-
alias_method
|
37
|
+
alias_method(:use_without_newrelic, :use)
|
38
|
+
alias_method(:use, :use_with_newrelic)
|
38
39
|
end
|
39
40
|
end
|
40
41
|
end
|
@@ -42,9 +43,9 @@ module NewRelic::Agent::Instrumentation
|
|
42
43
|
|
43
44
|
module URLMap
|
44
45
|
module Chain
|
45
|
-
def self.instrument!
|
46
|
+
def self.instrument!(url_map_class)
|
46
47
|
url_map_class.class_eval do
|
47
|
-
alias_method
|
48
|
+
alias_method(:initialize_without_newrelic, :initialize)
|
48
49
|
|
49
50
|
def initialize(map = {})
|
50
51
|
traced_map = ::NewRelic::Agent::Instrumentation::RackURLMap.generate_traced_map(map)
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
module NewRelic::Agent::Instrumentation
|
6
7
|
module RackHelpers
|