newrelic_rpm 8.9.0 → 8.10.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +1 -0
- data/.rubocop.yml +23 -8
- data/.rubocop_todo.yml +243 -0
- data/.simplecov +10 -2
- data/.snyk +11 -0
- data/Brewfile +1 -0
- data/CHANGELOG.md +78 -0
- data/Guardfile +1 -0
- data/Rakefile +5 -0
- data/Thorfile +6 -0
- 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 +10 -4
- 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 +98 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +90 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +112 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +31 -0
- data/lib/new_relic/agent/instrumentation/grpc/helper.rb +33 -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 +11 -6
- 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 +17 -14
- 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 +6 -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 +3 -2
- 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 +22 -11
- data/lib/tasks/install.rake +1 -0
- data/lib/tasks/instrumentation_generator/README.md +63 -0
- data/lib/tasks/instrumentation_generator/TODO.md +33 -0
- data/lib/tasks/instrumentation_generator/instrumentation.thor +96 -0
- data/lib/tasks/instrumentation_generator/templates/Envfile.tt +10 -0
- data/lib/tasks/instrumentation_generator/templates/chain.tt +22 -0
- data/lib/tasks/instrumentation_generator/templates/chain_method.tt +7 -0
- data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +30 -0
- data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +13 -0
- data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
- data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
- data/lib/tasks/instrumentation_generator/templates/prepend.tt +14 -0
- data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
- data/lib/tasks/instrumentation_generator/templates/test.tt +16 -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 +15 -17
- data/recipes/newrelic.rb +1 -0
- data/test/agent_helper.rb +114 -118
- metadata +58 -89
- data/bin/mongrel_rpm +0 -32
@@ -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
|
@@ -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
|
6
7
|
module Agent
|
7
8
|
module Instrumentation
|
8
9
|
module RackBuilder
|
9
|
-
def self.track_deferred_detection
|
10
|
+
def self.track_deferred_detection(builder_class)
|
10
11
|
class << builder_class
|
11
12
|
attr_accessor :_nr_deferred_detection_ran
|
12
13
|
end
|
@@ -16,7 +17,7 @@ module NewRelic
|
|
16
17
|
def deferred_dependency_check
|
17
18
|
return if self.class._nr_deferred_detection_ran
|
18
19
|
|
19
|
-
NewRelic::Agent.logger.info
|
20
|
+
NewRelic::Agent.logger.info("Doing deferred dependency-detection before Rack startup")
|
20
21
|
DependencyDetection.detect!
|
21
22
|
self.class._nr_deferred_detection_ran = true
|
22
23
|
end
|
@@ -47,15 +48,15 @@ module NewRelic
|
|
47
48
|
::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
|
48
49
|
end
|
49
50
|
|
50
|
-
def run_with_tracing
|
51
|
+
def run_with_tracing(app)
|
51
52
|
return yield(app) unless middleware_instrumentation_enabled?
|
52
|
-
yield
|
53
|
+
yield(::NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(app, true))
|
53
54
|
end
|
54
55
|
|
55
|
-
def use_with_tracing
|
56
|
+
def use_with_tracing(middleware_class)
|
56
57
|
return if middleware_class.nil?
|
57
58
|
return yield(middleware_class) unless middleware_instrumentation_enabled?
|
58
|
-
yield
|
59
|
+
yield(::NewRelic::Agent::Instrumentation::MiddlewareProxy.for_class(middleware_class))
|
59
60
|
end
|
60
61
|
end
|
61
62
|
|
@@ -1,13 +1,14 @@
|
|
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 URLMap
|
8
9
|
module Prepend
|
9
10
|
def initialize(map = {})
|
10
|
-
super
|
11
|
+
super(::NewRelic::Agent::Instrumentation::RackURLMap.generate_traced_map(map))
|
11
12
|
end
|
12
13
|
end
|
13
14
|
end
|
@@ -15,8 +16,8 @@ module NewRelic::Agent::Instrumentation
|
|
15
16
|
module Prepend
|
16
17
|
include ::NewRelic::Agent::Instrumentation::RackBuilder
|
17
18
|
|
18
|
-
def self.prepended
|
19
|
-
NewRelic::Agent::Instrumentation::RackBuilder.track_deferred_detection
|
19
|
+
def self.prepended(builder_class)
|
20
|
+
NewRelic::Agent::Instrumentation::RackBuilder.track_deferred_detection(builder_class)
|
20
21
|
end
|
21
22
|
|
22
23
|
def to_app
|
@@ -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/instrumentation/controller_instrumentation'
|
6
7
|
|
@@ -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/parameter_filtering'
|
6
7
|
|
@@ -40,7 +41,7 @@ module NewRelic
|
|
40
41
|
"file"
|
41
42
|
elsif identifier.nil?
|
42
43
|
::NewRelic::Agent::UNKNOWN_METRIC
|
43
|
-
elsif identifier.include?
|
44
|
+
elsif identifier.include?('/') # this is a filepath
|
44
45
|
identifier.split('/')[-2..-1].join('/')
|
45
46
|
else
|
46
47
|
identifier
|
@@ -74,7 +75,7 @@ DependencyDetection.defer do
|
|
74
75
|
end
|
75
76
|
|
76
77
|
executes do
|
77
|
-
::NewRelic::Agent.logger.info
|
78
|
+
::NewRelic::Agent.logger.info('Installing Rails 3 Controller instrumentation')
|
78
79
|
end
|
79
80
|
|
80
81
|
executes do
|
@@ -101,7 +102,7 @@ DependencyDetection.defer do
|
|
101
102
|
end
|
102
103
|
|
103
104
|
executes do
|
104
|
-
::NewRelic::Agent.logger.info
|
105
|
+
::NewRelic::Agent.logger.info('Installing Rails 3.2 view instrumentation')
|
105
106
|
end
|
106
107
|
|
107
108
|
executes do
|
@@ -111,10 +112,10 @@ DependencyDetection.defer do
|
|
111
112
|
|
112
113
|
def render_with_newrelic(context, options)
|
113
114
|
# This is needed for rails 3.2 compatibility
|
114
|
-
@details = extract_details(options) if respond_to?
|
115
|
+
@details = extract_details(options) if respond_to?(:extract_details, true)
|
115
116
|
identifier = determine_template(options) ? determine_template(options).identifier : nil
|
116
117
|
scope_name = "View/#{NewRelic::Agent::Instrumentation::Rails3::ActionView::NewRelic.template_metric(identifier, options)}/Rendering"
|
117
|
-
trace_execution_scoped
|
118
|
+
trace_execution_scoped(scope_name) do
|
118
119
|
render_without_newrelic(context, options)
|
119
120
|
end
|
120
121
|
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
|
require 'new_relic/agent/instrumentation/middleware_proxy'
|
6
7
|
|
@@ -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/instrumentation/action_cable_subscriber'
|
5
7
|
require 'new_relic/agent/prepend_supportability'
|
6
8
|
|
@@ -19,7 +21,7 @@ DependencyDetection.defer do
|
|
19
21
|
end
|
20
22
|
|
21
23
|
executes do
|
22
|
-
::NewRelic::Agent.logger.info
|
24
|
+
::NewRelic::Agent.logger.info('Installing notifications based Action Cable instrumentation')
|
23
25
|
end
|
24
26
|
|
25
27
|
executes do
|
@@ -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/instrumentation/action_controller_subscriber'
|
5
7
|
require 'new_relic/agent/prepend_supportability'
|
6
8
|
|
@@ -16,7 +18,7 @@ DependencyDetection.defer do
|
|
16
18
|
end
|
17
19
|
|
18
20
|
executes do
|
19
|
-
::NewRelic::Agent.logger.info
|
21
|
+
::NewRelic::Agent.logger.info('Installing notifications based Action Controller instrumentation')
|
20
22
|
end
|
21
23
|
|
22
24
|
executes do
|
@@ -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/instrumentation/action_view_subscriber'
|
5
7
|
require 'new_relic/agent/prepend_supportability'
|
6
8
|
|
@@ -17,7 +19,7 @@ DependencyDetection.defer do
|
|
17
19
|
end
|
18
20
|
|
19
21
|
executes do
|
20
|
-
NewRelic::Agent.logger.info
|
22
|
+
NewRelic::Agent.logger.info('Installing notification based Action View instrumentation')
|
21
23
|
end
|
22
24
|
|
23
25
|
executes do
|
@@ -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 = :rainbows
|
@@ -10,8 +11,8 @@ DependencyDetection.defer do
|
|
10
11
|
end
|
11
12
|
|
12
13
|
executes do
|
13
|
-
::NewRelic::Agent.logger.info
|
14
|
-
::NewRelic::Agent.logger.info
|
14
|
+
::NewRelic::Agent.logger.info('Installing Rainbows instrumentation')
|
15
|
+
::NewRelic::Agent.logger.info('Detected Rainbows, please see additional documentation: https://newrelic.com/docs/troubleshooting/im-using-unicorn-and-i-dont-see-any-data')
|
15
16
|
|
16
17
|
deprecation_msg = 'The dispatcher rainbows is deprecated. It will be removed ' \
|
17
18
|
'in version 9.0.0. Please use a supported dispatcher instead. ' \
|
@@ -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 Rake
|
@@ -8,7 +9,7 @@ module NewRelic::Agent::Instrumentation
|
|
8
9
|
def self.instrument!
|
9
10
|
::Rake::Task.class_eval do
|
10
11
|
include NewRelic::Agent::Instrumentation::Rake::Tracer
|
11
|
-
alias_method
|
12
|
+
alias_method(:invoke_without_newrelic, :invoke)
|
12
13
|
|
13
14
|
def invoke(*args)
|
14
15
|
invoke_with_newrelic_tracing(*args) { invoke_without_newrelic(*args) }
|
@@ -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 'rake/instrumentation'
|
6
7
|
require_relative 'rake/chain'
|
@@ -17,8 +18,8 @@ DependencyDetection.defer do
|
|
17
18
|
depends_on { ::NewRelic::Agent::Instrumentation::Rake.safe_from_third_party_gem? }
|
18
19
|
|
19
20
|
executes do
|
20
|
-
::NewRelic::Agent.logger.info
|
21
|
-
::NewRelic::Agent.logger.debug
|
21
|
+
::NewRelic::Agent.logger.info("Installing Rake instrumentation")
|
22
|
+
::NewRelic::Agent.logger.debug("Instrumenting Rake tasks: #{::NewRelic::Agent.config[:'rake.tasks']}")
|
22
23
|
end
|
23
24
|
|
24
25
|
executes do
|
@@ -10,19 +10,19 @@ module NewRelic::Agent::Instrumentation
|
|
10
10
|
::Redis::Client.class_eval do
|
11
11
|
include NewRelic::Agent::Instrumentation::Redis
|
12
12
|
|
13
|
-
alias_method
|
13
|
+
alias_method(:call_without_new_relic, :call)
|
14
14
|
|
15
15
|
def call(*args, &block)
|
16
16
|
call_with_tracing(args[0]) { call_without_new_relic(*args, &block) }
|
17
17
|
end
|
18
18
|
|
19
|
-
alias_method
|
19
|
+
alias_method(:call_pipeline_without_new_relic, :call_pipeline)
|
20
20
|
|
21
21
|
def call_pipeline(*args, &block)
|
22
22
|
call_pipeline_with_tracing(args[0]) { call_pipeline_without_new_relic(*args, &block) }
|
23
23
|
end
|
24
24
|
|
25
|
-
alias_method
|
25
|
+
alias_method(:connect_without_new_relic, :connect)
|
26
26
|
|
27
27
|
def connect(*args, &block)
|
28
28
|
connect_with_tracing { connect_without_new_relic(*args, &block) }
|
@@ -12,14 +12,14 @@ module NewRelic::Agent::Instrumentation
|
|
12
12
|
MULTI_OPERATION = 'multi'
|
13
13
|
PIPELINE_OPERATION = 'pipeline'
|
14
14
|
|
15
|
-
def call_with_tracing
|
15
|
+
def call_with_tracing(command, &block)
|
16
16
|
operation = command[0]
|
17
17
|
statement = ::NewRelic::Agent::Datastores::Redis.format_command(command)
|
18
18
|
|
19
19
|
with_tracing(operation, statement) { yield }
|
20
20
|
end
|
21
21
|
|
22
|
-
def call_pipeline_with_tracing
|
22
|
+
def call_pipeline_with_tracing(pipeline)
|
23
23
|
operation = pipeline.is_a?(::Redis::Pipeline::Multi) ? MULTI_OPERATION : PIPELINE_OPERATION
|
24
24
|
statement = ::NewRelic::Agent::Datastores::Redis.format_pipeline_commands(pipeline.commands)
|
25
25
|
|
@@ -32,7 +32,7 @@ module NewRelic::Agent::Instrumentation
|
|
32
32
|
|
33
33
|
private
|
34
34
|
|
35
|
-
def with_tracing
|
35
|
+
def with_tracing(operation, statement = nil)
|
36
36
|
segment = NewRelic::Agent::Tracer.start_datastore_segment(
|
37
37
|
product: PRODUCT_NAME,
|
38
38
|
operation: operation,
|
@@ -51,14 +51,14 @@ module NewRelic::Agent::Instrumentation
|
|
51
51
|
def _nr_hostname
|
52
52
|
self.path ? LOCALHOST : self.host
|
53
53
|
rescue => e
|
54
|
-
NewRelic::Agent.logger.debug
|
54
|
+
NewRelic::Agent.logger.debug("Failed to retrieve Redis host: #{e}")
|
55
55
|
UNKNOWN
|
56
56
|
end
|
57
57
|
|
58
58
|
def _nr_port_path_or_id
|
59
59
|
self.path || self.port
|
60
60
|
rescue => e
|
61
|
-
NewRelic::Agent.logger.debug
|
61
|
+
NewRelic::Agent.logger.debug("Failed to retrieve Redis port_path_or_id: #{e}")
|
62
62
|
UNKNOWN
|
63
63
|
end
|
64
64
|
end
|
@@ -8,15 +8,15 @@ module NewRelic::Agent::Instrumentation
|
|
8
8
|
module Prepend
|
9
9
|
include NewRelic::Agent::Instrumentation::Redis
|
10
10
|
|
11
|
-
def call
|
11
|
+
def call(*args, &block)
|
12
12
|
call_with_tracing(args[0]) { super }
|
13
13
|
end
|
14
14
|
|
15
|
-
def call_pipeline
|
15
|
+
def call_pipeline(*args, &block)
|
16
16
|
call_pipeline_with_tracing(args[0]) { super }
|
17
17
|
end
|
18
18
|
|
19
|
-
def connect
|
19
|
+
def connect(*args, &block)
|
20
20
|
connect_with_tracing { super }
|
21
21
|
end
|
22
22
|
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
|
require 'new_relic/agent/datastores'
|
6
7
|
require 'new_relic/agent/datastores/redis'
|
@@ -28,7 +29,7 @@ DependencyDetection.defer do
|
|
28
29
|
end
|
29
30
|
|
30
31
|
executes do
|
31
|
-
NewRelic::Agent.logger.info
|
32
|
+
NewRelic::Agent.logger.info('Installing Redis Instrumentation')
|
32
33
|
if use_prepend?
|
33
34
|
prepend_instrument ::Redis::Client, NewRelic::Agent::Instrumentation::Redis::Prepend
|
34
35
|
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
|
module NewRelic::Agent::Instrumentation
|
6
7
|
module Resque
|
@@ -9,7 +10,7 @@ module NewRelic::Agent::Instrumentation
|
|
9
10
|
::Resque::Job.class_eval do
|
10
11
|
include NewRelic::Agent::Instrumentation::Resque
|
11
12
|
|
12
|
-
alias_method
|
13
|
+
alias_method(:perform_without_instrumentation, :perform)
|
13
14
|
|
14
15
|
def perform
|
15
16
|
with_tracing { perform_without_instrumentation }
|
@@ -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 'resque/instrumentation'
|
6
7
|
require_relative 'resque/chain'
|
@@ -19,12 +20,12 @@ DependencyDetection.defer do
|
|
19
20
|
end
|
20
21
|
|
21
22
|
executes do
|
22
|
-
::NewRelic::Agent.logger.info
|
23
|
+
::NewRelic::Agent.logger.info('Installing Resque instrumentation')
|
23
24
|
end
|
24
25
|
|
25
26
|
executes do
|
26
27
|
if NewRelic::Agent.config[:'resque.use_ruby_dns'] && NewRelic::Agent.config[:dispatcher] == :resque
|
27
|
-
::NewRelic::Agent.logger.info
|
28
|
+
::NewRelic::Agent.logger.info('Requiring resolv-replace')
|
28
29
|
require 'resolv'
|
29
30
|
require 'resolv-replace'
|
30
31
|
end
|