newrelic_rpm 8.7.0 → 8.11.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +4 -0
- data/.rubocop.yml +68 -189
- data/.rubocop_todo.yml +52 -0
- data/.simplecov +15 -0
- data/.snyk +11 -0
- data/.yardopts +1 -0
- data/Brewfile +1 -0
- data/CHANGELOG.md +181 -23
- data/CONTRIBUTING.md +1 -1
- data/Gemfile +0 -1
- data/Guardfile +1 -0
- data/README.md +1 -1
- data/Rakefile +13 -20
- data/Thorfile +5 -0
- data/bin/newrelic +2 -1
- data/bin/newrelic_cmd +1 -0
- data/bin/nrdebug +66 -45
- data/config.dot +5 -5
- data/init.rb +4 -4
- data/install.rb +2 -2
- data/lib/new_relic/agent/adaptive_sampler.rb +4 -4
- data/lib/new_relic/agent/agent/shutdown.rb +34 -0
- data/lib/new_relic/agent/agent/special_startup.rb +70 -0
- data/lib/new_relic/agent/agent/start_worker_thread.rb +163 -0
- data/lib/new_relic/agent/agent/startup.rb +196 -0
- data/lib/new_relic/agent/agent.rb +134 -534
- data/lib/new_relic/agent/agent_logger.rb +8 -10
- data/lib/new_relic/agent/attribute_filter.rb +40 -21
- data/lib/new_relic/agent/attribute_processing.rb +7 -7
- data/lib/new_relic/agent/attributes.rb +2 -2
- data/lib/new_relic/agent/audit_logger.rb +3 -3
- data/lib/new_relic/agent/autostart.rb +2 -2
- data/lib/new_relic/agent/chained_call.rb +1 -1
- data/lib/new_relic/agent/commands/agent_command.rb +1 -1
- data/lib/new_relic/agent/commands/agent_command_router.rb +8 -8
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -1
- data/lib/new_relic/agent/configuration/default_source.rb +105 -41
- data/lib/new_relic/agent/configuration/dotted_hash.rb +2 -2
- data/lib/new_relic/agent/configuration/environment_source.rb +5 -5
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +1 -1
- data/lib/new_relic/agent/configuration/high_security_source.rb +1 -1
- data/lib/new_relic/agent/configuration/manager.rb +5 -5
- data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
- data/lib/new_relic/agent/configuration/mask_defaults.rb +3 -3
- data/lib/new_relic/agent/configuration/security_policy_source.rb +7 -4
- data/lib/new_relic/agent/configuration/server_source.rb +7 -7
- data/lib/new_relic/agent/configuration/yaml_source.rb +6 -4
- data/lib/new_relic/agent/configuration.rb +1 -1
- data/lib/new_relic/agent/connect/request_builder.rb +3 -3
- data/lib/new_relic/agent/connect/response_handler.rb +5 -5
- data/lib/new_relic/agent/custom_event_aggregator.rb +5 -5
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +1 -1
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +1 -1
- data/lib/new_relic/agent/database/obfuscator.rb +2 -2
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +1 -1
- data/lib/new_relic/agent/database.rb +21 -21
- data/lib/new_relic/agent/database_adapter.rb +1 -1
- data/lib/new_relic/agent/datastores/metric_helper.rb +12 -13
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +4 -3
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +2 -4
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +2 -2
- data/lib/new_relic/agent/datastores/mongo.rb +1 -1
- data/lib/new_relic/agent/datastores/redis.rb +3 -3
- data/lib/new_relic/agent/datastores.rb +4 -4
- data/lib/new_relic/agent/deprecator.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +16 -17
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +9 -10
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +18 -19
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +8 -10
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +2 -3
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +40 -40
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +16 -15
- data/lib/new_relic/agent/distributed_tracing.rb +17 -18
- data/lib/new_relic/agent/encoding_normalizer.rb +1 -1
- data/lib/new_relic/agent/error_collector.rb +6 -5
- data/lib/new_relic/agent/error_event_aggregator.rb +3 -4
- data/lib/new_relic/agent/error_filter.rb +5 -5
- data/lib/new_relic/agent/error_trace_aggregator.rb +3 -3
- data/lib/new_relic/agent/event_aggregator.rb +20 -20
- data/lib/new_relic/agent/event_buffer.rb +1 -1
- data/lib/new_relic/agent/event_listener.rb +1 -1
- data/lib/new_relic/agent/event_loop.rb +9 -9
- data/lib/new_relic/agent/external.rb +10 -10
- data/lib/new_relic/agent/guid_generator.rb +2 -2
- data/lib/new_relic/agent/harvester.rb +1 -1
- data/lib/new_relic/agent/heap.rb +5 -5
- data/lib/new_relic/agent/hostname.rb +4 -3
- data/lib/new_relic/agent/http_clients/abstract.rb +1 -2
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +5 -6
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +4 -5
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +2 -3
- 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 +1 -2
- data/lib/new_relic/agent/http_clients/uri_util.rb +1 -2
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +6 -5
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +31 -23
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +7 -6
- data/lib/new_relic/agent/instrumentation/active_job.rb +11 -4
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +4 -3
- data/lib/new_relic/agent/instrumentation/active_record.rb +9 -9
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +37 -21
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +3 -3
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +21 -11
- data/lib/new_relic/agent/instrumentation/active_storage.rb +2 -2
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +16 -15
- data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/active_support_logger.rb +2 -2
- data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +2 -2
- data/lib/new_relic/agent/instrumentation/authlogic.rb +2 -2
- data/lib/new_relic/agent/instrumentation/bunny/chain.rb +10 -10
- data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +10 -11
- data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +4 -4
- data/lib/new_relic/agent/instrumentation/bunny.rb +1 -2
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +25 -17
- data/lib/new_relic/agent/instrumentation/curb/chain.rb +21 -22
- data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +19 -16
- data/lib/new_relic/agent/instrumentation/curb/prepend.rb +2 -3
- data/lib/new_relic/agent/instrumentation/curb.rb +2 -2
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +44 -44
- data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +1 -2
- data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +2 -3
- data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +1 -2
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +3 -3
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +3 -3
- data/lib/new_relic/agent/instrumentation/excon.rb +2 -2
- data/lib/new_relic/agent/instrumentation/grape/chain.rb +6 -6
- data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +5 -5
- data/lib/new_relic/agent/instrumentation/grape/prepend.rb +4 -4
- data/lib/new_relic/agent/instrumentation/grape.rb +1 -1
- data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +97 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +89 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +111 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +30 -0
- data/lib/new_relic/agent/instrumentation/grpc/helper.rb +32 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +69 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +134 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +26 -0
- data/lib/new_relic/agent/instrumentation/grpc_client.rb +23 -0
- data/lib/new_relic/agent/instrumentation/grpc_server.rb +25 -0
- data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +6 -6
- data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/httpclient.rb +2 -2
- data/lib/new_relic/agent/instrumentation/httprb/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +4 -4
- data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/httprb.rb +2 -2
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +2 -2
- data/lib/new_relic/agent/instrumentation/logger/chain.rb +2 -2
- data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +5 -1
- data/lib/new_relic/agent/instrumentation/logger/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/logger.rb +2 -2
- data/lib/new_relic/agent/instrumentation/memcache/chain.rb +2 -3
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +24 -17
- data/lib/new_relic/agent/instrumentation/memcache/helper.rb +8 -9
- data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +17 -15
- data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +21 -15
- data/lib/new_relic/agent/instrumentation/memcache.rb +5 -6
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +2 -2
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +0 -1
- data/lib/new_relic/agent/instrumentation/mongo.rb +2 -2
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +15 -14
- data/lib/new_relic/agent/instrumentation/net_http/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +5 -5
- data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/net_http.rb +2 -2
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +6 -6
- data/lib/new_relic/agent/instrumentation/padrino/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/padrino.rb +2 -2
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +3 -3
- data/lib/new_relic/agent/instrumentation/queue_time.rb +1 -2
- data/lib/new_relic/agent/instrumentation/rack/chain.rb +12 -12
- data/lib/new_relic/agent/instrumentation/rack/helpers.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +7 -7
- data/lib/new_relic/agent/instrumentation/rack/prepend.rb +4 -4
- data/lib/new_relic/agent/instrumentation/rack.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +6 -6
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +3 -2
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +3 -2
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +3 -2
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +3 -3
- data/lib/new_relic/agent/instrumentation/rake/chain.rb +2 -2
- data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +6 -2
- data/lib/new_relic/agent/instrumentation/rake/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rake.rb +3 -3
- data/lib/new_relic/agent/instrumentation/redis/chain.rb +3 -4
- data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +5 -6
- data/lib/new_relic/agent/instrumentation/redis/prepend.rb +3 -4
- data/lib/new_relic/agent/instrumentation/redis.rb +2 -2
- data/lib/new_relic/agent/instrumentation/resque/chain.rb +2 -2
- data/lib/new_relic/agent/instrumentation/resque/helper.rb +1 -1
- data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/resque/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/resque.rb +3 -3
- data/lib/new_relic/agent/instrumentation/sequel.rb +8 -8
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +6 -5
- data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +2 -2
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +2 -2
- data/lib/new_relic/agent/instrumentation/sinatra.rb +2 -2
- data/lib/new_relic/agent/instrumentation/sunspot.rb +4 -4
- data/lib/new_relic/agent/instrumentation/thread/chain.rb +2 -2
- data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/thread/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/thread.rb +2 -2
- data/lib/new_relic/agent/instrumentation/tilt/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/tilt.rb +1 -1
- data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +8 -8
- data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +2 -2
- data/lib/new_relic/agent/instrumentation.rb +1 -1
- data/lib/new_relic/agent/internal_agent_error.rb +1 -1
- data/lib/new_relic/agent/javascript_instrumentor.rb +8 -8
- data/lib/new_relic/agent/linking_metadata.rb +2 -3
- data/lib/new_relic/agent/local_log_decorator.rb +0 -1
- data/lib/new_relic/agent/log_event_aggregator.rb +7 -7
- data/lib/new_relic/agent/log_once.rb +1 -1
- data/lib/new_relic/agent/log_priority.rb +1 -1
- data/lib/new_relic/agent/logging.rb +13 -13
- data/lib/new_relic/agent/memory_logger.rb +1 -1
- data/lib/new_relic/agent/messaging.rb +19 -20
- data/lib/new_relic/agent/method_tracer.rb +15 -10
- data/lib/new_relic/agent/method_tracer_helpers.rb +83 -1
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +4 -4
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +3 -3
- data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +1 -1
- data/lib/new_relic/agent/monitors/synthetics_monitor.rb +2 -2
- data/lib/new_relic/agent/monitors.rb +5 -5
- data/lib/new_relic/agent/new_relic_service/encoders.rb +2 -2
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +4 -4
- data/lib/new_relic/agent/new_relic_service/marshaller.rb +1 -1
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +1 -1
- data/lib/new_relic/agent/new_relic_service.rb +214 -166
- data/lib/new_relic/agent/{noticible_error.rb → noticeable_error.rb} +2 -3
- data/lib/new_relic/agent/null_logger.rb +1 -1
- data/lib/new_relic/agent/obfuscator.rb +3 -3
- data/lib/new_relic/agent/parameter_filtering.rb +1 -1
- data/lib/new_relic/agent/payload_metric_mapping.rb +1 -1
- data/lib/new_relic/agent/pipe_channel_manager.rb +10 -5
- data/lib/new_relic/agent/pipe_service.rb +2 -2
- data/lib/new_relic/agent/prepend_supportability.rb +2 -2
- data/lib/new_relic/agent/priority_sampled_buffer.rb +4 -4
- data/lib/new_relic/agent/range_extensions.rb +8 -28
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +2 -2
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +1 -1
- data/lib/new_relic/agent/rules_engine.rb +2 -2
- data/lib/new_relic/agent/sampler.rb +1 -1
- data/lib/new_relic/agent/sampler_collection.rb +1 -1
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +2 -2
- data/lib/new_relic/agent/samplers/memory_sampler.rb +10 -10
- data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/vm_sampler.rb +3 -1
- data/lib/new_relic/agent/span_event_aggregator.rb +2 -2
- data/lib/new_relic/agent/span_event_primitive.rb +24 -19
- data/lib/new_relic/agent/sql_sampler.rb +8 -8
- data/lib/new_relic/agent/stats.rb +15 -4
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +1 -2
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +4 -4
- data/lib/new_relic/agent/stats_engine.rb +1 -1
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +6 -6
- data/lib/new_relic/agent/system_info.rb +68 -53
- data/lib/new_relic/agent/threading/agent_thread.rb +13 -9
- data/lib/new_relic/agent/threading/backtrace_node.rb +6 -4
- data/lib/new_relic/agent/threading/backtrace_service.rb +1 -1
- data/lib/new_relic/agent/threading/thread_profile.rb +4 -4
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
- data/lib/new_relic/agent/tracer.rb +19 -17
- data/lib/new_relic/agent/transaction/abstract_segment.rb +93 -34
- data/lib/new_relic/agent/transaction/datastore_segment.rb +12 -12
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +52 -48
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +21 -22
- data/lib/new_relic/agent/transaction/external_request_segment.rb +37 -29
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +6 -6
- data/lib/new_relic/agent/transaction/request_attributes.rb +29 -29
- data/lib/new_relic/agent/transaction/segment.rb +8 -8
- data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction/trace.rb +3 -3
- data/lib/new_relic/agent/transaction/trace_builder.rb +10 -10
- data/lib/new_relic/agent/transaction/trace_context.rb +22 -20
- data/lib/new_relic/agent/transaction/trace_node.rb +9 -9
- data/lib/new_relic/agent/transaction/tracing.rb +7 -7
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -2
- data/lib/new_relic/agent/transaction.rb +35 -31
- data/lib/new_relic/agent/transaction_error_primitive.rb +9 -9
- data/lib/new_relic/agent/transaction_event_aggregator.rb +5 -5
- data/lib/new_relic/agent/transaction_event_primitive.rb +3 -4
- data/lib/new_relic/agent/transaction_event_recorder.rb +15 -14
- data/lib/new_relic/agent/transaction_metrics.rb +4 -4
- data/lib/new_relic/agent/transaction_sampler.rb +5 -5
- data/lib/new_relic/agent/transaction_time_aggregator.rb +14 -14
- data/lib/new_relic/agent/utilization/aws.rb +4 -4
- data/lib/new_relic/agent/utilization/azure.rb +2 -2
- data/lib/new_relic/agent/utilization/gcp.rb +7 -7
- data/lib/new_relic/agent/utilization/pcf.rb +4 -4
- data/lib/new_relic/agent/utilization/vendor.rb +28 -28
- data/lib/new_relic/agent/utilization_data.rb +1 -1
- data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -1
- data/lib/new_relic/agent/vm/mri_vm.rb +36 -23
- data/lib/new_relic/agent/vm/snapshot.rb +2 -2
- data/lib/new_relic/agent/vm.rb +1 -1
- data/lib/new_relic/agent/worker_loop.rb +2 -2
- data/lib/new_relic/agent.rb +27 -27
- data/lib/new_relic/cli/command.rb +6 -6
- data/lib/new_relic/cli/commands/deployments.rb +81 -29
- data/lib/new_relic/cli/commands/install.rb +6 -6
- data/lib/new_relic/coerce.rb +5 -6
- data/lib/new_relic/collection_helper.rb +4 -4
- data/lib/new_relic/constants.rb +0 -1
- data/lib/new_relic/control/class_methods.rb +1 -1
- data/lib/new_relic/control/frameworks/external.rb +1 -1
- data/lib/new_relic/control/frameworks/rails.rb +3 -3
- data/lib/new_relic/control/frameworks/rails3.rb +1 -1
- data/lib/new_relic/control/frameworks/rails4.rb +1 -1
- data/lib/new_relic/control/frameworks/rails_notifications.rb +1 -1
- data/lib/new_relic/control/frameworks/ruby.rb +1 -1
- data/lib/new_relic/control/frameworks/sinatra.rb +1 -1
- data/lib/new_relic/control/frameworks.rb +1 -1
- data/lib/new_relic/control/instance_methods.rb +20 -42
- data/lib/new_relic/control/instrumentation.rb +7 -7
- data/lib/new_relic/control/private_instance_methods.rb +48 -0
- data/lib/new_relic/control/server_methods.rb +2 -2
- data/lib/new_relic/control.rb +1 -1
- data/lib/new_relic/delayed_job_injection.rb +1 -1
- data/lib/new_relic/dependency_detection.rb +23 -22
- data/lib/new_relic/environment_report.rb +24 -14
- data/lib/new_relic/helper.rb +5 -5
- data/lib/new_relic/language_support.rb +8 -3
- data/lib/new_relic/latest_changes.rb +4 -4
- data/lib/new_relic/local_environment.rb +9 -11
- data/lib/new_relic/metric_data.rb +30 -24
- data/lib/new_relic/metric_spec.rb +3 -3
- data/lib/new_relic/noticed_error.rb +3 -6
- data/lib/new_relic/rack/agent_hooks.rb +1 -1
- data/lib/new_relic/rack/agent_middleware.rb +1 -1
- data/lib/new_relic/rack/browser_monitoring.rb +132 -123
- data/lib/new_relic/rack.rb +1 -1
- data/lib/new_relic/recipes/capistrano3.rb +3 -59
- data/lib/new_relic/recipes/capistrano_legacy.rb +13 -13
- data/lib/new_relic/recipes/helpers/send_deployment.rb +69 -0
- data/lib/new_relic/recipes.rb +1 -1
- data/lib/new_relic/supportability_helper.rb +6 -6
- data/lib/new_relic/traced_thread.rb +5 -7
- data/lib/new_relic/version.rb +2 -2
- data/lib/newrelic_rpm.rb +1 -1
- data/lib/sequel/extensions/newrelic_instrumentation.rb +8 -8
- data/lib/sequel/plugins/newrelic_instrumentation.rb +1 -1
- data/lib/tasks/all.rb +1 -1
- data/lib/tasks/config.rake +8 -112
- data/lib/tasks/coverage_report.rake +28 -0
- 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 +120 -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 +4 -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 +102 -0
- data/lib/tasks/instrumentation_generator/templates/Envfile.tt +9 -0
- data/lib/tasks/instrumentation_generator/templates/chain.tt +21 -0
- data/lib/tasks/instrumentation_generator/templates/chain_method.tt +7 -0
- data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +29 -0
- data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +12 -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 +13 -0
- data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
- data/lib/tasks/instrumentation_generator/templates/test.tt +15 -0
- data/lib/tasks/multiverse.rake +4 -0
- data/lib/tasks/multiverse.rb +5 -30
- data/lib/tasks/newrelic.rb +1 -1
- data/lib/tasks/tests.rake +7 -8
- data/newrelic.yml +514 -483
- data/newrelic_rpm.gemspec +16 -21
- data/recipes/newrelic.rb +1 -1
- data/test/agent_helper.rb +125 -147
- metadata +82 -90
- data/bin/mongrel_rpm +0 -32
@@ -1,6 +1,6 @@
|
|
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.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
module NewRelic
|
6
6
|
module Agent
|
@@ -12,7 +12,6 @@ module NewRelic
|
|
12
12
|
REQUEST_START_HEADER = 'HTTP_X_REQUEST_START'.freeze
|
13
13
|
QUEUE_START_HEADER = 'HTTP_X_QUEUE_START'.freeze
|
14
14
|
MIDDLEWARE_START_HEADER = 'HTTP_X_MIDDLEWARE_START'.freeze
|
15
|
-
ALL_QUEUE_METRIC = 'WebFrontend/QueueTime'.freeze
|
16
15
|
# any timestamps before this are thrown out and the parser
|
17
16
|
# will try again with a larger unit (2000/1/1 UTC)
|
18
17
|
EARLIEST_ACCEPTABLE_TIME = Time.at(946684800).to_f
|
@@ -1,12 +1,12 @@
|
|
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.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
module NewRelic::Agent::Instrumentation
|
6
6
|
module Rack
|
7
7
|
module Chain
|
8
|
-
def self.instrument!
|
9
|
-
NewRelic::Agent::Instrumentation::RackBuilder.track_deferred_detection
|
8
|
+
def self.instrument!(builder_class)
|
9
|
+
NewRelic::Agent::Instrumentation::RackBuilder.track_deferred_detection(builder_class)
|
10
10
|
|
11
11
|
builder_class.class_eval do
|
12
12
|
include ::NewRelic::Agent::Instrumentation::RackBuilder
|
@@ -15,26 +15,26 @@ module NewRelic::Agent::Instrumentation
|
|
15
15
|
with_deferred_dependency_detection { to_app_without_newrelic }
|
16
16
|
end
|
17
17
|
|
18
|
-
alias_method
|
19
|
-
alias_method
|
18
|
+
alias_method(:to_app_without_newrelic, :to_app)
|
19
|
+
alias_method(:to_app, :to_app_with_newrelic_deferred_dependency_detection)
|
20
20
|
|
21
21
|
if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
|
22
|
-
::NewRelic::Agent.logger.info
|
22
|
+
::NewRelic::Agent.logger.info("Installing #{builder_class} middleware instrumentation")
|
23
23
|
|
24
24
|
def run_with_newrelic(app, *args)
|
25
25
|
run_with_tracing(app) { |wrapped_app| run_without_newrelic(wrapped_app, *args) }
|
26
26
|
end
|
27
27
|
|
28
|
-
alias_method
|
29
|
-
alias_method
|
28
|
+
alias_method(:run_without_newrelic, :run)
|
29
|
+
alias_method(:run, :run_with_newrelic)
|
30
30
|
|
31
31
|
def use_with_newrelic(middleware_class, *args, &block)
|
32
32
|
use_with_tracing(middleware_class) { |wrapped_class| use_without_newrelic(wrapped_class, *args, &block) }
|
33
33
|
end
|
34
34
|
ruby2_keywords(:use_with_newrelic) if respond_to?(:ruby2_keywords, true)
|
35
35
|
|
36
|
-
alias_method
|
37
|
-
alias_method
|
36
|
+
alias_method(:use_without_newrelic, :use)
|
37
|
+
alias_method(:use, :use_with_newrelic)
|
38
38
|
end
|
39
39
|
end
|
40
40
|
end
|
@@ -42,9 +42,9 @@ module NewRelic::Agent::Instrumentation
|
|
42
42
|
|
43
43
|
module URLMap
|
44
44
|
module Chain
|
45
|
-
def self.instrument!
|
45
|
+
def self.instrument!(url_map_class)
|
46
46
|
url_map_class.class_eval do
|
47
|
-
alias_method
|
47
|
+
alias_method(:initialize_without_newrelic, :initialize)
|
48
48
|
|
49
49
|
def initialize(map = {})
|
50
50
|
traced_map = ::NewRelic::Agent::Instrumentation::RackURLMap.generate_traced_map(map)
|
@@ -1,6 +1,6 @@
|
|
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.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
module NewRelic::Agent::Instrumentation
|
6
6
|
module RackHelpers
|
@@ -1,12 +1,12 @@
|
|
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.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
module NewRelic
|
6
6
|
module Agent
|
7
7
|
module Instrumentation
|
8
8
|
module RackBuilder
|
9
|
-
def self.track_deferred_detection
|
9
|
+
def self.track_deferred_detection(builder_class)
|
10
10
|
class << builder_class
|
11
11
|
attr_accessor :_nr_deferred_detection_ran
|
12
12
|
end
|
@@ -16,7 +16,7 @@ module NewRelic
|
|
16
16
|
def deferred_dependency_check
|
17
17
|
return if self.class._nr_deferred_detection_ran
|
18
18
|
|
19
|
-
NewRelic::Agent.logger.info
|
19
|
+
NewRelic::Agent.logger.info("Doing deferred dependency-detection before Rack startup")
|
20
20
|
DependencyDetection.detect!
|
21
21
|
self.class._nr_deferred_detection_ran = true
|
22
22
|
end
|
@@ -47,15 +47,15 @@ module NewRelic
|
|
47
47
|
::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
|
48
48
|
end
|
49
49
|
|
50
|
-
def run_with_tracing
|
50
|
+
def run_with_tracing(app)
|
51
51
|
return yield(app) unless middleware_instrumentation_enabled?
|
52
|
-
yield
|
52
|
+
yield(::NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(app, true))
|
53
53
|
end
|
54
54
|
|
55
|
-
def use_with_tracing
|
55
|
+
def use_with_tracing(middleware_class)
|
56
56
|
return if middleware_class.nil?
|
57
57
|
return yield(middleware_class) unless middleware_instrumentation_enabled?
|
58
|
-
yield
|
58
|
+
yield(::NewRelic::Agent::Instrumentation::MiddlewareProxy.for_class(middleware_class))
|
59
59
|
end
|
60
60
|
end
|
61
61
|
|
@@ -1,13 +1,13 @@
|
|
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.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
module NewRelic::Agent::Instrumentation
|
6
6
|
module Rack
|
7
7
|
module URLMap
|
8
8
|
module Prepend
|
9
9
|
def initialize(map = {})
|
10
|
-
super
|
10
|
+
super(::NewRelic::Agent::Instrumentation::RackURLMap.generate_traced_map(map))
|
11
11
|
end
|
12
12
|
end
|
13
13
|
end
|
@@ -15,8 +15,8 @@ module NewRelic::Agent::Instrumentation
|
|
15
15
|
module Prepend
|
16
16
|
include ::NewRelic::Agent::Instrumentation::RackBuilder
|
17
17
|
|
18
|
-
def self.prepended
|
19
|
-
NewRelic::Agent::Instrumentation::RackBuilder.track_deferred_detection
|
18
|
+
def self.prepended(builder_class)
|
19
|
+
NewRelic::Agent::Instrumentation::RackBuilder.track_deferred_detection(builder_class)
|
20
20
|
end
|
21
21
|
|
22
22
|
def to_app
|
@@ -1,6 +1,6 @@
|
|
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.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
require 'new_relic/agent/instrumentation/controller_instrumentation'
|
6
6
|
|
@@ -1,6 +1,6 @@
|
|
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.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
require 'new_relic/agent/parameter_filtering'
|
6
6
|
|
@@ -40,7 +40,7 @@ module NewRelic
|
|
40
40
|
"file"
|
41
41
|
elsif identifier.nil?
|
42
42
|
::NewRelic::Agent::UNKNOWN_METRIC
|
43
|
-
elsif identifier.include?
|
43
|
+
elsif identifier.include?('/') # this is a filepath
|
44
44
|
identifier.split('/')[-2..-1].join('/')
|
45
45
|
else
|
46
46
|
identifier
|
@@ -74,7 +74,7 @@ DependencyDetection.defer do
|
|
74
74
|
end
|
75
75
|
|
76
76
|
executes do
|
77
|
-
::NewRelic::Agent.logger.info
|
77
|
+
::NewRelic::Agent.logger.info('Installing Rails 3 Controller instrumentation')
|
78
78
|
end
|
79
79
|
|
80
80
|
executes do
|
@@ -101,7 +101,7 @@ DependencyDetection.defer do
|
|
101
101
|
end
|
102
102
|
|
103
103
|
executes do
|
104
|
-
::NewRelic::Agent.logger.info
|
104
|
+
::NewRelic::Agent.logger.info('Installing Rails 3.2 view instrumentation')
|
105
105
|
end
|
106
106
|
|
107
107
|
executes do
|
@@ -111,10 +111,10 @@ DependencyDetection.defer do
|
|
111
111
|
|
112
112
|
def render_with_newrelic(context, options)
|
113
113
|
# This is needed for rails 3.2 compatibility
|
114
|
-
@details = extract_details(options) if respond_to?
|
114
|
+
@details = extract_details(options) if respond_to?(:extract_details, true)
|
115
115
|
identifier = determine_template(options) ? determine_template(options).identifier : nil
|
116
116
|
scope_name = "View/#{NewRelic::Agent::Instrumentation::Rails3::ActionView::NewRelic.template_metric(identifier, options)}/Rendering"
|
117
|
-
trace_execution_scoped
|
117
|
+
trace_execution_scoped(scope_name) do
|
118
118
|
render_without_newrelic(context, options)
|
119
119
|
end
|
120
120
|
end
|
@@ -1,6 +1,6 @@
|
|
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.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
require 'new_relic/agent/instrumentation/middleware_proxy'
|
6
6
|
|
@@ -1,6 +1,7 @@
|
|
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.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
4
5
|
require 'new_relic/agent/instrumentation/action_cable_subscriber'
|
5
6
|
require 'new_relic/agent/prepend_supportability'
|
6
7
|
|
@@ -19,7 +20,7 @@ DependencyDetection.defer do
|
|
19
20
|
end
|
20
21
|
|
21
22
|
executes do
|
22
|
-
::NewRelic::Agent.logger.info
|
23
|
+
::NewRelic::Agent.logger.info('Installing notifications based Action Cable instrumentation')
|
23
24
|
end
|
24
25
|
|
25
26
|
executes do
|
@@ -1,6 +1,7 @@
|
|
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.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
4
5
|
require 'new_relic/agent/instrumentation/action_controller_subscriber'
|
5
6
|
require 'new_relic/agent/prepend_supportability'
|
6
7
|
|
@@ -16,7 +17,7 @@ DependencyDetection.defer do
|
|
16
17
|
end
|
17
18
|
|
18
19
|
executes do
|
19
|
-
::NewRelic::Agent.logger.info
|
20
|
+
::NewRelic::Agent.logger.info('Installing notifications based Action Controller instrumentation')
|
20
21
|
end
|
21
22
|
|
22
23
|
executes do
|
@@ -1,6 +1,7 @@
|
|
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.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
4
5
|
require 'new_relic/agent/instrumentation/action_view_subscriber'
|
5
6
|
require 'new_relic/agent/prepend_supportability'
|
6
7
|
|
@@ -17,7 +18,7 @@ DependencyDetection.defer do
|
|
17
18
|
end
|
18
19
|
|
19
20
|
executes do
|
20
|
-
NewRelic::Agent.logger.info
|
21
|
+
NewRelic::Agent.logger.info('Installing notification based Action View instrumentation')
|
21
22
|
end
|
22
23
|
|
23
24
|
executes do
|
@@ -1,6 +1,6 @@
|
|
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.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
DependencyDetection.defer do
|
6
6
|
@name = :rainbows
|
@@ -10,8 +10,8 @@ DependencyDetection.defer do
|
|
10
10
|
end
|
11
11
|
|
12
12
|
executes do
|
13
|
-
::NewRelic::Agent.logger.info
|
14
|
-
::NewRelic::Agent.logger.info
|
13
|
+
::NewRelic::Agent.logger.info('Installing Rainbows instrumentation')
|
14
|
+
::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
15
|
|
16
16
|
deprecation_msg = 'The dispatcher rainbows is deprecated. It will be removed ' \
|
17
17
|
'in version 9.0.0. Please use a supported dispatcher instead. ' \
|
@@ -1,6 +1,6 @@
|
|
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.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
module NewRelic::Agent::Instrumentation
|
6
6
|
module Rake
|
@@ -8,7 +8,7 @@ module NewRelic::Agent::Instrumentation
|
|
8
8
|
def self.instrument!
|
9
9
|
::Rake::Task.class_eval do
|
10
10
|
include NewRelic::Agent::Instrumentation::Rake::Tracer
|
11
|
-
alias_method
|
11
|
+
alias_method(:invoke_without_newrelic, :invoke)
|
12
12
|
|
13
13
|
def invoke(*args)
|
14
14
|
invoke_with_newrelic_tracing(*args) { invoke_without_newrelic(*args) }
|
@@ -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
|
@@ -9,7 +8,7 @@ module NewRelic
|
|
9
8
|
module Rake
|
10
9
|
module Tracer
|
11
10
|
def invoke_with_newrelic_tracing(*args)
|
12
|
-
unless NewRelic::Agent::Instrumentation::Rake.should_trace?
|
11
|
+
unless NewRelic::Agent::Instrumentation::Rake.should_trace?(name)
|
13
12
|
return yield
|
14
13
|
end
|
15
14
|
|
@@ -133,7 +132,12 @@ module NewRelic
|
|
133
132
|
at_exit do
|
134
133
|
# The agent's default at_exit might not default to installing, but
|
135
134
|
# if we are running an instrumented rake task, we always want it.
|
135
|
+
# No code coverage, as the strategy for mocking Kernel.exit prevents
|
136
|
+
# the at_exit block from being executed, and not mocking results in
|
137
|
+
# an early unwanted exit of MiniTest.
|
138
|
+
# :nocov:
|
136
139
|
NewRelic::Agent.shutdown
|
140
|
+
# :nocov:
|
137
141
|
end
|
138
142
|
|
139
143
|
@installed_at_exit = true
|
@@ -1,6 +1,6 @@
|
|
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.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
require_relative 'rake/instrumentation'
|
6
6
|
require_relative 'rake/chain'
|
@@ -17,8 +17,8 @@ DependencyDetection.defer do
|
|
17
17
|
depends_on { ::NewRelic::Agent::Instrumentation::Rake.safe_from_third_party_gem? }
|
18
18
|
|
19
19
|
executes do
|
20
|
-
::NewRelic::Agent.logger.info
|
21
|
-
::NewRelic::Agent.logger.debug
|
20
|
+
::NewRelic::Agent.logger.info("Installing Rake instrumentation")
|
21
|
+
::NewRelic::Agent.logger.debug("Instrumenting Rake tasks: #{::NewRelic::Agent.config[:'rake.tasks']}")
|
22
22
|
end
|
23
23
|
|
24
24
|
executes do
|
@@ -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
|
@@ -10,19 +9,19 @@ module NewRelic::Agent::Instrumentation
|
|
10
9
|
::Redis::Client.class_eval do
|
11
10
|
include NewRelic::Agent::Instrumentation::Redis
|
12
11
|
|
13
|
-
alias_method
|
12
|
+
alias_method(:call_without_new_relic, :call)
|
14
13
|
|
15
14
|
def call(*args, &block)
|
16
15
|
call_with_tracing(args[0]) { call_without_new_relic(*args, &block) }
|
17
16
|
end
|
18
17
|
|
19
|
-
alias_method
|
18
|
+
alias_method(:call_pipeline_without_new_relic, :call_pipeline)
|
20
19
|
|
21
20
|
def call_pipeline(*args, &block)
|
22
21
|
call_pipeline_with_tracing(args[0]) { call_pipeline_without_new_relic(*args, &block) }
|
23
22
|
end
|
24
23
|
|
25
|
-
alias_method
|
24
|
+
alias_method(:connect_without_new_relic, :connect)
|
26
25
|
|
27
26
|
def connect(*args, &block)
|
28
27
|
connect_with_tracing { connect_without_new_relic(*args, &block) }
|
@@ -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
|
@@ -12,14 +11,14 @@ module NewRelic::Agent::Instrumentation
|
|
12
11
|
MULTI_OPERATION = 'multi'
|
13
12
|
PIPELINE_OPERATION = 'pipeline'
|
14
13
|
|
15
|
-
def call_with_tracing
|
14
|
+
def call_with_tracing(command, &block)
|
16
15
|
operation = command[0]
|
17
16
|
statement = ::NewRelic::Agent::Datastores::Redis.format_command(command)
|
18
17
|
|
19
18
|
with_tracing(operation, statement) { yield }
|
20
19
|
end
|
21
20
|
|
22
|
-
def call_pipeline_with_tracing
|
21
|
+
def call_pipeline_with_tracing(pipeline)
|
23
22
|
operation = pipeline.is_a?(::Redis::Pipeline::Multi) ? MULTI_OPERATION : PIPELINE_OPERATION
|
24
23
|
statement = ::NewRelic::Agent::Datastores::Redis.format_pipeline_commands(pipeline.commands)
|
25
24
|
|
@@ -32,7 +31,7 @@ module NewRelic::Agent::Instrumentation
|
|
32
31
|
|
33
32
|
private
|
34
33
|
|
35
|
-
def with_tracing
|
34
|
+
def with_tracing(operation, statement = nil)
|
36
35
|
segment = NewRelic::Agent::Tracer.start_datastore_segment(
|
37
36
|
product: PRODUCT_NAME,
|
38
37
|
operation: operation,
|
@@ -51,14 +50,14 @@ module NewRelic::Agent::Instrumentation
|
|
51
50
|
def _nr_hostname
|
52
51
|
self.path ? LOCALHOST : self.host
|
53
52
|
rescue => e
|
54
|
-
NewRelic::Agent.logger.debug
|
53
|
+
NewRelic::Agent.logger.debug("Failed to retrieve Redis host: #{e}")
|
55
54
|
UNKNOWN
|
56
55
|
end
|
57
56
|
|
58
57
|
def _nr_port_path_or_id
|
59
58
|
self.path || self.port
|
60
59
|
rescue => e
|
61
|
-
NewRelic::Agent.logger.debug
|
60
|
+
NewRelic::Agent.logger.debug("Failed to retrieve Redis port_path_or_id: #{e}")
|
62
61
|
UNKNOWN
|
63
62
|
end
|
64
63
|
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,15 +7,15 @@ module NewRelic::Agent::Instrumentation
|
|
8
7
|
module Prepend
|
9
8
|
include NewRelic::Agent::Instrumentation::Redis
|
10
9
|
|
11
|
-
def call
|
10
|
+
def call(*args, &block)
|
12
11
|
call_with_tracing(args[0]) { super }
|
13
12
|
end
|
14
13
|
|
15
|
-
def call_pipeline
|
14
|
+
def call_pipeline(*args, &block)
|
16
15
|
call_pipeline_with_tracing(args[0]) { super }
|
17
16
|
end
|
18
17
|
|
19
|
-
def connect
|
18
|
+
def connect(*args, &block)
|
20
19
|
connect_with_tracing { super }
|
21
20
|
end
|
22
21
|
end
|
@@ -1,6 +1,6 @@
|
|
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.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
require 'new_relic/agent/datastores'
|
6
6
|
require 'new_relic/agent/datastores/redis'
|
@@ -28,7 +28,7 @@ DependencyDetection.defer do
|
|
28
28
|
end
|
29
29
|
|
30
30
|
executes do
|
31
|
-
NewRelic::Agent.logger.info
|
31
|
+
NewRelic::Agent.logger.info('Installing Redis Instrumentation')
|
32
32
|
if use_prepend?
|
33
33
|
prepend_instrument ::Redis::Client, NewRelic::Agent::Instrumentation::Redis::Prepend
|
34
34
|
else
|
@@ -1,6 +1,6 @@
|
|
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.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
module NewRelic::Agent::Instrumentation
|
6
6
|
module Resque
|
@@ -9,7 +9,7 @@ module NewRelic::Agent::Instrumentation
|
|
9
9
|
::Resque::Job.class_eval do
|
10
10
|
include NewRelic::Agent::Instrumentation::Resque
|
11
11
|
|
12
|
-
alias_method
|
12
|
+
alias_method(:perform_without_instrumentation, :perform)
|
13
13
|
|
14
14
|
def perform
|
15
15
|
with_tracing { perform_without_instrumentation }
|
@@ -1,6 +1,6 @@
|
|
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.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
require_relative 'resque/instrumentation'
|
6
6
|
require_relative 'resque/chain'
|
@@ -19,12 +19,12 @@ DependencyDetection.defer do
|
|
19
19
|
end
|
20
20
|
|
21
21
|
executes do
|
22
|
-
::NewRelic::Agent.logger.info
|
22
|
+
::NewRelic::Agent.logger.info('Installing Resque instrumentation')
|
23
23
|
end
|
24
24
|
|
25
25
|
executes do
|
26
26
|
if NewRelic::Agent.config[:'resque.use_ruby_dns'] && NewRelic::Agent.config[:dispatcher] == :resque
|
27
|
-
::NewRelic::Agent.logger.info
|
27
|
+
::NewRelic::Agent.logger.info('Requiring resolv-replace')
|
28
28
|
require 'resolv'
|
29
29
|
require 'resolv-replace'
|
30
30
|
end
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# -*- ruby -*-
|
2
|
-
# encoding: utf-8
|
3
2
|
# This file is distributed under New Relic's license terms.
|
4
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
5
5
|
|
6
6
|
DependencyDetection.defer do
|
7
7
|
@name = :sequel
|
@@ -24,24 +24,24 @@ DependencyDetection.defer do
|
|
24
24
|
executes do
|
25
25
|
if supported_sequel_version?
|
26
26
|
|
27
|
-
::NewRelic::Agent.logger.info
|
27
|
+
::NewRelic::Agent.logger.info('Installing Sequel instrumentation')
|
28
28
|
|
29
29
|
if Sequel::Database.respond_to?(:extension)
|
30
|
-
Sequel::Database.extension
|
30
|
+
Sequel::Database.extension(:newrelic_instrumentation)
|
31
31
|
else
|
32
|
-
NewRelic::Agent.logger.info
|
33
|
-
NewRelic::Agent.logger.info
|
34
|
-
"https://newrelic.com/docs/ruby/sequel-instrumentation"
|
32
|
+
NewRelic::Agent.logger.info("Detected Sequel version %s." % [Sequel::VERSION])
|
33
|
+
NewRelic::Agent.logger.info("Please see additional documentation: " +
|
34
|
+
"https://newrelic.com/docs/ruby/sequel-instrumentation")
|
35
35
|
end
|
36
36
|
|
37
37
|
Sequel.synchronize { Sequel::DATABASES.dup }.each do |db|
|
38
|
-
db.extension
|
38
|
+
db.extension(:newrelic_instrumentation)
|
39
39
|
end
|
40
40
|
|
41
41
|
Sequel::Model.plugin(:newrelic_instrumentation) if defined?(Sequel::Model)
|
42
42
|
else
|
43
43
|
|
44
|
-
NewRelic::Agent.logger.info
|
44
|
+
NewRelic::Agent.logger.info("Sequel instrumentation requires at least version 3.37.0.")
|
45
45
|
|
46
46
|
end
|
47
47
|
end
|
@@ -1,5 +1,6 @@
|
|
1
1
|
# This file is distributed under New Relic's license terms.
|
2
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
3
4
|
|
4
5
|
DependencyDetection.defer do
|
5
6
|
@name = :sidekiq
|
@@ -9,7 +10,7 @@ DependencyDetection.defer do
|
|
9
10
|
end
|
10
11
|
|
11
12
|
executes do
|
12
|
-
::NewRelic::Agent.logger.info
|
13
|
+
::NewRelic::Agent.logger.info('Installing Sidekiq instrumentation')
|
13
14
|
end
|
14
15
|
|
15
16
|
executes do
|
@@ -80,20 +81,20 @@ DependencyDetection.defer do
|
|
80
81
|
|
81
82
|
Sidekiq.configure_client do |config|
|
82
83
|
config.client_middleware do |chain|
|
83
|
-
chain.add
|
84
|
+
chain.add(NewRelic::SidekiqInstrumentation::Client)
|
84
85
|
end
|
85
86
|
end
|
86
87
|
|
87
88
|
Sidekiq.configure_server do |config|
|
88
89
|
config.client_middleware do |chain|
|
89
|
-
chain.add
|
90
|
+
chain.add(NewRelic::SidekiqInstrumentation::Client)
|
90
91
|
end
|
91
92
|
config.server_middleware do |chain|
|
92
|
-
chain.add
|
93
|
+
chain.add(NewRelic::SidekiqInstrumentation::Server)
|
93
94
|
end
|
94
95
|
|
95
96
|
if config.respond_to?(:error_handlers)
|
96
|
-
config.error_handlers <<
|
97
|
+
config.error_handlers << proc do |error, *_|
|
97
98
|
NewRelic::Agent.notice_error(error)
|
98
99
|
end
|
99
100
|
end
|